diff --git a/include/staff/dynamic-form.inc.php b/include/staff/dynamic-form.inc.php index 79ef67f634f123296cc82d27b7d2734b9c1f62b4..0f18c7e89d0db018caefbb2aa3b1035309470f99 100644 --- a/include/staff/dynamic-form.inc.php +++ b/include/staff/dynamic-form.inc.php @@ -272,7 +272,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); <div style="display:none;" class="dialog draggable" id="field-config"> <div id="popup-loading"> - <h1><i class="icon-spinner icon-spin icon-large pull-left"></i> + <h1><i class="icon-spinner icon-spin icon-large"></i> <?php echo __('Loading ...');?></h1> </div> <div class="body"></div> @@ -280,10 +280,14 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); <script type="text/javascript"> $(function() { - $('#popup-loading').hide().ajaxStart( function() { - $(this).show(); // show Loading Div - } ).ajaxStop ( function(){ - $(this).hide(); // hide loading div + var $this = $('#popup-loading').hide(); + $(document).ajaxStart( function(event) { + console.log(1,event); + var $h1 = $this.find('h1'); + $this.show(); + $h1.css({'margin-top':$this.height()/3-$h1.height()/3}); // show Loading Div + }).ajaxStop ( function(){ + $this.hide(); // hide loading div }); }); $('form.manage-form').on('submit.inline', function(e) { diff --git a/include/staff/dynamic-list.inc.php b/include/staff/dynamic-list.inc.php index 38629cf73ed79759c8d018edfc4bd1c6946320a7..d4126e821b055457c6a28d0dd713cf0868be6a4e 100644 --- a/include/staff/dynamic-list.inc.php +++ b/include/staff/dynamic-list.inc.php @@ -268,17 +268,22 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); <div style="display:none;" class="dialog draggable" id="field-config"> <div id="popup-loading"> - <h1><i class="icon-spinner icon-spin icon-large pull-left"></i> + <h1><i class="icon-spinner icon-spin icon-large"></i> <?php echo __('Loading ...');?></h1> </div> <div class="body"></div> </div> + <script type="text/javascript"> $(function() { - $('#popup-loading').hide().ajaxStart( function() { - $(this).show(); // show Loading Div - } ).ajaxStop ( function(){ - $(this).hide(); // hide loading div + var $this = $('#popup-loading').hide(); + $(document).ajaxStart( function(event) { + console.log(1,event); + var $h1 = $this.find('h1'); + $this.show(); + $h1.css({'margin-top':$this.height()/3-$h1.height()/3}); // show Loading Div + }).ajaxStop ( function(){ + $this.hide(); // hide loading div }); }); </script> diff --git a/scp/css/scp.css b/scp/css/scp.css index 11a647993974a6617a2a0bf760426c94405843ee..f52ab06aa135baa9895bbf162c4174a2bf4670b3 100644 --- a/scp/css/scp.css +++ b/scp/css/scp.css @@ -1336,9 +1336,21 @@ time { box-shadow: 0 5px 60px #001; border-radius: 5px; max-height: 72%; + min-height: 50px; overflow-y: auto; } +.dialog .popup-loading { + position:absolute; + text-align:center; + background:rgba(255,255,255,0.8); + top:0; + bottom:0; + left:0; + right:0; + z-index:1; +} + .redactor_editor { font-size: 11pt; } diff --git a/setup/cli/modules/i18n.php b/setup/cli/modules/i18n.php index c9152ac6267789812bb2e3db9defcd6f1e7b0c3b..8edb5c955884d7a843bf7d420f24c9e9196f9e34 100644 --- a/setup/cli/modules/i18n.php +++ b/setup/cli/modules/i18n.php @@ -245,7 +245,7 @@ class i18n_Compiler extends Module { #'Approved' => 'Id' => 'lang:' . $lang, 'Last-Revision' => $po_header['PO-Revision-Date'], - 'Version' => strtotime($po_header['PO-Revision-Date']) / 10000, + 'Version' => (int)(strtotime($po_header['PO-Revision-Date']) / 10000), ); $phar->addFromString( 'MANIFEST.php',