From d97cfcbc7f4edd358e8af377ec8041c9d1a17434 Mon Sep 17 00:00:00 2001 From: Saophalkun Ponlu Date: Thu, 16 Dec 2010 04:08:02 +0000 Subject: [PATCH] ENHANCEMENT: Improve CMS loading screen #6254 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115117 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/LeftAndMain.php | 7 +++++- css/layout.css | 44 +++++++++++++++++++++++++++++++++++--- images/loading.gif | Bin 5004 -> 0 bytes images/logo.gif | Bin 0 -> 2097 bytes images/spinner.gif | Bin 0 -> 8787 bytes javascript/LeftAndMain.js | 15 +++++++++++++ templates/LeftAndMain.ss | 7 +++++- 7 files changed, 68 insertions(+), 5 deletions(-) delete mode 100755 images/loading.gif create mode 100644 images/logo.gif create mode 100644 images/spinner.gif diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index bb9c3ce1..0614dbda 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -1198,7 +1198,12 @@ class LeftAndMain extends Controller { self::$application_logo_text = ''; } - protected static $loading_image = 'cms/images/loading.gif'; + /** + * The height of the image should be around 164px to avoid the overlaping between the image and loading animation graphic. + * If the given image's height is significantly larger or smaller, adjust the loading animation's top offset in + * positionLoadingSpinner() in LeftAndMain.js + */ + protected static $loading_image = 'cms/images/logo.gif'; /** * Set the image shown when the CMS is loading. diff --git a/css/layout.css b/css/layout.css index f5cd81bc..47f90ad0 100644 --- a/css/layout.css +++ b/css/layout.css @@ -14,16 +14,54 @@ body { height: 100%; } -.ss-loading-screen { +.ss-loading-screen, .ss-loading-screen .loading-logo { + width: 100%; height: 100%; overflow: hidden; + position: absolute; + background: #fff; + background: -moz-radial-gradient(50% 50% 180deg, circle cover, #FFFFFF, #EFEFEF, #C7C7C7 100%); + background: -webkit-gradient(radial, 50% 50%, 350, 50% 50%, 0, from(#E3E3E3), to(white)); + z-index: 100000; + margin: 0; + padding: 0; +} + +.ss-loading-screen .loading-logo { + background-repeat: no-repeat; + background-color: transparent; + background-position: 50% 50%; } .ss-loading-screen p { width: 100%; text-align: center; - position: fixed; - bottom: 0px; + position: absolute; + bottom: 80px; +} + +.ss-loading-screen p span.notice { + display: inline-block; + font-size: 14px; + padding: 10px 20px; + color: #dc7f00; + border: none; + + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -o-border-radius: 5px; + + -moz-box-shadow: 1px 1px 15px rgba(0,0,0, 0.1); + -webkit-box-shadow: 1px 1px 15px rgba(0,0,0, 0.1); + -o-box-shadow: 1px 1px 15px rgba(0,0,0, 0.1); + box-shadow: 1px 1px 15px rgba(0,0,0, 0.1); +} + +.ss-loading-screen .loading-animation { + display: none; + position: absolute; + left: 49%; + top: 75%; } /* diff --git a/images/loading.gif b/images/loading.gif deleted file mode 100755 index cfbfba27d7da93e6ba90affb15949bc9149281ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5004 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 bm>KxxF>^r7X2t-T)6C{JyZOyXivR#Sa!Af4 literal 0 HcmV?d00001 diff --git a/images/spinner.gif b/images/spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..8dc348a4b87364a67749110be84349f1a05f4a9b GIT binary patch literal 8787 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 literal 0 HcmV?d00001 diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js index a6135ed2..c7906114 100644 --- a/javascript/LeftAndMain.js +++ b/javascript/LeftAndMain.js @@ -10,6 +10,20 @@ var ss_MainLayout; (function($) { $.entwine('ss', function($){ + + $('.nojs-warning').hide(); + + /** + * Position the loading spinner animation below the ss logo + */ + var positionLoadingSpinner = function() { + var offset = 120; // offset from the ss logo + var spinner = $('.ss-loading-screen .loading-animation'); + var top = ($(window).height() - spinner.height()) / 2; + spinner.css('top', top + offset); + spinner.show(); + } + $(window).bind('resize', positionLoadingSpinner).trigger('resize'); // setup jquery.entwine $.entwine.warningLevel = $.entwine.WARN_LEVEL_BESTPRACTISE; @@ -54,6 +68,7 @@ var ss_MainLayout; // Remove loading screen $('.ss-loading-screen').hide(); $('body').removeClass('stillLoading'); + $(window).unbind('resize', positionLoadingSpinner); // Layout ss_MainLayout = this._setupLayout(); diff --git a/templates/LeftAndMain.ss b/templates/LeftAndMain.ss index 61c0b224..2728da56 100644 --- a/templates/LeftAndMain.ss +++ b/templates/LeftAndMain.ss @@ -9,7 +9,12 @@ -
<% _t('LOADING','Loading...',PR_HIGH) %>
+
+ +
$CMSTopMenu