From 1a0819bdc40fd6b40b556ba1739ae71214719b43 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 24 Jun 2013 13:32:31 -0500
Subject: [feature/twig] Changing INCLUDEJS behavior

Was:
<!-- INCLUDEJS template/foo.js -->

Now:
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' -->

Reasons for this:
1. INCLUDEJS is 3.1-dev only

2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path
to styles/name/ directory)

3. INCLUDEJS could not include files from outside directories or anywhere
else

4. It was easier to change INCLUDEJS behavior to something more flexible
and useful than hack around it to make it work as it was with Twig.

PHPBB3-11598
---
 phpBB/styles/prosilver/template/memberlist_search.html   | 2 +-
 phpBB/styles/prosilver/template/overall_footer.html      | 2 +-
 phpBB/styles/prosilver/template/posting_buttons.html     | 4 ++--
 phpBB/styles/prosilver/template/timezone_option.html     | 2 +-
 phpBB/styles/prosilver/template/ucp_avatar_options.html  | 2 +-
 phpBB/styles/subsilver2/template/timezone_option.html    | 2 +-
 phpBB/styles/subsilver2/template/ucp_groups_manage.html  | 2 +-
 phpBB/styles/subsilver2/template/ucp_profile_avatar.html | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 61bfd630ff..2b826497da 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -38,7 +38,7 @@ function insert_single(user)
 // ]]>
 </script>
 <!-- ENDIF -->
-<!-- INCLUDEJS template/forum_fn.js -->
+<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/forum_fn.js' -->
 <h2 class="solo">{L_FIND_USERNAME}</h2>
 
 <form method="post" action="{S_MODE_ACTION}" id="search_memberlist">
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index ba0412ddd3..01fc3f83da 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -55,7 +55,7 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js?assets_version={T_ASSETS_VERSION}"></script>
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
-<!-- INCLUDEJS template/ajax.js -->
+<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/ajax.js' -->
 {SCRIPTS}
 
 <!-- EVENT overall_footer_after -->
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index fadbc9b3ca..b3e2b85492 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -39,7 +39,7 @@
 	{
 		dE('colour_palette');
 		e = document.getElementById('colour_palette');
-		
+
 		if (e.style.display == 'block')
 		{
 			document.getElementById('bbpalette').value = '{LA_FONT_COLOR_HIDE}';
@@ -52,7 +52,7 @@
 
 // ]]>
 </script>
-<!-- INCLUDEJS template/editor.js -->
+<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/editor.js' -->
 
 <!-- IF S_BBCODE_ALLOWED -->
 <div id="colour_palette" style="display: none;">
diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html
index a77e82f9a1..95b30dbcd1 100644
--- a/phpBB/styles/prosilver/template/timezone_option.html
+++ b/phpBB/styles/prosilver/template/timezone_option.html
@@ -15,6 +15,6 @@
 			{S_TZ_OPTIONS}
 		</select>
 
-		<!-- INCLUDEJS template/timezone.js -->
+		<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/timezone.js' -->
 	</dd>
 </dl>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index e7f4a48e11..4f4aef3ff9 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -47,4 +47,4 @@
 	</div>
 </div>
 
-<!-- INCLUDEJS template/avatars.js -->
+<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/avatars.js' -->
diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html
index 26ba2388c9..d71166f517 100644
--- a/phpBB/styles/subsilver2/template/timezone_option.html
+++ b/phpBB/styles/subsilver2/template/timezone_option.html
@@ -15,6 +15,6 @@
 			{S_TZ_OPTIONS}
 		</select>
 
-		<!-- INCLUDEJS template/timezone.js -->
+		<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/timezone.js' -->
 	</td>
 </tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
index 8064e1e6e9..5595d19b9e 100644
--- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html
+++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
@@ -95,7 +95,7 @@
 	</tr>
 	</table>
 
-<!-- INCLUDEJS template/avatars.js -->
+<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/avatars.js' -->
 
 <!-- ELSEIF S_LIST -->
 
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
index 697cceabb9..58ef499c41 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
@@ -48,6 +48,6 @@
 	</tr>
 </table>
 
-<!-- INCLUDEJS template/avatars.js -->
+<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/avatars.js' -->
 
 <!-- INCLUDE ucp_footer.html -->
-- 
cgit v1.2.1


From 6c30441ad4a20fe4f154d5a859b9df0f28cbc8e0 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 12:26:01 -0500
Subject: [feature/twig] Changing INCLUDEJS behavior slightly

Automatically parsing inline variables the same way it is done for
INCLUDE, INCLUDEPHP

PHPBB3-11598
---
 phpBB/styles/prosilver/template/memberlist_search.html   | 2 +-
 phpBB/styles/prosilver/template/overall_footer.html      | 2 +-
 phpBB/styles/prosilver/template/posting_buttons.html     | 2 +-
 phpBB/styles/prosilver/template/timezone_option.html     | 2 +-
 phpBB/styles/prosilver/template/ucp_avatar_options.html  | 2 +-
 phpBB/styles/subsilver2/template/timezone_option.html    | 2 +-
 phpBB/styles/subsilver2/template/ucp_groups_manage.html  | 2 +-
 phpBB/styles/subsilver2/template/ucp_profile_avatar.html | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 97769b6155..6d2d87a278 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -38,7 +38,7 @@ function insert_single(user)
 // ]]>
 </script>
 <!-- ENDIF -->
-<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/forum_fn.js' -->
+<!-- INCLUDEJS {T_TEMPLATE_PATH}/forum_fn.js -->
 <h2 class="solo">{L_FIND_USERNAME}</h2>
 
 <form method="post" action="{S_MODE_ACTION}" id="search_memberlist">
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 01fc3f83da..5422cc7c10 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -55,7 +55,7 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js?assets_version={T_ASSETS_VERSION}"></script>
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
-<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/ajax.js' -->
+<!-- INCLUDEJS {T_TEMPLATE_PATH}/ajax.js -->
 {SCRIPTS}
 
 <!-- EVENT overall_footer_after -->
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index b3e2b85492..164e887f75 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -52,7 +52,7 @@
 
 // ]]>
 </script>
-<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/editor.js' -->
+<!-- INCLUDEJS {T_TEMPLATE_PATH}/editor.js -->
 
 <!-- IF S_BBCODE_ALLOWED -->
 <div id="colour_palette" style="display: none;">
diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html
index 95b30dbcd1..ebcf51a906 100644
--- a/phpBB/styles/prosilver/template/timezone_option.html
+++ b/phpBB/styles/prosilver/template/timezone_option.html
@@ -15,6 +15,6 @@
 			{S_TZ_OPTIONS}
 		</select>
 
-		<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/timezone.js' -->
+		<!-- INCLUDEJS {T_TEMPLATE_PATH}/timezone.js -->
 	</dd>
 </dl>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 4f4aef3ff9..02c7868afb 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -47,4 +47,4 @@
 	</div>
 </div>
 
-<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/avatars.js' -->
+<!-- INCLUDEJS {T_TEMPLATE_PATH}/avatars.js -->
diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html
index d71166f517..9b68f81557 100644
--- a/phpBB/styles/subsilver2/template/timezone_option.html
+++ b/phpBB/styles/subsilver2/template/timezone_option.html
@@ -15,6 +15,6 @@
 			{S_TZ_OPTIONS}
 		</select>
 
-		<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/timezone.js' -->
+		<!-- INCLUDEJS {T_TEMPLATE_PATH}/timezone.js -->
 	</td>
 </tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
index 5595d19b9e..13b8b8c6b7 100644
--- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html
+++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
@@ -95,7 +95,7 @@
 	</tr>
 	</table>
 
-<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/avatars.js' -->
+<!-- INCLUDEJS {T_TEMPLATE_PATH}/avatars.js -->
 
 <!-- ELSEIF S_LIST -->
 
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
index 58ef499c41..885d46ef0b 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
@@ -48,6 +48,6 @@
 	</tr>
 </table>
 
-<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/avatars.js' -->
+<!-- INCLUDEJS {T_TEMPLATE_PATH}/avatars.js -->
 
 <!-- INCLUDE ucp_footer.html -->
-- 
cgit v1.2.1


From 156d5c671fb9db28fbbdcacb974093c2c52b0f5b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 2 Jul 2013 10:13:16 -0500
Subject: [feature/twig] INCLUDEJS now uses the definition class

This had to be done because, like DEFINE, setting variables to $context
only affected the local file and any children, not parent templates.

PHPBB3-11598
---
 phpBB/styles/prosilver/template/overall_footer.html  | 2 +-
 phpBB/styles/subsilver2/template/overall_footer.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 5422cc7c10..dcb8058ee1 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -56,7 +56,7 @@
 <script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js?assets_version={T_ASSETS_VERSION}"></script>
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS {T_TEMPLATE_PATH}/ajax.js -->
-{SCRIPTS}
+{$SCRIPTS}
 
 <!-- EVENT overall_footer_after -->
 </body>
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 3a29a0d752..2d794d9f71 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -14,7 +14,7 @@
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
-{SCRIPTS}
+{$SCRIPTS}
 
 <!-- EVENT overall_footer_after -->
 </body>
-- 
cgit v1.2.1


From 59d13d0535ab3687725d36f2dbe2ee64de294df8 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 2 Jul 2013 11:02:55 -0500
Subject: [feature/twig] INCLUDEJS behavior now supports local relative paths

This was done because T_TEMPLATE_PATH is not always correct for js files
(e.g. the inheriting style does not include these). Now we use the Twig
Loader to find the correct file to link to (most specific file first, then
parent styles). Also allows using @namespace convention

PHPBB3-11598
---
 phpBB/styles/prosilver/template/memberlist_search.html   | 2 +-
 phpBB/styles/prosilver/template/overall_footer.html      | 6 +++---
 phpBB/styles/prosilver/template/posting_buttons.html     | 2 +-
 phpBB/styles/prosilver/template/timezone_option.html     | 2 +-
 phpBB/styles/prosilver/template/ucp_avatar_options.html  | 2 +-
 phpBB/styles/subsilver2/template/timezone_option.html    | 2 +-
 phpBB/styles/subsilver2/template/ucp_groups_manage.html  | 2 +-
 phpBB/styles/subsilver2/template/ucp_profile_avatar.html | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 6d2d87a278..4f029627fc 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -38,7 +38,7 @@ function insert_single(user)
 // ]]>
 </script>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_TEMPLATE_PATH}/forum_fn.js -->
+<!-- INCLUDEJS forum_fn.js -->
 <h2 class="solo">{L_FIND_USERNAME}</h2>
 
 <form method="post" action="{S_MODE_ACTION}" id="search_memberlist">
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index dcb8058ee1..5c88209ad8 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -53,9 +53,9 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js?assets_version={T_ASSETS_VERSION}"></script>
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
-<!-- INCLUDEJS {T_TEMPLATE_PATH}/ajax.js -->
+<!-- INCLUDEJS forum_fn.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/core.js -->
+<!-- INCLUDEJS ajax.js -->
 {$SCRIPTS}
 
 <!-- EVENT overall_footer_after -->
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 164e887f75..8a153a5ee8 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -52,7 +52,7 @@
 
 // ]]>
 </script>
-<!-- INCLUDEJS {T_TEMPLATE_PATH}/editor.js -->
+<!-- INCLUDEJS editor.js -->
 
 <!-- IF S_BBCODE_ALLOWED -->
 <div id="colour_palette" style="display: none;">
diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html
index ebcf51a906..fc0579bffd 100644
--- a/phpBB/styles/prosilver/template/timezone_option.html
+++ b/phpBB/styles/prosilver/template/timezone_option.html
@@ -15,6 +15,6 @@
 			{S_TZ_OPTIONS}
 		</select>
 
-		<!-- INCLUDEJS {T_TEMPLATE_PATH}/timezone.js -->
+		<!-- INCLUDEJS timezone.js -->
 	</dd>
 </dl>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 02c7868afb..072f235eb1 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -47,4 +47,4 @@
 	</div>
 </div>
 
-<!-- INCLUDEJS {T_TEMPLATE_PATH}/avatars.js -->
+<!-- INCLUDEJS avatars.js -->
diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html
index 9b68f81557..0f27719f86 100644
--- a/phpBB/styles/subsilver2/template/timezone_option.html
+++ b/phpBB/styles/subsilver2/template/timezone_option.html
@@ -15,6 +15,6 @@
 			{S_TZ_OPTIONS}
 		</select>
 
-		<!-- INCLUDEJS {T_TEMPLATE_PATH}/timezone.js -->
+		<!-- INCLUDEJS timezone.js -->
 	</td>
 </tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
index 13b8b8c6b7..b8e7e29481 100644
--- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html
+++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
@@ -95,7 +95,7 @@
 	</tr>
 	</table>
 
-<!-- INCLUDEJS {T_TEMPLATE_PATH}/avatars.js -->
+<!-- INCLUDEJS avatars.js -->
 
 <!-- ELSEIF S_LIST -->
 
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
index 885d46ef0b..60a816d00a 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
@@ -48,6 +48,6 @@
 	</tr>
 </table>
 
-<!-- INCLUDEJS {T_TEMPLATE_PATH}/avatars.js -->
+<!-- INCLUDEJS avatars.js -->
 
 <!-- INCLUDE ucp_footer.html -->
-- 
cgit v1.2.1


From 921d44aa4dfa307eb3b7e4f24befabb07e727812 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Jul 2013 14:17:46 -0500
Subject: [feature/twig] Put $SCRIPTS below overall_footer_after, use includejs
 for core

Moved below overall_footer_after so events can add JS files in that event.

PHPBB3-11598
---
 phpBB/styles/prosilver/template/overall_footer.html  | 4 +++-
 phpBB/styles/subsilver2/template/overall_footer.html | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 5c88209ad8..eef9f53409 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -56,8 +56,10 @@
 <!-- INCLUDEJS forum_fn.js -->
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/core.js -->
 <!-- INCLUDEJS ajax.js -->
-{$SCRIPTS}
 
 <!-- EVENT overall_footer_after -->
+
+{$SCRIPTS}
+
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 2d794d9f71..d2b30c22a0 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -13,9 +13,11 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
-{$SCRIPTS}
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/core.js -->
 
 <!-- EVENT overall_footer_after -->
+
+{$SCRIPTS}
+
 </body>
 </html>
-- 
cgit v1.2.1


From 159f018056659fa3eccae744ec513efbd2221f77 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 11 Jul 2013 15:22:05 -0500
Subject: [ticket/11388] INCLUDECSS

PHPBB3-11388
---
 phpBB/styles/prosilver/template/overall_header.html  | 2 ++
 phpBB/styles/subsilver2/template/overall_header.html | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 3c98edec79..25094bbf5d 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -76,6 +76,8 @@
 
 <!-- EVENT overall_header_head_append -->
 
+{$STYLESHEETS}
+
 </head>
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
 
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 0317d6e45c..bc2307154b 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -132,6 +132,8 @@ function marklist(id, name, state)
 
 <!-- EVENT overall_header_head_append -->
 
+{$STYLESHEETS}
+
 </head>
 <body class="{S_CONTENT_DIRECTION}">
 
-- 
cgit v1.2.1