Merge pull request #58 from HSG-Library/develop

- switch to new dynamic alert bar (always on top, message from SharePoint)
- hide search result snippet

Author: d22

css/hsg-alert.css

@@ -1,12 +1,23 @@
-/* body::before {
-  content: "";
-  display: inline-block;
+body::before {
+  content: var(--alert-message, );
+  display: block;
+  overflow: hidden;
   background: #ff9cdb;
+  animation: slideInDown 0.2s ease-in-out forwards;
   text-align: center;
-  padding: 10px;
   width: 100%;
   font-weight: normal;
+  line-height: 45px;
   color: black;
+  height: 0;
 }
 
-*/
+@keyframes slideInDown {
+  from {
+    height: 0;
+  }
+
+  to {
+    height: 45px;
+  }
+}

css/hsg-before-body-alert.css

@@ -0,0 +1,7 @@
+/****************************************/
+/****** hide search result snippet ******/
+/****************************************/
+
+prm-snippet {
+	display: none;
+}

css/hsg-hide-search-result-snippet.css

@@ -1,10 +1,4 @@
 <md-content ng-controller="hsgHomeController as $ctrl">
-    <div class="ps_content md-padding" layout-gt-sm="row" layout-align="center start" flex="100">
-        <div flex-gt-sm="80" flex="100" layout="column">
-            <hsg-alert-message-component></hsg-alert-message-component>
-        </div>
-    </div>
-
     <div class="ps_content md-padding" layout-gt-sm="row" layout-align="center start" flex="100">
         <!-- column 1-->
         <div flex-gt-sm="40" flex="100" layout="column">

html/homepage/homepage_de.html

@@ -1,9 +1,4 @@
 <md-content ng-controller="hsgHomeController as $ctrl">
-    <div class="ps_content md-padding" layout-gt-sm="row" layout-align="center start" flex="100">
-        <div flex-gt-sm="80" flex="100" layout="column">
-            <hsg-alert-message-component></hsg-alert-message-component>
-        </div>
-    </div>
 
     <div class="ps_content md-padding" layout-gt-sm="row" layout-align="center start" flex="100">
         <!-- column 1-->

html/homepage/homepage_en.html

@@ -1,7 +1,6 @@
 
 import { hsgHowovpAfterModule } from './modules/alma-howovp-after/hsg-howovp-after.module';
 import { hsgHtgiSvcAfterModule } from './modules/alma-htgi-svc-after/hsg-htgi-svc-after.module';
-import { hsgAlertMessageModule } from './modules/hsg-alert-message/hsg-alert-message.module';
 import { hsgExceptionHandlerModule } from './modules/hsg-exception-handler/hsg-exception-handler.module';
 import { hsgHomeModule } from './modules/hsg-home/hsg-home.module';
 import { hsgPickupAnywhereFormAfterModule } from './modules/pickup-anywhere-form-after/hsg-pickup-anywhere-form-after.module';
@@ -46,11 +45,11 @@ import { hsgUnionCatalogLoginAfterModule } from './modules/prm-union-catalog-log
 import { hsgUserAreaExpandableAfterModule } from './modules/prm-user-area-expandable-after/hsg-user-ara-expandable-after.module';
 import { slspHttpInterceptPickupInformation } from './modules/slsp-http-intercept-pickup-information/slsp-http-intercept-pickup-information.module';
 import { slspHttpInterceptRequestsModule } from './modules/slsp-http-intercept-requests/slsp-http-intercept-requests.module';
+import { hsgExploreMainAfterModule } from './modules/prm-explore-main/hsg-explore-main-after.module';
 
 let app = angular.module('viewCustom', ['angularLoad']);
 
 app.requires.push(hsgHomeModule.name);
-app.requires.push(hsgAlertMessageModule.name);
 app.requires.push(hsgExceptionHandlerModule.name);
 app.requires.push(hsgHowovpAfterModule.name);
 app.requires.push(hsgHtgiSvcAfterModule.name);
@@ -60,6 +59,7 @@ app.requires.push(hsgAlmaViewerAfterModule.name);
 app.requires.push(hsgAlmaViewitAfterModule.name);
 app.requires.push(hsgAlmaViewitItemsAfterModule.name);
 app.requires.push(hsgCitationAfterModule.name);
+app.requires.push(hsgExploreMainAfterModule.name);
 app.requires.push(hsgFinesAfterModule.name);
 app.requires.push(hsgFavoritesEditLabelsMenuAfterModule.name);
 app.requires.push(hsgFullViewAfterModule.name);

js/main.js

@@ -0,0 +1,44 @@
+
+export class hsgAlertMessageController {
+
+	constructor($http, hsgTranslatorService, hsgAlertMessageConfig) {
+		this.$http = $http;
+		this.translator = hsgTranslatorService;
+		this.config = hsgAlertMessageConfig;
+		this.showMessage = false;
+		this.message = '';
+		this.fetchMessage();
+	}
+
+	fetchMessage() {
+		let url = this.config.messageUrl;
+		let requestBody = {
+			lang: this.translator.getLang()
+		};
+		let that = this;
+		this.$http.post(
+			url,
+			requestBody
+		).then(
+			function (successResponse) {
+				that.showMessage = false;
+				that.message = successResponse.data;
+				if (that.message && !/^\s+$/.test(that.message)) {
+					that.showMessage = true;
+					document.documentElement.style.setProperty('--alert-message', `"${that.message}"`);
+					return;
+				}
+				that.showMessage = false;
+				document.documentElement.style.setProperty('--alert-message', '');
+			},
+			function (errorResponse) {
+				that.showMessage = false;
+				let code = errorResponse.data.error.code;
+				let errorMessage = errorResponse.data.error.message;
+				throw new Error("Could not retrieve hsg alert message from '" + url + "'. Error: '" + code + "', '" + errorMessage + "'");
+			}
+		);
+	}
+}
+
+hsgAlertMessageController.$inject = ['$http', 'hsgTranslatorService', 'hsgAlertMessageConfig'];