Merge remote-tracking branch 'igorw/ticket/10155' into develop

* igorw/ticket/10155:
  [ticket/10155] Briefly explain assets in coding-guidelines
  [ticket/10155] Move jQuery inclusion to footer
  [ticket/10155] Update to jQuery 1.6.2
  [ticket/10155] Add jQuery to AUTHORS
  [ticket/10155] Add jQuery, introduce global assets path

phpBB/adm/index.php

@@ -53,6 +53,7 @@ $mode			= request_var('mode', '');
 
 // Set custom template for admin area
 $template->set_custom_template($phpbb_admin_path . 'style', 'admin');
+$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
 $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
 
 // the acp template is never stored in the database

phpBB/adm/style/install_footer.html

@@ -12,5 +12,7 @@
 	</div>
 </div>
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+
 </body>
 </html>

phpBB/adm/style/overall_footer.html

@@ -20,5 +20,7 @@
 	</div>
 </div>
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+
 </body>
 </html>

phpBB/adm/style/simple_footer.html

@@ -16,5 +16,7 @@
 
 </div>
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+
 </body>
 </html>

phpBB/docs/AUTHORS

@@ -72,6 +72,7 @@ phpMyAdmin (c) 2001,2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/
 Jabber Class (c) 2006 Flyspray.org, http://www.flyspray.org/
 Chora (c) 2000-2006, The Horde Project. http://horde.org/chora/
 Horde Project (c) 2000-2006, The Horde Project. http://horde.org/
+jQuery (c) 2011, John Resig. http://jquery.com/
 
 PHP License, version 3.0:
 Pear (c) 2001-2004 PHP Group, http://pear.php.net

phpBB/docs/coding-guidelines.html

@@ -262,6 +262,7 @@ PHPBB_QA                   (Set board to QA-Mode, which means the updater also c
 <p>Path locations for the following template variables are affected by this too:</p>
 
 <ul>
+	<li>{T_ASSETS_PATH} - assets (non-style specific, static resources)</li>
 	<li>{T_THEME_PATH} - styles/xxx/theme</li>
 	<li>{T_TEMPLATE_PATH} - styles/xxx/template</li>
 	<li>{T_SUPER_TEMPLATE_PATH} - styles/xxx/template</li>

phpBB/docs/hook_system.html

@@ -395,6 +395,7 @@ PHPBB_USE_BOARD_URL_PATH (use generate_board_url() for image paths instead of $p
 <p>Path locations for the following template variables are affected by this too:</p>
 
 <ul>
+	<li>{T_ASSETS_PATH} - assets</li>
 	<li>{T_THEME_PATH} - styles/xxx/theme</li>
 	<li>{T_TEMPLATE_PATH} - styles/xxx/template</li>
 	<li>{T_SUPER_TEMPLATE_PATH} - styles/xxx/template</li>

phpBB/includes/functions.php

@@ -4550,6 +4550,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 
 		'S_SEARCH_HIDDEN_FIELDS'	=> build_hidden_fields($s_search_hidden_fields),
 
+		'T_ASSETS_PATH'			=> "{$web_path}assets",
 		'T_THEME_PATH'			=> "{$web_path}styles/" . $user->theme['theme_path'] . '/theme',
 		'T_TEMPLATE_PATH'		=> "{$web_path}styles/" . $user->theme['template_path'] . '/template',
 		'T_SUPER_TEMPLATE_PATH'	=> (isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? "{$web_path}styles/" . $user->theme['template_inherit_path'] . '/template' : "{$web_path}styles/" . $user->theme['template_path'] . '/template',

phpBB/install/index.php

@@ -202,6 +202,7 @@ $config = new phpbb_config(array(
 $template_locator = new phpbb_template_locator();
 $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $template_locator);
 $template->set_custom_template('../adm/style', 'admin');
+$template->assign_var('T_ASSETS_PATH', '../assets');
 $template->assign_var('T_TEMPLATE_PATH', '../adm/style');
 
 // the acp template is never stored in the database

phpBB/styles/prosilver/template/overall_footer.html

@@ -33,5 +33,7 @@
 	<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
 </div>
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+
 </body>
 </html>

phpBB/styles/prosilver/template/simple_footer.html

@@ -6,5 +6,7 @@
 	</div>
 </div>
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+
 </body>
 </html>

phpBB/styles/subsilver2/template/overall_footer.html

@@ -8,5 +8,7 @@
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
 </div>
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+
 </body>
 </html>

phpBB/styles/subsilver2/template/simple_footer.html

@@ -5,5 +5,7 @@
 	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group</span>
 </div>
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+
 </body>
 </html>