From ab220a5b6682ca7a995d3ebda5265b65f4d25925 Mon Sep 17 00:00:00 2001
From: Leonardo Merlin <leonardo.merlin@serpro.gov.br>
Date: Tue, 8 Sep 2015 10:35:22 -0300
Subject: [PATCH] Add modal terms into signin page

---
 src/app/pages/article/article.controller.js |  2 +-
 src/app/pages/auth/auth.controller.js       | 21 ++++++++++++++++++++-
 src/app/pages/auth/signin.html              | 21 ++++++++++++++++++++-
 src/app/pages/auth/signup.html              | 94 ----------------------------------------------------------------------------------------------
 4 files changed, 41 insertions(+), 97 deletions(-)
 delete mode 100644 src/app/pages/auth/signup.html

diff --git a/src/app/pages/article/article.controller.js b/src/app/pages/article/article.controller.js
index 4251883..a29f359 100644
--- a/src/app/pages/article/article.controller.js
+++ b/src/app/pages/article/article.controller.js
@@ -52,7 +52,7 @@
     }
 
     function handleError (error) {
-      vm.$log.debug('handleSuccess.error', error);
+      // vm.$log.debug('handleSuccess.error', error);
       vm.loading = false;
       vm.error = error;
     }
diff --git a/src/app/pages/auth/auth.controller.js b/src/app/pages/auth/auth.controller.js
index 94f52dc..56e08ec 100644
--- a/src/app/pages/auth/auth.controller.js
+++ b/src/app/pages/auth/auth.controller.js
@@ -6,7 +6,7 @@
     .controller('AuthPageController', AuthPageController);
 
   /** @ngInject */
-  function AuthPageController($scope, $rootScope, AUTH_EVENTS, AuthService, Session, $log) {
+  function AuthPageController($scope, $rootScope, AUTH_EVENTS, AuthService, DialogaService, Session, $log) {
     $log.debug('AuthPageController');
 
     var vm = this;
@@ -15,10 +15,12 @@
     vm.$scope = $scope;
     vm.AUTH_EVENTS = AUTH_EVENTS;
     vm.AuthService = AuthService;
+    vm.DialogaService = DialogaService;
     vm.Session = Session;
     vm.$log = $log;
 
     vm.init();
+    vm.loadData();
   }
 
   AuthPageController.prototype.init = function() {
@@ -26,6 +28,8 @@
 
     // init variables
     vm.credentials = {};
+    vm.terms = null;
+    vm.loadingTerms = null;
 
     // attach events
     vm.currentUser = vm.Session.getCurrentUser();
@@ -42,6 +46,21 @@
     // ...
   };
 
+  AuthPageController.prototype.loadData = function() {
+    var vm = this;
+
+    // load terms
+    vm.loadingTerms = true;
+    vm.DialogaService.getTerms(function(data){
+      vm.loadingTerms = false;
+      vm.terms = data.article;
+    }, function(error){
+      // vm.$log.debug('handleSuccess.error', error);
+      vm.loadingTerms = false;
+      vm.error = error;
+    });
+  };
+
 
   AuthPageController.prototype.onClickLogout = function (){
     var vm = this;
diff --git a/src/app/pages/auth/signin.html b/src/app/pages/auth/signin.html
index 11171cc..04b7ac8 100644
--- a/src/app/pages/auth/signin.html
+++ b/src/app/pages/auth/signin.html
@@ -157,7 +157,7 @@
                   <div class="form-group">
                     <input type="checkbox" id="termosDeUso" name="termosDeUso" value="aceito"  ng-model="termosDeUso" required>
                     Já li os
-                    <a href="">Termos de Uso</a>
+                    <button type="button" class="btn btn-link" data-toggle="modal" data-target="#modalTermosDeUso">Termos de Uso</button>
                     e concordo com os mesmos*
                   </input>
                   <validation-messages field="cadastroForm.termosDeUso"/>
@@ -176,3 +176,22 @@
       </div>
     </div>
   </section>
+
+
+<div class="modal fade" id="modalTermosDeUso" tabindex="-1" role="dialog" aria-labelledby="termosDeUsoLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header modal-termos-uso-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true" class="modal-fechar-pequeno">FECHAR</span>
+          <span aria-hidden="true" class="modal-fechar-grande">X</span>
+        </button>
+      </div>
+      <div class="modal-body modal-termos-uso-body">
+        <div class="modal-termos-uso-body-inner" ng-if="pageSignin.terms">
+          <div ng-bind-html="pageSignin.terms.body"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/pages/auth/signup.html b/src/app/pages/auth/signup.html
deleted file mode 100644
index a07289a..0000000
--- a/src/app/pages/auth/signup.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!-- Facebook -->
-<!-- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25"><path d="M18 32L12 32 12 16l-4 0 0-5.5 4 0 0-3.2C12 2.7 13.2 0 18.5 0l4.4 0 0 5.5 -2.8 0c-2.1 0-2.2 0.8-2.2 2.2l0 2.8 5 0 -0.6 5.5L18 16 18 32z"/></svg> -->
-<!-- Twitter -->
-<!-- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25"><path d="M32 6.1c-1.2 0.5-2.4 0.9-3.8 1 1.4-0.8 2.4-2.1 2.9-3.6 -1.3 0.8-2.7 1.3-4.2 1.6 -1.2-1.3-2.9-2.1-4.8-2.1 -3.6 0-6.6 2.9-6.6 6.6 0 0.5 0.1 1 0.2 1.5 -5.5-0.3-10.3-2.9-13.5-6.9 -0.6 1-0.9 2.1-0.9 3.3 0 2.3 1.2 4.3 2.9 5.5 -1.1 0-2.1-0.3-3-0.8 0 0 0 0.1 0 0.1 0 3.2 2.3 5.8 5.3 6.4 -0.6 0.2-1.1 0.2-1.7 0.2 -0.4 0-0.8 0-1.2-0.1 0.8 2.6 3.3 4.5 6.1 4.6 -2.2 1.8-5.1 2.8-8.2 2.8 -0.5 0-1.1 0-1.6-0.1 2.9 1.9 6.4 3 10.1 3 12.1 0 18.7-10 18.7-18.7 0-0.3 0-0.6 0-0.8C30 8.5 31.1 7.4 32 6.1z"/></svg> -->
-<!-- Google Plus -->
-<!-- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25"><path d="M17.5 2c0 0-6.3 0-8.4 0C5.3 2 1.8 4.8 1.8 8.1c0 3.4 2.6 6.1 6.4 6.1 0.3 0 0.5 0 0.8 0 -0.2 0.5-0.4 1-0.4 1.6 0 0.9 0.5 1.7 1.1 2.3 -0.5 0-0.9 0-1.5 0C3.6 18.1 0 21.1 0 24.1c0 3 3.9 4.9 8.6 4.9 5.3 0 8.2-3 8.2-6 0-2.4-0.7-3.9-2.9-5.4 -0.8-0.5-2.2-1.8-2.2-2.6 0-0.9 0.3-1.3 1.6-2.4 1.4-1.1 2.4-2.6 2.4-4.4 0-2.1-0.9-4.2-2.7-4.8l2.7 0L17.5 2zM14.5 22.5c0.1 0.3 0.1 0.6 0.1 0.9 0 2.4-1.6 4.4-6.1 4.4 -3.2 0-5.5-2-5.5-4.5 0-2.4 2.9-4.4 6.1-4.4 0.8 0 1.4 0.1 2.1 0.3C12.9 20.4 14.2 21.1 14.5 22.5zM9.4 13.4c-2.2-0.1-4.2-2.4-4.6-5.2 -0.4-2.8 1.1-5 3.2-4.9 2.2 0.1 4.2 2.3 4.6 5.2C13 11.2 11.6 13.4 9.4 13.4zM26 8L26 2 24 2 24 8 18 8 18 10 24 10 24 16 26 16 26 10 32 10 32 8z"/></svg> -->
-
-<section>
-  <div class="container">
-    <div class="row">
-      <div class="col-sm-12">
-        <!-- <h1>Ou cadastre-se</h1> -->
-        <!-- <p>Para fazer parte do Dialoga Brasil, interagir com as propostas e enviar as suas!</p> -->
-      </div>
-    </div>
-  </div>
-</section>
-<section role="main" class="section-gray auth-content">
-<div class="row">
-      <div class="col-sm-12">
-        <h1>Ou cadastre-se</h1>
-        <p>Para fazer parte do Dialoga Brasil, interagir com as propostas e enviar as suas!</p>
-      </div>
-    </div>
-  <div class="container">
-    <div class="row">
-      <div class="col-md-6">
-        <button type="button" class="btn btn-lg btn-block btn-social btn-facebook">
-          <span class="glyphicon icon-facebook icon-white" aria-hidden="true">
-            <!-- Facebook -->
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25"><path d="M18 32L12 32 12 16l-4 0 0-5.5 4 0 0-3.2C12 2.7 13.2 0 18.5 0l4.4 0 0 5.5 -2.8 0c-2.1 0-2.2 0.8-2.2 2.2l0 2.8 5 0 -0.6 5.5L18 16 18 32z"/></svg>
-          </span>
-          <span class="text">
-            Conectar pelo Facebook
-          </span>
-        </button>
-      </div>
-      <div class="col-md-6">
-        <button type="button" class="btn btn-lg btn-block btn-social btn-google-plus">
-          <span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
-            <!-- Google Plus -->
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25"><path d="M17.5 2c0 0-6.3 0-8.4 0C5.3 2 1.8 4.8 1.8 8.1c0 3.4 2.6 6.1 6.4 6.1 0.3 0 0.5 0 0.8 0 -0.2 0.5-0.4 1-0.4 1.6 0 0.9 0.5 1.7 1.1 2.3 -0.5 0-0.9 0-1.5 0C3.6 18.1 0 21.1 0 24.1c0 3 3.9 4.9 8.6 4.9 5.3 0 8.2-3 8.2-6 0-2.4-0.7-3.9-2.9-5.4 -0.8-0.5-2.2-1.8-2.2-2.6 0-0.9 0.3-1.3 1.6-2.4 1.4-1.1 2.4-2.6 2.4-4.4 0-2.1-0.9-4.2-2.7-4.8l2.7 0L17.5 2zM14.5 22.5c0.1 0.3 0.1 0.6 0.1 0.9 0 2.4-1.6 4.4-6.1 4.4 -3.2 0-5.5-2-5.5-4.5 0-2.4 2.9-4.4 6.1-4.4 0.8 0 1.4 0.1 2.1 0.3C12.9 20.4 14.2 21.1 14.5 22.5zM9.4 13.4c-2.2-0.1-4.2-2.4-4.6-5.2 -0.4-2.8 1.1-5 3.2-4.9 2.2 0.1 4.2 2.3 4.6 5.2C13 11.2 11.6 13.4 9.4 13.4zM26 8L26 2 24 2 24 8 18 8 18 10 24 10 24 16 26 16 26 10 32 10 32 8z"/></svg>
-          </span>
-          <span class="text">
-            Conectar pelo Google+
-          </span>
-        </button>
-      </div>
-    </div>
- <div class="row">
-        <div class="col-sm-12">
-          <hr class="separator separator-cadastro"></hr>
-        </div>
-      </div>
-    <div class="row">
-      <div class="col-sm-12">
-        <form name="loginForm" ng-submit="pageSignin.login(pageSignin.credentials)">
-          <div class="form-group">
-            <label for="inputNome">Nome:</label>
-            <input type="text" id="inputNome" class="form-control input-lg" required="true" autofocus="" ng-model="">
-          </div>
-          <div class="form-group">
-            <label for="inputEmail">E-mail*</label>
-            <input type="text" id="inputEmail" class="form-control input-lg" required="true" autofocus="" ng-model="">
-          </div>
-          <div class="form-group">
-            <div class="input-group">
-              <label for="inputPassword">Senha:</label>
-              <input type="password" id="inputPassword" class="form-control input-lg" required="true" ng-model="">
-            </div>
-          </div>
-          <div class="form-group">
-
-            <div class="input-group">
-            <label for="inputRepeatPassword">Confirmar Senha:</label>
-            <input type="password" id="inputRepeatPassword" class="form-control input-lg" required="true" ng-model="">
-            </div>
-          </div>
-          <span>A senha deve ter 6 ou mais caracteres e conter números e letras.</span>
-          <div class="form-group">
-            <input type="checkbox" name="termosDeUso" value="aceito">Já li os <a href="">Termos de Uso</a> e concordo com os mesmos*</input>
-          </div>
-          <div class="form-group">
-            <span>Digite o texto da imagem</span>
-            <p>O Captcha vai aqui</p>
-          </div>
-          <div class="form-group">
-            <button class="btn btn-lg btn-block btn-submit" type="submit">Cadastrar</button>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-</section>
--
libgit2 0.21.2