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

improve style demo shell (#1326)

Browse Source
This commit is contained in:
Mario Romano 2016-12-19 16:13:07 +00:00 committed by Maurizio Vitale
parent b9c7b60fb6
commit 72ae760b85
9 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demo-shell-ng2/app/app.component.css
View File

@ -1,12 +1,12 @@
@media screen and (max-width: 1024px) { @media screen and (max-width: 1024px) {
.mdl-layout__header { .mdl-layout__header {
display: block; display: block;
} }
} }
@media screen and (max-width: 1024px) { @media screen and (max-width: 1024px) {
.mdl-layout__header { .mdl-layout__header {
display: block; display: block;
} }
} }
@ -25,3 +25,11 @@
.hide { .hide {
display: none !important; display: none !important;
} }
.mdl-navigation__link {
cursor: pointer;
}
.mdl-navigation__link label {
cursor: pointer;
}

1
demo-shell-ng2/app/app.component.html
View File

@ -62,6 +62,7 @@
<a class="mdl-navigation__link" href="" routerLink="/activiti" (click)="hideDrawer()">Activiti</a> <a class="mdl-navigation__link" href="" routerLink="/activiti" (click)="hideDrawer()">Activiti</a>
<a class="mdl-navigation__link" href="" routerLink="/webscript" (click)="hideDrawer()">Webscript</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="/tag" (click)="hideDrawer()">Tag</a>
<a class="mdl-navigation__link" href="" routerLink="/about" (click)="hideDrawer()">About</a>
<a class="mdl-navigation__link" href="" routerLink="/settings" (click)="hideDrawer()">Settings</a> <a class="mdl-navigation__link" href="" routerLink="/settings" (click)="hideDrawer()">Settings</a>
</nav> </nav>
</div> </div>

18
demo-shell-ng2/app/app.component.ts
View File

@ -78,20 +78,24 @@ export class AppComponent {
this.auth.logout() this.auth.logout()
.subscribe( .subscribe(
() => { () => {
this.router.navigate(['/login']); this.navigateToLogin();
this.hideDrawer();
}, },
($event: any) => { (error: any) => {
if ($event && $event.response && $event.response.status === 401) { if (error && error.response && error.response.status === 401) {
this.router.navigate(['/login']); this.navigateToLogin();
this.hideDrawer();
} else { } else {
console.error('An unknown error occurred while logging out', $event); console.error('An unknown error occurred while logging out', error);
this.navigateToLogin();
} }
} }
); );
} }
navigateToLogin(){
this.router.navigate(['/login']);
this.hideDrawer();
}
onToggleSearch(event) { onToggleSearch(event) {
let expandedHeaderClass = 'header-search-expanded', let expandedHeaderClass = 'header-search-expanded',
header = document.querySelector('header'); header = document.querySelector('header');

2
demo-shell-ng2/app/components/activiti/activiti-demo.component.css
View File

@ -10,7 +10,7 @@
.task-column { .task-column {
background-color: #f5f5f5; background-color: #f5f5f5;
padding: 10px 10px 10px 10px; padding: 10px 10px 10px 10px;
border: solid 2px rgb(31, 188, 210); border-right: solid 2px rgb(144, 143, 143);
} }
.list-column { .list-column {

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

@ -19,13 +19,15 @@
<div class="page-content"> <div class="page-content">
<div class="mdl-grid"> <div class="mdl-grid">
<div class="mdl-cell mdl-cell--2-col task-column mdl-shadow--2dp"> <div class="mdl-cell mdl-cell--2-col task-column mdl-shadow--2dp">
<span>Task Filters</span> <span><h5>Task Filters</h5></span>
<hr>
<activiti-start-task [appId]="appId" (onSuccess)="onStartTaskSuccess($event)"></activiti-start-task> <activiti-start-task [appId]="appId" (onSuccess)="onStartTaskSuccess($event)"></activiti-start-task>
<activiti-filters [appId]="appId" (filterClick)="onTaskFilterClick($event)" (onSuccess)="onSuccessTaskFilterList($event)" <activiti-filters [appId]="appId" (filterClick)="onTaskFilterClick($event)" (onSuccess)="onSuccessTaskFilterList($event)"
#activitifilter></activiti-filters> #activitifilter></activiti-filters>
</div> </div>
<div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp list-column"> <div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp list-column">
<span>Task List</span> <span><h5>Task List</h5></span>
<hr>
<activiti-tasklist *ngIf="taskFilter?.hasFilter()" [appId]="taskFilter.appId" <activiti-tasklist *ngIf="taskFilter?.hasFilter()" [appId]="taskFilter.appId"
[processDefinitionKey]="taskFilter.filter.processDefinitionKey" [processDefinitionKey]="taskFilter.filter.processDefinitionKey"
[name]="taskFilter.filter.name" [name]="taskFilter.filter.name"
@ -37,7 +39,8 @@
#activititasklist></activiti-tasklist> #activititasklist></activiti-tasklist>
</div> </div>
<div class="mdl-cell mdl-cell--7-col task-column mdl-shadow--2dp"> <div class="mdl-cell mdl-cell--7-col task-column mdl-shadow--2dp">
<span>Task Details</span> <span><h5>Task Details</h5></span>
<hr>
<activiti-task-details [taskId]="currentTaskId" (formCompleted)="onFormCompleted($event)" <activiti-task-details [taskId]="currentTaskId" (formCompleted)="onFormCompleted($event)"
#activitidetails></activiti-task-details> #activitidetails></activiti-task-details>
</div> </div>
@ -52,15 +55,17 @@
<div class="page-content"> <div class="page-content">
<div class="page-content"> <div class="page-content">
<div class="mdl-grid"> <div class="mdl-grid">
<div class="mdl-cell mdl-cell--2-col task-column"> <div class="mdl-cell mdl-cell--2-col task-column mdl-shadow--2dp">
<span>Process Filters</span> <span><h5>Process Filters</h5></span>
<hr>
<button type="button" (click)="navigateStartProcess()" class="mdl-button" data-automation-id="btn-start-process">Start Process</button> <button type="button" (click)="navigateStartProcess()" class="mdl-button" data-automation-id="btn-start-process">Start Process</button>
<activiti-process-instance-filters [appId]="appId" <activiti-process-instance-filters [appId]="appId"
(filterClick)="onProcessFilterClick($event)" (filterClick)="onProcessFilterClick($event)"
(onSuccess)="onSuccessProcessFilterList($event)"></activiti-process-instance-filters> (onSuccess)="onSuccessProcessFilterList($event)"></activiti-process-instance-filters>
</div> </div>
<div class="mdl-cell mdl-cell--3-col task-column list-column"> <div class="mdl-cell mdl-cell--3-col task-column list-column mdl-shadow--2dp">
<span>Process List</span> <span><h5>Process List</h5></span>
<hr>
<activiti-process-instance-list *ngIf="processFilter?.hasFilter()" [appId]="processFilter.appId" <activiti-process-instance-list *ngIf="processFilter?.hasFilter()" [appId]="processFilter.appId"
[processDefinitionKey]="processFilter.filter.processDefinitionKey" [processDefinitionKey]="processFilter.filter.processDefinitionKey"
[name]="processFilter.filter.name" [name]="processFilter.filter.name"
@ -70,14 +75,16 @@
(rowClick)="onProcessRowClick($event)" (rowClick)="onProcessRowClick($event)"
(onSuccess)="onSuccessProcessList($event)"></activiti-process-instance-list> (onSuccess)="onSuccessProcessList($event)"></activiti-process-instance-list>
</div> </div>
<div class="mdl-cell mdl-cell--7-col task-column" *ngIf="!isStartProcessMode()"> <div class="mdl-cell mdl-cell--7-col task-column mdl-shadow--2dp" *ngIf="!isStartProcessMode()">
<span>Process Details</span> <span><h5>Process Details</h5></span>
<hr>
<activiti-process-instance-details [processInstanceId]="currentProcessInstanceId" <activiti-process-instance-details [processInstanceId]="currentProcessInstanceId"
(activitiprocesslist)="taskFormCompleted()" (activitiprocesslist)="taskFormCompleted()"
(processCancelled)="processCancelled()"></activiti-process-instance-details> (processCancelled)="processCancelled()"></activiti-process-instance-details>
</div> </div>
<div class="mdl-cell mdl-cell--7-col task-column" *ngIf="isStartProcessMode()"> <div class="mdl-cell mdl-cell--7-col task-column" *ngIf="isStartProcessMode()">
<span>Start Process</span> <span>Start Process</span>
<hr>
<activiti-start-process [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process> <activiti-start-process [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process>
</div> </div>
</div> </div>
@ -92,6 +99,8 @@
<div class="page-content"> <div class="page-content">
<div class="mdl-grid"> <div class="mdl-grid">
<div class="mdl-cell mdl-cell--4-col task-column mdl-shadow--2dp"> <div class="mdl-cell mdl-cell--4-col task-column mdl-shadow--2dp">
<span><h5>Report List</h5></span>
<hr>
<analytics-report-list <analytics-report-list
(reportClick)="onReportClick($event)" (reportClick)="onReportClick($event)"
#analyticsreportlist > #analyticsreportlist >

2
demo-shell-ng2/app/components/home/home.component.css
View File

@ -16,7 +16,7 @@
.demo-card-square > .mdl-card__title { .demo-card-square > .mdl-card__title {
color: #fff; color: #fff;
background-color: #a1ce6d; background-color: rgb(158, 158, 158);
} }
.mdl-card__title { .mdl-card__title {

8
demo-shell-ng2/config/webpack.common.js
View File

@ -18,9 +18,6 @@ let options = {
let alfrescoLibs = glob.sync(pattern, options); let alfrescoLibs = glob.sync(pattern, options);
// console.dir(alfrescoLibs); // console.dir(alfrescoLibs);
let alfrescoLibsModules = alfrescoLibs.map(p => path.join(p, 'node_modules'));
let alfrescoLibsSources = alfrescoLibs.map(p => path.join(p, 'src'));
module.exports = { module.exports = {
entry: { entry: {
'polyfills': './app/polyfills.ts', 'polyfills': './app/polyfills.ts',
@ -106,10 +103,7 @@ module.exports = {
plugins: [ plugins: [
new webpack.WatchIgnorePlugin([ new webpack.WatchIgnorePlugin([ new RegExp('^((?!(ng2-activiti|ng2-alfresco|demo-shell-ng2)).)((?!(src|app)).)*$')]),
...alfrescoLibsModules,
...alfrescoLibsSources
]),
new CopyWebpackPlugin([ new CopyWebpackPlugin([
{ {

1
ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css
View File

@ -38,7 +38,6 @@
.icon-small h4 { .icon-small h4 {
clear: left; clear: left;
margin-left: 26px; margin-left: 26px;
padding-top: 12px;
} }
.icon-small:hover { .icon-small:hover {

2
ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html
View File

@ -18,7 +18,7 @@
<i class="material-icons">mode_edit</i> <i class="material-icons">mode_edit</i>
<h4 (click)="editEnable()">{{reportParameters.name}}</h4> <h4 (click)="editEnable()">{{reportParameters.name}}</h4>
</span> </span>
</div> </div><hr>
<div *ngFor="let field of reportParameters.definition.parameters"> <div *ngFor="let field of reportParameters.definition.parameters">
<div [ngSwitch]="field.type"> <div [ngSwitch]="field.type">
<div *ngSwitchCase="'integer'"> <div *ngSwitchCase="'integer'">