diff options
| author | Callum Macrae <callum@lynxphp.com> | 2011-11-18 17:31:10 +0000 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:09:22 +0200 |
| commit | 2189efadc624deb515df1ba04c232724a2f8eae3 (patch) | |
| tree | 8c395ac9ea5d0a1a4c58c8beaaa0cf7290b7f9db | |
| parent | 0d83e8725bfa51427a629fb540daf16035492a97 (diff) | |
| download | forums-2189efadc624deb515df1ba04c232724a2f8eae3.tar forums-2189efadc624deb515df1ba04c232724a2f8eae3.tar.gz forums-2189efadc624deb515df1ba04c232724a2f8eae3.tar.bz2 forums-2189efadc624deb515df1ba04c232724a2f8eae3.tar.xz forums-2189efadc624deb515df1ba04c232724a2f8eae3.zip | |
[ticket/10270] Moved the AJAX error langyage entries to the footer.
PHPBB3-10270
| -rw-r--r-- | phpBB/adm/style/overall_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/assets/javascript/core.js | 10 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index 5daaa4c6db..549b6995af 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -23,7 +23,7 @@ <div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div> </div> - <div id="phpbb_alert" class="phpbb_alert"> + <div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}"> <a href="#"><img src="images/alert_close.png" class="alert_close" /></a> <h3 class="alert_title"></h3><p class="alert_text"></p> </div> diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 067676348b..b25e75e979 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -4,12 +4,12 @@ phpbb.alert_time = 100; (function($) { // Avoid conflicts with other libraries // define a couple constants for keydown functions. -var ENTER = 13, - ESC = 27; +var ENTER = 13; +var ESC = 27; -var dark = $('#darkenwrapper'), - loading_alert = $('#loadingalert'); +var dark = $('#darkenwrapper'); +var loading_alert = $('#loadingalert'); /** @@ -30,7 +30,7 @@ phpbb.loading_alert = function() { setTimeout(function() { if (loading_alert.is(':visible')) { - phpbb.alert($('body').data('l-err'), $('body').data('l-timeout-processing-req')); + phpbb.alert($('#phpbb_alert').data('l-err'), $('#phpbb_alert').data('l-timeout-processing-req')); } }, 5000); }); diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 542bdf45f1..00de9029ec 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -30,7 +30,7 @@ <div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div> </div> - <div id="phpbb_alert" class="phpbb_alert"> + <div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}"> <a href="#"><img src="{T_THEME_PATH}/images/alert_close.png" class="alert_close" /></a> <h3 class="alert_title"></h3><p class="alert_text"></p> </div> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index b5bbdf4f3e..5e095d0a0d 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -90,7 +90,7 @@ </head> -<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}"> +<body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}"> <div id="wrap"> <a id="top" accesskey="t"></a> |