From 9f8f4a49cf908064b0303f09fde0556aee83142b Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Thu, 6 Aug 2015 17:39:59 -0400
Subject: timeline now has a joystick button that is easier to use, also
 removed dependencies

---
 www/templates/monitors-modal.html | 2 +-
 www/templates/montage.html        | 1 +
 www/templates/timeline.html       | 6 ++----
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index 979d307d..4e85234d 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -3,7 +3,7 @@
 
    <!--style="background-color:#444444;width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"-->
 
-    <ion-modal-view cache="false"  >
+    <ion-modal-view cache="false" style="background-color:#444444"  >
         <ion-content >
 
                 <ion-scroll has-bouncing=false min-zoom=1 zooming="true"
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 689329b3..035debd4 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -74,3 +74,4 @@
         </nav>
     </div>
 </ion-view>
+
diff --git a/www/templates/timeline.html b/www/templates/timeline.html
index 8cf83715..ea7e0e2c 100644
--- a/www/templates/timeline.html
+++ b/www/templates/timeline.html
@@ -14,7 +14,6 @@
 
 <ion-nav-buttons side="right">
 
-    <button class="button button-icon button-clear ion-arrow-shrink" ng-click="fit()"></button>
 
     <button class="button button-icon button-clear ion-arrow-move" ng-click="toggleNav();"></button>
     <!--
@@ -26,8 +25,7 @@
     <ion-content>
         <div style="padding-left:15px; font-size:10px; color:grey">
 
-        Latest {{maxItems}} events between:
-        {{prettify(fromDate)}} - {{prettify(toDate)}}
+        {{prettify(fromDate)}} - {{prettify(toDate)}} (only displaying last {{maxItems}} events)
             </div>
 
 
@@ -43,7 +41,7 @@
     </ion-content>
 
 </ion-view>
-<div class="timelinebuttons" >
+<div class="timelinebuttons" ng-if="graphLoaded">
                 <circular id ="timeline-ctrl" options="radialMenuOptions" class="animated bounceInRight">
                 </circular>
 </div>
-- 
cgit v1.2.3