From e5726d2840c5699d48184e5695f962fce6d02f48 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 13 Feb 2015 09:14:10 -0500
Subject: [PATCH] WiP - some improvements to the login form

---
 UI/Templates/MainUI/SOGoRootPage.wox     | 29 ++++++++++++++++--------
 UI/WebServerResources/js/SOGoRootPage.js | 15 +++++++++++-
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 60a76cc96..c086a628c 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -12,8 +12,8 @@
     ><var:string var:value="doctype" const:escapeHTML="NO"/>
 
 <md-content md-scroll-y="true">
-  <div>
-    <div id="aboutBox" style="display:none;">
+  <div data-ng-controller="loginController">
+    <!--   <div id="aboutBox" style="display:none;">
       <div>
         <p class="logo"><img const:alt="SOGo" rsrc:src="img/sogo-logo.png"/></p>
         <p>Version <var:string value="version"/> <span class="buildDate">(<var:string value="buildDate" />)</span></p>
@@ -24,14 +24,14 @@
         <p><a id="aboutClose" href="#" class="button">
         <span><var:string label:value="OK" /></span></a></p>
       </div>
-    </div>
-    <nav class="top-bar">
+    </div> -->
+    <!-- <nav class="top-bar">
       <section class="top-bar-section">
         <ul class="right">
           <li><a href="#"><var:string label:value="About" /></a></li>
         </ul>
       </section>
-    </nav>
+    </nav> -->
     <div id="login">
       <div id="logo">
         <img const:alt="*" id="splash" rsrc:src="img/sogo-logo.png"/>
@@ -42,7 +42,7 @@
         <md-input-container>
           <label><var:string label:value="Username:"/>
           </label>
-	  <input type="text" data-ng-model="creds.username" var:data-ng-init="cookieUsername" required="required" />
+	  <input type="text" data-ng-model="creds.username" var:data-ng-init='cookieUsername' required="required" />
         </md-input-container>
         <md-input-container>
 	  <label><var:string label:value="Password:"/>
@@ -72,15 +72,24 @@
 		     />
           </label>
         </var:if>
+        <!--
         <md-checkbox data-ng-model="creds.rememberLogin">
           <label><var:string label:value="Remember username"/></label>
-        </md-checkbox>
-	<label>
-	  <md-button type="submit" class="small" data-ng-disabled='!loginForm.$valid'>
+          </md-checkbox> -->
+          <!-- <label> -->
+	  <md-button type="submit" class="md-raised md-primary" data-ng-disabled='!loginForm.$valid'>
 	  <var:string label:value="Connect" /></md-button>
-	</label>
+	<!-- </label> -->
+        <md-switch data-ng-model="creds.rememberLogin">
+          <var:string label:value="Remember username"/>
+        </md-switch>
         <label id="animation"><!-- busy.gif! --></label>
       </form>
+      <md-toolbar>
+        <md-button ng-click="showAbout()">
+          About
+        </md-button>
+      </md-toolbar>
     </div>
   </div>
 </md-content>
diff --git a/UI/WebServerResources/js/SOGoRootPage.js b/UI/WebServerResources/js/SOGoRootPage.js
index 6920a5dee..71dedd9cb 100644
--- a/UI/WebServerResources/js/SOGoRootPage.js
+++ b/UI/WebServerResources/js/SOGoRootPage.js
@@ -6,7 +6,7 @@
 
   angular.module('SOGo.MainUI', ['SOGo.Authentication', 'SOGo.UI'])
 
-    .controller('loginController', ['$scope', 'Authentication', function($scope, Authentication) {
+    .controller('loginController', ['$scope', '$mdDialog', 'Authentication', function($scope, $mdDialog, Authentication) {
       $scope.warning = false;
       $scope.creds = { username: null, password: null };
       $scope.login = function(creds) {
@@ -19,5 +19,18 @@
           });
         return false;
       };
+      $scope.showAbout = function() {
+          var alert;
+          alert = $mdDialog.alert({
+              title: 'About SOGo',
+              content: 'This is SOGo v3!',
+              ok: 'OK'
+          });
+          $mdDialog
+              .show( alert )
+              .finally(function() {
+                  alert = undefined;
+              });
+      };
     }]);
 })();