makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10270] Moved some HTML from the JavaScript to overall_footer.

Browse source 
PHPBB3-10270
This commit is contained in:
Callum Macrae 2011-08-24 11:42:39 +01:00 • committed by Igor Wiedler
parent 6efb9dd0b6
commit 420de9c9a0
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/adm/style/overall_footer.html
View file

@ -18,6 +18,11 @@
{DEBUG_OUTPUT}
<!-- ENDIF -->
<div id="darkenwrapper">
<div id="darken">&nbsp;</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>

2
phpBB/language/en/common.php
View file

@ -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',

5
phpBB/styles/prosilver/template/overall_footer.html
View file

@ -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">&nbsp;</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>

7
phpBB/styles/script.js
View file

@ -3,11 +3,8 @@ var phpbb = {};
(function($) { //avoid conflicts with other libraries
var dark = $('<div id="darkenwrapper"><div id="darken">&nbsp;</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');
/**