Skip to content

Commit

Permalink
Revert "feat(login): add the locale changes (akveo#993)"
Browse files Browse the repository at this point in the history
This reverts commit e033edf.
  • Loading branch information
AlbertXingZhang committed Apr 24, 2017
1 parent 1fce638 commit 7a87535
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 14 deletions.
24 changes: 12 additions & 12 deletions src/app/pages/login/login.html
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
<div class="auth-main">
<div class="auth-block">
<h1 translate>{{'login.title'}}</h1>
<a routerLink="/register" class="auth-link" translate>{{'login.signup_link'}}</a>
<h1>Sign in to ng2-admin</h1>
<a routerLink="/register" class="auth-link">New to ng2-admin? Sign up!</a>

<form [formGroup]="form" (ngSubmit)="onSubmit(form.value)" class="form-horizontal">
<div class="form-group row" [ngClass]="{'has-error': (!email.valid && email.touched), 'has-success': (email.valid && email.touched)}">
<label for="inputEmail3" class="col-sm-2 control-label" translate>{{'login.email'}}</label>
<label for="inputEmail3" class="col-sm-2 control-label">Email</label>

<div class="col-sm-10">
<input [formControl]="email" type="email" class="form-control" id="inputEmail3" placeholder="{{'login.email' | translate}}">
<input [formControl]="email" type="email" class="form-control" id="inputEmail3" placeholder="Email">
</div>
</div>
<div class="form-group row" [ngClass]="{'has-error': (!password.valid && password.touched), 'has-success': (password.valid && password.touched)}">
<label for="inputPassword3" class="col-sm-2 control-label" translate>{{'login.password'}}</label>
<label for="inputPassword3" class="col-sm-2 control-label">Password</label>

<div class="col-sm-10">
<input [formControl]="password" type="password" class="form-control" id="inputPassword3" placeholder="{{'login.password' | translate}}">
<input [formControl]="password" type="password" class="form-control" id="inputPassword3" placeholder="Password">
</div>
</div>
<div class="form-group row">
<div class="offset-sm-2 col-sm-10">
<button [disabled]="!form.valid" type="submit" class="btn btn-default btn-auth" translate>{{'login.sign_in'}}</button>
<a routerLink="/login" class="forgot-pass" translate>{{'login.forgot_password'}}</a>
<button [disabled]="!form.valid" type="submit" class="btn btn-default btn-auth">Sign in</button>
<a routerLink="/login" class="forgot-pass">Forgot password?</a>
</div>
</div>
</form>

<div class="auth-sep"><span><span translate>{{'login.sign_from_app_text'}}</span></span></div>
<div class="auth-sep"><span><span>or Sign in with one click</span></span></div>

<div class="al-share-auth">
<ul class="al-share clearfix">
<li><i class="socicon socicon-facebook" title="{{'login.share_on_facebook' | translate}}"></i></li>
<li><i class="socicon socicon-twitter" title="{{'login.share_on_twitter' | translate}}"></i></li>
<li><i class="socicon socicon-google" title="{{'login.share_on_google_plus' | translate}}"></i></li>
<li><i class="socicon socicon-facebook" title="Share on Facebook"></i></li>
<li><i class="socicon socicon-twitter" title="Share on Twitter"></i></li>
<li><i class="socicon socicon-google" title="Share on Google Plus"></i></li>
</ul>
</div>
</div>
Expand Down
2 changes: 0 additions & 2 deletions src/app/pages/login/login.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { AppTranslationModule } from '../../app.translation.module';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NgaModule } from '../../theme/nga.module';

Expand All @@ -11,7 +10,6 @@ import { routing } from './login.routing';
@NgModule({
imports: [
CommonModule,
AppTranslationModule,
ReactiveFormsModule,
FormsModule,
NgaModule,
Expand Down

0 comments on commit 7a87535

Please sign in to comment.