From 12c5997471ffbc6a94c6f6efcf42a6d047c054a5 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 24 Oct 2013 21:10:22 +0300
Subject: [ticket/11957] Replace corner images with CSS3 corners

PHPBB3-11957
---
 phpBB/adm/style/overall_footer.html | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'phpBB/adm/style/overall_footer.html')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 145ad18709..6d54ee266d 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -1,9 +1,6 @@
 
 					</div>
 				</div>
-			<span class="corners-bottom"><span></span></span>
-			<div class="clear"></div>
-		</div>
 		</div>
 	</div>
 
-- 
cgit v1.2.1


From 8567adf5dbfc1d6363deb78b6ebf25a76857c9ac Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 25 Oct 2013 18:32:31 +0300
Subject: [ticket/11957] Include admin.js in footer

Include admin.js in footer, swap .hasjs and .nojs

PHPBB3-11957
---
 phpBB/adm/style/overall_footer.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/style/overall_footer.html')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 6d54ee266d..98a3a598e4 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -35,6 +35,7 @@
 <!-- IF S_ALLOW_CDN --><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>
 <!-- INCLUDEJS ajax.js -->
+<!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
 
 <!-- EVENT acp_overall_footer_after -->
-- 
cgit v1.2.1


From 2a1db92955d9c1d20cfa3e49da158a10961eb081 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 12:51:10 +0300
Subject: [ticket/11957] Wrap content in double div

PHPBB3-11957
---
 phpBB/adm/style/overall_footer.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style/overall_footer.html')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 98a3a598e4..3c291842dc 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -1,7 +1,7 @@
-
-					</div>
+						</div>
+					</div><!-- /#main -->
 				</div>
-		</div>
+		</div><!-- /#acp -->
 	</div>
 
 	<div id="page-footer">
-- 
cgit v1.2.1


From da4e0c4219e5132ffddd67fc4621840c557c132a Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 15 Oct 2013 21:37:53 -0700
Subject: [ticket/11928] Replace AJAX loading popup with animation.

PHPBB3-11928
---
 phpBB/adm/style/overall_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style/overall_footer.html')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 3c291842dc..72af9d3388 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -17,8 +17,8 @@
 
 		<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
 			<div id="darken">&nbsp;</div>
-			<div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
 		</div>
+		<div id="loading_indicator"></div>
 
 		<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
 			<a href="#" class="alert_close"></a>
-- 
cgit v1.2.1


From 55309424688724797f9ff7a6b4f816d73ab092a4 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 5 Dec 2013 09:55:52 -0800
Subject: [ticket/12062] Fix to allow extensions to use INCLUDEJS in the ACP

PHPBB3-12062
---
 phpBB/adm/style/overall_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style/overall_footer.html')

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 72af9d3388..8810414fc2 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -36,9 +36,9 @@
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->
-{$SCRIPTS}
 
 <!-- EVENT acp_overall_footer_after -->
+{$SCRIPTS}
 
 </body>
 </html>
-- 
cgit v1.2.1