From 1bd3546443c31f2e5b769372990cf4ce8f606cef Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Fri, 20 May 2016 10:56:19 -0400
Subject: more style tweaks

Former-commit-id: c9e67a99004863e0df2bbfda5fd21e2f8b676c06
---
 www/templates/events.html          | 8 +++++---
 www/templates/montage-history.html | 2 +-
 www/templates/montage.html         | 2 +-
 www/templates/wizard.html          | 5 ++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events.html b/www/templates/events.html
index 61fd52d4..010e4693 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -153,12 +153,14 @@
                                   
                                         <span ng-repeat="alarm in alarm_images">
                                                  
-                                            <figure style="display:inline-block">
+                                            <figure  style="display:inline-block">
                                                 
                                                 <figcaption class="smallnote">frame:{{alarm.frameid}} score:{{alarm.score}}</figcaption>       
-                                                  <img ng-if="event.Event.imageMode=='path'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{alarm.fname}}&height=380"    style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id)"/>
+                                                  <img ng-if="event.Event.imageMode=='path'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{alarm.fname}}&height=380"    style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id)" />
                                                 
-                                                <img ng-if="event.Event.imageMode=='fid'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}"    style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id)"/>
+                                                <img ng-if="event.Event.imageMode=='fid'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}"    style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id)" />
+                                                
+                                               
                                                   
                                                 
                                                 </figure>
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index 392f390c..3b82ed8f 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -136,7 +136,7 @@
 
     </div>
 
-    <ion-pull-up-footer class="bar-dark" on-expand="footerExpand()" on-minimize="footerCollapse()" on-collapse="footerCollapse()" initial-state="minimized" default-behavior="expand">
+    <ion-pull-up-footer class="zmPullup" on-expand="footerExpand()" on-minimize="footerCollapse()" on-collapse="footerCollapse()" initial-state="minimized" default-behavior="expand">
         <ion-pull-up-handle width="100" height="25" toggle="ion-chevron-up ion-chevron-down" style="border-radius: 25px 25px 0 0">
             <i class="icon ion-chevron-up"></i>
         </ion-pull-up-handle>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 9e6f2e1e..0e5feae1 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -30,7 +30,7 @@
     <ion-content ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate"  >
     
 
-        <span ng-show="!minimal && showSizeButtons">
+        <span  ng-if="!minimal && showSizeButtons">
             <!-- this is header -->
             
             <span ng-click="sliderChanged(1)" style="float:right;margin-top:0px;padding-top:8px;background-color:#5c6767;color:#fff;font-size:25px;opacity:1;width:40px;height:36px;border-radius: 0px 0px 0px 5px;">&nbsp;<i class="ion-plus-circled">&nbsp;</i></span>
diff --git a/www/templates/wizard.html b/www/templates/wizard.html
index d4c9412a..f44b44d3 100644
--- a/www/templates/wizard.html
+++ b/www/templates/wizard.html
@@ -11,7 +11,9 @@
         
         <!-- portal url -->
         <wz-step wz-title="1" canexit="exitPortal">
-            <h4><i class="ion-wand"></i> Welcome to zmWizard</h4>
+            
+            <h4><i class="ion-wand" style="font-size:2em"></i> Welcome to zmWizard</h4>
+            <img src="img/wizard.svg" width="100px" style="float:left"/>
             <p>Configuring ZoneMinder can be a pain. Let's see if zmWizard can help.</p>
 
             <h4>What is your Zoneminder portal url?</h4>
@@ -38,6 +40,7 @@
         <!-- auth mode -->  
         <wz-step wz-title="2"  >
             <h4>Portal Authentication</h4>
+            <!--<img src="img/wizard.svg" width="100px" style="float:left"/>-->
             <p>Lets talk about how you have configured authentication If you have enabled authentication, toggle this button</p>
             <ion-toggle ng-change="toggleAuth()" ng-model="wizard.useauth" ng-checked="wizard.useauth" toggle-class="toggle-calm">I use authentication</ion-toggle>
 
-- 
cgit v1.2.3