From 68400d52f749178eccc155bb462e3dc74da06c1d Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sun, 24 Dec 2017 10:51:35 -0500
Subject: #570 - optimized popover and iconography

---
 www/templates/moment-popover.html | 10 +++++-----
 www/templates/moment.html         |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/moment-popover.html b/www/templates/moment-popover.html
index 2da37112..6d2f49fc 100644
--- a/www/templates/moment-popover.html
+++ b/www/templates/moment-popover.html
@@ -1,16 +1,16 @@
 <ion-popover-view class="fit">
     <ion-content>
-        <div class="list" ng-click="popover.hide()">
+        <div class="list" ng-click="popover.remove()">
            
-            <a class="item" ng-href="" ng-click="popover.hide();getMoments('StartTime');">
-              {{'kMomentMenuByTime' | translate}}
+            <a class="item" ng-href="" ng-click="popover.remove();getMoments('StartTime');">
+              {{'kMomentMenuByTime' | translate}} <i ng-if="::isChecked('kMomentMenuByTime')" class="ion-checkmark"></i>
             
             </a>
 
-            <a class="item" ng-href="" ng-click="popover.hide();getMoments('monitorName');">{{'kMomentMenuByMonitor' | translate}}</a>
+            <a class="item" ng-href="" ng-click="popover.remove();getMoments('monitorName');">{{'kMomentMenuByMonitor' | translate}} <i ng-if="::isChecked('kMomentMenuByMonitor')" class="ion-checkmark"></i></a>
 
 
-            <a class="item" ng-href="" ng-click="popover.hide();getMoments('MaxScore');">{{'kMomentMenuByScore' | translate}}</a>
+            <a class="item" ng-href="" ng-click="popover.remove();getMoments('MaxScore');">{{'kMomentMenuByScore' | translate}} <i ng-if="::isChecked('kMomentMenuByScore')" class="ion-checkmark"></i></a>
 
             
         </div>
diff --git a/www/templates/moment.html b/www/templates/moment.html
index 3ce02627..d2bbe8d8 100644
--- a/www/templates/moment.html
+++ b/www/templates/moment.html
@@ -1,5 +1,5 @@
 <ion-view cache-view="false">
-  <ion-nav-title>{{'kMoment24Heading' | translate}} {{type}}</ion-nav-title>
+  <ion-nav-title><i class="{{typeIcon}}"></i> {{'kMoment24Heading' | translate}}</ion-nav-title>
   <ion-nav-buttons side="left">
     <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
     <button class="button button-icon button-clear ion-gear-b" ng-click="hideUnhide()"></button>
@@ -12,7 +12,7 @@
 
     <a class="button button-icon icon ion-chevron-down" ng-click="toggleSubMenu()" ;></a>
 
-    <a class="button button-icon icon ion-android-more-vertical " ng-click="popover.show($event)" ;>&nbsp;&nbsp;&nbsp;</a>
+    <a class="button button-icon icon ion-android-more-vertical " ng-click="showPopover($event)" ;>&nbsp;&nbsp;&nbsp;</a>
 
 
 
-- 
cgit v1.2.3