From 9266c2e1e409ad906c36be8af9de407ab02c9e9c Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Fri, 20 May 2016 14:37:04 -0400
Subject: style updates

Former-commit-id: a3c028e3fdebe82eb3f47362a9dbf60f5fa178ea
---
 www/css/style.css         | 21 +++++++++++++++++++++
 www/js/app.js             |  7 ++++++-
 www/templates/wizard.html |  3 ++-
 3 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'www')

diff --git a/www/css/style.css b/www/css/style.css
index 0cf2314e..a7b88819 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -33,6 +33,22 @@
 }
 
 
+.image-loader-container
+{
+    position:relative;
+    width:100%;
+    height:100%;
+}
+
+image-loader
+{
+    position:absolute;
+    top:50%;
+    left:50%;
+    z-index:999;
+}
+
+
 .vis-time-axis .grid.vis-odd {
     background: #f5f5f5;
   }
@@ -794,6 +810,11 @@ input[type=range]::-webkit-slider-thumb {
     -webkit-animation-delay: 1s;
 }
 
+#transition-delay
+{
+    -webkit-animation-delay: 1s;
+}
+
 /* packery stuff */
 
 
diff --git a/www/js/app.js b/www/js/app.js
index 6cf9d9e1..52cadc8a 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -402,8 +402,13 @@ angular.module('zmApp', [
             },
             link: function ($scope, $element, $attributes) {
 
+                /*if ($attributes.imageSpinnerLoader) {
+                    var loader = $compile('<div class="image-loader-container"><ion-spinner  class="image-loader" icon="' + $attributes.imageSpinnerLoader + '"></ion-spinner></div>')($scope);
+                    $element.after(loader);
+                }*/
+                
                 if ($attributes.imageSpinnerLoader) {
-                    var loader = $compile('<div class="image-loader-container"><ion-spinner style="position:fixed;top:5%;right:5%" class="image-loader" icon="' + $attributes.imageSpinnerLoader + '"></ion-spinner></div>')($scope);
+                    var loader = $compile('<div class="image-loader-container"><ion-spinner  class="image-loader" icon="' + 'bubbles'+ '"></ion-spinner></div>')($scope);
                     $element.after(loader);
                 }
                 imageLoadingDataShare.set(1);
diff --git a/www/templates/wizard.html b/www/templates/wizard.html
index f44b44d3..7eab6f3e 100644
--- a/www/templates/wizard.html
+++ b/www/templates/wizard.html
@@ -12,7 +12,7 @@
         <!-- portal url -->
         <wz-step wz-title="1" canexit="exitPortal">
             
-            <h4><i class="ion-wand" style="font-size:2em"></i> Welcome to zmWizard</h4>
+            <h4><i id="transition-delay" class="animated swing 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>
 
@@ -66,6 +66,7 @@
             <label class="item item-input item-floating-label" ng-show="wizard.usebasicauth">
                 <span class="input-label">password</span>
                 <input type="password" ng-model="wizard.basicpassword" placeholder="basic auth password" >
+                <p>note: if your password has # or ? in it, the wizard will fail cgi detection.</p>
             </label>
 
 
-- 
cgit v1.2.3