TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved dashboard css from storm to backend 

Dashboard is a specific part of the backend and storm should stand alone from this
This commit is contained in:
Samuel Georges 2016-02-25 18:07:25 +11:00
parent a892fff938
commit f6d76fade6
7 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
modules/backend/assets/css/dashboard/dashboard.css Normal file
View File

@ -0,0 +1,41 @@
.dashboard-container > .report-container.loading {
position: absolute;
width: 100%;
height: 100%;
}
.dashboard-container > .report-container.loading .loading-indicator-container {
position: absolute;
left: 0;
top: 0;
height: 100%;
width: 100%;
}
.dashboard-container > .report-container.loading .loading-indicator-container .loading-indicator {
padding: 0;
height: 150px;
top: 50%;
margin-top: -90px;
}
.dashboard-container > .report-container.loading .loading-indicator-container .loading-indicator:before {
content: '';
background: transparent url('../../images/october-leaf.svg') no-repeat;
background-size: 49px 65px;
width: 49px;
height: 65px;
left: 50%;
top: 50%;
margin-top: -33px;
margin-left: -24px;
position: absolute;
opacity: 0.2;
filter: alpha(opacity=20);
}
.dashboard-container > .report-container.loading .loading-indicator-container .loading-indicator > span {
left: 50%;
width: 200px;
height: 200px;
margin-left: -100px;
margin-top: -100px;
background-size: 200px 200px;
background-image: url('../../images/dashboard-loading-indicator.svg');
}

0
modules/system/assets/ui/images/dashboard-loading-indicator.svg → modules/backend/assets/images/dashboard-loading-indicator.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
modules/system/assets/ui/images/october-leaf.svg → modules/backend/assets/images/october-leaf.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

8
modules/system/assets/ui/less/dashboard.less → modules/backend/assets/less/dashboard/dashboard.less
View File

@ -1,3 +1,5 @@
@import "../../../../backend/assets/less/core/boot.less";
.dashboard-container > .report-container {
&.loading {
position: absolute;
@ -19,7 +21,7 @@
&:before {
content: '';
background: transparent url('images/october-leaf.svg') no-repeat;
background: transparent url('../../images/october-leaf.svg') no-repeat;
background-size: 49px 65px;
width: 49px;
height: 65px;
@ -38,9 +40,9 @@
margin-left: -100px;
margin-top: -100px;
background-size: 200px 200px;
background-image: url('images/dashboard-loading-indicator.svg');
background-image: url('../../images/dashboard-loading-indicator.svg');
}
}
}
}
}
}

3
modules/backend/controllers/Index.php
View File

@ -30,6 +30,9 @@ class Index extends Controller
parent::__construct();
BackendMenu::setContextOwner('October.Backend');
$this->addCss('/modules/backend/assets/css/dashboard/dashboard.css', 'core');
if (BackendAuth::check()) {
new ReportContainer($this);
}

5
modules/system/assets/ui/storm.css
View File

@ -1572,11 +1572,6 @@ div.scoreboard .control-chart ul li > i{margin-left:-18px}
div.scoreboard .control-chart .canvas + ul{margin-left:0}
div.scoreboard .scoreboard-offset{padding-left:20px}
body.slim-container div.scoreboard{padding:0 25px}
.dashboard-container > .report-container.loading{position:absolute;width:100%;height:100%}
.dashboard-container > .report-container.loading .loading-indicator-container{position:absolute;left:0;top:0;height:100%;width:100%}
.dashboard-container > .report-container.loading .loading-indicator-container .loading-indicator{padding:0;height:150px;top:50%;margin-top:-90px}
.dashboard-container > .report-container.loading .loading-indicator-container .loading-indicator:before{content:'';background:transparent url('images/october-leaf.svg') no-repeat;background-size:49px 65px;width:49px;height:65px;left:50%;top:50%;margin-top:-33px;margin-left:-24px;position:absolute;opacity:0.2;filter:alpha(opacity=20)}
.dashboard-container > .report-container.loading .loading-indicator-container .loading-indicator > span{left:50%;width:200px;height:200px;margin-left:-100px;margin-top:-100px;background-size:200px 200px;background-image:url('images/dashboard-loading-indicator.svg')}
#layout-canvas .flash-message{display:none}
.flash-message{position:fixed;width:500px;left:50%;top:13px;margin-left:-250px;color:#ffffff;font-size:13px;padding:10px 30px 10px 15px;z-index:10000;word-wrap:break-word;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}
.flash-message.fade{opacity:0;filter:alpha(opacity=0);-webkit-transition:all 0.5s,width 0s;transition:all 0.5s,width 0s;-webkit-transform:scale(0.9);-ms-transform:scale(0.9);transform:scale(0.9)}

1
modules/system/assets/ui/storm.less
View File

@ -16,7 +16,6 @@
@import "less/tab.less";
@import "less/chart.less";
@import "less/scoreboard.less";
@import "less/dashboard.less";
@import "less/flashmessage.less";
@import "less/icon.less";
@import "less/flag.less";