From 1ee9cee7bf0f395a68bef48006605349bbcbac51 Mon Sep 17 00:00:00 2001
From: Rafael Diego <rafael.gomes@serpro.gov.br>
Date: Mon, 7 Sep 2015 15:26:06 -0300
Subject: [PATCH] default

---
 src/app/components/cadastro-proposta/cadastro-proposta.html             |  18 +++++++++---------
 src/app/components/cadastro-proposta/cadastro-proposta.scss             |  26 +++++++++++++++-----------
 src/app/components/form-messages/form-messages.directive.js             |  52 ----------------------------------------------------
 src/app/components/form-messages/form-messages.html                     |  10 ----------
 src/app/components/form-messages/form-messages.scss                     |   0
 src/app/components/show-message/message.html                            |  17 -----------------
 src/app/components/show-message/show-message.directive.js               |   2 +-
 src/app/components/show-message/show-message.html                       |  17 +++++++++++++++++
 src/app/components/validation-messages/validation-messages.directive.js |  52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/app/components/validation-messages/validation-messages.html         |  10 ++++++++++
 src/app/components/validation-messages/validation-messages.scss         |   3 +++
 src/app/layout.scss                                                     |   7 ++-----
 src/app/pages/auth/auth.scss                                            | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------
 src/app/pages/auth/message.html                                         |   1 +
 src/app/pages/auth/signin.html                                          |  26 ++++++++------------------
 src/app/pages/propostas/cadastro-proposta.html                          |   7 ++-----
 16 files changed, 193 insertions(+), 198 deletions(-)
 delete mode 100644 src/app/components/form-messages/form-messages.directive.js
 delete mode 100644 src/app/components/form-messages/form-messages.html
 delete mode 100644 src/app/components/form-messages/form-messages.scss
 delete mode 100644 src/app/components/show-message/message.html
 create mode 100644 src/app/components/show-message/show-message.html
 create mode 100644 src/app/components/validation-messages/validation-messages.directive.js
 create mode 100644 src/app/components/validation-messages/validation-messages.html
 create mode 100644 src/app/components/validation-messages/validation-messages.scss

diff --git a/src/app/components/cadastro-proposta/cadastro-proposta.html b/src/app/components/cadastro-proposta/cadastro-proposta.html
index 6f93b16..7dc3e60 100644
--- a/src/app/components/cadastro-proposta/cadastro-proposta.html
+++ b/src/app/components/cadastro-proposta/cadastro-proposta.html
@@ -20,21 +20,21 @@
       <div class="row linha-proposta">
         <div class="col-sm-8">
           <span>Descrição da proposta*</span>
-              <a tabindex="0" class="btn btn-link link-popover" role="button" data-toggle="popover" data-trigger="focus">?</a>
+          <div class="teste"><a tabindex="0" class="btn btn-link link-popover" role="button" data-toggle="popover" data-trigger="focus">?</a></div>
           <textarea id="proposta" name="proposta" class="texto-proposta form-control"
-           ng-class="{ 'has-error' : testeForm.proposta.$invalid && testeForm.proposta.$touched }"
-           ng-model="proposta"
-           required ng-maxlength="200" ></textarea>
-           <form-messages field="testeForm.proposta" maxlength="'Ops, esse campo não pode ser maior que 200 caracteres.'"/>
+          ng-class="{ 'has-error' : testeForm.proposta.$invalid && testeForm.proposta.$touched }"
+          ng-model="proposta"
+          required ng-maxlength="200" ></textarea>
+          <validation-messages field="testeForm.proposta" maxlength="'Ops, esse campo não pode ser maior que 200 caracteres.'"/>
           <span class="pull-left">*Dados obrigatórios</span>
           <span class="pull-right">Máx. 200 caracteres</span>
         </div>
       </div>
     </div>
     <div class="form-group">
-       <div class="col-sm-4">
-        <button class="btn btn-lg btn-block btn-submit" type="submit">Enviar Proposta</button>
-      </div>
+     <div class="col-sm-4">
+      <button class="btn btn-lg btn-block btn-submit" type="submit">Enviar Proposta</button>
     </div>
-  </form>
+  </div>
+</form>
 </div>
diff --git a/src/app/components/cadastro-proposta/cadastro-proposta.scss b/src/app/components/cadastro-proposta/cadastro-proposta.scss
index ba81c59..cfdc1e5 100644
--- a/src/app/components/cadastro-proposta/cadastro-proposta.scss
+++ b/src/app/components/cadastro-proposta/cadastro-proposta.scss
@@ -1,4 +1,5 @@
 .envio-proposta {
+
     .titulo-envio-proposta{
         color: #2D7B66;
     }
@@ -37,15 +38,18 @@
         display: none;
     }
 
-    .btn-question {
-        color: #484848;
-        background-color: #fff;
-        display: inline-block;
-        text-align: center;
-        width: 22px;
-        height: 22px;
-        margin-left: 10px;
-        padding: 0;
-        border-radius: 10px;
-    }
+    .teste {
+      border-radius: 10px;
+      width: 20px;
+      height: 20px;
+      display: inline-block;
+      background-color: lightyellow;
+  }
+
+  .link-popover {
+      font-size: 15px;
+      color: gray;
+      padding: 0px 7px;
+      border-style: none;
+  }
 }
diff --git a/src/app/components/form-messages/form-messages.directive.js b/src/app/components/form-messages/form-messages.directive.js
deleted file mode 100644
index 790336a..0000000
--- a/src/app/components/form-messages/form-messages.directive.js
+++ /dev/null
@@ -1,52 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-  .module('dialoga')
-  .directive('formMessages', formMessages);
-
-  /** @ngInject */
-  function formMessages() {
-
-    /** @ngInject */
-    function FormMessagesController($log) {
-      $log.debug('FormMessagesController');
-
-      var vm = this;
-      vm.$log = $log;
-
-      vm.init();
-
-    }
-
-    FormMessagesController.prototype.init = function () {
-      // async values
-      var vm = this;
-
-      if (!vm.required) {vm.required = "Ops, o campo é obrigatório."};
-      if (!vm.minlength) {vm.minlength = "O campo deve ser maior."};
-      if (!vm.maxlength) {vm.maxlength = "O campo deve ser menor"};
-      if (!vm.email) {vm.email = "O endereço de e-mail deve ser válido"};
-
-    };
-
-    var directive = {
-      restrict: 'E',
-      templateUrl: 'app/components/form-messages/form-messages.html',
-      scope: {
-        field: '=',
-        required: '=',
-        minlength: '=',
-        maxlength: '=',
-        email: '='
-      },
-      controller: FormMessagesController,
-      controllerAs: 'vm',
-      bindToController: true
-    };
-
-    return directive;
-  }
-
-})();
-
diff --git a/src/app/components/form-messages/form-messages.html b/src/app/components/form-messages/form-messages.html
deleted file mode 100644
index 259cdcb..0000000
--- a/src/app/components/form-messages/form-messages.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div ng-show="vm.field.$touched">
-  <div ng-messages="vm.field.$error">
-    <div class="error-message">
-      <div ng-message="required">{{vm.required}}</div>
-      <div ng-message="minlength">{{vm.minlength}}</div>
-      <div ng-message="maxlength">{{vm.maxlength}}</div>
-      <div ng-message="email">{{vm.email}}</div>
-    </div>
-  </div>
-</div>
diff --git a/src/app/components/form-messages/form-messages.scss b/src/app/components/form-messages/form-messages.scss
deleted file mode 100644
index e69de29..0000000
--- a/src/app/components/form-messages/form-messages.scss
+++ /dev/null
diff --git a/src/app/components/show-message/message.html b/src/app/components/show-message/message.html
deleted file mode 100644
index 5bb7b60..0000000
--- a/src/app/components/show-message/message.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="message" class="show-message">
-  <div class="row">
-  <div class="div-center">
-    <div class="col-sm-2 col-sm-offset-2 message-border {{ ::vm.type }}">
-      <span class="glyphicon glyphicon-ok icon-white" aria-hidden="true"></span>
-    </div>
-  </div>
-    <div class="col-sm-7  div-mensagem">
-      <div class="row">
-        <h3>{{ ::vm.title }}</h3>
-      </div>
-      <div class="row">
-        <h5>{{ ::vm.message }}</h5>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/src/app/components/show-message/show-message.directive.js b/src/app/components/show-message/show-message.directive.js
index 24879cb..550f5aa 100644
--- a/src/app/components/show-message/show-message.directive.js
+++ b/src/app/components/show-message/show-message.directive.js
@@ -18,7 +18,7 @@
 
     var directive = {
       restrict: 'E',
-      templateUrl: 'app/components/show-message/message.html',
+      templateUrl: 'app/components/show-message/show-message.html',
       scope: {
         type: '=',
         title: '=',
diff --git a/src/app/components/show-message/show-message.html b/src/app/components/show-message/show-message.html
new file mode 100644
index 0000000..5bb7b60
--- /dev/null
+++ b/src/app/components/show-message/show-message.html
@@ -0,0 +1,17 @@
+<div id="message" class="show-message">
+  <div class="row">
+  <div class="div-center">
+    <div class="col-sm-2 col-sm-offset-2 message-border {{ ::vm.type }}">
+      <span class="glyphicon glyphicon-ok icon-white" aria-hidden="true"></span>
+    </div>
+  </div>
+    <div class="col-sm-7  div-mensagem">
+      <div class="row">
+        <h3>{{ ::vm.title }}</h3>
+      </div>
+      <div class="row">
+        <h5>{{ ::vm.message }}</h5>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/components/validation-messages/validation-messages.directive.js b/src/app/components/validation-messages/validation-messages.directive.js
new file mode 100644
index 0000000..e041a98
--- /dev/null
+++ b/src/app/components/validation-messages/validation-messages.directive.js
@@ -0,0 +1,52 @@
+(function() {
+  'use strict';
+
+  angular
+  .module('dialoga')
+  .directive('validationMessages', validationMessages);
+
+  /** @ngInject */
+  function validationMessages() {
+
+    /** @ngInject */
+    function validationMessagesController($log) {
+      $log.debug('validationMessagesController');
+
+      var vm = this;
+      vm.$log = $log;
+
+      vm.init();
+
+    }
+
+    validationMessagesController.prototype.init = function () {
+      // async values
+      var vm = this;
+
+      if (!vm.required) {vm.required = "Ops, o campo é obrigatório."};
+      if (!vm.minlength) {vm.minlength = "O campo deve ser maior."};
+      if (!vm.maxlength) {vm.maxlength = "O campo deve ser menor"};
+      if (!vm.email) {vm.email = "O endereço de e-mail deve ser válido"};
+
+    };
+
+    var directive = {
+      restrict: 'E',
+      templateUrl: 'app/components/validation-messages/validation-messages.html',
+      scope: {
+        field: '=',
+        required: '=',
+        minlength: '=',
+        maxlength: '=',
+        email: '='
+      },
+      controller: validationMessagesController,
+      controllerAs: 'vm',
+      bindToController: true
+    };
+
+    return directive;
+  }
+
+})();
+
diff --git a/src/app/components/validation-messages/validation-messages.html b/src/app/components/validation-messages/validation-messages.html
new file mode 100644
index 0000000..259cdcb
--- /dev/null
+++ b/src/app/components/validation-messages/validation-messages.html
@@ -0,0 +1,10 @@
+<div ng-show="vm.field.$touched">
+  <div ng-messages="vm.field.$error">
+    <div class="error-message">
+      <div ng-message="required">{{vm.required}}</div>
+      <div ng-message="minlength">{{vm.minlength}}</div>
+      <div ng-message="maxlength">{{vm.maxlength}}</div>
+      <div ng-message="email">{{vm.email}}</div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/components/validation-messages/validation-messages.scss b/src/app/components/validation-messages/validation-messages.scss
new file mode 100644
index 0000000..55b0e08
--- /dev/null
+++ b/src/app/components/validation-messages/validation-messages.scss
@@ -0,0 +1,3 @@
+.error-message {
+    color: #ff4431
+}
diff --git a/src/app/layout.scss b/src/app/layout.scss
index c393eb6..0adf69f 100644
--- a/src/app/layout.scss
+++ b/src/app/layout.scss
@@ -120,10 +120,7 @@
     border-width: 1px;
 }
 
-.error-message {
-    color: #ff4431
-}
-
+// Está com o nome do termos de uso. Deixas genérico ou apenas aqui? Ver como vão ficar esses modais
 .modal-termos-uso{
   &-header{
     border-bottom: none;
@@ -180,4 +177,4 @@
 //     border-radius: 10px;
 //     -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
 //     background-color: black;
-// }
\ No newline at end of file
+// }
diff --git a/src/app/pages/auth/auth.scss b/src/app/pages/auth/auth.scss
index c2dd67a..2104c04 100644
--- a/src/app/pages/auth/auth.scss
+++ b/src/app/pages/auth/auth.scss
@@ -7,31 +7,33 @@
     }
 
     .btn-social {
-      color: #fff;
-      font-weight: bold;
-      padding: 15px 16px;
-      font-size: 16px;
-      white-space: normal;
+        color: #fff;
+        font-weight: bold;
+        padding: 15px 16px;
+        font-size: 16px;
+        white-space: normal;
 
-      &:hover,
-      &:focus {color: #fff;}
+        &:hover,
+        &:focus {color: #fff;}
 
-      &.btn-facebook {
-        background-color: #496AA0;
+        &.btn-facebook {
+            background-color: #496AA0;
 
-        &:hover,
-        &:focus {background-color: #304373; }
-        &:active {background-color: #33477a; }
-      }
-      &.btn-google-plus {
-        background-color: #b92d25;
-        &:hover,
-        &:focus {background-color: #b12b23; }
-        &:active {background-color: #b92d25; }
-      }
-      @media (max-width: 991px) {
-        margin-bottom: 20px;
-      }
+            &:hover,
+            &:focus {background-color: #304373; }
+            &:active {background-color: #33477a; }
+        }
+
+        &.btn-google-plus {
+            background-color: #b92d25;
+            &:hover,
+            &:focus {background-color: #b12b23; }
+            &:active {background-color: #b92d25; }
+        }
+
+        @media (max-width: 991px) {
+            margin-bottom: 20px;
+        }
     }
 
     .btn {
@@ -39,6 +41,7 @@
             color: #fff;
         }
     }
+
     .btn-primary {
         .contraste & {
             background-color: #262626;
@@ -47,66 +50,66 @@
     }
 
     .glyphicon {
-      &.icon-white {
-        fill: white;
-      }
+        &.icon-white {
+            fill: white;
+        }
     }
 
     .border-social-icon {
-      border-radius: 25px;
-      padding: 7px 9px;
-      width: 40px;
-      height: 40px;
-      display: inline-block;
-
-      &.border-social-facebook {
-        background: #547BBC;
-      }
-
-      &.border-social-googlePlus {
-        background: #D44105;
-      }
+        border-radius: 25px;
+        padding: 7px 9px;
+        width: 40px;
+        height: 40px;
+        display: inline-block;
+
+        &.border-social-facebook {
+            background: #547BBC;
+        }
+
+        &.border-social-googlePlus {
+            background: #D44105;
+        }
     }
 
     .separator {
-      border-top: 2px solid #d8d8d8;
-      text-align: center;
-      font-weight: bold;
-      margin-top: 20px;
-      margin-bottom: 35px;
-
-      &:after {
-          position: absolute;
-          top: 4px;
-          margin-left: -26px;
-          font-size: 20px;
-          line-height: 30px;
-          padding: 0 0.25em;
-          background: $gray;
+        border-top: 2px solid #d8d8d8;
+        text-align: center;
+        font-weight: bold;
+        margin-top: 20px;
+        margin-bottom: 35px;
+
+        &:after {
+            position: absolute;
+            top: -15px;
+            margin-left: -26px;
+            font-size: 20px;
+            line-height: 30px;
+            padding: 0 0.25em;
+            background: $gray;
 
             .contraste & {
-              background: #000;
+                background: #000;
             }
-      }
+        }
 
-      &.separator-or:after {
-        content: "ou";
-        left: 51%;
-      }
+        &.separator-or:after {
+            content: "ou";
+            left: 50%;
+            margin-left: -17px;
 
-      &.separator-cadastro:after {
-        content: "ou preencha o formulario";
-        left: 31%;
-      }
+            @media (min-width: 992px) {
+                top: 4px;
+            }
+        }
 
-    }
+        &.separator-cadastro:after {
+            content: "ou preencha o formulario";
+            left: 50%;
+            margin-left: -133px;
 
-    input[type="checkbox"] {
-      display:inline-block;
-      width:18px;
-      height:18px;
-      margin:-1px 4px 0 0;
-      vertical-align:middle;
-      cursor:pointer;
+            @media (min-width: 768px) {
+                top: 4px;
+            }
+        }
     }
 }
diff --git a/src/app/pages/auth/message.html b/src/app/pages/auth/message.html
index fba3094..e859608 100644
--- a/src/app/pages/auth/message.html
+++ b/src/app/pages/auth/message.html
@@ -1,3 +1,4 @@
+<!--  APENAS PARA TESTE DO SHOW MESSAGE E DO MODAL DE TERMOS DE USO -->
 <section
 	role="main"
 	class="section-gray auth-content">
diff --git a/src/app/pages/auth/signin.html b/src/app/pages/auth/signin.html
index b1f5221..11171cc 100644
--- a/src/app/pages/auth/signin.html
+++ b/src/app/pages/auth/signin.html
@@ -28,12 +28,13 @@
                 <div class="form-group">
                   <label for="inputLoginUsername">E-mail*</label>
                   <input type="email" id="inputLoginUsername" name="inputLoginUsername" class="form-control input-lg" ng-class="{ 'has-error' : loginForm.inputLoginUsername.$invalid && loginForm.inputLoginUsername.$touched }" ng-model="pageSignin.credentials.username" required/>
-                  <form-messages field="loginForm.inputLoginUsername"></show-message>
+                  <!-- Diretiva validation-messages -->
+                  <validation-messages field="loginForm.inputLoginUsername"/>
                 </div>
                 <div class="form-group">
                   <label for="inputLoginPassword">Senha*</label>
                   <input type="password" id="inputLoginPassword" name="inputLoginPassword" class="form-control input-lg" ng-class="{ 'has-error' : loginForm.inputLoginPassword.$invalid && loginForm.inputLoginPassword.$touched }" ng-model="pageSignin.credentials.password" required>
-                  <form-messages field="loginForm.inputLoginPassword" ></show-message>
+                  <validation-messages field="loginForm.inputLoginPassword"/>
                 </div>
                 <div class="form-group">
                   <button class="btn btn-lg btn-block btn-submit" type="submit">Entrar</button>
@@ -123,37 +124,26 @@
                     <label for="inputNome">Nome:</label>
                     <span class="pull-right">*Dados obrigatórios</span>
                     <input type="text" id="inputNome" name="inputNome" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputNome.$invalid && cadastroForm.inputNome.$touched }" ng-model="nome" ng-minlength="" ng-maxlength="" required>
-                    <form-messages field="cadastroForm.inputNome" ></show-message>
-                  </div>
-                  <div class="form-group">
-                    <p>Descrição da proposta*</p>
-                    <textarea id="proposta" name="proposta" class="texto-proposta form-control"  ng-class="{ 'has-error' : cadastroForm.proposta.$invalid && cadastroForm.proposta.$touched }" ng-model="vm.proposta" required ng-maxlength="200" ></textarea>
-                    <div ng-show="cadastroForm.proposta.$touched">
-                      <div ng-messages="cadastroForm.proposta.$error">
-                        <form-messages field="cadastroForm.proposta" ></show-message>
-                      </div>
-                    </div>
-                    <span class="pull-left">*Dados obrigatórios</span>
-                    <span class="pull-right">Máx. 200 caracteres</span>
+                    <validation-messages field="cadastroForm.inputNome"/>
                   </div>
                   <div class="form-group">
                     <label for="inputEmail">E-mail*</label>
                     <input type="email" id="inputEmail" name="inputEmail" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputEmail.$invalid && cadastroForm.inputEmail.$touched }" ng-model="email" ng-minlength="" ng-maxlength="" required>
-                    <form-messages field="cadastroForm.inputEmail" ></show-message>
+                    <validation-messages field="cadastroForm.inputEmail"/>
                   </div>
                   <div class="row">
                     <div class="col-sm-6">
                       <div class="form-group">
                         <label for="inputPassword">Senha:</label>
                         <input type="password" id="inputPassword" name="inputPassword" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputPassword.$invalid && cadastroForm.inputPassword.$touched }" ng-model="senha" ng-minlength="" ng-maxlength="" required>
-                        <form-messages field="cadastroForm.inputPassword" ></show-message>
+                        <validation-messages field="cadastroForm.inputPassword"/>
                       </div>
                     </div>
                     <div class="col-sm-6">
                       <div class="form-group">
                         <label for="inputRepeatPassword">Confirmar Senha:</label>
                         <input type="password" id="inputRepeatPassword" name="inputRepeatPassword" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputRepeatPassword.$invalid && cadastroForm.inputRepeatPassword.$touched }" ng-model="senhaRepetida" ng-minlength="" ng-maxlength="" required>
-                        <form-messages field="cadastroForm.inputRepeatPassword" ></show-message>
+                        <validation-messages field="cadastroForm.inputRepeatPassword"/>
                       </div>
                     </div>
                   </div>
@@ -170,7 +160,7 @@
                     <a href="">Termos de Uso</a>
                     e concordo com os mesmos*
                   </input>
-                  <form-messages field="cadastroForm.termosDeUso" ></show-message>
+                  <validation-messages field="cadastroForm.termosDeUso"/>
                 </div>
                 <div class="form-group">
                   <span>Digite o texto da imagem</span>
diff --git a/src/app/pages/propostas/cadastro-proposta.html b/src/app/pages/propostas/cadastro-proposta.html
index 0e5d7da..72af118 100644
--- a/src/app/pages/propostas/cadastro-proposta.html
+++ b/src/app/pages/propostas/cadastro-proposta.html
@@ -1,16 +1,13 @@
+<!--  APENAS PARA TESTE DO ENVIAR PROPOSTA -->
 <div class="container">
   <div class="row">
     <div class="col-sm-12">
-      <!-- <div ncy-breadcrumb></div> -->
     </div>
   </div>
 </div>
 
-<!-- <div class="container page--propostas">
-  <h1>TODO: Home > Proposta</h1>
-</div> -->
 <section class="section-gray auth-content ng-scope">
     <div class="container">
         <cadastro-proposta></cadastro-proposta>
     </div>
-</section>
\ No newline at end of file
+</section>
--
libgit2 0.21.2