summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2014-06-11 15:27:12 +0200
committerSimon Rettberg2014-06-11 15:27:12 +0200
commit7c84f4ea0b83794b6fde1aa26fc11b55c7542c0b (patch)
treee8ad3624dfab5f2bcfcd6779b86ceb520f59aa69
parentImproved some help text :) (diff)
downloadslx-admin-7c84f4ea0b83794b6fde1aa26fc11b55c7542c0b.tar.gz
slx-admin-7c84f4ea0b83794b6fde1aa26fc11b55c7542c0b.tar.xz
slx-admin-7c84f4ea0b83794b6fde1aa26fc11b55c7542c0b.zip
Add animation class slx-rotation that will make an element rotate (used for "in progress")
-rw-r--r--script/taskmanager.js2
-rw-r--r--style/default.css12
-rw-r--r--templates/systemstatus/_page.html10
3 files changed, 18 insertions, 6 deletions
diff --git a/script/taskmanager.js b/script/taskmanager.js
index c2305a2b..0184bdcd 100644
--- a/script/taskmanager.js
+++ b/script/taskmanager.js
@@ -99,7 +99,7 @@ function tmResult(data, status)
} else if (task.statusCode === 'TASK_WAITING') {
icon.attr('class', 'data-tm-icon glyphicon glyphicon-pause');
} else if (task.statusCode === 'TASK_PROCESSING') {
- icon.attr('class', 'data-tm-icon glyphicon glyphicon-play');
+ icon.attr('class', 'data-tm-icon glyphicon glyphicon-refresh slx-rotation');
} else if (task.statusCode === 'TASK_FINISHED') {
icon.attr('class', 'data-tm-icon glyphicon glyphicon-ok');
} else if (task.statusCode === 'TASK_ERROR') {
diff --git a/style/default.css b/style/default.css
index e6104b8f..c8e4d260 100644
--- a/style/default.css
+++ b/style/default.css
@@ -114,4 +114,16 @@ body {
.slx-bold {
font-weight: bold;
+}
+
+.slx-rotation {
+ animation-name: rotateThis;
+ animation-duration: .75s;
+ animation-iteration-count: infinite;
+ animation-timing-function: linear;
+}
+
+@keyframes rotateThis {
+ from { transform: scale( 1 ) rotate( 0deg ); }
+ to { transform: scale( 1 ) rotate( 360deg ); }
} \ No newline at end of file
diff --git a/templates/systemstatus/_page.html b/templates/systemstatus/_page.html
index b202181e..fca087d1 100644
--- a/templates/systemstatus/_page.html
+++ b/templates/systemstatus/_page.html
@@ -12,7 +12,7 @@
Speicherplatz
</div>
<div class="panel-body" id="diskstat">
- *dreh dreh dreh dreh*
+ <span class="glyphicon glyphicon-refresh slx-rotation"></span>
</div>
</div>
</div>
@@ -23,7 +23,7 @@
Dienste
</div>
<div class="panel-body" id="services">
- *dreh dreh dreh dreh*
+ <span class="glyphicon glyphicon-refresh slx-rotation"></span>
</div>
</div>
</div>
@@ -39,7 +39,7 @@
Adresskonfiguration
</div>
<div class="panel-body" id="addresses">
- *dreh dreh dreh dreh*
+ <span class="glyphicon glyphicon-refresh slx-rotation"></span>
</div>
</div>
</div>
@@ -47,10 +47,10 @@
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
- Systemlast
+ System
</div>
<div class="panel-body" id="systeminfo">
- *dreh dreh dreh dreh*
+ <span class="glyphicon glyphicon-refresh slx-rotation"></span>
</div>
</div>
</div>