Add missing user info reference

includes minor code readability improvements
This commit is contained in:
Denys Vuika
2016-11-07 12:04:10 +00:00
parent 7cacfe1fb7
commit 3c1c2ec94b
5 changed files with 42 additions and 33 deletions

View File

@@ -4,9 +4,10 @@
}
}
.mdl-layout-title{
.mdl-layout-title {
font-size: 17px;
}
.user-profile{
.user-profile {
margin-right: 3px;
}

View File

@@ -13,8 +13,7 @@
<!-- Navigation. We hide it in small screens. -->
<nav class="mdl-navigation mdl-layout--large-screen-only">
<a class="mdl-navigation__link" data-automation-id="files" href=""
routerLink="/files">DocumentList</a>
<a class="mdl-navigation__link" data-automation-id="files" href="" routerLink="/files">DocumentList</a>
<a class="mdl-navigation__link" data-automation-id="datatable" href="" routerLink="/datatable">DataTable</a>
<a class="mdl-navigation__link" data-automation-id="uploader" href="" routerLink="/uploader">Uploader</a>
<a class="mdl-navigation__link" data-automation-id="activiti" href="" routerLink="/activiti">Activiti</a>
@@ -36,16 +35,26 @@
<ul class="mdl-menu mdl-menu--bottom-right mdl-js-menu mdl-js-ripple-effect"
for="demo-menu-lower-right">
<li class="mdl-menu__item" (click)="changeLanguage('en')"><span
class="flag-icon flag-icon-gb"></span><label tabindex="0"> English</label></li>
<li class="mdl-menu__item" (click)="changeLanguage('gr')"><span
class="flag-icon flag-icon-gr"></span><label tabindex="0"> Greek</label></li>
<li class="mdl-menu__item" (click)="changeLanguage('it')"><span
class="flag-icon flag-icon-it"></span><label tabindex="0"> Italian</label></li>
<a class="mdl-menu__item" routerLink="/about"><label tabindex="0">About</label></a>
<a *ngIf="!isLoggedIn()" class="mdl-menu__item" routerLink="/login"><label
tabindex="0">Login</label></a>
<li *ngIf="isLoggedIn()" class="mdl-menu__item" (click)="onLogout($event)"><label tabindex="0">Logout</label>
<li class="mdl-menu__item" (click)="changeLanguage('en')">
<span class="flag-icon flag-icon-gb"></span>
<label tabindex="0"> English</label>
</li>
<li class="mdl-menu__item" (click)="changeLanguage('gr')">
<span class="flag-icon flag-icon-gr"></span>
<label tabindex="0"> Greek</label>
</li>
<li class="mdl-menu__item" (click)="changeLanguage('it')">
<span class="flag-icon flag-icon-it"></span>
<label tabindex="0"> Italian</label>
</li>
<a class="mdl-menu__item" routerLink="/about">
<label tabindex="0">About</label>
</a>
<a *ngIf="!isLoggedIn()" class="mdl-menu__item" routerLink="/login">
<label tabindex="0">Login</label>
</a>
<li *ngIf="isLoggedIn()" class="mdl-menu__item" (click)="onLogout($event)">
<label tabindex="0">Logout</label>
</li>
</ul>
</div>
@@ -54,12 +63,10 @@
<span class="mdl-layout-title">Components List</span>
<nav class="mdl-navigation">
<a class="mdl-navigation__link" href="" routerLink="/files" (click)="hideDrawer()">DocumentList Demo</a>
<a class="mdl-navigation__link" href="" routerLink="/datatable" (click)="hideDrawer()">DataTable
Demo</a>
<a class="mdl-navigation__link" href="" routerLink="/datatable" (click)="hideDrawer()">DataTable Demo</a>
<a class="mdl-navigation__link" href="" routerLink="/uploader" (click)="hideDrawer()">Uploader Demo</a>
<a class="mdl-navigation__link" href="" routerLink="/login" (click)="hideDrawer()">Login Demo</a>
<a class="mdl-navigation__link" href="" routerLink="/activiti" (click)="hideDrawer()">Activiti
Components Demo</a>
<a class="mdl-navigation__link" href="" routerLink="/activiti" (click)="hideDrawer()">Activiti Components Demo</a>
<a class="mdl-navigation__link" href="" routerLink="/webscript" (click)="hideDrawer()">Webscript</a>
<a class="mdl-navigation__link" href="" routerLink="/tag" (click)="hideDrawer()">Tag</a>
<a class="mdl-navigation__link" href="" routerLink="/settings" (click)="hideDrawer()">Settings</a>

View File

@@ -32,7 +32,6 @@ declare var document: any;
styleUrls: ['app/app.component.css']
})
export class AppComponent {
translate: AlfrescoTranslationService;
searchTerm: string = '';
ecmHost: string = 'http://' + window.location.hostname + ':8080';
@@ -41,13 +40,14 @@ export class AppComponent {
constructor(public auth: AlfrescoAuthenticationService,
public router: Router,
public alfrescoSettingsService: AlfrescoSettingsService,
translate: AlfrescoTranslationService) {
private translate: AlfrescoTranslationService) {
this.setEcmHost();
this.setBpmHost();
this.setProvider();
this.translate = translate;
this.translate.addTranslationFolder();
if (translate) {
translate.addTranslationFolder();
}
}
isLoggedIn(): boolean {