inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2026-09-09 18:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA] ADF latest alpha (#311)

Browse Source 
* update

* fix layout

* about page layout fix
This commit is contained in:
Cilibiu Bogdan
2018-04-17 12:08:24 +01:00
committed by Denys Vuika
parent bc6f02e261
commit 5ebcd44723
7 changed files with 690 additions and 4874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+641 -4832
View File
File diff suppressed because it is too large Load Diff
package.json
+2 -2
View File
@@ -18,8 +18,8 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": "2.3.0-eff3ea83b03603d77986d6080553f799025e3f90", "@alfresco/adf-content-services": "2.3.0-0a8438954b0b3f7b0d1ba805e9fd030ba6b36e45",
"@alfresco/adf-core": "2.3.0-eff3ea83b03603d77986d6080553f799025e3f90", "@alfresco/adf-core": "2.3.0-0a8438954b0b3f7b0d1ba805e9fd030ba6b36e45",
"@angular/animations": "5.1.1", "@angular/animations": "5.1.1",
"@angular/cdk": "5.0.1", "@angular/cdk": "5.0.1",
"@angular/common": "5.1.1", "@angular/common": "5.1.1",
src/app/components/about/about.component.html
+3 -1
View File
@@ -1,5 +1,6 @@
<div class="inner-layout inner-layout--scroll"> <div class="inner-layout inner-layout--scroll">
<div class="inner-layout__content inner-layout__content--scroll"> <div class="inner-layout__content">
<div class="inner-layout__panel content--scroll">
<article *ngIf="ecmVersion" class="padding"> <article *ngIf="ecmVersion" class="padding">
<header class="header padding-left">Alfresco Content Services</header> <header class="header padding-left">Alfresco Content Services</header>
<p class="padding-left"> version: {{ ecmVersion.edition }} {{ ecmVersion.version.display }} </p> <p class="padding-left"> version: {{ ecmVersion.edition }} {{ ecmVersion.version.display }} </p>
@@ -43,4 +44,5 @@
<adf-datatable [data]="data"></adf-datatable> <adf-datatable [data]="data"></adf-datatable>
</article> </article>
</div> </div>
</div>
</div> </div>
src/app/components/about/about.component.ts
+3 -3
View File
@@ -55,7 +55,7 @@ export class AboutComponent implements OnInit {
{type: 'text', key: 'id', title: 'ID', sortable: true}, {type: 'text', key: 'id', title: 'ID', sortable: true},
{type: 'text', key: 'title', title: 'Title', sortable: true}, {type: 'text', key: 'title', title: 'Title', sortable: true},
{type: 'text', key: 'version', title: 'Description', sortable: true}, {type: 'text', key: 'version', title: 'Description', sortable: true},
{type: 'text', key: 'installDate', title: 'Install Date', sortable: true}, {type: 'date', key: 'installDate', title: 'Install Date', sortable: true},
{type: 'text', key: 'installState', title: 'Install State', sortable: true}, {type: 'text', key: 'installState', title: 'Install State', sortable: true},
{type: 'text', key: 'versionMin', title: 'Version Minor', sortable: true}, {type: 'text', key: 'versionMin', title: 'Version Minor', sortable: true},
{type: 'text', key: 'versionMax', title: 'Version Max', sortable: true} {type: 'text', key: 'versionMax', title: 'Version Max', sortable: true}
@@ -69,8 +69,8 @@ export class AboutComponent implements OnInit {
]); ]);
this.license = new ObjectDataTableAdapter([this.ecmVersion.license], [ this.license = new ObjectDataTableAdapter([this.ecmVersion.license], [
{type: 'text', key: 'issuedAt', title: 'Issued At', sortable: true}, {type: 'date', key: 'issuedAt', title: 'Issued At', sortable: true},
{type: 'text', key: 'expiresAt', title: 'Expires At', sortable: true}, {type: 'date', key: 'expiresAt', title: 'Expires At', sortable: true},
{type: 'text', key: 'remainingDays', title: 'Remaining Days', sortable: true}, {type: 'text', key: 'remainingDays', title: 'Remaining Days', sortable: true},
{type: 'text', key: 'holder', title: 'Holder', sortable: true}, {type: 'text', key: 'holder', title: 'Holder', sortable: true},
{type: 'text', key: 'mode', title: 'Type', sortable: true}, {type: 'text', key: 'mode', title: 'Type', sortable: true},
src/app/ui/_layout.scss
+4 -4
View File
@@ -26,10 +26,6 @@ $app-inner-layout--footer-height: 48px;
@include flex-row; @include flex-row;
} }
&__content--scroll {
overflow: auto;
}
&__content--hide { &__content--hide {
display: none !important; display: none !important;
} }
@@ -47,6 +43,10 @@ $app-inner-layout--footer-height: 48px;
} }
} }
.content--scroll {
overflow: auto !important;
}
app-generic-error { app-generic-error {
height: 100%; height: 100%;
width: 100%; width: 100%;
src/app/ui/application.scss
+1
View File
@@ -11,6 +11,7 @@ html, body {
} }
app-root, app-root,
app-about,
app-layout, app-layout,
adf-layout-container, adf-layout-container,
app-search, app-search,
src/app/ui/overrides/_adf-sidenav-layout.scss
+4
View File
@@ -12,3 +12,7 @@ adf-sidenav-layout {
.sidenav-layout { .sidenav-layout {
@include flex-column; @include flex-column;
} }
.mat-drawer-content>div, .mat-drawer-content>div>div {
@include flex-column;
}