Merge pull request #838 from Alfresco/dev-valbano-727

Dev valbano 727
This commit is contained in:
Mario Romano
2016-10-05 12:00:05 +02:00
committed by GitHub
53 changed files with 2532 additions and 10 deletions

View File

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

View File

@@ -21,6 +21,10 @@
<a class="mdl-navigation__link" data-automation-id="login" href="" routerLink="/login">Login</a>
</nav>
<div class="user-profile" *ngIf="isLoggedIn()">
<ng2-alfresco-userinfo></ng2-alfresco-userinfo>
</div>
<!-- Right aligned menu below button -->
<button id="demo-menu-lower-right" data-automation-id="right-action-menu"
class="mdl-button mdl-js-button mdl-button--icon">

View File

@@ -30,6 +30,7 @@ import { ViewerModule } from 'ng2-alfresco-viewer';
import { ActivitiFormModule } from 'ng2-activiti-form';
import { ActivitiTaskListModule } from 'ng2-activiti-tasklist';
import { ActivitiProcessListModule } from 'ng2-activiti-processlist';
import { UserInfoComponentModule } from 'ng2-alfresco-userinfo';
import { AppComponent } from './app.component';
import { routing } from './app.routes';
@@ -63,7 +64,8 @@ import {
ViewerModule.forRoot(),
ActivitiFormModule.forRoot(),
ActivitiTaskListModule.forRoot(),
ActivitiProcessListModule.forRoot()
ActivitiProcessListModule.forRoot(),
UserInfoComponentModule.forRoot()
],
declarations: [
AppComponent,

View File

@@ -36,7 +36,8 @@
'ng2-alfresco-tag': 'npm:ng2-alfresco-tag/dist',
'ng2-activiti-tasklist': 'npm:ng2-activiti-tasklist/dist',
'alfresco-js-api': 'npm:alfresco-js-api/dist',
'ng2-activiti-processlist': 'npm:ng2-activiti-processlist/dist'
'ng2-activiti-processlist': 'npm:ng2-activiti-processlist/dist',
'ng2-alfresco-userinfo': 'npm:ng2-alfresco-userinfo/dist'
},
// packages tells the System loader how to load when no filename and/or no extension
packages: {
@@ -61,7 +62,8 @@
'ng2-activiti-tasklist': { main: './index.js', defaultExtension: 'js'},
'ng2-alfresco-webscript': { main: './index.js', defaultExtension: 'js'},
'ng2-alfresco-tag': { main: './index.js', defaultExtension: 'js'},
'alfresco-js-api': { main: './alfresco-js-api.js', defaultExtension: 'js'}
'alfresco-js-api': { main: './alfresco-js-api.js', defaultExtension: 'js'},
'ng2-alfresco-userinfo': { main: './index.js', defaultExtension: 'js'}
}
});
})(this);