From c945fc9355fca866bfb095a2e79c51408a709387 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Mon, 11 Jul 2011 09:55:18 +0200 Subject: [PATCH] [ticket/10155] Add jQuery, introduce global assets path Add the jQuery JavaScript library to all pages, giving modifications instant access and allowing for any future core JavaScript to take advantage of it. Also introduce a global /assets directory for assets that are shared between styles. PHPBB3-10155 --- phpBB/adm/index.php | 1 + phpBB/adm/style/install_header.html | 1 + phpBB/adm/style/overall_header.html | 1 + phpBB/adm/style/simple_header.html | 1 + phpBB/assets/javascript/jquery.js | 16 ++++++++++++++++ phpBB/docs/coding-guidelines.html | 1 + phpBB/docs/hook_system.html | 1 + phpBB/includes/functions.php | 1 + phpBB/install/index.php | 1 + .../prosilver/template/overall_header.html | 1 + .../styles/prosilver/template/simple_header.html | 1 + .../subsilver2/template/overall_header.html | 1 + .../subsilver2/template/simple_header.html | 1 + 13 files changed, 28 insertions(+) create mode 100644 phpBB/assets/javascript/jquery.js diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 726cb1644c..2444a1b597 100644 --- a/phpBB/adm/index.php +++ b/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 diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index fbb6a7b409..0a49e57afa 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -11,6 +11,7 @@ +