From 90840d949bea45ad8c8e5a879d96d52a89b132e8 Mon Sep 17 00:00:00 2001
From: Christian Scheible <christian.scheible@uni-konstanz.de>
Date: Tue, 13 Jun 2017 14:35:57 +0200
Subject: [PATCH] Refactored collection/community logo and name as shared
 components.

---
 .../collection-page.component.html               |  9 +++++++--
 .../collection-page/collection-page.module.ts    |  4 ----
 .../logo/collection-page-logo.component.html     |  3 ---
 .../logo/collection-page-logo.component.ts       | 13 -------------
 .../name/collection-page-name.component.ts       | 11 -----------
 .../community-page/community-page.component.html | 16 ++++++++--------
 src/app/community-page/community-page.module.ts  |  4 ----
 .../logo/community-page-logo.component.html      |  3 ---
 .../logo/community-page-logo.component.scss      |  1 -
 .../logo/community-page-logo.component.ts        | 13 -------------
 .../name/community-page-name.component.html      |  1 -
 .../name/community-page-name.component.scss      |  1 -
 .../name/community-page-name.component.ts        | 11 -----------
 .../content-with-optional-title.component.html   |  4 ++--
 src/app/shared/dso-logo/dso-logo.component.html  |  3 +++
 .../dso-logo/dso-logo.component.scss}            |  0
 src/app/shared/dso-logo/dso-logo.component.ts    | 15 +++++++++++++++
 .../dso-name/dso-name.component.html}            |  0
 .../dso-name/dso-name.component.scss}            |  0
 src/app/shared/dso-name/dso-name.component.ts    | 11 +++++++++++
 src/app/shared/shared.module.ts                  |  6 +++++-
 21 files changed, 51 insertions(+), 78 deletions(-)
 delete mode 100644 src/app/collection-page/logo/collection-page-logo.component.html
 delete mode 100644 src/app/collection-page/logo/collection-page-logo.component.ts
 delete mode 100644 src/app/collection-page/name/collection-page-name.component.ts
 delete mode 100644 src/app/community-page/logo/community-page-logo.component.html
 delete mode 100644 src/app/community-page/logo/community-page-logo.component.scss
 delete mode 100644 src/app/community-page/logo/community-page-logo.component.ts
 delete mode 100644 src/app/community-page/name/community-page-name.component.html
 delete mode 100644 src/app/community-page/name/community-page-name.component.scss
 delete mode 100644 src/app/community-page/name/community-page-name.component.ts
 create mode 100644 src/app/shared/dso-logo/dso-logo.component.html
 rename src/app/{collection-page/logo/collection-page-logo.component.scss => shared/dso-logo/dso-logo.component.scss} (100%)
 create mode 100644 src/app/shared/dso-logo/dso-logo.component.ts
 rename src/app/{collection-page/name/collection-page-name.component.html => shared/dso-name/dso-name.component.html} (100%)
 rename src/app/{collection-page/name/collection-page-name.component.scss => shared/dso-name/dso-name.component.scss} (100%)
 create mode 100644 src/app/shared/dso-name/dso-name.component.ts

diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index cfa4ef4dee..02fc1fd9b7 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -1,6 +1,11 @@
 <div class="collection-page" *ngIf="collectionData.hasSucceeded | async">
-  <ds-collection-page-name [name]="(collectionData.payload | async)?.name"></ds-collection-page-name>
-  <ds-collection-page-logo *ngIf="logoData" [logo]="logoData.payload | async"></ds-collection-page-logo>
+  <!-- Collection Name -->
+  <ds-dso-name [name]="(collectionData.payload | async)?.name"></ds-dso-name>
+  <!-- Collection logo -->
+  <ds-dso-logo *ngIf="logoData" 
+      [logo]="logoData.payload | async"
+      [alternateText]="'Collection Logo'">
+  </ds-dso-logo>
   <!-- Introductionary text -->
   <ds-content-with-optional-title
       [content]="(collectionData.payload | async)?.introductoryText"
diff --git a/src/app/collection-page/collection-page.module.ts b/src/app/collection-page/collection-page.module.ts
index 1065d237df..76e3128871 100644
--- a/src/app/collection-page/collection-page.module.ts
+++ b/src/app/collection-page/collection-page.module.ts
@@ -6,8 +6,6 @@ import { TranslateModule } from "@ngx-translate/core";
 import { SharedModule } from '../shared/shared.module';
 import { CollectionPageComponent } from './collection-page.component';
 import { FieldWrapperComponent } from './field-wrapper/field-wrapper.component';
-import { CollectionPageNameComponent } from './name/collection-page-name.component';
-import { CollectionPageLogoComponent } from './logo/collection-page-logo.component';
 import { CollectionPageRoutingModule } from './collection-page-routing.module';
 
 @NgModule({
@@ -20,8 +18,6 @@ import { CollectionPageRoutingModule } from './collection-page-routing.module';
   declarations: [
     CollectionPageComponent,
     FieldWrapperComponent,
-    CollectionPageNameComponent,
-    CollectionPageLogoComponent,
   ]
 })
 export class CollectionPageModule { }
diff --git a/src/app/collection-page/logo/collection-page-logo.component.html b/src/app/collection-page/logo/collection-page-logo.component.html
deleted file mode 100644
index 1c331e2e25..0000000000
--- a/src/app/collection-page/logo/collection-page-logo.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<ds-field-wrapper *ngIf="logo" class="collection-page-logo">
-    <img [src]="logo.url" class="img-responsive" alt="Collection logo" />
-</ds-field-wrapper>
\ No newline at end of file
diff --git a/src/app/collection-page/logo/collection-page-logo.component.ts b/src/app/collection-page/logo/collection-page-logo.component.ts
deleted file mode 100644
index 22c34422ea..0000000000
--- a/src/app/collection-page/logo/collection-page-logo.component.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Component, Input } from '@angular/core';
-
-import { Bitstream } from "../../core/shared/bitstream.model";
-
-
-@Component({
-  selector: 'ds-collection-page-logo',
-  styleUrls: ['./collection-page-logo.component.css'],
-  templateUrl: './collection-page-logo.component.html',
-})
-export class CollectionPageLogoComponent {
-  @Input() logo: Bitstream;
-}
diff --git a/src/app/collection-page/name/collection-page-name.component.ts b/src/app/collection-page/name/collection-page-name.component.ts
deleted file mode 100644
index 30121fd01b..0000000000
--- a/src/app/collection-page/name/collection-page-name.component.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component, Input } from '@angular/core';
-
-
-@Component({
-  selector: 'ds-collection-page-name',
-  styleUrls: ['./collection-page-name.component.css'],
-  templateUrl: './collection-page-name.component.html',
-})
-export class CollectionPageNameComponent {
-  @Input() name: String;
-}
diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index d01130a006..4fc21b07df 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -1,6 +1,11 @@
 <div class="community-page" *ngIf="communityData.hasSucceeded | async">
-  <ds-community-page-name [name]="(communityData.payload | async)?.name"></ds-community-page-name>
-  <ds-community-page-logo *ngIf="logoData" [logo]="logoData.payload | async"></ds-community-page-logo>
+  <!-- Community name -->
+  <ds-dso-name [name]="(communityData.payload | async)?.name"></ds-dso-name>
+  <!-- Community logo -->
+  <ds-dso-logo *ngIf="logoData" 
+      [logo]="logoData.payload | async"
+      [alternateText]="'Community Logo'">
+  </ds-dso-logo>
   <!-- Introductionary text -->
   <ds-content-with-optional-title 
       [content]="(communityData.payload | async)?.introductoryText"
@@ -16,11 +21,6 @@
   <ds-content-with-optional-title
       [content]="(communityData.payload | async)?.copyrightText"
       [hasInnerHtml]="true">
-  </ds-content-with-optional-title>
-  <!-- Licence -->
-  <ds-content-with-optional-title
-      [content]="(communityData.payload | async)?.license"
-      [title]="'community.page.license'">
-  </ds-content-with-optional-title>
+  </ds-content-with-optional-title>  
   <ds-community-page-sub-collection-list></ds-community-page-sub-collection-list>
 </div>
diff --git a/src/app/community-page/community-page.module.ts b/src/app/community-page/community-page.module.ts
index 043b5ca47a..0d6db23d32 100644
--- a/src/app/community-page/community-page.module.ts
+++ b/src/app/community-page/community-page.module.ts
@@ -7,8 +7,6 @@ import { TranslateModule } from "@ngx-translate/core";
 import { SharedModule } from '../shared/shared.module';
 import { CommunityPageComponent } from './community-page.component';
 import { FieldWrapperComponent } from './field-wrapper/field-wrapper.component';
-import { CommunityPageNameComponent } from './name/community-page-name.component';
-import { CommunityPageLogoComponent } from './logo/community-page-logo.component';
 import { CommunityPageSubCollectionListComponent } from './sub-collection-list/community-page-sub-collection-list.component';
 import { CommunityPageRoutingModule } from './community-page-routing.module';
 
@@ -23,8 +21,6 @@ import { CommunityPageRoutingModule } from './community-page-routing.module';
   declarations: [
     CommunityPageComponent,
     FieldWrapperComponent,
-    CommunityPageNameComponent,
-    CommunityPageLogoComponent,
     CommunityPageSubCollectionListComponent,
   ]
 })
diff --git a/src/app/community-page/logo/community-page-logo.component.html b/src/app/community-page/logo/community-page-logo.component.html
deleted file mode 100644
index d5ef5d6311..0000000000
--- a/src/app/community-page/logo/community-page-logo.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<ds-field-wrapper *ngIf="logo" class="community-page-logo">
-    <img [src]="logo.url" class="img-responsive" alt="Community logo" />
-</ds-field-wrapper>
\ No newline at end of file
diff --git a/src/app/community-page/logo/community-page-logo.component.scss b/src/app/community-page/logo/community-page-logo.component.scss
deleted file mode 100644
index ad84b72f8c..0000000000
--- a/src/app/community-page/logo/community-page-logo.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../styles/variables.scss';
\ No newline at end of file
diff --git a/src/app/community-page/logo/community-page-logo.component.ts b/src/app/community-page/logo/community-page-logo.component.ts
deleted file mode 100644
index 3610932745..0000000000
--- a/src/app/community-page/logo/community-page-logo.component.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Component, Input } from '@angular/core';
-
-import { Bitstream } from "../../core/shared/bitstream.model";
-
-
-@Component({
-  selector: 'ds-community-page-logo',
-  styleUrls: ['./community-page-logo.component.css'],
-  templateUrl: './community-page-logo.component.html',
-})
-export class CommunityPageLogoComponent {
-  @Input() logo: Bitstream;
-}
diff --git a/src/app/community-page/name/community-page-name.component.html b/src/app/community-page/name/community-page-name.component.html
deleted file mode 100644
index 21f1f65331..0000000000
--- a/src/app/community-page/name/community-page-name.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<h1 *ngIf="name">{{ name }}</h1>
\ No newline at end of file
diff --git a/src/app/community-page/name/community-page-name.component.scss b/src/app/community-page/name/community-page-name.component.scss
deleted file mode 100644
index ad84b72f8c..0000000000
--- a/src/app/community-page/name/community-page-name.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../styles/variables.scss';
\ No newline at end of file
diff --git a/src/app/community-page/name/community-page-name.component.ts b/src/app/community-page/name/community-page-name.component.ts
deleted file mode 100644
index f2cbded07c..0000000000
--- a/src/app/community-page/name/community-page-name.component.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component, Input } from '@angular/core';
-
-
-@Component({
-  selector: 'ds-community-page-name',
-  styleUrls: ['./community-page-name.component.css'],
-  templateUrl: './community-page-name.component.html',
-})
-export class CommunityPageNameComponent {
-  @Input() name: String;
-}
diff --git a/src/app/shared/content-with-optional-title/content-with-optional-title.component.html b/src/app/shared/content-with-optional-title/content-with-optional-title.component.html
index 67c49496ae..4a0be8cfc7 100644
--- a/src/app/shared/content-with-optional-title/content-with-optional-title.component.html
+++ b/src/app/shared/content-with-optional-title/content-with-optional-title.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="content" class="content-with-optional-title">
     <h2 *ngIf="title">{{ title | translate }}</h2>
-    <p *ngIf="hasInnerHtml" [innerHtml]="content"></p>
-    <p *ngIf="!hasInnerHtml">{{content}}</p>
+    <div *ngIf="hasInnerHtml" [innerHtml]="content"></div>
+    <div *ngIf="!hasInnerHtml">{{content}}</div>
 </div>
\ No newline at end of file
diff --git a/src/app/shared/dso-logo/dso-logo.component.html b/src/app/shared/dso-logo/dso-logo.component.html
new file mode 100644
index 0000000000..81769c3c0f
--- /dev/null
+++ b/src/app/shared/dso-logo/dso-logo.component.html
@@ -0,0 +1,3 @@
+<div *ngIf="logo" class="dso-logo">
+    <img [src]="logo.url" class="img-responsive" [attr.alt]="alternateText ? alternateText : null" />
+</div>
\ No newline at end of file
diff --git a/src/app/collection-page/logo/collection-page-logo.component.scss b/src/app/shared/dso-logo/dso-logo.component.scss
similarity index 100%
rename from src/app/collection-page/logo/collection-page-logo.component.scss
rename to src/app/shared/dso-logo/dso-logo.component.scss
diff --git a/src/app/shared/dso-logo/dso-logo.component.ts b/src/app/shared/dso-logo/dso-logo.component.ts
new file mode 100644
index 0000000000..fc41315415
--- /dev/null
+++ b/src/app/shared/dso-logo/dso-logo.component.ts
@@ -0,0 +1,15 @@
+import { Component, Input } from '@angular/core';
+
+import { Bitstream } from "../../core/shared/bitstream.model";
+
+
+@Component({
+  selector: 'ds-dso-logo',
+  styleUrls: ['./dso-logo.component.css'],
+  templateUrl: './dso-logo.component.html',
+})
+export class DsoLogoComponent {
+  @Input() logo: Bitstream;
+
+  @Input() alternateText: string;
+}
\ No newline at end of file
diff --git a/src/app/collection-page/name/collection-page-name.component.html b/src/app/shared/dso-name/dso-name.component.html
similarity index 100%
rename from src/app/collection-page/name/collection-page-name.component.html
rename to src/app/shared/dso-name/dso-name.component.html
diff --git a/src/app/collection-page/name/collection-page-name.component.scss b/src/app/shared/dso-name/dso-name.component.scss
similarity index 100%
rename from src/app/collection-page/name/collection-page-name.component.scss
rename to src/app/shared/dso-name/dso-name.component.scss
diff --git a/src/app/shared/dso-name/dso-name.component.ts b/src/app/shared/dso-name/dso-name.component.ts
new file mode 100644
index 0000000000..7f88e3189e
--- /dev/null
+++ b/src/app/shared/dso-name/dso-name.component.ts
@@ -0,0 +1,11 @@
+import { Component, Input } from '@angular/core';
+
+
+@Component({
+  selector: 'ds-dso-name',
+  styleUrls: ['./dso-name.component.css'],
+  templateUrl: './dso-name.component.html',
+})
+export class DsoNameComponent {
+  @Input() name: String;
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 285f1087bd..338fb5fe5d 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -15,6 +15,8 @@ import { SafeUrlPipe } from "./utils/safe-url-pipe";
 import { HostWindowService } from "./host-window.service";
 import { NativeWindowFactory, NativeWindowService } from "./window.service";
 import { ContentWithOptionalTitleComponent } from "./content-with-optional-title/content-with-optional-title.component";
+import { DsoNameComponent } from "./dso-name/dso-name.component";
+import { DsoLogoComponent } from "./dso-logo/dso-logo.component";
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -37,7 +39,9 @@ const COMPONENTS = [
   // put shared components here
   PaginationComponent,
   ThumbnailComponent,
-  ContentWithOptionalTitleComponent
+  ContentWithOptionalTitleComponent,
+  DsoNameComponent,
+  DsoLogoComponent
 ];
 
 const PROVIDERS = [