inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #977 from Alfresco/dev-mromano-766

Browse Source 
remove unused icons && fix autoselect app
This commit is contained in:
Eugenio Romano 2016-11-02 09:41:19 +00:00 committed by GitHub
commit e5dc17ab2c
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
demo-shell-ng2/app/components/activiti/activiti-demo.component.html
View File

@ -1,6 +1,9 @@
<div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
<header class="mdl-layout__header">
<!-- Tabs -->
<!-- TABS -->
<div class="mdl-layout__tab-bar mdl-js-ripple-effect" #tabheader>
<a id="apps-header" href="#apps" class="mdl-layout__tab is-active">APPS</a>
<a id="tasks-header" href="#tasks" class="mdl-layout__tab">TASK LIST</a>
@ -8,12 +11,20 @@
<a id="report-header" href="#report" class="mdl-layout__tab">ANALYTICS</a>
</div>
</header>
<main class="mdl-layout__content activiti" #tabmain>
<!-- APPPS COMPONENT -->
<section class="mdl-layout__tab-panel is-active" id="apps">
<div class="page-content">
<activiti-apps [layoutType]="layoutType" (appClick)="onAppClick($event)" #activitiapps></activiti-apps>
</div>
</section>
<!-- TASKS COMPONENT -->
<section class="mdl-layout__tab-panel" id="tasks">
<div class="page-content">
<div class="mdl-grid">
@ -37,6 +48,10 @@
</div>
</div>
</section>
<!-- PROCESS COMPONENT -->
<section class="mdl-layout__tab-panel" id="processes">
<div class="page-content">
<div class="page-content">
@ -62,6 +77,10 @@
</div>
</div>
</section>
<!-- ANALYTICS COMPONENT -->
<section class="mdl-layout__tab-panel" id="report">
<div class="page-content">
<div class="mdl-grid">
@ -74,5 +93,6 @@
</div>
</div>
</section>
</main>
</div>

7
ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.html
View File

@ -18,12 +18,7 @@
</div>
<div class="mdl-card__actions mdl-card--border">
<i class="material-icons selectedIcon" *ngIf="isSelected(app.id)">done</i>
<div class="mdl-layout-spacer"></div>
<button class="mdl-button mdl-button--icon mdl-button--colored"><i class="material-icons">delete</i></button>
<button class="mdl-button mdl-button--icon mdl-button--colored"><i class="material-icons">favorite</i></button>
<button class="mdl-button mdl-button--icon mdl-button--colored"><i class="material-icons">share</i></button>
<button class="mdl-button mdl-button--icon mdl-button--colored"><i class="material-icons">file_download</i></button>
</div>
</div>
</div>
</div>
</div>

1
ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts
View File

@ -94,7 +94,6 @@ export class ActivitiApps implements OnInit {
app.theme = ActivitiApps.DEFAULT_TASKS_APP_THEME;
app.icon = ActivitiApps.DEFAULT_TASKS_APP_ICON;
this.appsObserver.next(app);
this.selectApp(app);
} else if (app.deploymentId) {
this.appsObserver.next(app);
}