tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

API CHANGE Removed LeftAndMain::set_loading_image() and LoadingImage(), use CSS

Browse Source
This commit is contained in:
Ingo Schommer 2011-03-31 12:01:23 +13:00
parent 11a3b86fef
commit e3928a0517
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
admin/code/LeftAndMain.php
View File

@ -1159,24 +1159,6 @@ class LeftAndMain extends Controller {
self::$application_logo_text = ''; self::$application_logo_text = '';
} }
/**
* 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 = 'sapphire/admin/images/logo.gif';
/**
* Set the image shown when the CMS is loading.
*/
static function set_loading_image($loadingImage) {
self::$loading_image = $loadingImage;
}
function LoadingImage() {
return self::$loading_image;
}
/** /**
* Combines an optional background image and additional CSS styles, * Combines an optional background image and additional CSS styles,
* set through {@link setLogo()}. * set through {@link setLogo()}.

1
admin/css/layout.css
View File

@ -19,6 +19,7 @@
} }
.ss-loading-screen .loading-logo { .ss-loading-screen .loading-logo {
background-url: url(../images/logo.gif);
background-repeat: no-repeat; background-repeat: no-repeat;
background-color: transparent; background-color: transparent;
background-position: 50% 50%; background-position: 50% 50%;

2
admin/templates/LeftAndMain.ss
View File

@ -9,7 +9,7 @@
<body class="stillLoading $CSSClasses"> <body class="stillLoading $CSSClasses">
<div class="ss-loading-screen"> <div class="ss-loading-screen">
<div class="loading-logo" style="background-image: url($LoadingImage);"> <div class="loading-logo">
<img class="loading-animation" src="sapphire/admin/images/spinner.gif" alt="<% _t('LOADING','Loading...',PR_HIGH) %>" /> <img class="loading-animation" src="sapphire/admin/images/spinner.gif" alt="<% _t('LOADING','Loading...',PR_HIGH) %>" />
<noscript><p class="nojs-warning"><span class="message notice"><% _t('REQUIREJS','The CMS requires that you have JavaScript enabled.',PR_HIGH) %></span></p></noscript> <noscript><p class="nojs-warning"><span class="message notice"><% _t('REQUIREJS','The CMS requires that you have JavaScript enabled.',PR_HIGH) %></span></p></noscript>
</div> </div>