Merge branch 'entities-or2018' into entities-master

resources/images/atmire-logo.svg

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="536.718px" height="699.821px" viewBox="0 0 536.718 699.821" enable-background="new 0 0 536.718 699.821"
+	 xml:space="preserve">
+<polygon fill="#0069A4" points="459.164,385.152 392.142,510.237 519.215,510.237 "/>
+<polygon fill="#0069A4" points="273.893,0 35.377,510.237 204.12,510.237 359.388,178.085 "/>
+<polygon fill="#63B1DC" points="406.903,76.441 359.388,178.085 204.12,510.237 235.528,510.237 374.284,510.237 501.322,273.103 
+	"/>
+<g>
+	<path fill="#0069A4" d="M72.537,664.797H17.956L6.223,699.821H0l41.601-121.249h7.645l41.602,121.249H84.27L72.537,664.797z
+		 M70.58,659.108l-25.245-75.559l-25.423,75.559H70.58z"/>
+	<path fill="#0069A4" d="M168.893,584.438h-36.802v115.383h-6.223V584.438H89.067v-5.866h80.892L168.893,584.438z"/>
+	<path fill="#0069A4" d="M291.028,699.821h-6.043l-6.578-60.446c-2.135-19.912-4.624-43.559-5.513-55.292l-33.779,100.982h-5.866
+		l-34.49-100.982c-0.712,10.489-3.378,34.668-5.334,53.868l-6.044,61.87h-6.046l12.445-121.249h9.244l33.246,99.025l32.536-99.025
+		h9.422L291.028,699.821z"/>
+	<path fill="#0069A4" d="M331.736,699.821h-6.223V578.572h6.223V699.821z"/>
+	<path fill="#0069A4" d="M408.36,643.285h-28.09v56.536h-6.224V578.572h27.557c28.446,0,41.07,11.379,41.07,32.001
+		c0,18.667-10.845,27.735-27.557,31.646l33.779,57.602h-7.824L408.36,643.285z M402.849,637.595
+		c20.979,0,33.245-8.355,33.245-27.022c0-17.068-9.422-26.49-35.023-26.49h-20.8v53.513H402.849z"/>
+	<path fill="#0069A4" d="M534.763,584.261h-51.558v49.068h44.624v5.512h-44.624v55.29h53.513v5.689h-59.736V578.572h58.67
+		L534.763,584.261z"/>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

src/app/+home-page/home-news/home-news.component.html

@@ -2,19 +2,16 @@
   <div class="container">
     <div class="d-flex">
       <div class="dspace-logo-container">
-        <img src="assets/images/dspace-logo.png" />
+        <img src="assets/images/atmire-logo.svg" />
       </div>
       <div>
-        <h1 class="display-3">Welcome to DSpace</h1>
-        <p class="lead">DSpace is an open source software platform that enables organisations to:</p>
+        <h1 class="display-3">DSpace 7 entities prototype</h1>
+        <p class="lead">This is the demo site of the prototype implementation of a flexible data model for DSpace 7:</p>
       </div>
     </div>
     <ul>
-      <li>capture and describe digital material using a submission workflow module, or a variety of programmatic ingest options
-      </li>
-      <li>distribute an organisation's digital assets over the web through a search and retrieval system
-      </li>
-      <li>preserve digital assets over the long term</li>
+      <li>The functionality is governed and discussed by the DSpace 7 Entities Working Group, if you would like to participate, please visit <a href="https://wiki.duraspace.org/display/DSPACE/DSpace+7+Entities+Working+Group">the wiki</a></li>
+      <li>Documentation on this prototype implementation and links to the source code can be found <a href="https://docs.google.com/document/d/1wEmHirFzrY3qgGtRr2YBQwGOvH1IuTVGmxDIdnqvwxM">here</a></li>
     </ul>
   </div>
 </div>

src/app/footer/footer.component.html

 <footer class="footer">
   <div class="container-fluid content-container-fluid">
+    <img src="assets/images/dspace-logo.png" />
     <p>
       <a href="http://www.dspace.org/">{{ 'footer.link.dspace' | translate}}</a>
       {{ 'footer.copyright' | translate:{year : dateObj | date:'y'} }}

src/app/footer/footer.component.scss

@@ -2,6 +2,7 @@
 $footer-bg: $gray-100;
 $footer-border: 1px solid darken($footer-bg, 10%);
 $footer-padding: $spacer * 1.5;
+$footer-logo-height: 55px;
 
 .footer {
   background-color: $footer-bg;
@@ -12,4 +13,7 @@ $footer-padding: $spacer * 1.5;
   p {
     margin: 0;
   }
+  img {
+    height: $footer-logo-height;
+  }
 }