mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
ENHANCEMENT Using Requirements instead of hardcoded template logic to include some LeftAndMain js/css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60395 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
c43a3ba4f5
commit
861fae99e1
@ -101,6 +101,11 @@ class LeftAndMain extends Controller {
|
||||
return;
|
||||
}
|
||||
|
||||
Requirements::css('cms/css/typography.css');
|
||||
Requirements::css('cms/css/layout.css');
|
||||
Requirements::css('cms/css/cms_left.css');
|
||||
Requirements::css('cms/css/cms_right.css');
|
||||
|
||||
Requirements::javascript('jsparty/prototype.js');
|
||||
Requirements::javascript('jsparty/behaviour.js');
|
||||
Requirements::javascript('jsparty/prototype_improvements.js');
|
||||
@ -202,6 +207,8 @@ class LeftAndMain extends Controller {
|
||||
foreach (self::$extra_requirements['themedcss'] as $file) {
|
||||
Requirements::css($file[0], $file[1]);
|
||||
}
|
||||
|
||||
Requirements::customScript('Behaviour.addLoader(hideLoading);');
|
||||
|
||||
$dummy = null;
|
||||
$this->extend('augmentInit', $dummy);
|
||||
|
@ -4,11 +4,6 @@
|
||||
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
|
||||
<% base_tag %>
|
||||
<title>$ApplicationName</title>
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="cms/css/typography.css" />
|
||||
<link rel="stylesheet" type="text/css" href="cms/css/layout.css" />
|
||||
<link rel="stylesheet" type="text/css" href="cms/css/cms_left.css" />
|
||||
<link rel="stylesheet" type="text/css" href="cms/css/cms_right.css" />
|
||||
</head>
|
||||
|
||||
<body class="stillLoading $CSSClasses">
|
||||
@ -64,6 +59,5 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">Behaviour.addLoader(hideLoading)</script>
|
||||
</body>
|
||||
</html>
|
||||
|
Loading…
Reference in New Issue
Block a user