tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT Using concrete for CMS loading screen javascript

Browse Source 
ENHANCEMENT Better styling for non-javascript message in CMS loading screen

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92701 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-11-21 03:14:49 +00:00
parent febe9f6e8b
commit 7400f8e3d1
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/LeftAndMain.php
View File

@ -248,8 +248,6 @@ class LeftAndMain extends Controller {
Requirements::css($file[0], $file[1]); Requirements::css($file[0], $file[1]);
} }
Requirements::customScript('Behaviour.addLoader(hideLoading);');
// Javascript combined files // Javascript combined files
Requirements::combine_files( Requirements::combine_files(
'assets/base.js', 'assets/base.js',

11
css/layout.css
View File

@ -5,10 +5,21 @@
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
} }
html {
overflow: hidden;
}
body { body {
background: #ccdef3; background: #ccdef3;
} }
.ss-loading-screen p {
width: 100%;
text-align: center;
position: fixed;
bottom: 0px;
}
/* /*
* Default Layout Theme * Default Layout Theme
* *

9
javascript/LeftAndMain.js
View File

@ -21,6 +21,10 @@
onmatch: function() { onmatch: function() {
var self = this; var self = this;
// Remove loading screen
$('ss-loading-screen').hide();
$(document).removeClass('stillLoading');
this._setupPinging(); this._setupPinging();
this._setupButtons(); this._setupButtons();
this._resizeChildren(); this._resizeChildren();
@ -290,11 +294,6 @@ function ajaxErrorHandler(response) {
errorMessage('Server Error', response); errorMessage('Server Error', response);
} }
function hideLoading() {
if($('Loading')) $('Loading').style.display = 'none';
Element.removeClassName(document.body, 'stillLoading');
}
returnFalse = function() { returnFalse = function() {
return false; return false;
} }

2
templates/LeftAndMain.ss
View File

@ -9,7 +9,7 @@
</head> </head>
<body class="stillLoading $CSSClasses"> <body class="stillLoading $CSSClasses">
<div id="Loading" style="background: #FFF url($LoadingImage) 50% 50% no-repeat; position: absolute;z-index: 100000;height: 100%;width: 100%;margin: 0;padding: 0;z-index: 100000;position: absolute;"><% _t('LOADING','Loading...',PR_HIGH) %><noscript><h1><% _t('REQUIREJS','The CMS requires that you have JavaScript enabled.',PR_HIGH) %></h1></noscript></div> <div class="ss-loading-screen" style="background: #FFF url($LoadingImage) 50% 50% no-repeat; position: absolute;z-index: 100000;height: 100%;width: 100%;margin: 0;padding: 0;z-index: 100000;position: absolute;"><% _t('LOADING','Loading...',PR_HIGH) %><noscript><p class="message notice"><% _t('REQUIREJS','The CMS requires that you have JavaScript enabled.',PR_HIGH) %></p></noscript></div>
<div class="ui-layout-north ss-cms-top-menu"> <div class="ui-layout-north ss-cms-top-menu">
$CMSTopMenu $CMSTopMenu