inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into dev-denys-440

Browse Source 
# Conflicts:
#	.travis.yml
#	demo-shell-ng2/app/app.component.html
#	demo-shell-ng2/app/app.component.ts
#	demo-shell-ng2/package.json
#	demo-shell-ng2/systemjs.config.js
This commit is contained in:
Denys Vuika
2016-07-22 09:59:44 +01:00
parent e3831d7622 8615853805
commit ab891ff5c2
62 changed files with 2058 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demo-shell-ng2/app/app.component.html
+2
View File
@@ -17,6 +17,7 @@
<a class="mdl-navigation__link" data-automation-id="uploader" href="" [routerLink]="['Uploader']">Uploader</a>
<a class="mdl-navigation__link" data-automation-id="tasks" href="" [routerLink]="['Activiti']">Activiti</a>
<a class="mdl-navigation__link" data-automation-id="tasks" href="" [routerLink]="['Tasks']">Tasks</a>
<a class="mdl-navigation__link" data-automation-id="webscript" href="" [routerLink]="['Webscript']">Webscript</a>
<a class="mdl-navigation__link" data-automation-id="login" href="" [routerLink]="['Login']">Login</a>
</nav>
@@ -46,6 +47,7 @@
<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]="['Tasks']" (click)="hideDrawer()">Activiti Tasks Demo</a>
<a class="mdl-navigation__link" href="" [routerLink]="['Webscript']" (click)="hideDrawer()">Webscript</a>
</nav>
</div>
<main class="mdl-layout__content">