From 49a048fbb3472ff71eb919171210c164a0e6cfb5 Mon Sep 17 00:00:00 2001
From: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
Date: Mon, 13 Jun 2016 11:40:29 -0300
Subject: [PATCH] Improvements to login modal

---
 src/app/layout/blocks/login-block/login-block.html | 10 +++++-----
 src/app/login/login.html                           | 17 ++++++++++++-----
 src/app/login/login.scss                           | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/languages/en.json                              |  5 +++--
 src/languages/pt.json                              |  5 +++--
 5 files changed, 78 insertions(+), 14 deletions(-)
 create mode 100644 src/app/login/login.scss

diff --git a/src/app/layout/blocks/login-block/login-block.html b/src/app/layout/blocks/login-block/login-block.html
index 8010ea9..0e95f56 100644
--- a/src/app/layout/blocks/login-block/login-block.html
+++ b/src/app/layout/blocks/login-block/login-block.html
@@ -15,13 +15,13 @@
 <div class="logged-user-info" ng-show="!ctrl.currentUser">
   <form>
     <div class="form-group">
-      <label for="exampleInputEmail1">{{"auth.form.login" | translate}}</label>
-      <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Login / Email" ng-model="ctrl.credentials.username">
+      <label for="email">{{"auth.form.login" | translate}}</label>
+      <input type="text" class="form-control" id="email" placeholder="{{'auth.form.login' | translate}}" ng-model="ctrl.credentials.username">
     </div>
     <div class="form-group">
-      <label for="exampleInputPassword1">{{"auth.form.password" | translate}}</label>
-      <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password" ng-model="ctrl.credentials.password">
+      <label for="passwd">{{"auth.form.password" | translate}}</label>
+      <input type="password" class="form-control" id="passwd" placeholder="{{'auth.form.password' | translate}}" ng-model="ctrl.credentials.password">
     </div>
     <button type="submit" class="btn btn-default" ng-click="ctrl.login()">{{"auth.form.login_button" | translate}}</button>
   </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/login/login.html b/src/app/login/login.html
index 8c01ca8..cc74405 100644
--- a/src/app/login/login.html
+++ b/src/app/login/login.html
@@ -4,13 +4,20 @@
 <div class="modal-body">
   <form>
     <div class="form-group">
-      <label for="exampleInputEmail1">{{"auth.form.login" | translate}}</label>
-      <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Login / Email" ng-model="vm.credentials.username">
+      <label for="email">{{"auth.form.login" | translate}}</label>
+      <input type="text" class="form-control" id="email" placeholder="{{'auth.form.login' | translate}}" ng-model="vm.credentials.username">
     </div>
     <div class="form-group">
-      <label for="exampleInputPassword1">{{"auth.form.password" | translate}}</label>
-      <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password" ng-model="vm.credentials.password">
+      <label for="passwd">{{"auth.form.password" | translate}}</label>
+      <input type="password" class="form-control" id="passwd" placeholder="{{'auth.form.password' | translate}}" ng-model="vm.credentials.password">
     </div>
-    <button type="submit" class="btn btn-default" ng-click="vm.login()">{{"auth.form.login_button" | translate}}</button>
+    <div class="form-inline">
+      <div class="checkbox">
+        <label>
+          <input type="checkbox" > {{"auth.form.keepLoggedIn" | translate}}
+        </label>
+      </div>
+    </div>
+    <button type="submit" class="btn btn-default btn-block" ng-click="vm.login()">{{"auth.form.login_button" | translate}}</button>
   </form>
 </div>
diff --git a/src/app/login/login.scss b/src/app/login/login.scss
new file mode 100644
index 0000000..d526c1c
--- /dev/null
+++ b/src/app/login/login.scss
@@ -0,0 +1,55 @@
+.modal-content{
+  padding: 40px;
+}
+.modal-header {
+  border-bottom: 0;
+  text-align: center;
+}
+form {
+  margin-bottom: 30px;
+}
+form button {
+  margin-top: 20px;
+  text-transform: uppercase;
+}
+.strike {
+  display: block;
+  text-align: center;
+  overflow: hidden;
+  white-space: nowrap;
+  padding: 25px 0;
+}
+
+.strike > span {
+  position: relative;
+  display: inline-block;
+}
+
+.strike > span:before,
+.strike > span:after {
+  content: "";
+  position: absolute;
+  top: 50%;
+  width: 9999px;
+  height: 1px;
+  background: black;
+}
+
+.strike > span:before {
+  right: 100%;
+  margin-right: 15px;
+}
+
+.strike > span:after {
+  left: 100%;
+  margin-left: 15px;
+}
+.strike span {
+  text-transform: uppercase;
+}
+#oauth-block span {
+  margin: 5px;
+}
+#create-account {
+  padding: 30px 0 0;
+}
diff --git a/src/languages/en.json b/src/languages/en.json
index 4b2c9ae..371e9fc 100644
--- a/src/languages/en.json
+++ b/src/languages/en.json
@@ -21,9 +21,10 @@
   "activities.create_article.description": "has published on",
   "activities.add_member_in_community.description": "has joined the community",
   "activities.new_friendship.description": "has made {friends, plural, one{one new friend} other{# new friends}}:",
-  "auth.title": "Login",
-  "auth.form.login": "Login / Email address",
+  "auth.title": "Great to have you back!",
+  "auth.form.login": "Username or Email address",
   "auth.form.password": "Password",
+  "auth.form.keepLoggedIn": "Keep me logged in",
   "auth.form.login_button": "Login",
   "navbar.content_viewer_actions.new_item": "New Item",
   "navbar.profile_actions.new_item": "New Item",
diff --git a/src/languages/pt.json b/src/languages/pt.json
index c372858..972363f 100644
--- a/src/languages/pt.json
+++ b/src/languages/pt.json
@@ -21,9 +21,10 @@
   "activities.create_article.description": "publicou em",
   "activities.add_member_in_community.description": "entrou na comunidade",
   "activities.new_friendship.description": "fez {friends, plural, one{um novo amigo} other{# novos amigos}}:",
-  "auth.title": "Login",
-  "auth.form.login": "Login / Email",
+  "auth.title": "Legal ter você de volta!",
+  "auth.form.login": "Nome de usuário ou Email",
   "auth.form.password": "Senha",
+  "auth.form.keepLoggedIn": "Continuar logado",
   "auth.form.login_button": "Login",
   "navbar.content_viewer_actions.new_item": "Novo Item",
   "navbar.profile_actions.new_item": "Novo Item",
--
libgit2 0.21.2