Added account languages.

Author: hikalkan

angular/src/account/account.component.html

@@ -9,12 +9,12 @@
 
     <router-outlet></router-outlet>
 
-    <!--<vc:account-languages></vc:account-languages>-->
+    <account-languages></account-languages>
 
-    <!--<div class="row">
+    <div class="row">
         <div class="col-xs-12 text-center" style="color: #e9e9e9">
-            <small>&copy; @DateTime.Now.Year AbpProjectName. <b>Version </b> @AppVersionHelper.Version [@AppVersionHelper.ReleaseDate.ToString("yyyyMMdd")]</small>
+            <small>&copy; {{currentYear}} AbpProjectName. <b>Version </b> {{versionText}}</small>
         </div>
-    </div>-->
-
+    </div>
+    
 </div>

angular/src/account/account.component.ts

@@ -1,8 +1,6 @@
-import { Component, ViewContainerRef, OnInit, ViewEncapsulation } from '@angular/core';
+import { Component, ViewContainerRef, OnInit, ViewEncapsulation, Injector } from '@angular/core';
 import { LoginService } from './login/login.service';
-import { AppConsts } from '@shared/AppConsts';
-
-import * as moment from 'moment';
+import { AppComponentBase } from '@shared/app-component-base';
 
 @Component({
     templateUrl: './account.component.html',
@@ -11,15 +9,21 @@ import * as moment from 'moment';
     ],
     encapsulation: ViewEncapsulation.None
 })
-export class AccountComponent implements OnInit {
+export class AccountComponent extends AppComponentBase implements OnInit {
 
     private viewContainerRef: ViewContainerRef;
 
-    currentYear: number = moment().year();
+    versionText: string;
+    currentYear: number;
 
     public constructor(
+        injector: Injector,
         private _loginService: LoginService
     ) {
+        super(injector);
+
+        this.currentYear = new Date().getFullYear();
+        this.versionText = this.appSession.application.version + ' [' + this.appSession.application.releaseDate.format('YYYYDDMM') + ']';
     }
 
     showTenantChange(): boolean {

angular/src/account/account.module.ts

@@ -1,5 +1,5 @@
 import { CommonModule } from '@angular/common';
-import { NgModule, APP_INITIALIZER } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { HttpModule, JsonpModule } from '@angular/http';
 import { ModalModule } from 'ngx-bootstrap';
@@ -10,14 +10,14 @@ import { AccountRoutingModule } from './account-routing.module';
 
 import { ServiceProxyModule } from '@shared/service-proxies/service-proxy.module';
 
-import { AppConsts } from '@shared/AppConsts';
 import { SharedModule } from '@shared/shared.module';
 
 import { AccountComponent } from './account.component';
 import { TenantChangeComponent } from './tenant/tenant-change.component';
 import { TenantChangeModalComponent } from './tenant/tenant-change-modal.component';
 import { LoginComponent } from './login/login.component';
 import { RegisterComponent } from './register/register.component';
+import { AccountLanguagesComponent } from './layout/account-languages.component';
 
 import { LoginService } from './login/login.service';
 
@@ -38,7 +38,8 @@ import { LoginService } from './login/login.service';
         TenantChangeComponent,
         TenantChangeModalComponent,
         LoginComponent,
-        RegisterComponent
+        RegisterComponent,
+        AccountLanguagesComponent
     ],
     providers: [
         LoginService

angular/src/account/layout/account-languages.component.html

@@ -0,0 +1,6 @@
+<ul class="account-language-switch-list text-center">
+    <li *ngFor="let language of languages">
+        <!-- TODO: Handle Return URL -->
+        <a *ngIf="language.name != currentLanguage.name" href="javascript:void();" title="{{language.displayName}}" (click)="changeLanguage(language.name)"><i class="{{language.icon}}"></i></a>
+    </li>
+</ul>

angular/src/account/layout/account-languages.component.less

@@ -0,0 +1,11 @@
+.account-language-switch-list {
+    list-style: none;
+    margin: 0px;
+    padding: 10px;
+
+    > li {
+        display: inline;
+        margin: 0px;
+        padding: 0px;
+    }
+}

angular/src/account/layout/account-languages.component.ts

@@ -0,0 +1,37 @@
+import { Component, OnInit, Injector } from '@angular/core';
+import { AppComponentBase } from '@shared/app-component-base';
+
+@Component({
+    selector: 'account-languages',
+    templateUrl: './account-languages.component.html',
+    styleUrls: [
+        './account-languages.component.less'
+    ]
+})
+export class AccountLanguagesComponent extends AppComponentBase implements OnInit {
+
+    languages: abp.localization.ILanguageInfo[];
+    currentLanguage: abp.localization.ILanguageInfo;
+
+    constructor(
+        injector: Injector
+    ) { 
+        super(injector);
+    }
+
+    ngOnInit() {
+        this.languages = this.localization.languages;
+        this.currentLanguage = this.localization.currentLanguage;
+    }
+
+    changeLanguage(languageName: string): void {
+        abp.utils.setCookieValue(
+            "Abp.Localization.CultureName",
+            languageName,
+            new Date(new Date().getTime() + 5 * 365 * 86400000), //5 year
+            abp.appPath
+        );
+
+        location.reload();
+    }
+}

angular/src/account/register/register.component.html

@@ -40,7 +40,7 @@ <h4 class="text-center">{{l("Register")}}</h4>
 
             <div class="form-actions">
                 <button [disabled]="saving" [routerLink]="['../login']" type="button" class="btn btn-default">{{l("Back")}}</button>
-                <button type="submit" class="btn btn-success uppercase" [disabled]="!registerForm.form.valid">{{l("Submit")}}</button>
+                <button type="submit" class="btn btn-success" [disabled]="!registerForm.form.valid">{{l("Submit")}}</button>
             </div>
 
         </form>

angular/src/account/tenant/tenant-change.component.ts

@@ -2,7 +2,6 @@
 import { AccountServiceProxy } from '@shared/service-proxies/service-proxies' 
 import { TenantChangeModalComponent } from './tenant-change-modal.component'
 import { AppComponentBase } from '@shared/app-component-base';
-import { AppSessionService } from '@shared/session/app-session.service';
 
 @Component({
     selector: 'tenant-change',
@@ -17,16 +16,16 @@ export class TenantChangeComponent extends AppComponentBase implements OnInit {
 
     constructor(
         injector: Injector,
-        private _appSessionService: AppSessionService,
         private _accountService: AccountServiceProxy
         ) { 
         super(injector);
     }
 
     ngOnInit() {
-        if (this._appSessionService.tenant) {
-            this.tenancyName = this._appSessionService.tenant.tenancyName;
-            this.name = this._appSessionService.tenant.name;
+        
+        if (this.appSession.tenant) {
+            this.tenancyName = this.appSession.tenant.tenancyName;
+            this.name = this.appSession.tenant.name;
         }
     }
 

angular/src/app/layout/topbar-languageswitch.component.ts

@@ -1,8 +1,5 @@
 import { Component, OnInit, Injector, ViewEncapsulation } from '@angular/core';
-import { Router } from '@angular/router';
-import { AbpSessionService } from '@abp/session/abp-session.service';
 import { AppComponentBase } from '@shared/app-component-base';
-import { AppAuthService } from '@shared/auth/app-auth.service';
 
 @Component({
   templateUrl: './topbar-languageswitch.component.html',
@@ -15,10 +12,7 @@ export class TopBarLanguageSwitchComponent extends AppComponentBase implements O
   currentLanguage: abp.localization.ILanguageInfo;
 
   constructor(
-    injector: Injector,
-    private _sessionService: AbpSessionService,
-    private _authService: AppAuthService,
-    private _router: Router
+    injector: Injector
   ) {
     super(injector);
   }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Account/Login.js

@@ -40,5 +40,5 @@
         $form.submit();
     });
 
-    $loginForm.find('input:first-child').focus();
+    $loginForm.find('input[type=text]:first-child').focus();
 });