From c945fc9355fca866bfb095a2e79c51408a709387 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 11 Jul 2011 09:55:18 +0200
Subject: [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/styles/prosilver/template/overall_header.html | 1 +
 phpBB/styles/prosilver/template/simple_header.html  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 4d6fbf4dae..e80c8dd55c 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -34,6 +34,7 @@
 	      about phpBB please visit http://www.phpbb.com
 -->
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 <script type="text/javascript">
 // <![CDATA[
 	var jump_page = '{LA_JUMP_PAGE}:';
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html
index f983a8ef8d..f7851a2c39 100644
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ b/phpBB/styles/prosilver/template/simple_header.html
@@ -13,6 +13,7 @@
 {META}
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 <script type="text/javascript">
 // <![CDATA[
 
-- 
cgit v1.2.1


From 17bf983cdc9de05273d0279af5f0b5043d3d53b4 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 17 Jul 2011 10:05:40 +0200
Subject: [ticket/10155] Move jQuery inclusion to footer

PHPBB3-10155
---
 phpBB/styles/prosilver/template/overall_footer.html | 2 ++
 phpBB/styles/prosilver/template/overall_header.html | 1 -
 phpBB/styles/prosilver/template/simple_footer.html  | 2 ++
 phpBB/styles/prosilver/template/simple_header.html  | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 5075c661f3..51a2fba060 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/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>
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index e80c8dd55c..4d6fbf4dae 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -34,7 +34,6 @@
 	      about phpBB please visit http://www.phpbb.com
 -->
 
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 <script type="text/javascript">
 // <![CDATA[
 	var jump_page = '{LA_JUMP_PAGE}:';
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index 2511db675f..5899da0b7a 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/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>
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html
index f7851a2c39..f983a8ef8d 100644
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ b/phpBB/styles/prosilver/template/simple_header.html
@@ -13,7 +13,6 @@
 {META}
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 <script type="text/javascript">
 // <![CDATA[
 
-- 
cgit v1.2.1