From 836f2d1c187047c8c6f4182c91a8ffb48d7c0de6 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 29 Oct 2018 16:52:27 -0400
Subject: #733 initial rough in

---
 www/templates/state.html | 100 +++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 84 insertions(+), 16 deletions(-)

(limited to 'www/templates/state.html')

diff --git a/www/templates/state.html b/www/templates/state.html
index f5bff536..7791cd7b 100644
--- a/www/templates/state.html
+++ b/www/templates/state.html
@@ -6,6 +6,24 @@
   </ion-nav-buttons>
   <ion-content delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
     <ion-refresher pulling-text="{{'kPullToReload' | translate}}..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
+
+    <ion-item>
+
+      <div>
+        <div class="row">
+          <div class="col text-center">
+            <a class="button button-small button-outline button-dark " ng-click="selectCustomState();" href="">{{'kChangeState'|translate}}</a>
+            <a class="button  button-small button-outline button-dark " ng-click="controlZM('restart');" href="">{{'kRestart'
+              | translate}}</a>
+            <a class="button  button-small button-outline  button-dark" href="" ng-click="controlZM('stop');">{{'kStop'
+              | translate}}</a>
+            <a class="button  button-small button-outline button-dark" ng-click="controlZM('start');" href="">{{'kStart'
+              | translate}}</a>
+          </div>
+        </div>
+      </div>
+    </ion-item>
+
     <ion-list>
       <ion-item>
         <div class="row">
@@ -35,23 +53,73 @@
           </div>
         </div>
       </ion-item>
+    </ion-list>
 
-      <ion-item>
-
-        <div>
-          <div class="row">
-            <div class="col text-center">
-              <a class="button button-small button-outline button-dark " ng-click="selectCustomState();" href="">{{'kChangeState'|translate}}</a>
-              <a class="button  button-small button-outline button-dark " ng-click="controlZM('restart');" href="">{{'kRestart'
-                | translate}}</a>
-              <a class="button  button-small button-outline  button-dark" href="" ng-click="controlZM('stop');">{{'kStop'
-                | translate}}</a>
-              <a class="button  button-small button-outline button-dark" ng-click="controlZM('start');" href="">{{'kStart'
-                | translate}}</a>
-            </div>
-          </div>
+   
+    
+      <div class="list" >
+        <div class="item item-divider icon-left" ng-click="toggleStorage()">
+            <i class="icon"  ng-class="showStorage? 'ion-chevron-up':'ion-chevron-down'"></i>
+          {{'kStateStorage' | translate}}
         </div>
-      </ion-item>
-    </ion-list>
+        <div  ng-repeat = "store in storage">
+          <div class="item item-accordion item-divider item-icon-left " ng-show="showStorage">
+              <i class="icon ion-social-buffer"></i>
+              {{store.Storage.Name}} ({{store.Storage.Id}}) 
+          </div> <!-- divider -->
+          <div class="item item-accordion" ng-show="showStorage">
+   
+              <div class="row">
+                  {{'kStatePath' | translate }}: {{store.Storage.Path}}
+              </div>
+              <div class="row">
+                  {{'kStateDiskUsed' | translate }}: {{ humanFileSize(store.Storage.DiskSpace,true)}}
+              </div>
+              <div class="row">
+                  {{'kScheme' | translate }}: {{ store.Storage.Scheme}}
+              </div>
+              <div ng-if="store.Storage.ServerId" class="row">
+                  {{'kStateServer' | translate }}: {{ matchServer(store.Storage.ServerId)}}
+              </div>
+       
+          </div> <!-- item -->
+        </div> <!-- repeat -->
+ 
+          <div class="item item-divider icon-left" ng-click="toggleServer()">
+              <i class="icon"  ng-class="showServer? 'ion-chevron-up':'ion-chevron-down'"></i>
+            {{'kStateServer' | translate}}
+          </div>
+          <div  ng-repeat = "server in servers">
+            <div class="item item-accordion item-divider item-icon-left " ng-show="showServer">
+                <i class="icon ion-monitor"></i>
+                {{server.Server.Name}} ({{server.Server.Id}}) 
+            </div> <!-- divider -->
+            <div class="item item-accordion" ng-show="showServer">
+        
+                <div class="row">
+                    {{'kStateHost' | translate }}: {{server.Server.Hostname}}
+                </div>
+                <div class="row">
+                    {{'kStatus' | translate }}: {{ server.Server.Status}}
+                </div>
+                <div class="row">
+                    {{'kStateCpuLoad' | translate }}: {{ server.Server.CpuLoad}}
+                </div>
+                <div class="row">
+                    {{'kStateTotalMem' | translate }}: {{ humanFileSize(server.Server.TotalMem, true)}}
+                </div>
+                <div class="row">
+                    {{'kStateFreeMem' | translate }}: {{ humanFileSize(server.Server.FreeMem, true)}}
+                </div>
+
+        
+            </div> <!-- item -->
+          </div> <!-- repeat -->
+        </div> <!-- list ---->
+
+
+
+ 
+
   </ion-content>
 </ion-view>
-- 
cgit v1.2.3


From b3789d4a753814e81672aa59dee4a6e0d5ce55b2 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Tue, 30 Oct 2018 08:14:41 -0400
Subject: line height fix

---
 www/templates/state.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'www/templates/state.html')

diff --git a/www/templates/state.html b/www/templates/state.html
index 7791cd7b..b967c64c 100644
--- a/www/templates/state.html
+++ b/www/templates/state.html
@@ -69,16 +69,16 @@
           </div> <!-- divider -->
           <div class="item item-accordion" ng-show="showStorage">
    
-              <div class="row">
+              <div class="row" style="line-height:140%;">
                   {{'kStatePath' | translate }}: {{store.Storage.Path}}
               </div>
-              <div class="row">
+              <div class="row" style="line-height:140%;">
                   {{'kStateDiskUsed' | translate }}: {{ humanFileSize(store.Storage.DiskSpace,true)}}
               </div>
-              <div class="row">
+              <div class="row" style="line-height:140%;">
                   {{'kScheme' | translate }}: {{ store.Storage.Scheme}}
               </div>
-              <div ng-if="store.Storage.ServerId" class="row">
+              <div ng-if="store.Storage.ServerId" class="row" style="line-height:140%;">
                   {{'kStateServer' | translate }}: {{ matchServer(store.Storage.ServerId)}}
               </div>
        
@@ -96,19 +96,19 @@
             </div> <!-- divider -->
             <div class="item item-accordion" ng-show="showServer">
         
-                <div class="row">
+                <div class="row" style="line-height:140%;">
                     {{'kStateHost' | translate }}: {{server.Server.Hostname}}
                 </div>
-                <div class="row">
+                <div class="row" style="line-height:140%;">
                     {{'kStatus' | translate }}: {{ server.Server.Status}}
                 </div>
-                <div class="row">
+                <div class="row" style="line-height:140%;">
                     {{'kStateCpuLoad' | translate }}: {{ server.Server.CpuLoad}}
                 </div>
-                <div class="row">
+                <div class="row" style="line-height:140%;">
                     {{'kStateTotalMem' | translate }}: {{ humanFileSize(server.Server.TotalMem, true)}}
                 </div>
-                <div class="row">
+                <div class="row" style="line-height:140%;">
                     {{'kStateFreeMem' | translate }}: {{ humanFileSize(server.Server.FreeMem, true)}}
                 </div>
 
-- 
cgit v1.2.3


From bbbf935e2abd9b603a090c594d09ea91d7a92f6e Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Tue, 30 Oct 2018 11:21:39 -0400
Subject: #733 other cleanup

---
 www/templates/state.html | 47 ++++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

(limited to 'www/templates/state.html')

diff --git a/www/templates/state.html b/www/templates/state.html
index b967c64c..b534b693 100644
--- a/www/templates/state.html
+++ b/www/templates/state.html
@@ -4,7 +4,7 @@
     <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge"
       ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
   </ion-nav-buttons>
-  <ion-content delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
+  <ion-content delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll >
     <ion-refresher pulling-text="{{'kPullToReload' | translate}}..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
 
     <ion-item>
@@ -24,6 +24,7 @@
       </div>
     </ion-item>
 
+
     <ion-list>
       <ion-item>
         <div class="row">
@@ -56,67 +57,71 @@
     </ion-list>
 
    
-    
+ 
       <div class="list" >
-        <div class="item item-divider icon-left" ng-click="toggleStorage()">
-            <i class="icon"  ng-class="showStorage? 'ion-chevron-up':'ion-chevron-down'"></i>
+
+           <!-- Storage -->
+        <div class="item item-divider item-icon-left item-icon-right" ng-click="toggleStorage()">
+            <i class="icon"  ng-class="showStorage? 'ion-minus':'ion-plus'"></i>
+            <i class="icon ion-social-buffer"></i>
           {{'kStateStorage' | translate}}
         </div>
         <div  ng-repeat = "store in storage">
-          <div class="item item-accordion item-divider item-icon-left " ng-show="showStorage">
-              <i class="icon ion-social-buffer"></i>
+          <div class="item item-accordion item-divider" ng-show="showStorage">
+              
               {{store.Storage.Name}} ({{store.Storage.Id}}) 
           </div> <!-- divider -->
           <div class="item item-accordion" ng-show="showStorage">
    
-              <div class="row" style="line-height:140%;">
+              <div class="row" style="font-size:80%;line-height:140%;">
                   {{'kStatePath' | translate }}: {{store.Storage.Path}}
               </div>
-              <div class="row" style="line-height:140%;">
+              <div class="row" style="font-size:80%;line-height:140%;">
                   {{'kStateDiskUsed' | translate }}: {{ humanFileSize(store.Storage.DiskSpace,true)}}
               </div>
-              <div class="row" style="line-height:140%;">
+              <div class="row" style="font-size:80%;line-height:140%;">
                   {{'kScheme' | translate }}: {{ store.Storage.Scheme}}
               </div>
-              <div ng-if="store.Storage.ServerId" class="row" style="line-height:140%;">
+              <div ng-if="store.Storage.ServerId" class="row" style="font-size:80%;line-height:140%;">
                   {{'kStateServer' | translate }}: {{ matchServer(store.Storage.ServerId)}}
               </div>
        
           </div> <!-- item -->
         </div> <!-- repeat -->
  
-          <div class="item item-divider icon-left" ng-click="toggleServer()">
-              <i class="icon"  ng-class="showServer? 'ion-chevron-up':'ion-chevron-down'"></i>
+        <!-- server -->
+          <div class="item item-divider item-icon-left item-icon-right" ng-click="toggleServer()">
+              <i class="icon"  ng-class="showServer? 'ion-minus':'ion-plus'"></i>
+              <i class="icon ion-monitor"></i>
             {{'kStateServer' | translate}}
           </div>
           <div  ng-repeat = "server in servers">
-            <div class="item item-accordion item-divider item-icon-left " ng-show="showServer">
-                <i class="icon ion-monitor"></i>
+            <div class="item item-accordion item-divider" ng-show="showServer">
+                
                 {{server.Server.Name}} ({{server.Server.Id}}) 
             </div> <!-- divider -->
             <div class="item item-accordion" ng-show="showServer">
         
-                <div class="row" style="line-height:140%;">
+                <div class="row" style="font-size:80%;line-height:140%;">
                     {{'kStateHost' | translate }}: {{server.Server.Hostname}}
                 </div>
-                <div class="row" style="line-height:140%;">
+                <div class="row" style="font-size:80%;line-height:140%;">
                     {{'kStatus' | translate }}: {{ server.Server.Status}}
                 </div>
-                <div class="row" style="line-height:140%;">
+                <div class="row" style="font-size:80%;line-height:140%;">
                     {{'kStateCpuLoad' | translate }}: {{ server.Server.CpuLoad}}
                 </div>
-                <div class="row" style="line-height:140%;">
+                <div class="row" style="font-size:80%;line-height:140%;">
                     {{'kStateTotalMem' | translate }}: {{ humanFileSize(server.Server.TotalMem, true)}}
                 </div>
-                <div class="row" style="line-height:140%;">
+                <div class="row" style="font-size:80%;line-height:140%;">
                     {{'kStateFreeMem' | translate }}: {{ humanFileSize(server.Server.FreeMem, true)}}
                 </div>
-
         
             </div> <!-- item -->
           </div> <!-- repeat -->
         </div> <!-- list ---->
-
+    
 
 
  
-- 
cgit v1.2.3