diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-11-04 00:28:02 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-11-04 00:28:02 +0530 |
| commit | 0e0e12963a290b60b2f540fad60d240c515dd679 (patch) | |
| tree | e642d260d52f9e1a4e91ad6ee20b7982e9c56e22 /phpBB/adm | |
| parent | efe94e9c7369c83d00b0e5bfe8fdfe8f48cca5c4 (diff) | |
| parent | 478c3ea3a07437e752331ee74ccb20f52c3ab4c9 (diff) | |
| download | forums-0e0e12963a290b60b2f540fad60d240c515dd679.tar forums-0e0e12963a290b60b2f540fad60d240c515dd679.tar.gz forums-0e0e12963a290b60b2f540fad60d240c515dd679.tar.bz2 forums-0e0e12963a290b60b2f540fad60d240c515dd679.tar.xz forums-0e0e12963a290b60b2f540fad60d240c515dd679.zip | |
Merge remote-tracking branch 'prototech/ticket/11928' into develop
# 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.
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/images/loading.gif | bin | 0 -> 1320 bytes | |||
| -rw-r--r-- | phpBB/adm/style/admin.css | 15 | ||||
| -rw-r--r-- | phpBB/adm/style/overall_footer.html | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/phpBB/adm/images/loading.gif b/phpBB/adm/images/loading.gif Binary files differnew file mode 100644 index 0000000000..e1ed0883e0 --- /dev/null +++ b/phpBB/adm/images/loading.gif diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 006cee9080..a3b794aaf2 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -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 { 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"> </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> |
