Commit 3f04100e0faf17986a01be4a2d1152154c5521be
1 parent
74754190
Exists in
login_modal
Removed not functionals links and buttons
Links and buttons that are not working yet: - "Forgot your password?" - "Create account" - Login with other networks (social media icons)
Showing
4 changed files
with
5 additions
and
48 deletions
Show diff stats
src/app/layout/blocks/login-block/login-block.html
| ... | ... | @@ -15,13 +15,13 @@ |
| 15 | 15 | <div class="logged-user-info" ng-show="!ctrl.currentUser"> |
| 16 | 16 | <form> |
| 17 | 17 | <div class="form-group"> |
| 18 | - <label for="exampleInputEmail1">{{"auth.form.login" | translate}}</label> | |
| 19 | - <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Login / Email" ng-model="ctrl.credentials.username"> | |
| 18 | + <label for="email">{{"auth.form.login" | translate}}</label> | |
| 19 | + <input type="text" class="form-control" id="email" placeholder="{{'auth.form.login' | translate}}" ng-model="ctrl.credentials.username"> | |
| 20 | 20 | </div> |
| 21 | 21 | <div class="form-group"> |
| 22 | - <label for="exampleInputPassword1">{{"auth.form.password" | translate}}</label> | |
| 23 | - <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password" ng-model="ctrl.credentials.password"> | |
| 22 | + <label for="passwd">{{"auth.form.password" | translate}}</label> | |
| 23 | + <input type="password" class="form-control" id="passwd" placeholder="{{'auth.form.password' | translate}}" ng-model="ctrl.credentials.password"> | |
| 24 | 24 | </div> |
| 25 | 25 | <button type="submit" class="btn btn-default" ng-click="ctrl.login()">{{"auth.form.login_button" | translate}}</button> |
| 26 | 26 | </form> |
| 27 | -</div> | |
| 28 | 27 | \ No newline at end of file |
| 28 | +</div> | ... | ... |
src/app/login/login.html
| ... | ... | @@ -17,36 +17,7 @@ |
| 17 | 17 | <input type="checkbox" > {{"auth.form.keepLoggedIn" | translate}} |
| 18 | 18 | </label> |
| 19 | 19 | </div> |
| 20 | - <div class="pull-right"> | |
| 21 | - <a data-dismiss="modal-dialog">{{"auth.form.forgotPasswd" | translate}}</a> | |
| 22 | - </div> | |
| 23 | 20 | </div> |
| 24 | 21 | <button type="submit" class="btn btn-default btn-block" ng-click="vm.login()">{{"auth.form.login_button" | translate}}</button> |
| 25 | 22 | </form> |
| 26 | - <div class="strike"> | |
| 27 | - <span> | |
| 28 | - {{"auth.social.alternative" | translate}} | |
| 29 | - </span> | |
| 30 | - </div> | |
| 31 | - <div class="text-center"> | |
| 32 | - <span>{{"auth.social.connectWith" | translate}}</span> | |
| 33 | - | |
| 34 | - <div id="oauth-block"> | |
| 35 | - <span class="fa-stack fa-lg"> | |
| 36 | - <i class="fa fa-circle fa-stack-2x"></i> | |
| 37 | - <i class="fa fa-facebook fa-stack-1x fa-inverse"></i> | |
| 38 | - </span> | |
| 39 | - <span class="fa-stack fa-lg"> | |
| 40 | - <i class="fa fa-circle fa-stack-2x"></i> | |
| 41 | - <i class="fa fa-twitter fa-stack-1x fa-inverse"></i> | |
| 42 | - </span> | |
| 43 | - <span class="fa-stack fa-lg"> | |
| 44 | - <i class="fa fa-circle fa-stack-2x"></i> | |
| 45 | - <i class="fa fa-google-plus fa-stack-1x fa-inverse"></i> | |
| 46 | - </span> | |
| 47 | - </div> | |
| 48 | - <div id="create-account"> | |
| 49 | - <a href="">{{"auth.createAccount" | translate}}</a> | |
| 50 | - </div> | |
| 51 | - </div> | |
| 52 | 23 | </div> | ... | ... |
src/languages/en.json
| ... | ... | @@ -24,14 +24,7 @@ |
| 24 | 24 | "auth.form.login": "Username or Email address", |
| 25 | 25 | "auth.form.password": "Password", |
| 26 | 26 | "auth.form.keepLoggedIn": "Keep me logged in", |
| 27 | - "auth.form.forgotPasswd": "Forgot your password?", | |
| 28 | 27 | "auth.form.login_button": "Login", |
| 29 | - "auth.social.alternative": "Or", | |
| 30 | - "auth.social.connectWith": "Connect with:", | |
| 31 | - "auth.createAccount": "Create account", | |
| 32 | - "forgotPwd.title": "Forgot your password?", | |
| 33 | - "forgotPwd.sendInstructions": "Send Instructions", | |
| 34 | - "forgotPwd.info": "Upon clicking on the button above, you'll receive an email with instructions on how to create a new password.", | |
| 35 | 28 | "navbar.content_viewer_actions.new_item": "New Item", |
| 36 | 29 | "navbar.profile_actions.new_item": "New Item", |
| 37 | 30 | "navbar.content_viewer_actions.new_post": "New Post", | ... | ... |
src/languages/pt.json
| ... | ... | @@ -24,14 +24,7 @@ |
| 24 | 24 | "auth.form.login": "Nome de usuário ou Email", |
| 25 | 25 | "auth.form.password": "Senha", |
| 26 | 26 | "auth.form.keepLoggedIn": "Continuar logado", |
| 27 | - "auth.form.forgotPasswd": "Esqueceu sua senha?", | |
| 28 | 27 | "auth.form.login_button": "Login", |
| 29 | - "auth.social.alternative": "Ou", | |
| 30 | - "auth.social.connectWith": "Conectar com:", | |
| 31 | - "auth.createAccount": "Criar conta", | |
| 32 | - "forgotPwd.title": "Esqueceu sua senha?", | |
| 33 | - "forgotPwd.sendInstructions": "Enviar Instruções", | |
| 34 | - "forgotPwd.info": "Ao clicar no botão acima, você receberá um email com instruções para criar uma nova senha.", | |
| 35 | 28 | "navbar.content_viewer_actions.new_item": "Novo Item", |
| 36 | 29 | "navbar.profile_actions.new_item": "Novo Item", |
| 37 | 30 | "navbar.content_viewer_actions.new_post": "Novo Artigo", | ... | ... |