diff options
| author | Callum Macrae <callum@lynxphp.com> | 2011-08-24 11:42:39 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:09:14 +0200 |
| commit | 420de9c9a0a638135da147a498436dbe7abfd4bd (patch) | |
| tree | 6e37bbc1b3caac272cc100f92830ff67a7766fe9 | |
| parent | 6efb9dd0b6e0119009d5b10d198722ba2b19f0e2 (diff) | |
| download | forums-420de9c9a0a638135da147a498436dbe7abfd4bd.tar forums-420de9c9a0a638135da147a498436dbe7abfd4bd.tar.gz forums-420de9c9a0a638135da147a498436dbe7abfd4bd.tar.bz2 forums-420de9c9a0a638135da147a498436dbe7abfd4bd.tar.xz forums-420de9c9a0a638135da147a498436dbe7abfd4bd.zip | |
[ticket/10270] Moved some HTML from the JavaScript to overall_footer.
PHPBB3-10270
| -rw-r--r-- | phpBB/adm/style/overall_footer.html | 5 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 5 | ||||
| -rw-r--r-- | phpBB/styles/script.js | 7 |
4 files changed, 14 insertions, 5 deletions
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index 3740122d9b..625121f1bd 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -18,6 +18,11 @@ {DEBUG_OUTPUT} <!-- ENDIF --> + <div id="darkenwrapper"> + <div id="darken"> </div> + <div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div> + </div> + <!-- tmp --> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script> <script src="../styles/script.js"></script> diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 19b801e585..e8fff96e5a 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -314,6 +314,7 @@ $lang = array_merge($lang, array( 'LDAP_NO_SERVER_CONNECTION' => 'Could not connect to LDAP server.', 'LDAP_SEARCH_FAILED' => 'An error occured while searching the LDAP directory.', 'LEGEND' => 'Legend', + 'LOADING' => 'Loading', 'LOCATION' => 'Location', 'LOCK_POST' => 'Lock post', 'LOCK_POST_EXPLAIN' => 'Prevent editing', @@ -451,6 +452,7 @@ $lang = array_merge($lang, array( 2 => '%d pixels', ), 'PLAY_QUICKTIME_FILE' => 'Play Quicktime file', + 'PLEASE_WAIT' => 'Please wait.', 'PM' => 'PM', 'PM_REPORTED' => 'Click to view report', 'POSTING_MESSAGE' => 'Posting message in %s', diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index ffdb27be98..37caaf7cca 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -24,6 +24,11 @@ <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> <!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF --> </div> + + <div id="darkenwrapper"> + <div id="darken"> </div> + <div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div> + </div> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> <script src="styles/script.js"></script> diff --git a/phpBB/styles/script.js b/phpBB/styles/script.js index ceaf92672c..bf8c548df0 100644 --- a/phpBB/styles/script.js +++ b/phpBB/styles/script.js @@ -3,11 +3,8 @@ var phpbb = {}; (function($) { //avoid conflicts with other libraries -var dark = $('<div id="darkenwrapper"><div id="darken"> </div></div>'); -$('body').append(dark); - -var loading_alert = $('<div class="jalert"><h3>Loading</h3><p>Please wait.</p></div>'); -$(dark).append(loading_alert); +var dark = $('#darkenwrapper'), + loading_alert = $('#loadingalert'); /** |