mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'prototech/ticket/11928' into develop

Browse Source 
# By Cesar G
# Via Cesar G
* prototech/ticket/11928:
  [ticket/11928] Javascript requires camel case.
  [ticket/11928] Rename loadingAlert to loading_indicator.
  [ticket/11928] Make sure the indicator is on top of other elements.
  [ticket/11928] Replace AJAX loading popup with animation.
This commit is contained in:
Dhruv
2013-11-04 00:28:02 +05:30
parent efe94e9c73 478c3ea3a0
commit 0e0e12963a
8 changed files with 67 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/adm/style/admin.css
View File

@@ -1601,6 +1601,21 @@ input.button1:focus, input.button2:focus, input.button3:focus {
}
}
#loading_indicator {
background: #000000 url("../images/loading.gif") center center no-repeat;
border-radius: 5px;
display: none;
opacity: 0.8;
margin-top: -50px;
margin-left: -50px;
height: 50px;
width: 50px;
position: fixed;
left: 50%;
top: 50%;
z-index: 51;
}
/* Pagination
---------------------------------------- */
.pagination {

2
phpBB/adm/style/overall_footer.html
View File

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