diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html index b1aae17f7c..e9d4f29257 100644 --- a/src/app/+collection-page/collection-page.component.html +++ b/src/app/+collection-page/collection-page.component.html @@ -1,13 +1,13 @@
-
+
+ [logo]="logoData.payload | async" + [alternateText]="'Collection Logo'">
+
-
+

{{'collection.page.browse.recent.head' | translate}}

- + +
+
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html index 4f02c885e6..e58b358c35 100644 --- a/src/app/+community-page/community-page.component.html +++ b/src/app/+community-page/community-page.component.html @@ -1,26 +1,27 @@ -
+
+ [logo]="logoData.payload | async" + [alternateText]="'Community Logo'"> + [content]="(communityData.payload | async)?.introductoryText" + [hasInnerHtml]="true"> + [content]="(communityData.payload | async)?.sidebarText" + [hasInnerHtml]="true" + [title]="'community.page.news'"> + [content]="(communityData.payload | async)?.copyrightText" + [hasInnerHtml]="true">
+ diff --git a/src/app/+home/top-level-community-list/top-level-community-list.component.html b/src/app/+home/top-level-community-list/top-level-community-list.component.html index 772eb66012..183be2605c 100644 --- a/src/app/+home/top-level-community-list/top-level-community-list.component.html +++ b/src/app/+home/top-level-community-list/top-level-community-list.component.html @@ -1,6 +1,12 @@ -
+

{{'home.top-level-communities.head' | translate}}

{{'home.top-level-communities.help' | translate}}

- + +
+ \ No newline at end of file diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html index 59511d7d9d..ba8f7409d9 100644 --- a/src/app/+item-page/full/full-item-page.component.html +++ b/src/app/+item-page/full/full-item-page.component.html @@ -1,25 +1,20 @@ -
- - - - - - - - - - - - -
{{metadatum.key}}{{metadatum.value}}{{metadatum.language}}
- - - - - - +
+ + + + + + + + + + +
{{metadatum.key}}{{metadatum.value}}{{metadatum.language}}
+ +
+ diff --git a/src/app/+item-page/simple/item-page.component.html b/src/app/+item-page/simple/item-page.component.html index 94ab99482f..455b014add 100644 --- a/src/app/+item-page/simple/item-page.component.html +++ b/src/app/+item-page/simple/item-page.component.html @@ -1,26 +1,24 @@ -
- -
-
- - - - - - - -
- - +
+ +
+
+ + + + + +
+ +
+ diff --git a/src/app/shared/loading/loading.component.html b/src/app/shared/loading/loading.component.html new file mode 100644 index 0000000000..fb5224e1ac --- /dev/null +++ b/src/app/shared/loading/loading.component.html @@ -0,0 +1 @@ +
{{ message }}
\ No newline at end of file diff --git a/src/app/shared/loading/loading.component.scss b/src/app/shared/loading/loading.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/shared/loading/loading.component.ts b/src/app/shared/loading/loading.component.ts new file mode 100644 index 0000000000..8bb47c20d6 --- /dev/null +++ b/src/app/shared/loading/loading.component.ts @@ -0,0 +1,12 @@ +import { Component, Input } from '@angular/core'; + +@Component({ + selector: 'ds-loading', + styleUrls: ['./loading.component.scss'], + templateUrl: './loading.component.html' +}) +export class LoadingComponent { + + @Input() message: "Loading..."; + +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 7f0975ea6e..669f490c13 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -27,6 +27,7 @@ import { TruncatePipe } from './utils/truncate.pipe'; import { WrapperListElementComponent } from '../object-list/wrapper-list-element/wrapper-list-element.component'; import { SearchResultListElementComponent } from '../object-list/search-result-list-element/search-result-list-element.component'; import { SearchFormComponent } from './search-form/search-form.component'; +import { LoadingComponent } from './loading/loading.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -57,7 +58,8 @@ const COMPONENTS = [ ObjectListComponent, ObjectListElementComponent, WrapperListElementComponent, - SearchFormComponent + SearchFormComponent, + LoadingComponent ]; const ENTRY_COMPONENTS = [