enhancement: more small UI fix

abecms · Apr 27, 2017 · 28ff7bf · 28ff7bf
1 parent 6c08eca
commit 28ff7bf
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/src/server/public/abecms/css/styles.css b/src/server/public/abecms/css/styles.css
diff --git a/src/server/public/abecms/libs/stream-home.js b/src/server/public/abecms/libs/stream-home.js
@@ -51,6 +51,8 @@ function removeStream(callBack){
 }
 
 var StreamItem = function StreamItem (data) {
+  var noActivity = document.querySelector('.no-activity')
+  if(noActivity != null) noActivity.remove()
   this.data = data;
   this.createNode();
 };
@@ -138,6 +140,11 @@ StreamItem.prototype.getTextContent = function getTextContent () {
   return text
 };
 
+setTimeout(function () {
+  var noActivity = document.querySelector('.no-activity')
+  if(noActivity != null) noActivity.textContent = 'No activity yet'
+}, 2000)
+
 if (!!window.EventSource) {
   var stream = document.querySelector('.stream')
   var source = new EventSource('/abe/rest/activity-stream');

diff --git a/src/server/sass/modules/_editor.scss b/src/server/sass/modules/_editor.scss
@@ -16,6 +16,9 @@ body {
 
 /* = Form
 ************************************************************/
+.form-horizontal{
+  padding-top: 24px;
+}
 #abeForm{
   padding-bottom: 50px;
 }
@@ -75,7 +78,7 @@ body {
     }
   }
   [data-abe-create="true"]{
-    margin-top: 20px;
+    margin-top: 7px;
   }
 }
 

diff --git a/src/server/sass/modules/_homepage.scss b/src/server/sass/modules/_homepage.scss
@@ -376,3 +376,9 @@ body.with-menu{
   width: 75%;
   margin-left: 10px;
 }
+
+.no-activity{
+  text-transform: uppercase;
+  color: #CCC;
+  font-size: 12px;
+}
diff --git a/src/server/views/partials/home.html b/src/server/views/partials/home.html
@@ -15,7 +15,7 @@
             Key numbers
           </div>
           <div class="progress-stat">
-            <div class="progress-element" data-percent="{{statistics.percentPublishedPages}}%" style="color:#40B7E2">
+            <div class="progress-element" data-percent="{{#ifCond statistics.percentPublishedPages 'NaN'}}0{{else}}{{statistics.percentPublishedPages}}{{/ifCond}}%" style="color:#40B7E2">
               <svg viewBox="-10 -10 220 220">
                 <g fill="none" stroke-width="30" transform="translate(100,100)">
                   <path d="M 0,-100 A 100,100 0 0,1 86.6,-50" stroke="#40B7E2"/>
@@ -27,7 +27,7 @@
                 </g>
               </svg>
               <svg viewBox="-10 -10 220 220">
-                <path stroke="#F1F1F1" d="M200,100 C200,44.771525 155.228475,0 100,0 C44.771525,0 0,44.771525 0,100 C0,155.228475 44.771525,200 100,200 C155.228475,200 200,155.228475 200,100 Z" stroke-dashoffset="{{statistics.svgCirclePercent}}"></path>
+                <path stroke="#F1F1F1" d="M200,100 C200,44.771525 155.228475,0 100,0 C44.771525,0 0,44.771525 0,100 C0,155.228475 44.771525,200 100,200 C155.228475,200 200,155.228475 200,100 Z" stroke-dashoffset="{{#ifCond statistics.svgCirclePercent 'NaN'}}0{{else}}{{statistics.svgCirclePercent}}{{/ifCond}}"></path>
               </svg>
             </div>
             <div class="progress-text">
@@ -66,7 +66,7 @@
           </div>
 
           <div class="stream">
-
+            <span class="no-activity">Loading activity ...</span>
           </div>
 
         </div>

diff --git a/src/server/views/partials/right-file-list.html b/src/server/views/partials/right-file-list.html
@@ -10,7 +10,7 @@
 {{/isAuthorized}}
 <br/><br/>
   <div class="form-horizontal">
-    <div class="form-group form-group-lg">
+    <div class="form-group">
       <div class="col-sm-12">
         <div class="input-group">
           <span class="input-group-addon"><i class="fa fa-search"></i></span>