From 85961dd7488cc165f27a849a43501cafe01c5043 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Tue, 20 Sep 2016 12:24:56 -0400
Subject: "your fault" message delayed by a few seconds

Former-commit-id: 4deedeb83680c7aa06ab31f0086338cbaa7f9b77
---
 www/css/style.css                  | 4 ++++
 www/js/PortalLoginCtrl.js          | 4 +++-
 www/templates/zm-portal-login.html | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'www')

diff --git a/www/css/style.css b/www/css/style.css
index 9fb19658..33e6f972 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -701,6 +701,10 @@ input[type=range]::-webkit-slider-thumb {
     -webkit-animation-delay: 1s;
 }
 
+#really-your-fault {
+    -webkit-animation-delay: 4s;
+}
+
 /* packery stuff */
 * {
     box-sizing: border-box;
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index ec9d345a..7e874fa4 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -234,8 +234,10 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                     NVRDataModel.debug("logging state transition");
                                     NVRDataModel.debug("Transitioning state to: " +
                                         statetoGo + " with param " + JSON.stringify($rootScope.lastStateParam));
+                            
+                                    
                                     $state.go(statetoGo, $rootScope.lastStateParam);
-
+                                   
                                 },
                                 function (error) { // API Error
                                     NVRDataModel.log("API Error handler: going to login getAPI returned error: " + JSON.stringify(error));
diff --git a/www/templates/zm-portal-login.html b/www/templates/zm-portal-login.html
index 172136e2..90c068da 100644
--- a/www/templates/zm-portal-login.html
+++ b/www/templates/zm-portal-login.html
@@ -23,7 +23,7 @@
                     <button class="button  button-dark icon ion-unlocked" ng-click="unlock()"> Unlock
                     </button>
                 </div>
-                <div style="color:white">{{'kPortalNotice' | translate}}</div>
+                <div id = "really-your-fault" class="animated fadeIn" style="color:white">{{'kPortalNotice' | translate}}</div>
                 
             </center>
         </div>
-- 
cgit v1.2.3