From d530075139dfc78c5780fd64b3a71515815fa71b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Mon, 27 Jan 2020 16:07:11 +0100
Subject: [PATCH 01/30] Prepare Sprint 98 (closes #2495)

---
 pom.xml                                  | 2 +-
 src/main/webapp/scripts/app.constants.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1b5fe01067..f4c3ca2b65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>eu.dzhw.fdz.metadatamanagement</groupId>
     <artifactId>metadatamanagement</artifactId>
-    <version>1.0.97</version>
+    <version>1.0.98-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>metadatamanagement</name>
 
diff --git a/src/main/webapp/scripts/app.constants.js b/src/main/webapp/scripts/app.constants.js
index d073f402ce..ddb720aab7 100644
--- a/src/main/webapp/scripts/app.constants.js
+++ b/src/main/webapp/scripts/app.constants.js
@@ -6,7 +6,7 @@ angular.module('metadatamanagementApp')
 
 .constant('ENV', 'local')
 
-.constant('VERSION', '1.0.97')
+.constant('VERSION', '1.0.98-SNAPSHOT')
 
 .constant('ElasticSearchProperties', {apiVersion:'7.3',logLevel:'error',pageSize:10})
 

From d2f6844cf4fdbf3676b2df8f1d24b2ffd347ae2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Tue, 28 Jan 2020 12:43:17 +0100
Subject: [PATCH 02/30] Fix broken links in highlighted stata scripts (#2445)

---
 .../directives/create-variable-links.directive.js        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/scripts/variablemanagement/directives/create-variable-links.directive.js b/src/main/webapp/scripts/variablemanagement/directives/create-variable-links.directive.js
index a2f745945d..a0eac092b0 100644
--- a/src/main/webapp/scripts/variablemanagement/directives/create-variable-links.directive.js
+++ b/src/main/webapp/scripts/variablemanagement/directives/create-variable-links.directive.js
@@ -6,7 +6,7 @@
  and filter expressions. Currently only STATA syntax is supported.
 */
 angular.module('metadatamanagementApp').directive('createVariableLinks',
-    function($timeout, $compile, $log) {
+    function($timeout, $compile, $log, ProjectReleaseService) {
         var variableNameRegex = /([_A-Za-z][_A-Za-z0-9]{2,})/g;
         // STATA keywords, copied from highlightjs sources
         //jscs:disable
@@ -46,9 +46,12 @@ angular.module('metadatamanagementApp').directive('createVariableLinks',
             var currentLanguage = scope.createVariableLinks.currentLanguage;
             if (scope.hljsLanguage.toUpperCase() === 'STATA') {
               var substitution = '<a href="#!/' + currentLanguage +
-                  '/variables/var-' + currentVariable.dataAcquisitionProjectId +
+                  '/variables/var-' + ProjectReleaseService.stripVersionSuffix(
+                    currentVariable.dataAcquisitionProjectId) +
                   '-ds' + currentVariable.dataSetNumber +
-                  '-$1\$"><md-tooltip md-autohide="true" md-z-index=' +
+                  '-$1\$' + (currentVariable.shadow ? '?version=' +
+                  currentVariable.release.version + '"' : '"') +
+                  '><md-tooltip md-autohide="true" md-z-index=' +
                   '"bowser.mobile || bowser.tablet ? -100 : 100001">' +
                   linkTooltip[currentLanguage] + '</md-tooltip>$1</a>';
               $timeout(function() {

From 327efdae628c8da1a18029d26e7fad0dc6d3a0be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Tue, 28 Jan 2020 15:55:50 +0100
Subject: [PATCH 03/30] Add info buttons and fake modals (#2460)

---
 .../components/fdz/dataPacket-theme.scss      | 13 +++-
 src/main/webapp/assets/styles/fdz.css         | 12 ++-
 .../detail-component-controller.js            | 29 ++++++-
 .../components/configurator/detail.html.tmpl  | 76 +++++++++----------
 .../configuration/translations-de.js          |  4 +-
 .../configuration/translations-en.js          |  4 +-
 6 files changed, 91 insertions(+), 47 deletions(-)

diff --git a/src/main/scss/fdz-theme/components/fdz/dataPacket-theme.scss b/src/main/scss/fdz-theme/components/fdz/dataPacket-theme.scss
index d0e31d48ab..4e9b7f04f0 100644
--- a/src/main/scss/fdz-theme/components/fdz/dataPacket-theme.scss
+++ b/src/main/scss/fdz-theme/components/fdz/dataPacket-theme.scss
@@ -40,7 +40,7 @@
     & md-select {
       margin: 0;
       width: 100%;
-
+      display: block;
     }
 
     & h5 {
@@ -55,6 +55,15 @@
         overflow-wrap: break-word;
         word-wrap: break-word;
       }
+      div {
+        flex-direction: row;
+        display: flex;
+        flex: 1 1 auto;
+        .md-button {
+          margin: -4px 6px;
+          height: 32px;
+        }
+      }
     }
     @include rwd(375) {
       flex-flow: row;
@@ -68,7 +77,7 @@
         word-break: break-all;
       }
     }
-    & .md-button {
+    & .md-button.md-raised.md-accent {
       margin-left: 0;
       margin-top: 16px;
       text-transform: none;
diff --git a/src/main/webapp/assets/styles/fdz.css b/src/main/webapp/assets/styles/fdz.css
index ad13e8b4eb..b14ef8b845 100644
--- a/src/main/webapp/assets/styles/fdz.css
+++ b/src/main/webapp/assets/styles/fdz.css
@@ -2408,7 +2408,8 @@ tr:focus {
     margin-bottom: 8px; }
     .fdz-theme .fdz-data-packet md-list-item md-select {
       margin: 0;
-      width: 100%; }
+      width: 100%;
+      display: block; }
     .fdz-theme .fdz-data-packet md-list-item h5 {
       width: 100%; }
     .fdz-theme .fdz-data-packet md-list-item .md-secondary-container {
@@ -2418,6 +2419,13 @@ tr:focus {
       .fdz-theme .fdz-data-packet md-list-item .md-secondary-container > span {
         overflow-wrap: break-word;
         word-wrap: break-word; }
+      .fdz-theme .fdz-data-packet md-list-item .md-secondary-container div {
+        flex-direction: row;
+        display: flex;
+        flex: 1 1 auto; }
+        .fdz-theme .fdz-data-packet md-list-item .md-secondary-container div .md-button {
+          margin: -4px 6px;
+          height: 32px; }
     @media (min-width: 375px) {
       .fdz-theme .fdz-data-packet md-list-item {
         flex-flow: row;
@@ -2428,7 +2436,7 @@ tr:focus {
           width: 190px;
           overflow: hidden;
           word-break: break-all; } }
-    .fdz-theme .fdz-data-packet md-list-item .md-button {
+    .fdz-theme .fdz-data-packet md-list-item .md-button.md-raised.md-accent {
       margin-left: 0;
       margin-top: 16px;
       text-transform: none;
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/detail-component-controller.js b/src/main/webapp/scripts/ordermanagement/components/configurator/detail-component-controller.js
index 610bed3676..5c1e07462d 100644
--- a/src/main/webapp/scripts/ordermanagement/components/configurator/detail-component-controller.js
+++ b/src/main/webapp/scripts/ordermanagement/components/configurator/detail-component-controller.js
@@ -13,7 +13,7 @@
                                 ShoppingCartService,
                                 MessageBus,
                                 StudySearchService,
-                                StudyAccessWaysResource) {
+                                StudyAccessWaysResource, $mdDialog) {
     var $ctrl = this;
     var initReady = false;
     $ctrl.studyIdVersion = {};
@@ -154,6 +154,33 @@
           init();
         }
       }, true);
+
+    $ctrl.showVersionHelp = function($event) {
+      $mdDialog.show($mdDialog.alert()
+        .clickOutsideToClose(true)
+        .title('Version auswählen')
+        .textContent('Sie müssen sich für eine konkrete Version der Daten ' +
+        'entscheiden...')
+        .ariaLabel('Version auswählen')
+        .ok('Ok')
+        .fullscreen(true)
+        .targetEvent($event)
+      );
+      console.log('help version');
+    };
+
+    $ctrl.showAccessWayHelp = function($event) {
+      $mdDialog.show($mdDialog.alert()
+        .clickOutsideToClose(true)
+        .title('Zugangsweg auswählen')
+        .textContent('Sie müssen festlegen, wie Sie mit den Daten arbeiten ' +
+        'wollen...')
+        .ariaLabel('Zugangsweg auswählen')
+        .ok('Ok')
+        .fullscreen(true)
+        .targetEvent($event)
+      );
+    };
   }
 
   angular
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/detail.html.tmpl b/src/main/webapp/scripts/ordermanagement/components/configurator/detail.html.tmpl
index 418244ef0c..516a9be723 100644
--- a/src/main/webapp/scripts/ordermanagement/components/configurator/detail.html.tmpl
+++ b/src/main/webapp/scripts/ordermanagement/components/configurator/detail.html.tmpl
@@ -2,7 +2,7 @@
   <md-card-header>
     <md-card-header-text>
       <a ui-sref="studyDetail({id: $ctrl.studyIdVersion.masterId, version: $ctrl.studyIdVersion.version})" class="title">
-      {{$ctrl.study.title[$ctrl.lang]}}
+        {{$ctrl.study.title[$ctrl.lang]}}
       </a>
     </md-card-header-text>
   </md-card-header>
@@ -10,70 +10,66 @@
     <md-list class="">
       <md-list-item ng-if="$ctrl.study.surveyPeriod.start">
         <h5>{{'study-management.detail.label.survey-period' | translate }}:</h5>
-        <span
-          class="md-secondary">
+        <span class="md-secondary">
           {{($ctrl.study.surveyPeriod.start | date:'mediumDate')}} - {{($ctrl.study.surveyPeriod.end | date:'mediumDate')}}
-          </span>
+        </span>
       </md-list-item>
       <md-list-item ng-if="$ctrl.study.surveyDesign.en==='Panel' && $ctrl.study.numberOfWaves > 0">
         <h5>{{'study-management.detail.label.wave' | translate }}:</h5>
-        <span
-          class="md-secondary">
-            {{$ctrl.study.numberOfWaves}}
-          </span>
+        <span class="md-secondary">
+          {{$ctrl.study.numberOfWaves}}
+        </span>
       </md-list-item>
       <md-list-item ng-if="$ctrl.study.surveyDataTypes && $ctrl.study.surveyDataTypes.length > 0">
         <h5>{{'study-management.detail.label.survey-data-type' | translate }}:</h5>
-        <span
-          class="md-secondary">
-          <span
-            ng-repeat="dataType in $ctrl.study.surveyDataTypes">
+        <span class="md-secondary">
+          <span ng-repeat="dataType in $ctrl.study.surveyDataTypes">
             {{dataType[$ctrl.lang]}}{{!$last?'; ':''}}</span>
         </span>
       </md-list-item>
       <md-list-item ng-if="$ctrl.study.doi">
         <h5>{{'study-management.detail.label.doi' | translate }}:</h5>
-        <span
-          class="md-secondary">{{$ctrl.study.doi}}</span>
+        <span class="md-secondary">{{$ctrl.study.doi}}</span>
       </md-list-item>
       <md-list-item ng-if="$ctrl.study.release.firstDate">
         <h5>{{'study-management.detail.label.published' | translate }}:</h5>
-        <span
-          class="md-secondary">{{$ctrl.study.release.firstDate + 'Z' | date:'mediumDate'}}</span>
+        <span class="md-secondary">{{$ctrl.study.release.firstDate + 'Z' | date:'mediumDate'}}</span>
       </md-list-item>
       <md-list-item ng-if="$ctrl.releases.length > 0">
         <h5>{{'search-management.detail.versions' | translate }}:</h5>
-          <md-select
-            class="md-secondary"
-            name="version"
-            ng-model="$ctrl.selectedVersion"
-            ng-disabled="$ctrl.disabled"
-            aria-label="{{'search-management.detail.versions' | translate }}">
-            <md-optgroup
-              label="{{'shopping-cart.detail.label.available-versions' | translate}}">
-              <md-option
-                ng-repeat="item in $ctrl.releases"
-                ng-value="item.version">
+        <div class="md-secondary">
+          <md-select name="version" ng-model="$ctrl.selectedVersion" ng-disabled="$ctrl.disabled" aria-label="{{'search-management.detail.versions' | translate }}">
+            <md-optgroup label="{{'shopping-cart.detail.label.available-versions' | translate}}">
+              <md-option ng-repeat="item in $ctrl.releases" ng-value="item.version">
                 {{item.version}}{{$first?' (' + ('shopping-cart.detail.label.current' | translate) + ')':''}}</md-option>
-              </md-optgroup>
+            </md-optgroup>
           </md-select>
+          <md-button class="md-icon-button md-primary" ng-click="$ctrl.showVersionHelp($event)">
+            <md-icon>info</md-icon>
+            <md-tooltip md-direction="top" md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
+              {{'shopping-cart.buttons.data-package-version-tooltip' | translate}}
+            </md-tooltip>
+          </md-button>
+        </div>
       </md-list-item>
       <md-list-item ng-if="$ctrl.accessWays.length > 0">
         <h5>{{'search-management.detail.access-ways' | translate}}:</h5>
-        <md-select
-          class="md-secondary"
-          name="accessWay"
-          ng-model="$ctrl.selectedAccessWay"
-          aria-label="{{'search-management.detail.access-ways' | translate}}">
-          <md-optgroup label="{{'shopping-cart.detail.label.available-access-ways' | translate}}">
-            <md-option ng-repeat="item in $ctrl.accessWays" ng-value="item">{{item}}</md-option>
-          </md-optgroup>
-        </md-select>
+        <div class="md-secondary">
+          <md-select name="accessWay" ng-model="$ctrl.selectedAccessWay" aria-label="{{'search-management.detail.access-ways' | translate}}">
+            <md-optgroup label="{{'shopping-cart.detail.label.available-access-ways' | translate}}">
+              <md-option ng-repeat="item in $ctrl.accessWays" ng-value="item">{{item}}</md-option>
+            </md-optgroup>
+          </md-select>
+          <md-button class="md-icon-button md-primary" ng-click="$ctrl.showAccessWayHelp($event)">
+            <md-icon>info</md-icon>
+            <md-tooltip md-direction="top" md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
+              {{'shopping-cart.buttons.data-package-access-way-tooltip' | translate}}
+            </md-tooltip>
+          </md-button>
+        </div>
       </md-list-item>
       <md-list-item ng-if="$ctrl.releases.length > 0 && $ctrl.accessWays.length > 0">
-        <md-button
-          class="md-small md-raised md-accent fdz-truncate-string"
-          ng-click="$ctrl.addToShoppingCart()"
+        <md-button class="md-small md-raised md-accent fdz-truncate-string" ng-click="$ctrl.addToShoppingCart()"
           ng-disabled="!$ctrl.selectedAccessWay || !$ctrl.selectedVersion || $ctrl.noFinalRelease || $ctrl.variableNotAccessible || $ctrl.dataNotAvailable">
           <md-tooltip md-direction="top" md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
             {{'shopping-cart.buttons.add-study-tooltip' | translate}}
diff --git a/src/main/webapp/scripts/ordermanagement/configuration/translations-de.js b/src/main/webapp/scripts/ordermanagement/configuration/translations-de.js
index a2e4cdaf33..99d9800c36 100644
--- a/src/main/webapp/scripts/ordermanagement/configuration/translations-de.js
+++ b/src/main/webapp/scripts/ordermanagement/configuration/translations-de.js
@@ -80,7 +80,9 @@ angular.module('metadatamanagementApp').config(
           'remove-all-tooltip': 'Klicken, um alle Datenpakete aus dem Einkaufswagen zu entfernen.',
           'delete-product-tooltip': 'Klicken, um das Datenpaket aus dem Einkaufswagen zu entfernen.',
           'open-cart-tooltip': 'Klicken, um die Inhalte des Einkaufswagens anzuzeigen.',
-          'close-tooltip': 'Klicken, um die Produktauswahl zu verlassen.'
+          'close-tooltip': 'Klicken, um die Produktauswahl zu verlassen.',
+          'data-package-version-tooltip': 'Klicken, um weitere Informationen zur Version von Datenpaketen zu erhalten.',
+          'data-package-access-way-tooltip': 'Klicken, um weitere Informationen zu Zugangswegen zu erhalten.'
         }
       }
       //jscs:enable
diff --git a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
index c75b3ee2bc..24b289b515 100644
--- a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
+++ b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
@@ -80,7 +80,9 @@ angular.module('metadatamanagementApp').config(
           'remove-all-tooltip': 'Click to remove all packages from the shopping cart.',
           'delete-product-tooltip': 'Click to remove the package from the shopping cart.',
           'open-cart-tooltip': 'Click to show the contents of the shopping cart.',
-          'close-tooltip': 'Click to close the package selection.'
+          'close-tooltip': 'Click to close the package selection.',
+          'data-package-version-tooltip': 'Click to get more information about versions of data packages',
+          'data-package-access-way-tooltip': 'Click to get more information about access ways'
         }
       }
       //jscs:enable

From a2e9308be9b9c85a1ccd0365770fbb63eb00becc Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Sat, 1 Feb 2020 05:18:05 +0000
Subject: [PATCH 04/30] fix: package.json & package-lock.json to reduce
 vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-DOTPROP-543489
---
 package-lock.json | 304 ++++++++++++++++++++++++----------------------
 package.json      |   2 +-
 2 files changed, 158 insertions(+), 148 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4e74942374..5c7812319a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -327,6 +327,37 @@
         "lodash": "^4.17.13"
       }
     },
+    "@snyk/configstore": {
+      "version": "3.2.0-rc1",
+      "resolved": "https://registry.npmjs.org/@snyk/configstore/-/configstore-3.2.0-rc1.tgz",
+      "integrity": "sha512-CV3QggFY8BY3u8PdSSlUGLibqbqCG1zJRmGM2DhnhcxQDRRPTGTP//l7vJphOVsUP1Oe23+UQsj7KRWpRUZiqg==",
+      "dev": true,
+      "requires": {
+        "dot-prop": "^5.2.0",
+        "graceful-fs": "^4.1.2",
+        "make-dir": "^1.0.0",
+        "unique-string": "^1.0.0",
+        "write-file-atomic": "^2.0.0",
+        "xdg-basedir": "^3.0.0"
+      },
+      "dependencies": {
+        "make-dir": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
+      }
+    },
     "@snyk/dep-graph": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.13.1.tgz",
@@ -408,6 +439,24 @@
         }
       }
     },
+    "@snyk/update-notifier": {
+      "version": "2.5.1-rc1",
+      "resolved": "https://registry.npmjs.org/@snyk/update-notifier/-/update-notifier-2.5.1-rc1.tgz",
+      "integrity": "sha512-cIK+dMUsXBl4K9AKg5EYhdxWts0tAUvyu1WePse+tjzX4E9poME/wojkDrWQl1/SKLlhA559ftiOODmVa1adCg==",
+      "dev": true,
+      "requires": {
+        "@snyk/configstore": "3.2.0-rc1",
+        "boxen": "^1.2.1",
+        "chalk": "^2.0.1",
+        "import-lazy": "^2.1.0",
+        "is-ci": "^1.0.10",
+        "is-installed-globally": "^0.1.0",
+        "is-npm": "^1.0.0",
+        "latest-version": "^3.0.0",
+        "semver-diff": "^2.0.0",
+        "xdg-basedir": "^3.0.0"
+      }
+    },
     "@turf/area": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/@turf/area/-/area-6.0.1.tgz",
@@ -476,9 +525,9 @@
       "dev": true
     },
     "@types/js-yaml": {
-      "version": "3.12.1",
-      "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.1.tgz",
-      "integrity": "sha512-SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA==",
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.2.tgz",
+      "integrity": "sha512-0CFu/g4mDSNkodVwWijdlr8jH7RoplRWNgovjFLEZeT+QEbbZXjBmCe3HwaWheAlCbHwomTwzZoSedeOycABug==",
       "dev": true
     },
     "@types/minimatch": {
@@ -488,9 +537,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "13.1.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.8.tgz",
-      "integrity": "sha512-6XzyyNM9EKQW4HKuzbo/CkOIjn/evtCmsU+MUM1xDfJ+3/rNjBttM1NgN7AOQvN6tP1Sl1D1PIKMreTArnxM9A==",
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.0.tgz",
+      "integrity": "sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==",
       "dev": true
     },
     "@types/q": {
@@ -2557,37 +2606,6 @@
         "proto-list": "~1.2.1"
       }
     },
-    "configstore": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
-      "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
-      "dev": true,
-      "requires": {
-        "dot-prop": "^4.1.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^1.0.0",
-        "unique-string": "^1.0.0",
-        "write-file-atomic": "^2.0.0",
-        "xdg-basedir": "^3.0.0"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-          "dev": true,
-          "requires": {
-            "pify": "^3.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        }
-      }
-    },
     "connect": {
       "version": "3.6.6",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
@@ -3250,9 +3268,9 @@
       "dev": true
     },
     "dockerfile-ast": {
-      "version": "0.0.16",
-      "resolved": "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.16.tgz",
-      "integrity": "sha512-+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw==",
+      "version": "0.0.18",
+      "resolved": "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.18.tgz",
+      "integrity": "sha512-SEp95qCox1KAzf8BBtjHoBDD0a7/eNlZJ6fgDf9RxqeSEDwLuEN9YjdZ/tRlkrYLxXR4i+kqZzS4eDRSqs8VKQ==",
       "dev": true,
       "requires": {
         "vscode-languageserver-types": "^3.5.0"
@@ -3320,12 +3338,20 @@
       }
     },
     "dot-prop": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz",
+      "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==",
       "dev": true,
       "requires": {
-        "is-obj": "^1.0.0"
+        "is-obj": "^2.0.0"
+      },
+      "dependencies": {
+        "is-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+          "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+          "dev": true
+        }
       }
     },
     "dotignore": {
@@ -3863,6 +3889,15 @@
       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
       "dev": true
     },
+    "event-loop-spinner": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/event-loop-spinner/-/event-loop-spinner-1.1.0.tgz",
+      "integrity": "sha512-YVFs6dPpZIgH665kKckDktEVvSBccSYJmoZUfhNUdv5d3Xv+Q+SKF4Xis1jolq9aBzuW1ZZhQh/m/zU/TPdDhw==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.10.0"
+      }
+    },
     "event-stream": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
@@ -3915,13 +3950,13 @@
       }
     },
     "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "dev": true,
       "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
         "is-stream": "^1.1.0",
         "npm-run-path": "^2.0.0",
         "p-finally": "^1.0.0",
@@ -3930,14 +3965,12 @@
       },
       "dependencies": {
         "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "dev": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
+            "lru-cache": "^4.0.1",
             "shebang-command": "^1.2.0",
             "which": "^1.2.9"
           }
@@ -5280,13 +5313,10 @@
       "dev": true
     },
     "get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "requires": {
-        "pump": "^3.0.0"
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true
     },
     "get-uri": {
       "version": "2.0.4",
@@ -6137,14 +6167,6 @@
         "timed-out": "^4.0.0",
         "unzip-response": "^2.0.1",
         "url-parse-lax": "^1.0.0"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true
-        }
       }
     },
     "graceful-fs": {
@@ -12591,22 +12613,23 @@
       }
     },
     "snyk": {
-      "version": "1.279.0",
-      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.279.0.tgz",
-      "integrity": "sha512-LUy3S5msS0+1XXyBqLVHUWhunnWVpD9ClujLA90wYH/WOdjSfqd9YwLI8qH9a1c7hWhizqKR/Kmzm2/KosfHYA==",
+      "version": "1.290.1",
+      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.290.1.tgz",
+      "integrity": "sha512-8fB+b+trI5a6mU5cAKXOU2RG15xxr++4zYxkfNpkFkhbUqkcLsJtXD4H7Pcs6vXcOvoiEafyziPTpYurPFDXBQ==",
       "dev": true,
       "requires": {
         "@snyk/cli-interface": "2.3.0",
+        "@snyk/configstore": "^3.2.0-rc1",
         "@snyk/dep-graph": "1.13.1",
         "@snyk/gemfile": "1.2.0",
         "@snyk/snyk-cocoapods-plugin": "2.0.1",
+        "@snyk/update-notifier": "^2.5.1-rc1",
         "@types/agent-base": "^4.2.0",
         "@types/restify": "^4.3.6",
         "abbrev": "^1.1.1",
         "ansi-escapes": "3.2.0",
         "chalk": "^2.4.2",
         "cli-spinner": "0.2.10",
-        "configstore": "^3.1.2",
         "debug": "^3.1.0",
         "diff": "^4.0.1",
         "git-url-parse": "11.1.2",
@@ -12620,16 +12643,16 @@
         "proxy-from-env": "^1.0.0",
         "semver": "^6.0.0",
         "snyk-config": "^2.2.1",
-        "snyk-docker-plugin": "1.33.1",
+        "snyk-docker-plugin": "1.38.0",
         "snyk-go-plugin": "1.11.1",
         "snyk-gradle-plugin": "3.2.4",
         "snyk-module": "1.9.1",
-        "snyk-mvn-plugin": "2.7.0",
+        "snyk-mvn-plugin": "2.8.0",
         "snyk-nodejs-lockfile-parser": "1.17.0",
         "snyk-nuget-plugin": "1.16.0",
         "snyk-php-plugin": "1.7.0",
         "snyk-policy": "1.13.5",
-        "snyk-python-plugin": "1.16.0",
+        "snyk-python-plugin": "1.17.0",
         "snyk-resolve": "1.0.1",
         "snyk-resolve-deps": "4.4.0",
         "snyk-sbt-plugin": "2.11.0",
@@ -12639,7 +12662,6 @@
         "strip-ansi": "^5.2.0",
         "tempfile": "^2.0.0",
         "then-fs": "^2.0.0",
-        "update-notifier": "^2.5.0",
         "uuid": "^3.3.2",
         "wrap-ansi": "^5.1.0"
       },
@@ -12862,13 +12884,14 @@
       }
     },
     "snyk-docker-plugin": {
-      "version": "1.33.1",
-      "resolved": "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.33.1.tgz",
-      "integrity": "sha512-xfs3DN1tPMTh6J8x2341wGK4HRr+pI5+i/YRuRmsslnBnwk/DkKYcbt8zOIWk6kzMoW8vo+9LqqXBQO/24szKg==",
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.38.0.tgz",
+      "integrity": "sha512-43HbJj6QatuL2BNG+Uq2Taa73wdfSQSID8FJWW4q5/LYgd9D+RtdiE4lAMwxqYYbvThU9uuza4epuF/B1CAlYw==",
       "dev": true,
       "requires": {
         "debug": "^4.1.1",
-        "dockerfile-ast": "0.0.16",
+        "dockerfile-ast": "0.0.18",
+        "event-loop-spinner": "^1.1.0",
         "semver": "^6.1.0",
         "tar-stream": "^2.1.0",
         "tslib": "^1"
@@ -12961,12 +12984,12 @@
       }
     },
     "snyk-mvn-plugin": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.7.0.tgz",
-      "integrity": "sha512-DLBt+6ZvtoleXE7Si3wAa6gdPSWsXdIQEY6m2zW2InN9WiaRwIEKMCY822eFmRPZVNNmZNRUIeQsoHZwv/slqQ==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.8.0.tgz",
+      "integrity": "sha512-Jt6lsVOFOYj7rp0H2IWz/BZS9xxaO0jEFTAoafLCocJIWWuGhPpVocCqmh/hrYAdKY9gS4gVOViMJ3EvcC1r1Q==",
       "dev": true,
       "requires": {
-        "@snyk/cli-interface": "2.2.0",
+        "@snyk/cli-interface": "2.3.1",
         "debug": "^4.1.1",
         "lodash": "^4.17.15",
         "needle": "^2.4.0",
@@ -12975,9 +12998,9 @@
       },
       "dependencies": {
         "@snyk/cli-interface": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.2.0.tgz",
-          "integrity": "sha512-sA7V2JhgqJB9z5uYotgQc5iNDv//y+Mdm39rANxmFjtZMSYJZHkP80arzPjw1mB5ni/sWec7ieYUUFeySZBfVg==",
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.1.tgz",
+          "integrity": "sha512-JZvsmhDXSyjv1dkc12lPI3tNTNYlIaOiIQMYFg2RgqF3QmWjTyBUgRZcF7LoKyufHtS4dIudM6k1aHBpSaDrhw==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.3"
@@ -13120,9 +13143,9 @@
       }
     },
     "snyk-python-plugin": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.16.0.tgz",
-      "integrity": "sha512-IA53xOcy1s881tbIrIXNqIuCNozd4PAVWN8oF0xgRn2NQbq0e7EWt7kFPJbmZodpLCDpXaKKqV2MHbXruFIsrw==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.17.0.tgz",
+      "integrity": "sha512-EKdVOUlvhiVpXA5TeW8vyxYVqbITAfT+2AbL2ZRiiUNLP5ae+WiNYaPy7aB5HAS9IKBKih+IH8Ag65Xu1IYSYA==",
       "dev": true,
       "requires": {
         "@snyk/cli-interface": "^2.0.3",
@@ -14469,40 +14492,6 @@
       "dev": true,
       "requires": {
         "execa": "^0.7.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true
-        }
       }
     },
     "text-cache": {
@@ -15199,24 +15188,6 @@
       "resolved": "https://registry.npmjs.org/update-diff/-/update-diff-1.1.0.tgz",
       "integrity": "sha1-9RAYLYHugZ+4LDprIrYrve2ngI8="
     },
-    "update-notifier": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
-      "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
-      "dev": true,
-      "requires": {
-        "boxen": "^1.2.1",
-        "chalk": "^2.0.1",
-        "configstore": "^3.0.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^1.0.10",
-        "is-installed-globally": "^0.1.0",
-        "is-npm": "^1.0.0",
-        "latest-version": "^3.0.0",
-        "semver-diff": "^2.0.0",
-        "xdg-basedir": "^3.0.0"
-      }
-    },
     "upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -15520,9 +15491,9 @@
       }
     },
     "vscode-languageserver-types": {
-      "version": "3.15.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0.tgz",
-      "integrity": "sha512-AXteNagMhBWnZ6gNN0UB4HTiD/7TajgfHl6jaM6O7qz3zDJw0H3Jf83w05phihnBRCML+K6Ockh8f8bL0OObPw==",
+      "version": "3.15.1",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
+      "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==",
       "dev": true
     },
     "vt-pbf": {
@@ -15691,6 +15662,45 @@
       "dev": true,
       "requires": {
         "execa": "^1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        }
       }
     },
     "winston": {
diff --git a/package.json b/package.json
index cdedfe0d2c..fa36266cc8 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "node-sass": "4.13.1",
     "phantomjs-prebuilt": "2.1.16",
     "requirejs": "2.3",
-    "snyk": "^1.279.0",
+    "snyk": "^1.290.1",
     "tar": "5.0.5",
     "time-grunt": "2.0.0",
     "wiredep": "4.0.0",

From db9141347f3372f0c4238d209b567c9995d050df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Tue, 4 Feb 2020 13:37:47 +0100
Subject: [PATCH 05/30] Add text to dialogs (#2460)

---
 .../components/fdz/dataPacket-theme.scss      |  2 +-
 src/main/webapp/assets/styles/fdz.css         |  2 +-
 src/main/webapp/index.html                    |  2 +
 .../access-way-info.controller.js             | 12 ++++++
 .../configurator/access-way-info.html.tmpl    | 27 ++++++++++++++
 .../detail-component-controller.js            | 37 ++++++++-----------
 .../configurator/version-info.controller.js   | 12 ++++++
 .../configurator/version-info.html.tmpl       | 27 ++++++++++++++
 .../configuration/translations-de.js          |  9 +++++
 .../configuration/translations-en.js          |  9 +++++
 10 files changed, 116 insertions(+), 23 deletions(-)
 create mode 100644 src/main/webapp/scripts/ordermanagement/components/configurator/access-way-info.controller.js
 create mode 100644 src/main/webapp/scripts/ordermanagement/components/configurator/access-way-info.html.tmpl
 create mode 100644 src/main/webapp/scripts/ordermanagement/components/configurator/version-info.controller.js
 create mode 100644 src/main/webapp/scripts/ordermanagement/components/configurator/version-info.html.tmpl

diff --git a/src/main/scss/fdz-theme/components/fdz/dataPacket-theme.scss b/src/main/scss/fdz-theme/components/fdz/dataPacket-theme.scss
index 4e9b7f04f0..15a7ac702f 100644
--- a/src/main/scss/fdz-theme/components/fdz/dataPacket-theme.scss
+++ b/src/main/scss/fdz-theme/components/fdz/dataPacket-theme.scss
@@ -60,7 +60,7 @@
         display: flex;
         flex: 1 1 auto;
         .md-button {
-          margin: -4px 6px;
+          margin: -4px 0px -6px 6px;
           height: 32px;
         }
       }
diff --git a/src/main/webapp/assets/styles/fdz.css b/src/main/webapp/assets/styles/fdz.css
index b14ef8b845..8b9a82a0df 100644
--- a/src/main/webapp/assets/styles/fdz.css
+++ b/src/main/webapp/assets/styles/fdz.css
@@ -2424,7 +2424,7 @@ tr:focus {
         display: flex;
         flex: 1 1 auto; }
         .fdz-theme .fdz-data-packet md-list-item .md-secondary-container div .md-button {
-          margin: -4px 6px;
+          margin: -4px 0px -6px 6px;
           height: 32px; }
     @media (min-width: 375px) {
       .fdz-theme .fdz-data-packet md-list-item {
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index a443c00a42..dd65d323be 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -551,6 +551,8 @@
 <script src="scripts/ordermanagement/services/shoppingCart.service.js"></script>
 <script src="scripts/ordermanagement/resources/order.resource.js"></script>
 <script src="scripts/ordermanagement/components/configurator/detail-component.js"></script>
+<script src="scripts/ordermanagement/components/configurator/version-info.controller.js"></script>
+<script src="scripts/ordermanagement/components/configurator/access-way-info.controller.js"></script>
 <script src="scripts/ordermanagement/components/configurator/detail-component-controller.js"></script>
 
 <script src="scripts/conceptmanagement/configuration/concept.js"></script>
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/access-way-info.controller.js b/src/main/webapp/scripts/ordermanagement/components/configurator/access-way-info.controller.js
new file mode 100644
index 0000000000..7262032854
--- /dev/null
+++ b/src/main/webapp/scripts/ordermanagement/components/configurator/access-way-info.controller.js
@@ -0,0 +1,12 @@
+/* global bowser */
+'use strict';
+
+angular.module('metadatamanagementApp')
+    .controller('AccessWayInfoController',
+        function($scope, $mdDialog) {
+          $scope.bowser = bowser;
+
+          $scope.closeDialog = function() {
+            $mdDialog.cancel();
+          };
+        });
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/access-way-info.html.tmpl b/src/main/webapp/scripts/ordermanagement/components/configurator/access-way-info.html.tmpl
new file mode 100644
index 0000000000..ecd5beb5b7
--- /dev/null
+++ b/src/main/webapp/scripts/ordermanagement/components/configurator/access-way-info.html.tmpl
@@ -0,0 +1,27 @@
+<md-dialog aria-label="{{'shopping-cart.access-way-info.title' | translate}}" layout="column" class="ms-flex" flex="50">
+    <md-toolbar>
+        <div class="md-toolbar-tools" layout="row" layout-align="space-between center">
+            <h2 class="fdz-truncate-string">
+                <span>{{'shopping-cart.access-way-info.title' | translate}}</span>
+            </h2>
+            <md-button class="md-icon-button" ng-click="closeDialog()">
+                <md-icon md-font-set="material-icons">clear</md-icon>
+                <md-tooltip md-direction="top" md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 1000001">
+                    {{'shopping-cart.version-info.close-tooltip' | translate }}
+                </md-tooltip>
+            </md-button>
+        </div>
+    </md-toolbar>
+  <md-divider></md-divider>
+    <md-dialog-content layout-padding flex layout="column" class="ms-flex" data-translate="shopping-cart.access-way-info.content">
+
+    </md-dialog-content>
+    <md-dialog-actions layout="row">
+        <md-button class="md-primary" ng-click="closeDialog()">
+            <span>{{'global.entity.action.ok' | translate}}</span>
+            <md-tooltip md-direction="left" md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 1000001">
+                {{'shopping-cart.version-info.close-tooltip' | translate }}
+            </md-tooltip>
+        </md-button>
+    </md-dialog-actions>
+</md-dialog>
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/detail-component-controller.js b/src/main/webapp/scripts/ordermanagement/components/configurator/detail-component-controller.js
index 5c1e07462d..fdf24fedea 100644
--- a/src/main/webapp/scripts/ordermanagement/components/configurator/detail-component-controller.js
+++ b/src/main/webapp/scripts/ordermanagement/components/configurator/detail-component-controller.js
@@ -156,30 +156,25 @@
       }, true);
 
     $ctrl.showVersionHelp = function($event) {
-      $mdDialog.show($mdDialog.alert()
-        .clickOutsideToClose(true)
-        .title('Version auswählen')
-        .textContent('Sie müssen sich für eine konkrete Version der Daten ' +
-        'entscheiden...')
-        .ariaLabel('Version auswählen')
-        .ok('Ok')
-        .fullscreen(true)
-        .targetEvent($event)
-      );
-      console.log('help version');
+      $mdDialog.show({
+        controller: 'VersionInfoController',
+        templateUrl: 'scripts/ordermanagement/components/configurator/' +
+            'version-info.html.tmpl',
+        clickOutsideToClose: true,
+        fullscreen: true,
+        targetEvent: $event
+      });
     };
 
     $ctrl.showAccessWayHelp = function($event) {
-      $mdDialog.show($mdDialog.alert()
-        .clickOutsideToClose(true)
-        .title('Zugangsweg auswählen')
-        .textContent('Sie müssen festlegen, wie Sie mit den Daten arbeiten ' +
-        'wollen...')
-        .ariaLabel('Zugangsweg auswählen')
-        .ok('Ok')
-        .fullscreen(true)
-        .targetEvent($event)
-      );
+      $mdDialog.show({
+        controller: 'AccessWayInfoController',
+        templateUrl: 'scripts/ordermanagement/components/configurator/' +
+            'access-way-info.html.tmpl',
+        clickOutsideToClose: true,
+        fullscreen: true,
+        targetEvent: $event
+      });
     };
   }
 
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/version-info.controller.js b/src/main/webapp/scripts/ordermanagement/components/configurator/version-info.controller.js
new file mode 100644
index 0000000000..42b049db3c
--- /dev/null
+++ b/src/main/webapp/scripts/ordermanagement/components/configurator/version-info.controller.js
@@ -0,0 +1,12 @@
+/* global bowser */
+'use strict';
+
+angular.module('metadatamanagementApp')
+    .controller('VersionInfoController',
+        function($scope, $mdDialog) {
+          $scope.bowser = bowser;
+
+          $scope.closeDialog = function() {
+            $mdDialog.cancel();
+          };
+        });
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/version-info.html.tmpl b/src/main/webapp/scripts/ordermanagement/components/configurator/version-info.html.tmpl
new file mode 100644
index 0000000000..dbd588c378
--- /dev/null
+++ b/src/main/webapp/scripts/ordermanagement/components/configurator/version-info.html.tmpl
@@ -0,0 +1,27 @@
+<md-dialog aria-label="{{'shopping-cart.version-info.title' | translate}}" layout="column" class="ms-flex" flex="50">
+    <md-toolbar>
+        <div class="md-toolbar-tools" layout="row" layout-align="space-between center">
+            <h2 class="fdz-truncate-string">
+                <span>{{'shopping-cart.version-info.title' | translate}}</span>
+            </h2>
+            <md-button class="md-icon-button" ng-click="closeDialog()">
+                <md-icon md-font-set="material-icons">clear</md-icon>
+                <md-tooltip md-direction="top" md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 1000001">
+                    {{'shopping-cart.version-info.close-tooltip' | translate }}
+                </md-tooltip>
+            </md-button>
+        </div>
+    </md-toolbar>
+  <md-divider></md-divider>
+    <md-dialog-content layout-padding flex layout="column" class="ms-flex" data-translate="shopping-cart.version-info.content">
+
+    </md-dialog-content>
+    <md-dialog-actions layout="row">
+        <md-button class="md-primary" ng-click="closeDialog()">
+            <span>{{'global.entity.action.ok' | translate}}</span>
+            <md-tooltip md-direction="left" md-autohide="true" md-z-index="bowser.mobile || bowser.tablet ? -100 : 1000001">
+                {{'shopping-cart.version-info.close-tooltip' | translate }}
+            </md-tooltip>
+        </md-button>
+    </md-dialog-actions>
+</md-dialog>
diff --git a/src/main/webapp/scripts/ordermanagement/configuration/translations-de.js b/src/main/webapp/scripts/ordermanagement/configuration/translations-de.js
index 99d9800c36..3049fa5f34 100644
--- a/src/main/webapp/scripts/ordermanagement/configuration/translations-de.js
+++ b/src/main/webapp/scripts/ordermanagement/configuration/translations-de.js
@@ -83,6 +83,15 @@ angular.module('metadatamanagementApp').config(
           'close-tooltip': 'Klicken, um die Produktauswahl zu verlassen.',
           'data-package-version-tooltip': 'Klicken, um weitere Informationen zur Version von Datenpaketen zu erhalten.',
           'data-package-access-way-tooltip': 'Klicken, um weitere Informationen zu Zugangswegen zu erhalten.'
+        },
+        'version-info': {
+          'title': 'Eine Version auswählen',
+          'content': '<p style="margin-bottom: 0px;">Unsere Datenpakete liegen dreistellig versioniert vor. Die Stellen der Versionsnummer legen nahe, wie groß die Änderungen an den Daten sind. Bei Änderungen an den ersten beiden Stellen werden Sie benachrichtigt.</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px;"><li>Erste Stelle (Major): Änderungen am Datensatz (abgesehen von Änderungen der Variablenlabels)</li><li>Zweite Stelle (Minor): Label ändern sich, Metadatenänderungen wie Hinzufügen weiterer Fragen oder Änderungen der Metadaten/Dokumentation, die Auswirkungen auf die Analyse haben.</li><li>Dritte Stelle (Patch): Zusätzliche Datensatzformate werden bereitgestellt, Hinzufügen/Löschen von Sprachversionen.</li></ul><strong>Für die meisten Datennutzer/-innen ist die aktuellste Version der Daten relevant.</strong>',
+          'close-tooltip': 'Klicken, um diesen Dialog zu schließen.'
+        },
+        'access-way-info': {
+          'title': 'Einen Zugangsweg auswählen',
+          'content': '<p style="margin-bottom: 0px;">Für unsere Datenpakete gibt es vier Zugangswege, die zum einen den Grad der Anonymisierung bestimmen und zum anderen bestimmen auf welchem Weg die Daten verarbeitet werden können und ob sie zur Verwendung in der Lehre zugelassen sind. Scientific Use Files (SUF) sind ausschließlich zum Zweck der Forschung zu verwenden.</p><p style="margin-bottom: 0px; padding-bottom: 0px;">Unsere Datenpaketkonfigurationen sind gegliedert in:</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px; padding-top: 0px;"><li>download-cuf (Zulassung für Lehrzwecke; starke Anonymisierung; zum Download)</li><li>download-suf (stark anonymisiert; zum Download)</li><li>remote-desktop-suf (mittlerer Anonymisierungsgrad; Zugang über virtuelle Desktops per Internet)</li><li>onsite-suf (geringer Anonymisierungsgrad; Zugang nur vor Ort im fdz.DZHW in Hannover)</li></ul><p style="margin-bottom: 0px;">Weitere Informationen finden Sie <a href="https://fdz.dzhw.eu/datennutzung/zugang">hier</a>.</p>'
         }
       }
       //jscs:enable
diff --git a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
index 24b289b515..4a08d4835d 100644
--- a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
+++ b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
@@ -83,6 +83,15 @@ angular.module('metadatamanagementApp').config(
           'close-tooltip': 'Click to close the package selection.',
           'data-package-version-tooltip': 'Click to get more information about versions of data packages',
           'data-package-access-way-tooltip': 'Click to get more information about access ways'
+        },
+        'version-info': {
+          'title': 'Select a Version',
+          'content': '<p style="margin-bottom: 0px;">Unsere Datenpakete liegen dreistellig versioniert vor. Die Stellen der Versionsnummer legen nahe, wie groß die Änderungen an den Daten sind. Bei Änderungen an den ersten beiden Stellen werden Sie benachrichtigt.</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px;"><li>Erste Stelle (Major): Änderungen am Datensatz (abgesehen von Änderungen der Variablenlabels)</li><li>Zweite Stelle (Minor): Label ändern sich, Metadatenänderungen wie Hinzufügen weiterer Fragen oder Änderungen der Metadaten/Dokumentation, die Auswirkungen auf die Analyse haben.</li><li>Dritte Stelle (Patch): Zusätzliche Datensatzformate werden bereitgestellt, Hinzufügen/Löschen von Sprachversionen.</li></ul><strong>Für die meisten Datennutzer/-innen ist die aktuellste Version der Daten relevant.</strong>',
+          'close-tooltip': 'Click to close this dialog'
+        },
+        'access-way-info': {
+          'title': 'Select an Access Way',
+          'content': '<p style="margin-bottom: 0px;">Für unsere Datenpakete gibt es vier Zugangswege, die zum einen den Grad der Anonymisierung bestimmen und zum anderen bestimmen auf welchem Weg die Daten verarbeitet werden können und ob sie zur Verwendung in der Lehre zugelassen sind. Scientific Use Files (SUF) sind ausschließlich zum Zweck der Forschung zu verwenden.</p><p style="margin-bottom: 0px; padding-bottom: 0px;">Unsere Datenpaketkonfigurationen sind gegliedert in:</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px; padding-top: 0px;"><li>download-cuf (Zulassung für Lehrzwecke; starke Anonymisierung; zum Download)</li><li>download-suf (stark anonymisiert; zum Download)</li><li>remote-desktop-suf (mittlerer Anonymisierungsgrad; Zugang über virtuelle Desktops per Internet)</li><li>onsite-suf (geringer Anonymisierungsgrad; Zugang nur vor Ort im fdz.DZHW in Hannover)</li></ul><p style="margin-bottom: 0px;">Weitere Informationen finden Sie <a href="https://fdz.dzhw.eu/datennutzung/zugang">hier</a>.</p>'
         }
       }
       //jscs:enable

From 0f10a74e55da20a857b8facf6b469719bdba1896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Wed, 5 Feb 2020 10:06:28 +0100
Subject: [PATCH 06/30] Add strong access ways (#2460)

---
 .../scripts/ordermanagement/configuration/translations-de.js    | 2 +-
 .../scripts/ordermanagement/configuration/translations-en.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/scripts/ordermanagement/configuration/translations-de.js b/src/main/webapp/scripts/ordermanagement/configuration/translations-de.js
index 3049fa5f34..00dd8752a0 100644
--- a/src/main/webapp/scripts/ordermanagement/configuration/translations-de.js
+++ b/src/main/webapp/scripts/ordermanagement/configuration/translations-de.js
@@ -91,7 +91,7 @@ angular.module('metadatamanagementApp').config(
         },
         'access-way-info': {
           'title': 'Einen Zugangsweg auswählen',
-          'content': '<p style="margin-bottom: 0px;">Für unsere Datenpakete gibt es vier Zugangswege, die zum einen den Grad der Anonymisierung bestimmen und zum anderen bestimmen auf welchem Weg die Daten verarbeitet werden können und ob sie zur Verwendung in der Lehre zugelassen sind. Scientific Use Files (SUF) sind ausschließlich zum Zweck der Forschung zu verwenden.</p><p style="margin-bottom: 0px; padding-bottom: 0px;">Unsere Datenpaketkonfigurationen sind gegliedert in:</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px; padding-top: 0px;"><li>download-cuf (Zulassung für Lehrzwecke; starke Anonymisierung; zum Download)</li><li>download-suf (stark anonymisiert; zum Download)</li><li>remote-desktop-suf (mittlerer Anonymisierungsgrad; Zugang über virtuelle Desktops per Internet)</li><li>onsite-suf (geringer Anonymisierungsgrad; Zugang nur vor Ort im fdz.DZHW in Hannover)</li></ul><p style="margin-bottom: 0px;">Weitere Informationen finden Sie <a href="https://fdz.dzhw.eu/datennutzung/zugang">hier</a>.</p>'
+          'content': '<p style="margin-bottom: 0px;">Für unsere Datenpakete gibt es vier Zugangswege, die zum einen den Grad der Anonymisierung bestimmen und zum anderen bestimmen auf welchem Weg die Daten verarbeitet werden können und ob sie zur Verwendung in der Lehre zugelassen sind. Scientific Use Files (SUF) sind ausschließlich zum Zweck der Forschung zu verwenden.</p><p style="margin-bottom: 0px; padding-bottom: 0px;">Unsere Datenpaketkonfigurationen sind gegliedert in:</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px; padding-top: 0px;"><li><strong>download-cuf</strong> (Zulassung für Lehrzwecke; starke Anonymisierung; zum Download)</li><li><strong>download-suf</strong> (stark anonymisiert; zum Download)</li><li><strong>remote-desktop-suf</strong> (mittlerer Anonymisierungsgrad; Zugang über virtuelle Desktops per Internet)</li><li><strong>onsite-suf</strong> (geringer Anonymisierungsgrad; Zugang nur vor Ort im fdz.DZHW in Hannover)</li></ul><p style="margin-bottom: 0px;">Weitere Informationen finden Sie <a href="https://fdz.dzhw.eu/datennutzung/zugang">hier</a>.</p>'
         }
       }
       //jscs:enable
diff --git a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
index 4a08d4835d..3299e7fab2 100644
--- a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
+++ b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
@@ -91,7 +91,7 @@ angular.module('metadatamanagementApp').config(
         },
         'access-way-info': {
           'title': 'Select an Access Way',
-          'content': '<p style="margin-bottom: 0px;">Für unsere Datenpakete gibt es vier Zugangswege, die zum einen den Grad der Anonymisierung bestimmen und zum anderen bestimmen auf welchem Weg die Daten verarbeitet werden können und ob sie zur Verwendung in der Lehre zugelassen sind. Scientific Use Files (SUF) sind ausschließlich zum Zweck der Forschung zu verwenden.</p><p style="margin-bottom: 0px; padding-bottom: 0px;">Unsere Datenpaketkonfigurationen sind gegliedert in:</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px; padding-top: 0px;"><li>download-cuf (Zulassung für Lehrzwecke; starke Anonymisierung; zum Download)</li><li>download-suf (stark anonymisiert; zum Download)</li><li>remote-desktop-suf (mittlerer Anonymisierungsgrad; Zugang über virtuelle Desktops per Internet)</li><li>onsite-suf (geringer Anonymisierungsgrad; Zugang nur vor Ort im fdz.DZHW in Hannover)</li></ul><p style="margin-bottom: 0px;">Weitere Informationen finden Sie <a href="https://fdz.dzhw.eu/datennutzung/zugang">hier</a>.</p>'
+          'content': '<p style="margin-bottom: 0px;">Für unsere Datenpakete gibt es vier Zugangswege, die zum einen den Grad der Anonymisierung bestimmen und zum anderen bestimmen auf welchem Weg die Daten verarbeitet werden können und ob sie zur Verwendung in der Lehre zugelassen sind. Scientific Use Files (SUF) sind ausschließlich zum Zweck der Forschung zu verwenden.</p><p style="margin-bottom: 0px; padding-bottom: 0px;">Unsere Datenpaketkonfigurationen sind gegliedert in:</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px; padding-top: 0px;"><li><strong>download-cuf</strong> (Zulassung für Lehrzwecke; starke Anonymisierung; zum Download)</li><li><strong>download-suf</strong> (stark anonymisiert; zum Download)</li><li><strong>remote-desktop-suf</strong> (mittlerer Anonymisierungsgrad; Zugang über virtuelle Desktops per Internet)</li><li><strong>onsite-suf</strong> (geringer Anonymisierungsgrad; Zugang nur vor Ort im fdz.DZHW in Hannover)</li></ul><p style="margin-bottom: 0px;">Weitere Informationen finden Sie <a href="https://fdz.dzhw.eu/datennutzung/zugang">hier</a>.</p>'
         }
       }
       //jscs:enable

From 9550ac5191d30a7746bf3f72f5791e0f8bd27662 Mon Sep 17 00:00:00 2001
From: Robert Birkelbach <birkelbach@dzhw.eu>
Date: Wed, 5 Feb 2020 11:26:07 +0100
Subject: [PATCH 07/30] Translate version info (#2460)

---
 .../scripts/ordermanagement/configuration/translations-en.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
index 3299e7fab2..cce80e4536 100644
--- a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
+++ b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
@@ -86,7 +86,7 @@ angular.module('metadatamanagementApp').config(
         },
         'version-info': {
           'title': 'Select a Version',
-          'content': '<p style="margin-bottom: 0px;">Unsere Datenpakete liegen dreistellig versioniert vor. Die Stellen der Versionsnummer legen nahe, wie groß die Änderungen an den Daten sind. Bei Änderungen an den ersten beiden Stellen werden Sie benachrichtigt.</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px;"><li>Erste Stelle (Major): Änderungen am Datensatz (abgesehen von Änderungen der Variablenlabels)</li><li>Zweite Stelle (Minor): Label ändern sich, Metadatenänderungen wie Hinzufügen weiterer Fragen oder Änderungen der Metadaten/Dokumentation, die Auswirkungen auf die Analyse haben.</li><li>Dritte Stelle (Patch): Zusätzliche Datensatzformate werden bereitgestellt, Hinzufügen/Löschen von Sprachversionen.</li></ul><strong>Für die meisten Datennutzer/-innen ist die aktuellste Version der Daten relevant.</strong>',
+          'content': '<p style="margin-bottom: 0px;">Our data packages are available in a three-digit version. The digits of the version number indicate how big the changes to the data are. You will be notified if changes are made to the first two digits.</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px;"><li>First digit (Major): Changes to the data set (except for changes to variable labels)</li><li>Second digit (Minor): Labels change, metadata changes such as adding more questions or changes to metadata/documentation that affect the analysis.</li><li>Third digit (patch): Additional dataset formats are provided, adding/deleting language versions.</li></ul><strong>For most data users, the most recent version of the data is relevant.</strong>',
           'close-tooltip': 'Click to close this dialog'
         },
         'access-way-info': {

From 59c82797f1fb38cc3aa504779ed03a3c283c73c9 Mon Sep 17 00:00:00 2001
From: Robert Birkelbach <birkelbach@dzhw.eu>
Date: Wed, 5 Feb 2020 11:35:06 +0100
Subject: [PATCH 08/30] Translate access-way-info (#2460)

---
 .../scripts/ordermanagement/configuration/translations-en.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
index cce80e4536..ec0127bfe3 100644
--- a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
+++ b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
@@ -91,7 +91,7 @@ angular.module('metadatamanagementApp').config(
         },
         'access-way-info': {
           'title': 'Select an Access Way',
-          'content': '<p style="margin-bottom: 0px;">Für unsere Datenpakete gibt es vier Zugangswege, die zum einen den Grad der Anonymisierung bestimmen und zum anderen bestimmen auf welchem Weg die Daten verarbeitet werden können und ob sie zur Verwendung in der Lehre zugelassen sind. Scientific Use Files (SUF) sind ausschließlich zum Zweck der Forschung zu verwenden.</p><p style="margin-bottom: 0px; padding-bottom: 0px;">Unsere Datenpaketkonfigurationen sind gegliedert in:</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px; padding-top: 0px;"><li><strong>download-cuf</strong> (Zulassung für Lehrzwecke; starke Anonymisierung; zum Download)</li><li><strong>download-suf</strong> (stark anonymisiert; zum Download)</li><li><strong>remote-desktop-suf</strong> (mittlerer Anonymisierungsgrad; Zugang über virtuelle Desktops per Internet)</li><li><strong>onsite-suf</strong> (geringer Anonymisierungsgrad; Zugang nur vor Ort im fdz.DZHW in Hannover)</li></ul><p style="margin-bottom: 0px;">Weitere Informationen finden Sie <a href="https://fdz.dzhw.eu/datennutzung/zugang">hier</a>.</p>'
+          'content': '<p style="margin-bottom: 0px;">There are four access paths for our data packages, which on the one hand determine the degree of anonymisation and on the other hand determine the way in which the data can be processed and whether they are approved for use in teaching. Scientific Use Files (SUF) are to be used exclusively for research purposes.</p><p style="margin-bottom: 0px; padding-bottom: 0px;">Our data packet configurations are divided into:</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px; padding-top: 0px;"><li><strong>download-cuf</strong> (approval for teaching purposes; strong anonymization; for download)</li><li><strong>download-suf</strong> (strong anonymization; for download)</li><li><strong>remote-desktop-suf</strong> (medium degree of anonymization; access via virtual desktops via Internet)</li><li><strong>onsite-suf</strong> (low degree of anonymization; access only on site in fdz.DZHW in Hanover)</li></ul><p style="margin-bottom: 0px;">further information can be found <a href="https://fdz.dzhw.eu/en/datennutzung/zugang">here</a>.</p>'
         }
       }
       //jscs:enable

From 4b430d7b21633f541dc43ab8bf205f19cf404132 Mon Sep 17 00:00:00 2001
From: Robert Birkelbach <birkelbach@dzhw.eu>
Date: Wed, 5 Feb 2020 11:54:16 +0100
Subject: [PATCH 09/30] Fix translations (#2460)

packet -> package; patch -> Patch
---
 .../scripts/ordermanagement/configuration/translations-en.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
index ec0127bfe3..54ccff22e4 100644
--- a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
+++ b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
@@ -86,12 +86,12 @@ angular.module('metadatamanagementApp').config(
         },
         'version-info': {
           'title': 'Select a Version',
-          'content': '<p style="margin-bottom: 0px;">Our data packages are available in a three-digit version. The digits of the version number indicate how big the changes to the data are. You will be notified if changes are made to the first two digits.</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px;"><li>First digit (Major): Changes to the data set (except for changes to variable labels)</li><li>Second digit (Minor): Labels change, metadata changes such as adding more questions or changes to metadata/documentation that affect the analysis.</li><li>Third digit (patch): Additional dataset formats are provided, adding/deleting language versions.</li></ul><strong>For most data users, the most recent version of the data is relevant.</strong>',
+          'content': '<p style="margin-bottom: 0px;">Our data packages are available in a three-digit version. The digits of the version number indicate how big the changes to the data are. You will be notified if changes are made to the first two digits.</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px;"><li>First digit (Major): Changes to the data set (except for changes to variable labels)</li><li>Second digit (Minor): Labels change, metadata changes such as adding more questions or changes to metadata/documentation that affect the analysis.</li><li>Third digit (Patch): Additional dataset formats are provided, adding/deleting language versions.</li></ul><strong>For most data users, the most recent version of the data is relevant.</strong>',
           'close-tooltip': 'Click to close this dialog'
         },
         'access-way-info': {
           'title': 'Select an Access Way',
-          'content': '<p style="margin-bottom: 0px;">There are four access paths for our data packages, which on the one hand determine the degree of anonymisation and on the other hand determine the way in which the data can be processed and whether they are approved for use in teaching. Scientific Use Files (SUF) are to be used exclusively for research purposes.</p><p style="margin-bottom: 0px; padding-bottom: 0px;">Our data packet configurations are divided into:</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px; padding-top: 0px;"><li><strong>download-cuf</strong> (approval for teaching purposes; strong anonymization; for download)</li><li><strong>download-suf</strong> (strong anonymization; for download)</li><li><strong>remote-desktop-suf</strong> (medium degree of anonymization; access via virtual desktops via Internet)</li><li><strong>onsite-suf</strong> (low degree of anonymization; access only on site in fdz.DZHW in Hanover)</li></ul><p style="margin-bottom: 0px;">further information can be found <a href="https://fdz.dzhw.eu/en/datennutzung/zugang">here</a>.</p>'
+          'content': '<p style="margin-bottom: 0px;">There are four access paths for our data packages, which on the one hand determine the degree of anonymisation and on the other hand determine the way in which the data can be processed and whether they are approved for use in teaching. Scientific Use Files (SUF) are to be used exclusively for research purposes.</p><p style="margin-bottom: 0px; padding-bottom: 0px;">Our data package configurations are divided into:</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px; padding-top: 0px;"><li><strong>download-cuf</strong> (approval for teaching purposes; strong anonymization; for download)</li><li><strong>download-suf</strong> (strong anonymization; for download)</li><li><strong>remote-desktop-suf</strong> (medium degree of anonymization; access via virtual desktops via Internet)</li><li><strong>onsite-suf</strong> (low degree of anonymization; access only on site in fdz.DZHW in Hanover)</li></ul><p style="margin-bottom: 0px;">further information can be found <a href="https://fdz.dzhw.eu/en/datennutzung/zugang">here</a>.</p>'
         }
       }
       //jscs:enable

From 579a37a217a00e074fdbf1f623b4937f5168ed23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Wed, 5 Feb 2020 13:48:51 +0100
Subject: [PATCH 10/30] Fix robot tests for public user (#2497)

---
 .../common/navbar/views/navbar.controller.js  |  8 ++--
 .../configuration/translations-en.js          |  2 +-
 src/test/robotframework/common_variables.yaml |  2 +-
 ...bility.robot => side_nav_visibility.robot} | 14 +++---
 .../search_and_view_data_set.robot            | 17 +++----
 .../download_instrument_attachment.robot      |  7 ++-
 .../search_and_view_instrument.robot          | 18 ++++---
 ...heck_related_publications_of_gra2005.robot | 48 -------------------
 .../search_and_view_publication.robot         | 14 ++++--
 .../search_and_view_question.robot            | 14 ++++--
 .../questionmanagement/use_searchfilter.robot | 13 -----
 .../check_shoppingcart_funtionalities.robot   | 38 +++++----------
 .../keyword_search_and_view.robot             | 23 ---------
 .../search_and_view_study.robot               | 13 +++--
 .../search_and_view_survey.robot              | 12 +++--
 .../search_and_view_variable.robot            | 12 +++--
 .../resources/home_page_resource.robot        |  8 +++-
 .../resources/search_resource.robot           | 17 +++++++
 18 files changed, 117 insertions(+), 163 deletions(-)
 rename src/test/robotframework/public_user/common/{navbar_visibility.robot => side_nav_visibility.robot} (81%)
 delete mode 100644 src/test/robotframework/public_user/publicationmanagement/check_related_publications_of_gra2005.robot
 delete mode 100644 src/test/robotframework/public_user/questionmanagement/use_searchfilter.robot
 delete mode 100644 src/test/robotframework/public_user/studymanagement/keyword_search_and_view.robot

diff --git a/src/main/webapp/scripts/common/navbar/views/navbar.controller.js b/src/main/webapp/scripts/common/navbar/views/navbar.controller.js
index be1940206b..0cf4059689 100644
--- a/src/main/webapp/scripts/common/navbar/views/navbar.controller.js
+++ b/src/main/webapp/scripts/common/navbar/views/navbar.controller.js
@@ -39,9 +39,11 @@ angular.module('metadatamanagementApp').controller('NavbarController',
     };
 
     $scope.close = function() {
-      if (!$mdSidenav('SideNavBar').isLockedOpen()) {
-        $timeout($mdSidenav('SideNavBar').toggle, 200);
-      }
+      $timeout(function() {
+        if (!$mdSidenav('SideNavBar').isLockedOpen()) {
+          $mdSidenav('SideNavBar').toggle();
+        }
+      }, 1000);
     };
 
     $scope.focusContent = function() {
diff --git a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
index 54ccff22e4..2884bdfca6 100644
--- a/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
+++ b/src/main/webapp/scripts/ordermanagement/configuration/translations-en.js
@@ -91,7 +91,7 @@ angular.module('metadatamanagementApp').config(
         },
         'access-way-info': {
           'title': 'Select an Access Way',
-          'content': '<p style="margin-bottom: 0px;">There are four access paths for our data packages, which on the one hand determine the degree of anonymisation and on the other hand determine the way in which the data can be processed and whether they are approved for use in teaching. Scientific Use Files (SUF) are to be used exclusively for research purposes.</p><p style="margin-bottom: 0px; padding-bottom: 0px;">Our data package configurations are divided into:</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px; padding-top: 0px;"><li><strong>download-cuf</strong> (approval for teaching purposes; strong anonymization; for download)</li><li><strong>download-suf</strong> (strong anonymization; for download)</li><li><strong>remote-desktop-suf</strong> (medium degree of anonymization; access via virtual desktops via Internet)</li><li><strong>onsite-suf</strong> (low degree of anonymization; access only on site in fdz.DZHW in Hanover)</li></ul><p style="margin-bottom: 0px;">further information can be found <a href="https://fdz.dzhw.eu/en/datennutzung/zugang">here</a>.</p>'
+          'content': '<p style="margin-bottom: 0px;">There are four access paths for our data packages, which on the one hand determine the degree of anonymisation and on the other hand determine the way in which the data can be processed and whether they are approved for use in teaching. Scientific Use Files (SUF) are to be used exclusively for research purposes.</p><p style="margin-bottom: 0px; padding-bottom: 0px;">Our data package configurations are divided into:</p><ul style="list-style-type: disc; margin-inline-start: 16px; margin-bottom: 0px; padding-top: 0px;"><li><strong>download-cuf</strong> (approval for teaching purposes; strong anonymization; for download)</li><li><strong>download-suf</strong> (strong anonymization; for download)</li><li><strong>remote-desktop-suf</strong> (medium degree of anonymization; access via virtual desktops via Internet)</li><li><strong>onsite-suf</strong> (low degree of anonymization; access only on site in fdz.DZHW in Hanover)</li></ul><p style="margin-bottom: 0px;">Further information can be found <a href="https://fdz.dzhw.eu/en/datennutzung/zugang">here</a>.</p>'
         }
       }
       //jscs:enable
diff --git a/src/test/robotframework/common_variables.yaml b/src/test/robotframework/common_variables.yaml
index 2c160e7cc7..dd8ad1b88b 100644
--- a/src/test/robotframework/common_variables.yaml
+++ b/src/test/robotframework/common_variables.yaml
@@ -1,4 +1,4 @@
-website: https://metadatamanagement-dev.cfapps.io/#!/de/search
+website: https://metadatamanagement-dev.cfapps.io
 capabilities:
   chrome:
     name: Win10/Chrome
diff --git a/src/test/robotframework/public_user/common/navbar_visibility.robot b/src/test/robotframework/public_user/common/side_nav_visibility.robot
similarity index 81%
rename from src/test/robotframework/public_user/common/navbar_visibility.robot
rename to src/test/robotframework/public_user/common/side_nav_visibility.robot
index 5f9f5be51b..88c150ff08 100644
--- a/src/test/robotframework/public_user/common/navbar_visibility.robot
+++ b/src/test/robotframework/public_user/common/side_nav_visibility.robot
@@ -4,23 +4,25 @@ Resource          ../../resources/search_resource.robot
 Resource          ../../resources/home_page_resource.robot
 
 *** Test Cases ***
-Navbar is hidden on small devices
+Left side nav is hidden on small devices
     [Setup]    Set small device size
-    Pass Execution  Currently there is no navbar
+    Navigate to search
     Navbar should be hidden
     [Teardown]    Maximize Browser Window
 
-Navbar can be opened on small devices
+Left side nav can be opened on small devices
     [Setup]    Set small device size
-    Pass Execution  Currently there is no navbar
     Click menu button
     Navbar should be open
     [Teardown]    Maximize Browser Window
 
-Navbar is visible on large devices
-    Pass Execution  Currently there is no navbar
+Left side nav is visible on large devices
     Navbar should be always open
 
+Left side nav is not visible on start page
+    Click fdz logo
+    Navbar should be hidden
+
 *** Keywords ***
 Navbar should be hidden
     Page Should Contain Element    xpath=//md-sidenav[contains(@class, "md-closed")]
diff --git a/src/test/robotframework/public_user/datasetmanagement/search_and_view_data_set.robot b/src/test/robotframework/public_user/datasetmanagement/search_and_view_data_set.robot
index f6ee8cd904..1b4535ee57 100644
--- a/src/test/robotframework/public_user/datasetmanagement/search_and_view_data_set.robot
+++ b/src/test/robotframework/public_user/datasetmanagement/search_and_view_data_set.robot
@@ -5,16 +5,11 @@ Resource          ../../resources/home_page_resource.robot
 
 *** Test Cases ***
 Looking for Absolventenpanel 2005s individual data bachelor in german
+    Navigate to search
+    Search for    Absolventenpanel 2005
+    Click on first search result
     Click on data set tab
-    Search for    Absolventenpanel 2005 Personendatensatz Bachelor
-    Click on search result by id    dat-gra2005-ds3$
-    Page Should Contain    Kann nach Ab­schluss eines Da­ten­nut­zungs­ver­trags her­un­ter­ge­la­den wer­den
-    [Teardown]    Get back to german home page
-
-Looking for Graduate Panel 2005s individual data bachelor in english
-    [Setup]    Change language to english
-    Click on data set tab
-    Search for    Graduate Panel 2005 Questionnaire First Wave
-    Click on search result by id    dat-gra2005-ds3$
-    Page Should Contain    can be down­loaded after the con­clu­sion of a data use agree­ment
+    Search for in details   Personendatensatz traditionell
+    Click on first search result
+    Page Should Contain    Kann nach Abschluss eines Datennutzungsvertrags heruntergeladen werden
     [Teardown]    Get back to german home page
diff --git a/src/test/robotframework/public_user/instrumentmanagement/download_instrument_attachment.robot b/src/test/robotframework/public_user/instrumentmanagement/download_instrument_attachment.robot
index 20cf584ea6..45e35f99ce 100644
--- a/src/test/robotframework/public_user/instrumentmanagement/download_instrument_attachment.robot
+++ b/src/test/robotframework/public_user/instrumentmanagement/download_instrument_attachment.robot
@@ -6,9 +6,12 @@ Resource          ../../resources/home_page_resource.robot
 
 *** Test Cases ***
 Looking for Absolventenpanel 2005s Fragebogen Erste Welle in german
+    Navigate to search
+    Search for    Absolventenpanel 2005
+    Click on first search result
     Click on instruments tab
-    Search for    Absolventenpanel 2005 Fragebogen Erste Welle
-    Click on search result by id    ins-gra2005-ins1$
+    Search for in details   Fragebogen Erste Welle
+    Click on first search result
     Click on questionnaire
     Sleep    2s
     Switch windows forth and back
diff --git a/src/test/robotframework/public_user/instrumentmanagement/search_and_view_instrument.robot b/src/test/robotframework/public_user/instrumentmanagement/search_and_view_instrument.robot
index 76b15e3b24..1b8ba4611a 100644
--- a/src/test/robotframework/public_user/instrumentmanagement/search_and_view_instrument.robot
+++ b/src/test/robotframework/public_user/instrumentmanagement/search_and_view_instrument.robot
@@ -5,16 +5,22 @@ Resource          ../../resources/home_page_resource.robot
 
 *** Test Cases ***
 Looking for Absolventenpanel 2005s Fragebogen Erste Welle in german
+    Navigate to search
+    Search for    Absolventenpanel 2005
+    Click on first search result
     Click on instruments tab
-    Search for    Absolventenpanel 2005 Fragebogen Erste Welle
-    Click on search result by id    ins-gra2005-ins1$
-    Page Should Contain    gra2005_W1_Questionnaire_de.pdf
+    Search for in details    Fragebogen Erste Welle
+    Click on first search result
+    Page Should Contain    Filterführungsdiagramm
     [Teardown]    Get back to german home page
 
 Looking for Graduate Panel 2005s questionnaire first wave in english
     [Setup]    Change language to english
+    Navigate to search
+    Search for    Graduate Panel 2005
+    Click on first search result
     Click on instruments tab
-    Search for    Graduate Panel 2005 Questionnaire First Wave
-    Click on search result by id    ins-gra2005-ins1$
-    Page Should Contain    gra2005_W1_Questionnaire_en.pdf
+    Search for in details    Questionnaire First Wave
+    Click on first search result
+    Page Should Contain    Question Flow
     [Teardown]    Get back to german home page
diff --git a/src/test/robotframework/public_user/publicationmanagement/check_related_publications_of_gra2005.robot b/src/test/robotframework/public_user/publicationmanagement/check_related_publications_of_gra2005.robot
deleted file mode 100644
index aacb3d29c4..0000000000
--- a/src/test/robotframework/public_user/publicationmanagement/check_related_publications_of_gra2005.robot
+++ /dev/null
@@ -1,48 +0,0 @@
-*** Settings ***
-Documentation     Tests the related publications of study DZHW Graduate Panel 2005 and study series  "DZHW Graduate Survey Series"
-Resource          ../../resources/search_resource.robot
-Resource          ../../resources/home_page_resource.robot
-
-*** Test Cases ***
-Check related publications of the study gra2005
-    Click on study tab
-    Search for   DZHW Absolventenpanel 2005
-    Click on search result by id    stu-gra2005$
-    Assert study gra2005 has five publications
-    Click on publications related to study gra2005
-    Click on search result by id    pub-Kratz.2016$
-    Assert publication pub-Kratz.2016$ belongs to study gra2005
-    Get back to german home page
-
-Check related publications of the DZHW Graduate Survey Series
-    Click on study tab
-    Search for   DZHW Absolventenpanel 2005
-    Click on search result by id    stu-gra2005$
-    Assert study series DZHW Absolventenstudien has five publications
-    Click on publications related to study series DZHW Absolventenstudien
-    Click on search result by id    pub-Jaksztat.2014$
-    Assert publication pub-Jaksztat.2014$ belongs to study series DZHW Absolventenstudien
-    Get back to german home page
-
-
-*** Keywords ***
-Assert study gra2005 has five publications
-    Element Should Contain  xpath=//div[@class="fdz-truncate-string ng-scope flex"]//a[contains(., "Publikationen zu dieser Studie: (5)")]  Publikationen zu dieser Studie: (5)
-
-Click on publications related to study gra2005
-    Click Element Through Tooltips   xpath=//div[@class="fdz-truncate-string ng-scope flex"]//a[contains(., "Publikationen zu dieser Studie: (5)")]
-
-Assert publication pub-Kratz.2016$ belongs to study gra2005
-    Element Should Contain  xpath=//div[@class="fdz-truncate-string ng-scope flex"]//a//span[contains(., "DZHW-Absolventenpanel 2005")]  DZHW-Absolventenpanel 2005
-
-Assert study series DZHW Absolventenstudien has five publications
-    Element Should Contain  xpath=//div[@class="ng-scope"]//a[contains(., "Publikationen zur Studienreihe")]   Publikationen zur Studienreihe "DZHW-Absolventenstudien": (5)
-
-Click on publications related to study series DZHW Absolventenstudien
-    Click Element Through Tooltips  xpath=//div[@class="ng-scope"]//a[contains(., "Publikationen zur Studienreihe")]
-
-Assert publication pub-Jaksztat.2014$ belongs to study series DZHW Absolventenstudien
-    Element Should Contain  xpath=//div[@class="ng-binding ng-scope"]//a[contains(., "DZHW-Absolventenstudien")]  DZHW-Absolventenstudien
-
-
-
diff --git a/src/test/robotframework/public_user/publicationmanagement/search_and_view_publication.robot b/src/test/robotframework/public_user/publicationmanagement/search_and_view_publication.robot
index 85b09adc74..8d95b3a300 100644
--- a/src/test/robotframework/public_user/publicationmanagement/search_and_view_publication.robot
+++ b/src/test/robotframework/public_user/publicationmanagement/search_and_view_publication.robot
@@ -5,16 +5,22 @@ Resource          ../../resources/home_page_resource.robot
 
 *** Test Cases ***
 Looking for Bildungsherkunft und Promotionen
+    Navigate to search
+    Search for    Absolventenpanel 2005
+    Click on first search result
     Click on publications tab
-    Search for    Bildungsherkunft und Promotionen
-    Click on search result by id    pub-Jaksztat.2014$
+    Search for in details   Bildungsherkunft und Promotionen
+    Click on first search result
     Page Should Contain    http://www.zfs-online.org/index.php/zfs/article/view/3175/2712
     [Teardown]    Get back to german home page
 
 Looking for Graduate Panel 2005s individual data bachelor in english
     [Setup]    Change language to english
+    Navigate to search
+    Search for    Graduate Panel 2005
+    Click on first search result
     Click on publications tab
-    Search for    Bildungsherkunft und Promotionen
-    Click on search result by id    pub-Jaksztat.2014$
+    Search for in details   Bildungsherkunft und Promotionen
+    Click on first search result
     Page Should Contain    http://www.zfs-online.org/index.php/zfs/article/view/3175/2712
     [Teardown]    Get back to german home page
diff --git a/src/test/robotframework/public_user/questionmanagement/search_and_view_question.robot b/src/test/robotframework/public_user/questionmanagement/search_and_view_question.robot
index a49b0cbd9e..023d76bac6 100644
--- a/src/test/robotframework/public_user/questionmanagement/search_and_view_question.robot
+++ b/src/test/robotframework/public_user/questionmanagement/search_and_view_question.robot
@@ -5,16 +5,22 @@ Resource          ../../resources/home_page_resource.robot
 
 *** Test Cases ***
 Looking for Absolventenpanel 2005s Fragebogen Erste Welle in german
+    Navigate to search
+    Search for    Absolventenpanel 2005
+    Click on first search result
     Click on questions tab
-    Search for    Wel­che Er­fah­run­gen haben Sie (bis­her) in Ihrer Aus­bil­dungs- bzw. Prak­ti­kums­pha­se ge­macht?
-    Click on search result by id    que-gra2005-ins1-3.3$
+    Search for in details   Wel­che Er­fah­run­gen haben Sie (bis­her) in Ihrer Aus­bil­dungs- bzw. Prak­ti­kums­pha­se ge­macht?
+    Click on first search result
     Page Should Contain    Bilder zur Frage
     [Teardown]    Get back to german home page
 
 Looking for Graduate Panel 2005s questionnaire first wave in english
     [Setup]    Change language to english
+    Navigate to search
+    Search for    Graduate Panel 2005
+    Click on first search result
     Click on questions tab
-    Search for    What experiences have you had (so far) during your training/internship?
-    Click on search result by id    que-gra2005-ins1-3.3$
+    Search for in details   What experiences have you had (so far) during your training/internship?
+    Click on first search result
     Page Should Contain    Images of this Question
     [Teardown]    Get back to german home page
diff --git a/src/test/robotframework/public_user/questionmanagement/use_searchfilter.robot b/src/test/robotframework/public_user/questionmanagement/use_searchfilter.robot
deleted file mode 100644
index 52a4b48fd8..0000000000
--- a/src/test/robotframework/public_user/questionmanagement/use_searchfilter.robot
+++ /dev/null
@@ -1,13 +0,0 @@
-*** Settings ***
-Documentation     Tests the user experience of using a survey filter for finding a connected question
-Resource          ../../resources/search_resource.robot
-Resource          ../../resources/home_page_resource.robot
-
-*** Test Cases ***
-Use of Searchfilters to find a question
-    Click on questions tab
-    Activate Filter by name    Erhebung
-    Choose Filter Option by id    sur-gra2005-sy1$
-    Click on search result by id    que-gra2005-ins1-1.1$
-    Page Should Contain    Verbundene Objekte
-    [Teardown]    Get back to german home page
diff --git a/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot b/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot
index e2f12106f0..fe530cc093 100644
--- a/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot
+++ b/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot
@@ -1,62 +1,50 @@
 *** Settings ***
-Documentation     As a public user checking the shopping cart funtionalisties
+Documentation     As a public user checking the shopping cart funtionalities
 Resource          ../../resources/click_element_resource.robot
 Resource          ../../resources/search_resource.robot
 Resource          ../../resources/home_page_resource.robot
 
 *** Test Cases ***
 Check Shopping Cart as a Public User
-   Click on search result by id    stu-gra2005$
-   Select Item and Put in The Cart
-   Check Shopping Cart
+   Click Element  xpath=//a[contains(@ui-sref, 'Absolventen')]
+   Click on first search result
+   Put all access ways in shopping cart
+   Go to Shopping Cart
    Delete an Item   # we have 4 items in the cart and we delete one item
    Confirm Order
    Close The Toast Message
    Check The Links
-   Check Delete Button is Available
    Empty The Shopping Cart
    Get back to german home page   # to sync with next test flow
 
 
 *** Keywords ***
-Select Item and Put in The Cart
+Put all access ways in shopping cart
    @{MD_ACCESSWAYNAMES}   Create List    download-suf  remote-desktop-suf   onsite-suf   download-cuf
    :FOR  ${INDEX}  IN RANGE  0   4
-   \  Click On Add Shopping Cart Icon
-   \  Select Access Way for the Datasets from The List   @{MD_ACCESSWAYNAMES}[${INDEX}]
-   \  Select Version of the Datasets from The List   1.0.1
-   \  Check The Close Button is Available
+   \  Select Access Way for the Data Package   @{MD_ACCESSWAYNAMES}[${INDEX}]
+   \  Select Version for the Data Package   1.0.1
    \  Put in Shopping Cart
-   \  ${count} =    Evaluate    ${1}+${INDEX}
 
 Delete an Item
-   Click Element Through Tooltips   xpath=//div//following::button//md-icon[contains(., 'delete_forever')]
+   Click Element Through Tooltips   xpath=//button[text()=' Löschen ']
 
-Click On Add Shopping Cart Icon
-   Click Element Through Tooltips   xpath=//md-icon[contains(., 'add_shopping_cart')]
-
-Select Access Way for the Datasets from The List
+Select Access Way for the Data Package
    [Arguments]   ${accesswayname}
    Click Element Through Tooltips    xpath=//md-select[@name='accessWay']
    Click Element Through Tooltips    xpath=//md-select-menu//md-option[contains(., '${accesswayname}')]
 
-Select Version of the Datasets from The List
+Select Version for the Data Package
    [Arguments]   ${versionname}
    Click Element Through Tooltips    xpath=//md-select[@name='version']
    Click Element Through Tooltips    xpath=//md-select-menu//md-option[contains(., '${versionname}')]
 
 Put in Shopping Cart
-   Click Element Through Tooltips    xpath=//span[contains(., 'In den Einkaufswagen')]
+   Click Element Through Tooltips    xpath=//span[contains(., 'Zur Beantragung vormerken')]
 
-Check Shopping Cart
+Go to Shopping Cart
    Click Element Through Tooltips    xpath=//a//md-icon[contains(., 'shopping_cart')]
 
-Check Delete Button is Available
-   Page Should Contain Element    xpath=//button[md-icon[text()='delete_forever']]
-
-Check The Close Button is Available
-   Page Should Contain Element    xpath=//span[contains(., 'Schließen')]
-
 Confirm Order
    Click Element Through Tooltips   xpath=//span[contains(., 'Beantragen')]
 
diff --git a/src/test/robotframework/public_user/studymanagement/keyword_search_and_view.robot b/src/test/robotframework/public_user/studymanagement/keyword_search_and_view.robot
deleted file mode 100644
index 4138f061c7..0000000000
--- a/src/test/robotframework/public_user/studymanagement/keyword_search_and_view.robot
+++ /dev/null
@@ -1,23 +0,0 @@
-*** Settings ***
-Documentation     Tests the Tags in the Study
-Force Tags        smoketest
-Resource          ../../resources/search_resource.robot
-Resource          ../../resources/home_page_resource.robot
-
-*** Test Cases ***
-Search Tag and assert search results
-    Click on study tab
-    Search for    Deutsche Tags Schlüsselwörter
-    Sleep  2s  # avoid failling in firefox and chrome, the are too fast
-    Click on the first search result
-    Page Should Contain  Deutsche Tags Schlüsselwörter
-    Click Element Through Tooltips   xpath=//a[@ng-repeat="tag in ctrl.studyTags"]//span[contains(., "Deutsche Tags Schlüsselwörter")]
-    Assert search results contain the id of the study   # after clicking of the tag which whas searched
-    Get back to german home page
-
-*** Keywords ***
-Assert search results contain the id of the study
-    Page Should Contain  stu-robotprojectrelease4chrome$
-
-Click on the first search result
-    Click Element Through Tooltips   xpath=//a[@class='fdz-search-result'][1]
diff --git a/src/test/robotframework/public_user/studymanagement/search_and_view_study.robot b/src/test/robotframework/public_user/studymanagement/search_and_view_study.robot
index 116346c712..4bd701540f 100644
--- a/src/test/robotframework/public_user/studymanagement/search_and_view_study.robot
+++ b/src/test/robotframework/public_user/studymanagement/search_and_view_study.robot
@@ -1,19 +1,18 @@
 *** Settings ***
 Documentation     Tests the user experience of searching & finding the Graduate Panel 2005 and opening its study page
-Force Tags        smoketest
 Resource          ../../resources/search_resource.robot
 Resource          ../../resources/home_page_resource.robot
 
 *** Test Cases ***
 Looking for Absolventenpanel 2005 in german
-    Search for    Absolventenpanel 2005
-    Click on search result by id    stu-gra2005$
-    Page Should Contain    Wirt­schafts- und Fi­nanz­kri­se
+    Search for on startpage    Absolventenpanel 2005
+    Click on first search result
+    Page Should Contain    Wirtschafts- und Finanzkrise
     [Teardown]    Get back to german home page
 
 Looking for Graduate Panel 2005 in english
     [Setup]    Change language to english
-    Search for    Graduate Panel 2005
-    Click on search result by id    stu-gra2005$
-    Page Should Contain    eco­nomic and fi­nan­cial cri­sis
+    Search for on startpage    Graduate Panel 2005
+    Click on first search result
+    Page Should Contain   economic and financial crisis
     [Teardown]    Get back to german home page
diff --git a/src/test/robotframework/public_user/surveymanagement/search_and_view_survey.robot b/src/test/robotframework/public_user/surveymanagement/search_and_view_survey.robot
index 95dbc42a38..be3d9c6268 100644
--- a/src/test/robotframework/public_user/surveymanagement/search_and_view_survey.robot
+++ b/src/test/robotframework/public_user/surveymanagement/search_and_view_survey.robot
@@ -5,16 +5,20 @@ Resource          ../../resources/home_page_resource.robot
 
 *** Test Cases ***
 Looking for Absolventenpanel 2005s first wave survey in german
+    Search for on startpage    Absolventenpanel 2005
+    Click on first search result
     Click on surveys tab
-    Search for    Absolventenpanel 2005 Erste Welle
-    Click on search result by id    sur-gra2005-sy3$
+    Search for in details   Erste Welle Bachelor
+    Click on first search result
     Page Should Contain    n = 1.622
     [Teardown]    Get back to german home page
 
 Looking for Graduate Panel 2005s first wave survey in english
     [Setup]    Change language to english
+    Search for on startpage    Graduate Panel 2005
+    Click on first search result
     Click on surveys tab
-    Search for    DZHW Graduate Panel 2005 First Wave
-    Click on search result by id    sur-gra2005-sy3$
+    Search for in details   First Wave Bachelor
+    Click on first search result
     Page Should Contain    n = 1,622
     [Teardown]    Get back to german home page
diff --git a/src/test/robotframework/public_user/variablemanagement/search_and_view_variable.robot b/src/test/robotframework/public_user/variablemanagement/search_and_view_variable.robot
index 1fe7227b7d..c74969dc1e 100644
--- a/src/test/robotframework/public_user/variablemanagement/search_and_view_variable.robot
+++ b/src/test/robotframework/public_user/variablemanagement/search_and_view_variable.robot
@@ -5,16 +5,20 @@ Resource          ../../resources/home_page_resource.robot
 
 *** Test Cases ***
 Looking for Absolventenpanel 2005s individual data bachelor in german
+    Search for on startpage    Absolventenpanel 2005
+    Click on first search result
     Click on variable tab
-    Search for    Absolventenpanel 2005 Personendatensatz Bachelor studienberatung
-    Click on search result by id    var-gra2005-ds3-astu11z$
+    Search for in details   Personendatensatz Bachelor studienberatung
+    Click on first search result
     Page Should Contain    ordinal
     [Teardown]    Get back to german home page
 
 Looking for Graduate Panel 2005s individual data bachelor in english
     [Setup]    Change language to english
+    Search for on startpage    Graduate Panel 2005
+    Click on first search result
     Click on variable tab
-    Search for    graduate panel individual data bachelor study guidance
-    Click on search result by id    var-gra2005-ds3-astu11z$
+    Search for in details   individual data bachelor study guidance
+    Click on first search result
     Page Should Contain    ordinal
     [Teardown]    Get back to german home page
diff --git a/src/test/robotframework/resources/home_page_resource.robot b/src/test/robotframework/resources/home_page_resource.robot
index 288b085fbd..9ec2444f35 100644
--- a/src/test/robotframework/resources/home_page_resource.robot
+++ b/src/test/robotframework/resources/home_page_resource.robot
@@ -11,4 +11,10 @@ Change language to english
 Get back to german home page
   ${url} =  Get Location
   Run Keyword If   '/en/' in '${url}'    Click Element Through Tooltips  xpath=//*[@id = 'changeLanguageToDe']
-  Click Element Through Tooltips  xpath=//a[contains(@aria-label, "zur Suche")]
+  Click fdz logo
+
+Click fdz logo
+  Wait Until Keyword Succeeds    5s    1s    Click Element   xpath=//md-toolbar//a[contains(@class, "fdz-logo")]
+
+Navigate to search
+  Click Element   xpath=//a[@ui-sref="search"]
diff --git a/src/test/robotframework/resources/search_resource.robot b/src/test/robotframework/resources/search_resource.robot
index 9204d08a88..bbdb17ee2c 100644
--- a/src/test/robotframework/resources/search_resource.robot
+++ b/src/test/robotframework/resources/search_resource.robot
@@ -9,6 +9,20 @@ Search for
     [Arguments]    ${query}
     Click Element Through Tooltips    xpath=//input[@id='query']
     Input Text    id=query    ${query}
+    Wait Until Angular Ready    10s
+
+Search for on startpage
+    [Arguments]    ${query}
+    Click Element Through Tooltips    xpath=//input[@id='query']
+    Input Text    id=query    ${query}
+    Press Key     id=query    \\13
+    Wait Until Angular Ready    10s
+
+Search for in details
+    [Arguments]    ${query}
+    Click Element Through Tooltips    xpath=//input[@id='detailSearchQuery']
+    Input Text    id=detailSearchQuery    ${query}
+    Wait Until Angular Ready    10s
 
 Select project by name
     [Arguments]    ${projectname}
@@ -25,6 +39,9 @@ Click on search result by id
     [Arguments]    ${id}
     Click Element Through Tooltips    xpath=//a//span[text()='${id}']
 
+Click on first search result
+    Click Element Through Tooltips    xpath=(//md-card[contains(@class,'fdz-search-result')]//md-card-header//a)[1]
+
 Activate Filter by name
     [Arguments]    ${filtername}
     Click Element Through Tooltips    xpath=//search-filter-panel//md-select

From 3c0a363e2cd771e7d392e1a028bec998147be409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Thu, 6 Feb 2020 16:12:41 +0100
Subject: [PATCH 11/30] Fix robot tests for data provider (#2497)

---
 .travis.yml                                   | 77 ++++---------------
 .../components/md/autocomplete-theme.scss     |  5 ++
 .../fdz-theme/components/md/card-theme.scss   |  7 ++
 .../fdz-theme/components/md/select-theme.scss |  2 +-
 src/main/webapp/assets/styles/fdz.css         | 12 ++-
 .../views/data-set-edit-or-create.html.tmpl   |  4 +-
 .../views/instrument-edit-or-create.html.tmpl |  4 +-
 .../components/configurator/detail.html.tmpl  |  4 +-
 .../concept-search-result.html.tmpl           |  4 +-
 .../views/study-edit-or-create.html.tmpl      |  4 +-
 .../views/survey-edit-or-create.html.tmpl     |  8 +-
 .../check_banner_as_dataproviders.robot       |  4 -
 ...ssign_concept_to_and_from_instrument.robot | 33 ++++----
 .../datasetmanagement/create_dataset.robot    |  4 +-
 .../create_dataset_report.robot               |  5 +-
 .../create_instrument.robot                   |  5 +-
 .../upload_instrument_attachment.robot        |  9 ++-
 .../upload_study_attachment.robot             |  3 +-
 .../surveymanagement/upload_file.robot        | 17 ++--
 .../check_shoppingcart_funtionalities.robot   |  2 +
 .../resources/home_page_resource.robot        |  2 +-
 .../resources/search_resource.robot           |  4 +-
 src/test/robotframework/run_smoketests.sh     | 39 ----------
 23 files changed, 97 insertions(+), 161 deletions(-)
 delete mode 100755 src/test/robotframework/run_smoketests.sh

diff --git a/.travis.yml b/.travis.yml
index 8133494330..cb18a4b8a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,6 @@ stages:
   if: NOT branch =~ /^(development|master|test)$/
 - name: build and deploy
   if: branch =~ /^(development|master|test)$/
-- name: e2e smoketests
-  if: type = cron
 - name: nightly e2e tests publicuser
   if: type = cron
 - name: nightly e2e tests dataprovider
@@ -80,63 +78,20 @@ jobs:
       $TRAVIS_BRANCH $TRAVIS_EVENT_TYPE"
     after_success:
     - bash <(curl -s https://codecov.io/bash)
-  - stage: e2e smoketests
-    name: Chrome Smoketest
-    install:
-    - "./src/test/robotframework/setup.sh"
-    script:
-    - export PYTHONWARNINGS="ignore"
-    - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v
-      USE_SAUCELABS:TRUE -v BROWSER:chrome --include smoketest --exclude firefoxonly
-      ./src/test/robotframework
-  - name: Firefox Smoketest
-    install:
-    - "./src/test/robotframework/setup.sh"
-    script:
-    - export PYTHONWARNINGS="ignore"
-    - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v
-      USE_SAUCELABS:TRUE -v BROWSER:firefox --include smoketest --exclude chromeonly
-      ./src/test/robotframework
-  - name: Edge Smoketest
-    install:
-    - "./src/test/robotframework/setup.sh"
-    script:
-    - export PYTHONWARNINGS="ignore"
-    - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v
-      USE_SAUCELABS:TRUE -v BROWSER:edge --include smoketest --exclude firefoxonly
-      --exclude chromeonly --exclude noslowpoke ./src/test/robotframework
-  - name: IE11 Smoketest
-    install:
-    - "./src/test/robotframework/setup.sh"
-    script:
-    - export PYTHONWARNINGS="ignore"
-    - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v
-      USE_SAUCELABS:TRUE -v BROWSER:ie --include smoketest --exclude firefoxonly --exclude
-      chromeonly --exclude noslowpoke ./src/test/robotframework
-  - name: Safari Smoketest
-    install:
-    - "./src/test/robotframework/setup.sh"
-    script:
-    - export PYTHONWARNINGS="ignore"
-    - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v
-      USE_SAUCELABS:TRUE -v BROWSER:safari --include smoketest --exclude firefoxonly
-      --exclude chromeonly ./src/test/robotframework
   - stage: nightly e2e tests publicuser
     name: Nightly Chrome Tests (Public User)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome
-      -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include publicuserNOTsmoketestNOTfirefoxonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include publicuserNOTfirefoxonlyNOTlocalonly ./src/test/robotframework
   - name: Nightly Firefox Tests (Public User)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
     - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox
-      -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include publicuserNOTsmoketestNOTchromeonlyNOTlocalonly
+      -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include publicuserNOTchromeonlyNOTlocalonly
       ./src/test/robotframework
   - name: Nightly IE11 Tests (Public User)
     install:
@@ -144,7 +99,7 @@ jobs:
     script:
     - export PYTHONWARNINGS="ignore"
     - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11
-      -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publicuserNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
+      -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publicuserNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
       ./src/test/robotframework
   - name: Nightly Edge Tests (Public User)
     install:
@@ -152,7 +107,7 @@ jobs:
     script:
     - export PYTHONWARNINGS="ignore"
     - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge
-      -v USE_SAUCELABS:TRUE -v BROWSER:edge --include publicuserNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
+      -v USE_SAUCELABS:TRUE -v BROWSER:edge --include publicuserNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
       ./src/test/robotframework
   - name: Nightly Safari Tests (Public User)
     install:
@@ -160,7 +115,7 @@ jobs:
     script:
     - export PYTHONWARNINGS="ignore"
     - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari
-      -v USE_SAUCELABS:TRUE -v BROWSER:safari --include publicuserNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
+      -v USE_SAUCELABS:TRUE -v BROWSER:safari --include publicuserNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
       ./src/test/robotframework
   - stage: nightly e2e tests dataprovider
     name: Nightly Chrome Tests (Dataprovider)
@@ -168,16 +123,14 @@ jobs:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome
-      -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include dataproviderNOTsmoketestNOTfirefoxonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include dataproviderNOTfirefoxonlyNOTlocalonly ./src/test/robotframework
   - name: Nightly Firefox Tests (Dataprovider)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
     - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox
-      -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include dataproviderNOTsmoketestNOTchromeonlyNOTlocalonly
+      -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include dataproviderNOTchromeonlyNOTlocalonly
       ./src/test/robotframework
   - name: Nightly IE11 Tests (Dataprovider)
     install:
@@ -185,7 +138,7 @@ jobs:
     script:
     - export PYTHONWARNINGS="ignore"
     - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11
-      -v USE_SAUCELABS:TRUE -v BROWSER:ie --include dataproviderNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
+      -v USE_SAUCELABS:TRUE -v BROWSER:ie --include dataproviderNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
       ./src/test/robotframework
   - name: Nightly Edge Tests (Dataprovider)
     install:
@@ -193,7 +146,7 @@ jobs:
     script:
     - export PYTHONWARNINGS="ignore"
     - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge
-      -v USE_SAUCELABS:TRUE -v BROWSER:edge --include dataproviderNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
+      -v USE_SAUCELABS:TRUE -v BROWSER:edge --include dataproviderNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
       ./src/test/robotframework
   - name: Nightly Safari Tests (Dataprovider)
     install:
@@ -201,7 +154,7 @@ jobs:
     script:
     - export PYTHONWARNINGS="ignore"
     - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari
-      -v USE_SAUCELABS:TRUE -v BROWSER:safari --include dataproviderNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTlocalonly
+      -v USE_SAUCELABS:TRUE -v BROWSER:safari --include dataproviderNOTfirefoxonlyNOTchromeonlyNOTlocalonly
       ./src/test/robotframework
   - stage: nightly e2e tests publisher
     name: Nightly Chrome Tests (Publisher)
@@ -210,7 +163,7 @@ jobs:
     script:
     - export PYTHONWARNINGS="ignore"
     - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome
-      -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include publisherNOTsmoketestNOTfirefoxonlyNOTlocalonly
+      -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include publisherNOTfirefoxonlyNOTlocalonly
       ./src/test/robotframework
   - name: Nightly Firefox Tests (Publisher)
     install:
@@ -218,7 +171,7 @@ jobs:
     script:
     - export PYTHONWARNINGS="ignore"
     - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox
-      -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include publisherNOTsmoketestNOTchromeonlyNOTlocalonly
+      -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include publisherNOTchromeonlyNOTlocalonly
       ./src/test/robotframework
   - name: Nightly IE11 Tests (Publisher)
     install:
@@ -226,7 +179,7 @@ jobs:
     script:
     - export PYTHONWARNINGS="ignore"
     - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11
-      -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publisherNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
+      -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publisherNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
       ./src/test/robotframework
   - name: Nightly Edge Tests (Publisher)
     install:
@@ -234,7 +187,7 @@ jobs:
     script:
     - export PYTHONWARNINGS="ignore"
     - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge
-      -v USE_SAUCELABS:TRUE -v BROWSER:edge --include publisherNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
+      -v USE_SAUCELABS:TRUE -v BROWSER:edge --include publisherNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
       ./src/test/robotframework
   - name: Nightly Safari Tests (Publisher)
     install:
@@ -242,7 +195,7 @@ jobs:
     script:
     - export PYTHONWARNINGS="ignore"
     - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari
-      -v USE_SAUCELABS:TRUE -v BROWSER:safari --include publisherNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTlocalonly
+      -v USE_SAUCELABS:TRUE -v BROWSER:safari --include publisherNOTfirefoxonlyNOTchromeonlyNOTlocalonly
       ./src/test/robotframework
 notifications:
   slack:
diff --git a/src/main/scss/fdz-theme/components/md/autocomplete-theme.scss b/src/main/scss/fdz-theme/components/md/autocomplete-theme.scss
index 4fe29ce8ad..8dfc62570b 100644
--- a/src/main/scss/fdz-theme/components/md/autocomplete-theme.scss
+++ b/src/main/scss/fdz-theme/components/md/autocomplete-theme.scss
@@ -56,4 +56,9 @@
       background: $background-500-018;
     }
   }
+  // fix for not found layout
+  &.md-not-found li {
+    margin-left: 16px;
+    margin-top: 14px;
+  }
 }
diff --git a/src/main/scss/fdz-theme/components/md/card-theme.scss b/src/main/scss/fdz-theme/components/md/card-theme.scss
index 3e69dfb611..67143ee352 100644
--- a/src/main/scss/fdz-theme/components/md/card-theme.scss
+++ b/src/main/scss/fdz-theme/components/md/card-theme.scss
@@ -82,3 +82,10 @@ $card-border-radius: 2px !default;
     padding-bottom: 16px;
   }
 }
+
+.fdz-theme md-card-header-text.pb {
+  padding-bottom: 8px;
+  @include rwd(600) {
+    padding-bottom: 16px;
+  }
+}
diff --git a/src/main/scss/fdz-theme/components/md/select-theme.scss b/src/main/scss/fdz-theme/components/md/select-theme.scss
index 07ccb19c9e..de39066724 100644
--- a/src/main/scss/fdz-theme/components/md/select-theme.scss
+++ b/src/main/scss/fdz-theme/components/md/select-theme.scss
@@ -96,7 +96,7 @@ md-input-container {
 
   &:not([disabled]):focus {
     .md-select-value {
-      border-bottom-color: $accent-color;
+      border-bottom-color: $primary-contrast;
       color: $foreground-1;
       &.md-select-placeholder {
         color: $foreground-1;
diff --git a/src/main/webapp/assets/styles/fdz.css b/src/main/webapp/assets/styles/fdz.css
index 8b9a82a0df..14f070d9a2 100644
--- a/src/main/webapp/assets/styles/fdz.css
+++ b/src/main/webapp/assets/styles/fdz.css
@@ -548,6 +548,10 @@ ui-view:focus {
     .fdz-theme .md-autocomplete-standard-list-container .md-autocomplete-suggestion:hover,
     .fdz-theme .md-autocomplete-standard-list-container .md-autocomplete-suggestion.selected {
       background: rgba(194, 194, 194, 0.18); }
+  .fdz-theme .md-autocomplete-suggestions-container.md-not-found li,
+  .fdz-theme .md-autocomplete-standard-list-container.md-not-found li {
+    margin-left: 16px;
+    margin-top: 14px; }
 
 .fdz-theme md-backdrop {
   background-color: rgba(60, 60, 60, 0); }
@@ -613,6 +617,12 @@ ui-view:focus {
     .fdz-theme form md-card-header-text {
       padding-bottom: 16px; } }
 
+.fdz-theme md-card-header-text.pb {
+  padding-bottom: 8px; }
+  @media (min-width: 600px) {
+    .fdz-theme md-card-header-text.pb {
+      padding-bottom: 16px; } }
+
 .fdz-theme md-checkbox .md-ripple {
   color: #f0812d; }
 
@@ -1092,7 +1102,7 @@ md-input-container:not(.md-input-invalid).md-input-focused.md-warn .md-select-va
   border-bottom-color: transparent !important; }
 
 .fdz-theme md-select:not([disabled]):focus .md-select-value {
-  border-bottom-color: #f7a839;
+  border-bottom-color: #0071bc;
   color: black; }
   .fdz-theme md-select:not([disabled]):focus .md-select-value.md-select-placeholder {
     color: black; }
diff --git a/src/main/webapp/scripts/datasetmanagement/views/data-set-edit-or-create.html.tmpl b/src/main/webapp/scripts/datasetmanagement/views/data-set-edit-or-create.html.tmpl
index f240cde557..63e414268c 100644
--- a/src/main/webapp/scripts/datasetmanagement/views/data-set-edit-or-create.html.tmpl
+++ b/src/main/webapp/scripts/datasetmanagement/views/data-set-edit-or-create.html.tmpl
@@ -314,7 +314,7 @@
   <div>
     <md-card class="mt0 mb8" ng-if="ctrl.dataSet.id">
       <md-card-header layout-align="center center">
-        <md-card-header-text>
+        <md-card-header-text class="pb">
           <h2 class="md-title">{{'data-set-management.detail.attachments.table-title' | translate}}</h2>
         </md-card-header-text>
       </md-card-header>
@@ -393,7 +393,7 @@
           </tr>
         </tbody>
       </table>
-      <md-divider ng-if="ctrl.createMode"></md-divider>
+      <md-divider></md-divider>
       <md-card-content ng-if="ctrl.createMode">
         {{'data-set-management.detail.attachments.save-data-set-before-adding-attachment' | translate}}
       </md-card-content>
diff --git a/src/main/webapp/scripts/instrumentmanagement/views/instrument-edit-or-create.html.tmpl b/src/main/webapp/scripts/instrumentmanagement/views/instrument-edit-or-create.html.tmpl
index 063ae67afd..03ad2cf76b 100644
--- a/src/main/webapp/scripts/instrumentmanagement/views/instrument-edit-or-create.html.tmpl
+++ b/src/main/webapp/scripts/instrumentmanagement/views/instrument-edit-or-create.html.tmpl
@@ -214,7 +214,7 @@
   <div>
     <md-card class="mt0 mb8" ng-if="ctrl.instrument.id">
       <md-card-header layout-align="center center">
-        <md-card-header-text>
+        <md-card-header-text class="pb">
           <h2 class="md-title">{{'instrument-management.detail.attachments.table-title' | translate}}</h2>
         </md-card-header-text>
       </md-card-header>
@@ -292,7 +292,7 @@
           </tr>
         </tbody>
       </table>
-      <md-divider ng-if="ctrl.createMode"></md-divider>
+      <md-divider></md-divider>
       <md-card-content ng-if="ctrl.createMode">
         {{'instrument-management.detail.attachments.save-instrument-before-adding-attachment' | translate}}
       </md-card-content>
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/detail.html.tmpl b/src/main/webapp/scripts/ordermanagement/components/configurator/detail.html.tmpl
index 516a9be723..30c837d1c5 100644
--- a/src/main/webapp/scripts/ordermanagement/components/configurator/detail.html.tmpl
+++ b/src/main/webapp/scripts/ordermanagement/components/configurator/detail.html.tmpl
@@ -38,7 +38,7 @@
       <md-list-item ng-if="$ctrl.releases.length > 0">
         <h5>{{'search-management.detail.versions' | translate }}:</h5>
         <div class="md-secondary">
-          <md-select name="version" ng-model="$ctrl.selectedVersion" ng-disabled="$ctrl.disabled" aria-label="{{'search-management.detail.versions' | translate }}">
+          <md-select class="md-accent" name="version" ng-model="$ctrl.selectedVersion" ng-disabled="$ctrl.disabled" aria-label="{{'search-management.detail.versions' | translate }}">
             <md-optgroup label="{{'shopping-cart.detail.label.available-versions' | translate}}">
               <md-option ng-repeat="item in $ctrl.releases" ng-value="item.version">
                 {{item.version}}{{$first?' (' + ('shopping-cart.detail.label.current' | translate) + ')':''}}</md-option>
@@ -55,7 +55,7 @@
       <md-list-item ng-if="$ctrl.accessWays.length > 0">
         <h5>{{'search-management.detail.access-ways' | translate}}:</h5>
         <div class="md-secondary">
-          <md-select name="accessWay" ng-model="$ctrl.selectedAccessWay" aria-label="{{'search-management.detail.access-ways' | translate}}">
+          <md-select class="md-accent" name="accessWay" ng-model="$ctrl.selectedAccessWay" aria-label="{{'search-management.detail.access-ways' | translate}}">
             <md-optgroup label="{{'shopping-cart.detail.label.available-access-ways' | translate}}">
               <md-option ng-repeat="item in $ctrl.accessWays" ng-value="item">{{item}}</md-option>
             </md-optgroup>
diff --git a/src/main/webapp/scripts/searchmanagement/directives/concept-search-result.html.tmpl b/src/main/webapp/scripts/searchmanagement/directives/concept-search-result.html.tmpl
index 5e7c2a106c..f48f077d46 100644
--- a/src/main/webapp/scripts/searchmanagement/directives/concept-search-result.html.tmpl
+++ b/src/main/webapp/scripts/searchmanagement/directives/concept-search-result.html.tmpl
@@ -23,11 +23,11 @@
     </md-card-header-text>
   </md-card-header>
   <md-card-content>
-    <div class="fdz-text-block fdz-multiline-property" display-i18n-string="searchResult.description" 
+    <div class="fdz-text-block fdz-multiline-property" display-i18n-string="searchResult.description"
          limit-to="256"></div>
   </md-card-content>
   <md-card-actions style="margin-bottom: -10px;"
-    data-has-any-authority="ROLE_PUBLISHER, ROLE_DATA_PROVIDER">
+    data-has-any-authority="ROLE_PUBLISHER">
     <a
       class="md-primary md-small md-button"
       style="display:flex;"
diff --git a/src/main/webapp/scripts/studymanagement/views/study-edit-or-create.html.tmpl b/src/main/webapp/scripts/studymanagement/views/study-edit-or-create.html.tmpl
index bd114bf92f..81aa61f435 100644
--- a/src/main/webapp/scripts/studymanagement/views/study-edit-or-create.html.tmpl
+++ b/src/main/webapp/scripts/studymanagement/views/study-edit-or-create.html.tmpl
@@ -555,7 +555,7 @@
   <div>
     <md-card class="mt0" ng-if="ctrl.study.id">
       <md-card-header layout-align="center center">
-        <md-card-header-text>
+        <md-card-header-text class="pb">
           <h2 class="md-title">{{'study-management.detail.attachments.table-title' | translate}}</h2>
         </md-card-header-text>
       </md-card-header>
@@ -645,7 +645,7 @@
         </tr>
         </tbody>
       </table>
-      <md-divider ng-if="ctrl.createMode"></md-divider>
+      <md-divider></md-divider>
       <md-card-content ng-if="ctrl.createMode">
         {{'study-management.detail.attachments.save-study-before-adding-attachment' | translate}}
       </md-card-content>
diff --git a/src/main/webapp/scripts/surveymanagement/views/survey-edit-or-create.html.tmpl b/src/main/webapp/scripts/surveymanagement/views/survey-edit-or-create.html.tmpl
index 9f678b1643..3dbfc6fecc 100644
--- a/src/main/webapp/scripts/surveymanagement/views/survey-edit-or-create.html.tmpl
+++ b/src/main/webapp/scripts/surveymanagement/views/survey-edit-or-create.html.tmpl
@@ -281,7 +281,7 @@
     <div flex-gt-sm="50">
       <md-card class="mt0 mb8">
         <md-card-header>
-          <md-card-header-text>
+          <md-card-header-text class="pb">
             <h2 class="md-title">{{'survey-management.detail.response-rate-information' | translate }}
               ({{'global.in-german' | translate}})</h2>
           </md-card-header-text>
@@ -323,7 +323,7 @@
     <div flex-gt-sm="50">
       <md-card class="mt0 mb8" ng-class="{'ml0': $mdMedia('gt-sm')}">
         <md-card-header>
-          <md-card-header-text>
+          <md-card-header-text class="pb">
             <h2 class="md-title">{{'survey-management.detail.response-rate-information' | translate }}
               ({{'global.in-english' | translate}})</h2>
           </md-card-header-text>
@@ -366,7 +366,7 @@
   <div>
     <md-card class="mt0 mb8" ng-if="ctrl.survey.id">
       <md-card-header layout-align="center center">
-        <md-card-header-text>
+        <md-card-header-text class="pb">
           <h2 class="md-title">{{'survey-management.detail.attachments.table-title' | translate}}</h2>
         </md-card-header-text>
       </md-card-header>
@@ -444,7 +444,7 @@
           </tr>
         </tbody>
       </table>
-      <md-divider ng-if="ctrl.createMode"></md-divider>
+      <md-divider></md-divider>
       <md-card-content ng-if="ctrl.createMode">
         {{'survey-management.detail.attachments.save-survey-before-adding-attachment' | translate}}
       </md-card-content>
diff --git a/src/test/robotframework/data_provider/common/check_banner_as_dataproviders.robot b/src/test/robotframework/data_provider/common/check_banner_as_dataproviders.robot
index fc0c151432..eb0174e15b 100644
--- a/src/test/robotframework/data_provider/common/check_banner_as_dataproviders.robot
+++ b/src/test/robotframework/data_provider/common/check_banner_as_dataproviders.robot
@@ -16,10 +16,6 @@ Check for Dataproviders Welcome Banner Appears
    Close The Banner
    Click on Information for Data Providers Link
    Close The Banner
-   Reload Page   # cross check the banner after reload also
-   Sleep  1s
-   Assert Welcome Text After Login
-   Close The Banner
    Dataprovidertest Provider Logout
    Login as dataprovider
 
diff --git a/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot b/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot
index 6405ef193b..c4c42bb80f 100644
--- a/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot
+++ b/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot
@@ -13,6 +13,8 @@ Assign and Unassign concept to and from an instrument
     Assign Concept to an Instrument
     Click on Save Button
     Get back to german home page
+    # wait for elasticsearch index beeing updated
+    Sleep  10s
     Assert the concept has been assigned to the instrument
     Assert the concept is assigned to a study
     Assert the concept is assigned to a survey
@@ -22,10 +24,10 @@ Assign and Unassign concept to and from an instrument
 *** Keywords ***
 Click on Instrument Edit Button
    Click Element Through Tooltips  xpath=//md-card[@type="instruments"]//button[@ng-click="ctrl.edit(ctrl.searchState)"]//span[text()="Bearbeiten"]
-   Click Element Through Tooltips  xpath=//button[md-icon[text()="mode_edit"]]
+   Click Element Through Tooltips  xpath=//md-card-actions//button[normalize-space()="Bearbeiten"]
 
 Assign Concept to an Instrument
-   Click Element Through Tooltips  xpath=//md-chips[@name="concepts"]//input[@placeholder="Konzepte suchen..."]
+   Click Element  xpath=//md-chips[@name="concepts"]//input[@placeholder="Konzepte suchen..."]
    Run Keyword If    '${BROWSER}' == 'firefox'  Click Element Through Tooltips  xpath=//md-virtual-repeat-container[@ng-hide="$mdAutocompleteCtrl.hidden"]//ul//li//span//span[contains(., "con-i8h7b1a0e4e4i8f5b1$")]
    Run Keyword If    '${BROWSER}' == 'chrome'  Click Element Through Tooltips  xpath=//md-virtual-repeat-container[@ng-hide="$mdAutocompleteCtrl.hidden"]//ul//li//span//span[contains(., "con-d3i8h7i8g6g6i8f5b1$")]
    Run Keyword If    '${BROWSER}' == 'safari'  Click Element Through Tooltips  xpath=//md-virtual-repeat-container[@ng-hide="$mdAutocompleteCtrl.hidden"]//ul//li//span//span[contains(., "con-e2j9h7i8g6g6i9g6c2$")]
@@ -37,26 +39,25 @@ Click on Save Button
 
 Assert the concept has been assigned to the instrument
    Click on instruments tab
-   Run Keyword If    '${BROWSER}' == 'safari'    Click Element Through Tooltips  xpath=//span[contains(., "ins-conceptprojectsafari-ins1$")]
-   Run Keyword If    '${BROWSER}' == 'chrome'    Click Element Through Tooltips  xpath=//span[contains(., "ins-conceptprojectchrome-ins1$")]
-   Run Keyword If    '${BROWSER}' == 'firefox'  Click Element Through Tooltips  xpath=//span[contains(., "ins-conceptprojectfirefox-ins1$")]
-   Run Keyword If    '${BROWSER}' == 'edge'  Click Element Through Tooltips  xpath=//span[contains(., "ins-conceptprojectedge-ins1$")]
-   Run Keyword If    '${BROWSER}' == 'ie'  Click Element Through Tooltips  xpath=//span[contains(., "ins-conceptprojectie-ins1$")]
-
-   Run Keyword If    '${BROWSER}' == 'firefox'  Page Should Contain   Konzept: Test Konzept Firefox Publisher
-   Run Keyword If    '${BROWSER}' == 'chrome'  Page Should Contain   Konzept: Test Konzept Chrome Publisher
-   Run Keyword If    '${BROWSER}' == 'safari'  Page Should Contain   Konzept: Test Konzept Safari Publisher
-   Run Keyword If    '${BROWSER}' == 'edge'  Page Should Contain   Konzept: Test Konzept Edge Publisher
-   Run Keyword If    '${BROWSER}' == 'ie'  Page Should Contain   Konzept: Test Konzept IE Publisher
+   Click on first search result
+   Click on concept tab
+   Click on first search result
+   Run Keyword If    '${BROWSER}' == 'firefox'  Page Should Contain   Test Konzept Firefox Publisher
+   Run Keyword If    '${BROWSER}' == 'chrome'  Page Should Contain   Test Konzept Chrome Publisher
+   Run Keyword If    '${BROWSER}' == 'safari'  Page Should Contain   Test Konzept Safari Publisher
+   Run Keyword If    '${BROWSER}' == 'edge'  Page Should Contain   Test Konzept Edge Publisher
+   Run Keyword If    '${BROWSER}' == 'ie'  Page Should Contain   Test Konzept IE Publisher
 
 Assert the concept is assigned to a study
-   Page Should Contain  Studie: Study Title in German
+   Page Should Contain  Study Title in German
 
 Assert the concept is assigned to a survey
-   Page Should Contain  Erhebung: Survey Title in German
+   Click on surveys tab
+   Page Should Contain  Survey Title in German
 
 Unassign the concept from the instrument
-   Click Element Through Tooltips  xpath=//button//md-icon[contains(.,"mode_edit")]
+   Click on instruments tab
+   Click Element Through Tooltips  xpath=//md-card-actions//button[normalize-space()="Bearbeiten"]
    Click Element Through Tooltips  xpath=//md-chips[@name="concepts"]//button[@ng-if="$mdChipsCtrl.isRemovable()"]//md-icon[@role="img"]
    Click on Save Button
 
diff --git a/src/test/robotframework/data_provider/datasetmanagement/create_dataset.robot b/src/test/robotframework/data_provider/datasetmanagement/create_dataset.robot
index 8ba7bedfdc..5814328411 100644
--- a/src/test/robotframework/data_provider/datasetmanagement/create_dataset.robot
+++ b/src/test/robotframework/data_provider/datasetmanagement/create_dataset.robot
@@ -72,7 +72,7 @@ Choose Type
 
 Choose Survey
     Pass Execution If    '${BROWSER}' == 'ie'     Dataset Creation not possible in IE
-    Click Element Through Tooltips  xpath=//md-chips[@name="surveys"]//md-autocomplete
+    Click Element   xpath=//md-chips[@name="surveys"]//md-autocomplete//input
     Click Element Through Tooltips  xpath=//span[contains(.,'sur-robotproject4${BROWSER}')]
 
 Fill up the Annotations
@@ -81,5 +81,5 @@ Fill up the Annotations
     Input Text  xpath=//textarea[contains(@name,'annotationsEn')]  This is Annotation in En
 
 Delete Dataset
-    Click Element Through Tooltips    xpath=//button[md-icon[text()='delete_forever']]
+    Click Element Through Tooltips    xpath=//button[normalize-space()='Löschen']
     Click Element Through Tooltips    xpath=//button[text()='Ja']
diff --git a/src/test/robotframework/data_provider/datasetmanagement/create_dataset_report.robot b/src/test/robotframework/data_provider/datasetmanagement/create_dataset_report.robot
index 5c3b4369b1..af9c0c7adb 100644
--- a/src/test/robotframework/data_provider/datasetmanagement/create_dataset_report.robot
+++ b/src/test/robotframework/data_provider/datasetmanagement/create_dataset_report.robot
@@ -8,10 +8,11 @@ Resource          ../../resources/search_resource.robot
 Create Dataset Report
     Select project by name    gra2005
     Click on data set tab
-    Click on search result by id    dat-gra2005-ds2$
+    Search for    dat-gra2005-ds2$
+    Click on first search result
     Click Report Button
     Write Dataset Report Version
-    Page Should Not Contain Element  xpath://md-toast[contains(@class,"md-accent")]
+    Page Should Contain  Der Datensatzreport wird jetzt erzeugt.
     Get back to home page and deselect project
 
 *** Keywords ***
diff --git a/src/test/robotframework/data_provider/instrumentmanagement/create_instrument.robot b/src/test/robotframework/data_provider/instrumentmanagement/create_instrument.robot
index 8b7295a30d..54183f7fd6 100644
--- a/src/test/robotframework/data_provider/instrumentmanagement/create_instrument.robot
+++ b/src/test/robotframework/data_provider/instrumentmanagement/create_instrument.robot
@@ -41,7 +41,7 @@ Choose Type
 
 Choose Survey
     Pass Execution If    '${BROWSER}' == 'ie'    Instrument Creation not possible in IE
-    Click Element Through Tooltips  xpath=//md-chips[@name="surveys"]//md-autocomplete
+    Click Element   xpath=//md-chips[@name="surveys"]//md-autocomplete//input
     Click Element Through Tooltips  xpath=//span[contains(.,'sur-robotproject4${BROWSER}')]
 
 Fill up the Annotations
@@ -50,6 +50,5 @@ Fill up the Annotations
     Input Text  xpath=//textarea[contains(@name,'annotationsEn')]  This is Annotation in En
 
 Delete Instrument
-    Click Element Through Tooltips    xpath=//button[md-icon[text()='delete_forever']]
+    Click Element Through Tooltips    xpath=//button[normalize-space()='Löschen']
     Click Element Through Tooltips    xpath=//button[text()='Ja']
-
diff --git a/src/test/robotframework/data_provider/instrumentmanagement/upload_instrument_attachment.robot b/src/test/robotframework/data_provider/instrumentmanagement/upload_instrument_attachment.robot
index b53cc930f2..47ad4872a4 100644
--- a/src/test/robotframework/data_provider/instrumentmanagement/upload_instrument_attachment.robot
+++ b/src/test/robotframework/data_provider/instrumentmanagement/upload_instrument_attachment.robot
@@ -8,7 +8,7 @@ Upload Attachment for Instrument
     [Tags]  chromeonly
     Select project by name    fileuploadproject
     Click on instruments tab
-    Click on search result by id    ins-fileuploadproject-ins1$
+    Search for    ins-fileuploadproject-ins1$
     Click instrument edit button
     Click add button
     Upload instrument file
@@ -17,7 +17,7 @@ Upload Attachment for Instrument
     Write instrument description in de and en
     Save Changes for instrument attachment
     Assert gra2005_W1_Questionnaire in the attachment
-    Delete instrument with uploaded document
+    Delete uploaded document
     Get back to home page and deselect project
 
 *** Keywords ***
@@ -26,7 +26,7 @@ Get back to home page and deselect project
     Click Element Through Tooltips    xpath=//md-sidenav//project-navbar-module//button[@aria-label='Clear Input']
 
 Click instrument edit button
-    Click Element Through Tooltips    xpath=//ui-view//button/md-icon[text()='mode_edit']
+    Click Element Through Tooltips    xpath=//ui-view//button[normalize-space()='Bearbeiten']
 
 Click add button
     Click Element Through Tooltips    xpath=//ui-view//button/md-icon[text()='add']
@@ -54,6 +54,7 @@ Save Changes for instrument attachment
 Assert gra2005_W1_Questionnaire in the attachment
     Page Should Contain Element    xpath=//a[@ng-href="/public/files/instruments/ins-fileuploadproject-ins1$/attachments/gra2005_W1_Questionnaire_de.pdf"]
 
-Delete instrument with uploaded document
+Delete uploaded document
     Click Element Through Tooltips    xpath=//button[md-icon[text()='delete_forever']]
     Click Element Through Tooltips    xpath=//button[text()='Ja']
+    Page Should Contain   Datei "gra2005_W1_Questionnaire_de.pdf" wurde gelöscht!
diff --git a/src/test/robotframework/data_provider/studymanagement/upload_study_attachment.robot b/src/test/robotframework/data_provider/studymanagement/upload_study_attachment.robot
index 36d6023024..b9ecdf7c44 100644
--- a/src/test/robotframework/data_provider/studymanagement/upload_study_attachment.robot
+++ b/src/test/robotframework/data_provider/studymanagement/upload_study_attachment.robot
@@ -26,7 +26,7 @@ Get back to home page and deselect project
     Click Element Through Tooltips    xpath=//md-sidenav//project-navbar-module//button[@aria-label="Clear Input"]
 
 Click study edit button
-    Click Element Through Tooltips    xpath=//ui-view//button//md-icon[text()="mode_edit"]
+    Click Element Through Tooltips    xpath=//ui-view//button[normalize-space()="Bearbeiten"]
 
 Click add button
     Click Element Through Tooltips    xpath=//ui-view//button[@ng-click="ctrl.addAttachment($event)"]//md-icon[text()="add"]
@@ -61,3 +61,4 @@ Assert gra2005_MethodReport in the attachment
 Delete study with uploaded document
     Click Element Through Tooltips    xpath=//button[md-icon[text()="delete_forever"]]
     Click Element Through Tooltips    xpath=//button[text()="Ja"]
+    Page Should Contain   Datei "gra2005_MethodReport_de.pdf" wurde gelöscht!
diff --git a/src/test/robotframework/data_provider/surveymanagement/upload_file.robot b/src/test/robotframework/data_provider/surveymanagement/upload_file.robot
index 67d608b74f..a6fb1854f1 100644
--- a/src/test/robotframework/data_provider/surveymanagement/upload_file.robot
+++ b/src/test/robotframework/data_provider/surveymanagement/upload_file.robot
@@ -8,19 +8,16 @@ Resource          ../../resources/search_resource.robot
 Upload file in survey editor
     Select project by name    fileuploadproject
     Click on surveys tab
-    Click on search result by id    sur-fileuploadproject-sy1$
+    Search for    sur-fileuploadproject-sy1$
     Click Survey Edit Button
     Upload Response Response Rate
-    # Sleep is needed as the save button is too soon available and the upload wouldn't be done.
-    Sleep    2s
     Save Response Rate Changes
     Get To Survey Page
     Page Should Contain Element    xpath=//md-content//a[@ng-href="/public/files/surveys/sur-fileuploadproject-sy1$/1_responserate_de"]
-    Click Survey Edit Button
+    Click Edit Button on Survey Details
     Delete Response Rate Upload
-    # Same Reason as above
-    Sleep    2s
     Save Response Rate Changes
+    Page Should Contain   gelöscht
     Get back to home page and deselect project
 
 *** Keywords ***
@@ -28,11 +25,9 @@ Get back to home page and deselect project
     Get back to german home page
     Click Element Through Tooltips    xpath=//md-sidenav//project-navbar-module//button[@aria-label='Clear Input']
 
-Click Survey Edit Button
-    Click Element Through Tooltips    xpath=//ui-view//button/md-icon[text()='mode_edit']
-
 Delete Response Rate Upload
     Click Element Through Tooltips    xpath=//md-card//button[@ng-click='ctrl.deleteResponseRateImageDe()']
+    Wait Until Angular Ready    2s
 
 Save Response Rate Changes
     Click Element Through Tooltips    xpath=//md-card//button[contains(.,'save')]
@@ -42,3 +37,7 @@ Get To Survey Page
 
 Upload Response Response Rate
     Choose File    xpath=//input[@type='file'][@ngf-select='ctrl.saveResponseRateImageDe($file)'][1]    ${CURDIR}/data/1_responserate_de.svg
+    Wait Until Angular Ready    2s
+
+Click Edit Button on Survey Details
+    Click Element Through Tooltips    xpath=//ui-view//button/md-icon[text()='mode_edit']
diff --git a/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot b/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot
index fe530cc093..4df1fda7fb 100644
--- a/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot
+++ b/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot
@@ -28,6 +28,7 @@ Put all access ways in shopping cart
 
 Delete an Item
    Click Element Through Tooltips   xpath=//button[text()=' Löschen ']
+   Xpath Should Match X Times   //md-card[contains(@class, 'fdz-search-result')]  4
 
 Select Access Way for the Data Package
    [Arguments]   ${accesswayname}
@@ -44,6 +45,7 @@ Put in Shopping Cart
 
 Go to Shopping Cart
    Click Element Through Tooltips    xpath=//a//md-icon[contains(., 'shopping_cart')]
+   Xpath Should Match X Times   //md-card[contains(@class, 'fdz-search-result')]  3
 
 Confirm Order
    Click Element Through Tooltips   xpath=//span[contains(., 'Beantragen')]
diff --git a/src/test/robotframework/resources/home_page_resource.robot b/src/test/robotframework/resources/home_page_resource.robot
index 9ec2444f35..ef7c30e1aa 100644
--- a/src/test/robotframework/resources/home_page_resource.robot
+++ b/src/test/robotframework/resources/home_page_resource.robot
@@ -14,7 +14,7 @@ Get back to german home page
   Click fdz logo
 
 Click fdz logo
-  Wait Until Keyword Succeeds    5s    1s    Click Element   xpath=//md-toolbar//a[contains(@class, "fdz-logo")]
+  Wait Until Keyword Succeeds    5s    1s    Click Element Through Tooltips  xpath=//md-toolbar//a[contains(@class, "fdz-logo")]
 
 Navigate to search
   Click Element   xpath=//a[@ui-sref="search"]
diff --git a/src/test/robotframework/resources/search_resource.robot b/src/test/robotframework/resources/search_resource.robot
index bbdb17ee2c..064fe9b258 100644
--- a/src/test/robotframework/resources/search_resource.robot
+++ b/src/test/robotframework/resources/search_resource.robot
@@ -26,7 +26,7 @@ Search for in details
 
 Select project by name
     [Arguments]    ${projectname}
-    Input Text    xpath=//md-sidenav//input[@type='search']    ${projectname}
+    Input Text    xpath=//md-sidenav//project-navbar-module//md-autocomplete//input    ${projectname}
     Run Keyword And Ignore Error  Click Element Through Tooltips    xpath=//md-virtual-repeat-container//span[text()='${projectname}']
 
 Delete project by name
@@ -92,7 +92,7 @@ Click on concept tab
     Run Keyword If    '/en/' in '${url}'    Click Element Through Tooltips    xpath=//md-pagination-wrapper/md-tab-item[contains(.,'Concepts')]
 
 Click Survey Edit Button
-    Click Element Through Tooltips    xpath=//ui-view//button/md-icon[text()='mode_edit']
+    Click Element Through Tooltips    xpath=//ui-view//button[normalize-space()='Bearbeiten']
 
 Click on Cockpit Button
     Click Element Through Tooltips    xpath=//project-navbar-module//a[contains(@class, 'md-accent')]
diff --git a/src/test/robotframework/run_smoketests.sh b/src/test/robotframework/run_smoketests.sh
deleted file mode 100755
index 7498df2a0a..0000000000
--- a/src/test/robotframework/run_smoketests.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# this script executes the robotframework tests tagged with 'smoketest' on
-# all supported browsers against the dev stage, the tests are executed
-# sequentially
-if [[ $0 != ./src/* ]]; then
-  echo "Please run this script from the root of our repository!"
-  exit -1
-fi
-export PYTHONWARNINGS="ignore"
-echo "Smoke Testing E2E with Chrome:"
-robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include smoketest --exclude firefoxonly ./src/test/robotframework
-if [ $? -ne 0 ]; then
-    echo "E2E test with Chrome failed!"
-    exit -1
-fi
-echo "Smoke Testing E2E with Firefox:"
-robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include smoketest --exclude chromeonly ./src/test/robotframework
-if [ $? -ne 0 ]; then
-    echo "E2E test with Firefox failed!"
-    exit -1
-fi
-echo "Smoke Testing E2E with IE11:"
-robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v USE_SAUCELABS:TRUE -v BROWSER:ie --include smoketest --exclude firefoxonly --exclude chromeonly --exclude noslowpoke ./src/test/robotframework
-if [ $? -ne 0 ]; then
-    echo "E2E test with IE11 failed!"
-    exit -1
-fi
-echo "Smoke Testing E2E with Edge:"
-robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v USE_SAUCELABS:TRUE -v BROWSER:edge --include smoketest --exclude firefoxonly --exclude chromeonly --exclude noslowpoke ./src/test/robotframework
-if [ $? -ne 0 ]; then
-    echo "E2E test with Edge failed!"
-    exit -1
-fi
-echo "Smoke Testing E2E with Safari:"
-robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v USE_SAUCELABS:TRUE -v BROWSER:safari --include smoketest --exclude firefoxonly --exclude chromeonly ./src/test/robotframework
-if [ $? -ne 0 ]; then
-    echo "E2E test with Safari failed!"
-    exit -1
-fi

From 8fe19545b1c9ca37540c548b7e998d10088f6836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Fri, 7 Feb 2020 12:16:22 +0100
Subject: [PATCH 12/30] fix for data provider search filter, logout and desgin
 issues (#2497)

---
 .../components/fdz/search-filter-theme.scss   | 11 ++-
 src/main/webapp/assets/styles/fdz.css         | 10 ++-
 src/main/webapp/scripts/app.js                |  3 +-
 .../scripts/common/error/errorEventHandler.js |  4 +-
 .../common/services/toolbarHeader.service.js  |  5 +-
 .../services/searchHelper.service.js          |  2 +-
 .../views/search.controller.js                | 67 +++++++------------
 .../auth/provider/auth.oauth2.service.js      |  5 +-
 8 files changed, 49 insertions(+), 58 deletions(-)

diff --git a/src/main/scss/fdz-theme/components/fdz/search-filter-theme.scss b/src/main/scss/fdz-theme/components/fdz/search-filter-theme.scss
index 66702ff29f..a640280ae7 100644
--- a/src/main/scss/fdz-theme/components/fdz/search-filter-theme.scss
+++ b/src/main/scss/fdz-theme/components/fdz/search-filter-theme.scss
@@ -95,11 +95,10 @@
   margin-top: 0;
 }
 
-.fdz-search-filter-items li {
+.md-autocomplete-suggestions.fdz-search-filter-items li.md-autocomplete-suggestion {
   border-bottom: 1px solid #ccc;
   height: auto;
-  padding: 6px;
-  padding-left: 12px;
+  padding: 6px 12px 5px 12px;
   white-space: normal;
 }
 
@@ -108,3 +107,9 @@
   display: block;
   line-height: 1.5;
 }
+
+.md-autocomplete-suggestions-container.md-not-found .fdz-search-filter-items li {
+  margin-left: 0px;
+  margin-top: 0px;
+  padding: 4px 12px 2px 12px;
+}
diff --git a/src/main/webapp/assets/styles/fdz.css b/src/main/webapp/assets/styles/fdz.css
index 14f070d9a2..41d63106f3 100644
--- a/src/main/webapp/assets/styles/fdz.css
+++ b/src/main/webapp/assets/styles/fdz.css
@@ -2374,11 +2374,10 @@ tr:focus {
   opacity: 1;
   margin-top: 0; }
 
-.fdz-search-filter-items li {
+.md-autocomplete-suggestions.fdz-search-filter-items li.md-autocomplete-suggestion {
   border-bottom: 1px solid #ccc;
   height: auto;
-  padding: 6px;
-  padding-left: 12px;
+  padding: 6px 12px 5px 12px;
   white-space: normal; }
 
 .fdz-search-filter-items .item-title,
@@ -2386,6 +2385,11 @@ tr:focus {
   display: block;
   line-height: 1.5; }
 
+.md-autocomplete-suggestions-container.md-not-found .fdz-search-filter-items li {
+  margin-left: 0px;
+  margin-top: 0px;
+  padding: 4px 12px 2px 12px; }
+
 .fdz-theme .fdz-data-packet {
   box-shadow: none;
   padding-top: 16px; }
diff --git a/src/main/webapp/scripts/app.js b/src/main/webapp/scripts/app.js
index 8c19c745b1..a48cf6219d 100644
--- a/src/main/webapp/scripts/app.js
+++ b/src/main/webapp/scripts/app.js
@@ -74,7 +74,8 @@ try {
           if (Principal.isAuthenticated() &&
             $rootScope.toState.parent.name === 'account' &&
             ($rootScope.toState.name === 'login' ||
-              $rootScope.toState.name === 'register')) {
+              $rootScope.toState.name === 'register' ||
+              $rootScope.toState.name === 'start')) {
             return trans.router.stateService.target('search',
             {
               lang: LanguageService.getCurrentInstantly()
diff --git a/src/main/webapp/scripts/common/error/errorEventHandler.js b/src/main/webapp/scripts/common/error/errorEventHandler.js
index 9f6151315d..7b800dcb5a 100644
--- a/src/main/webapp/scripts/common/error/errorEventHandler.js
+++ b/src/main/webapp/scripts/common/error/errorEventHandler.js
@@ -8,7 +8,7 @@ based on the Error Event.*/
 
 angular.module('metadatamanagementApp').run(
   function($rootScope, $state, SimpleMessageToastService, PageTitleService,
-           LanguageService, Auth) {
+           LanguageService, Auth, Principal) {
     var ignore404 = 0;
     var ignore401 = 0;
 
@@ -76,7 +76,7 @@ angular.module('metadatamanagementApp').run(
       // they wanted before you
       // send them to the signin state, so you can
       // return them when you're done
-      if (!inTransition &&
+      if (!Principal.isAuthenticated() && !inTransition &&
           $rootScope.toStateName &&
           $rootScope.toStateName !== 'login' &&
           $rootScope.toStateName !== 'register') {
diff --git a/src/main/webapp/scripts/common/services/toolbarHeader.service.js b/src/main/webapp/scripts/common/services/toolbarHeader.service.js
index b1e8282f83..61aa011746 100644
--- a/src/main/webapp/scripts/common/services/toolbarHeader.service.js
+++ b/src/main/webapp/scripts/common/services/toolbarHeader.service.js
@@ -4,10 +4,7 @@
 // TODO: Move factory to the appropiate location
 angular.module('metadatamanagementApp').factory('ToolbarHeaderService',
   function($rootScope, $log, Principal) {
-    var isAuthenticated = false;
-    Principal.identity().then(function() {
-      isAuthenticated = Principal.isAuthenticated;
-    });
+    var isAuthenticated = Principal.isAuthenticated;
     var stripVersionSuffix = function(id) {
       if (!id) {
         return id;
diff --git a/src/main/webapp/scripts/searchmanagement/services/searchHelper.service.js b/src/main/webapp/scripts/searchmanagement/services/searchHelper.service.js
index 0a31ba57c3..7740683b36 100644
--- a/src/main/webapp/scripts/searchmanagement/services/searchHelper.service.js
+++ b/src/main/webapp/scripts/searchmanagement/services/searchHelper.service.js
@@ -376,7 +376,7 @@ angular.module('metadatamanagementApp').factory(
           if (_.isArray(filterArray)) {
             filterArray.push(filterCriteria);
           } else {
-            _.set(query, 'body.query.bool.filter', filterCriteria);
+            _.set(query, 'body.query.bool.filter[0]', filterCriteria);
           }
         }
       }
diff --git a/src/main/webapp/scripts/searchmanagement/views/search.controller.js b/src/main/webapp/scripts/searchmanagement/views/search.controller.js
index ee89a1f65a..07760dece6 100644
--- a/src/main/webapp/scripts/searchmanagement/views/search.controller.js
+++ b/src/main/webapp/scripts/searchmanagement/views/search.controller.js
@@ -14,8 +14,8 @@ angular.module('metadatamanagementApp').controller('SearchController',
            $rootScope, ProjectStatusScoringService, DeleteMetadataService,
            SimpleMessageToastService) {
 
-    var queryChangedOnInit = false;
-    var tabChangedOnInitFlag = false;
+    var queryChangedOnInit = true;
+    var tabChangedOnInitFlag = true;
     var locationChanged = false;
     var currentProjectChangeIsBeingHandled = false;
     var selectedTabChangeIsBeingHandled = false;
@@ -460,23 +460,6 @@ angular.module('metadatamanagementApp').controller('SearchController',
         });
       });
 
-    // $scope.$on('user-logged-out', function() {
-    //   var currentType = $scope.tabs[$scope.searchParams.selectedTabIndex]
-    //     .elasticSearchType;
-    //   $scope.tabs = _.filter($scope.tabs, function(tab) {
-    //     return tab.visibleForPublicUser || Principal.isAuthenticated();
-    //   });
-    //   var indexToSelect = _.findIndex($scope.tabs,
-    //     function(tab) {
-    //       return tab.elasticSearchType === currentType;
-    //     });
-    //   if (indexToSelect < 0) {
-    //     $scope.searchParams.selectedTabIndex = 0;
-    //   } else {
-    //     $scope.searchParams.selectedTabIndex = indexToSelect;
-    //   }
-    // });
-
     $scope.onPageChanged = function() {
       writeSearchParamsToLocation();
       $scope.search();
@@ -500,32 +483,34 @@ angular.module('metadatamanagementApp').controller('SearchController',
           queryChangeIsBeingHandled = false;
         });
       });
+    }
 
-      $scope.onSelectedTabChanged = function() {
-        if (!selectedTabChangeIsBeingHandled && !queryChangeIsBeingHandled) {
-          //prevent multiple tab change handlers caused by logout
-          selectedTabChangeIsBeingHandled = true;
-          $timeout(function() {
-            if (!tabChangedOnInitFlag) {
-              $scope.searchParams.filter = SearchHelperService
-                .removeIrrelevantFilters(
-                  $scope.tabs[$scope.searchParams.selectedTabIndex]
-                    .elasticSearchType,
-                  $scope.searchParams.filter);
-              $scope.searchParams.sortBy = undefined;
-              $scope.options.pageObject.page = 1;
-              writeSearchParamsToLocation();
-              if (!currentProjectChangeIsBeingHandled) {
-                $scope.search();
-              }
-              $scope.loadStudyForProject();
+    $scope.onSelectedTabChanged = function() {
+      if (!selectedTabChangeIsBeingHandled) {
+        //prevent multiple tab change handlers caused by logout
+        selectedTabChangeIsBeingHandled = true;
+        $timeout(function() {
+          if (!tabChangedOnInitFlag) {
+            $scope.searchParams.filter = SearchHelperService
+              .removeIrrelevantFilters(
+                $scope.tabs[$scope.searchParams.selectedTabIndex]
+                  .elasticSearchType,
+                $scope.searchParams.filter);
+            $scope.searchParams.sortBy = undefined;
+            $scope.options.pageObject.page = 1;
+            writeSearchParamsToLocation();
+            if (!currentProjectChangeIsBeingHandled) {
+              $scope.search();
             }
+            $scope.loadStudyForProject();
+            selectedTabChangeIsBeingHandled = false;
+          } else {
             tabChangedOnInitFlag = false;
             selectedTabChangeIsBeingHandled = false;
-          });
-        }
-      };
-    }
+          }
+        });
+      }
+    };
     //Refresh function for the refresh button
     $scope.refresh = function() {
       $scope.search();
diff --git a/src/main/webapp/scripts/usermanagement/auth/provider/auth.oauth2.service.js b/src/main/webapp/scripts/usermanagement/auth/provider/auth.oauth2.service.js
index 6ae2d43bb2..276d5fef4d 100644
--- a/src/main/webapp/scripts/usermanagement/auth/provider/auth.oauth2.service.js
+++ b/src/main/webapp/scripts/usermanagement/auth/provider/auth.oauth2.service.js
@@ -32,9 +32,8 @@ angular
         },
         logout: function() {
           // logout from the server
-          $http.post('api/logout').then(function() {
-            localStorageService.remove('token');
-          });
+          localStorageService.remove('token');
+          $http.post('api/logout');
         },
         getToken: function() {
           return localStorageService.get('token');

From cbe09aeb775adb53152f05580e418e87f7642e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Wed, 12 Feb 2020 11:59:10 +0100
Subject: [PATCH 13/30] #2383 add derivedVariables to template model

---
 .travis.yml                                   |  4 +---
 .../service/DataSetReportService.java         | 19 ++++++++++++++-----
 .../repository/VariableRepository.java        |  6 +++++-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cb18a4b8a5..4ed12f7706 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -162,9 +162,7 @@ jobs:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome
-      -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include publisherNOTfirefoxonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include publisherNOTfirefoxonlyNOTlocalonly ./src/test/robotframework
   - name: Nightly Firefox Tests (Publisher)
     install:
     - "./src/test/robotframework/setup.sh"
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/service/DataSetReportService.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/service/DataSetReportService.java
index 23d9a01929..e7bead86e6 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/service/DataSetReportService.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/service/DataSetReportService.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.cloudfoundry.client.CloudFoundryClient;
 import org.cloudfoundry.client.v3.tasks.CreateTaskRequest;
 import org.cloudfoundry.operations.CloudFoundryOperations;
@@ -38,7 +39,6 @@
 import eu.dzhw.fdz.metadatamanagement.common.config.MetadataManagementProperties;
 import eu.dzhw.fdz.metadatamanagement.common.config.MetadataManagementProperties.DatasetReportTask;
 import eu.dzhw.fdz.metadatamanagement.common.domain.Task;
-import eu.dzhw.fdz.metadatamanagement.common.domain.projections.IdAndVersionProjection;
 import eu.dzhw.fdz.metadatamanagement.common.rest.util.ZipUtil;
 import eu.dzhw.fdz.metadatamanagement.common.service.TaskManagementService;
 import eu.dzhw.fdz.metadatamanagement.datasetmanagement.domain.DataSet;
@@ -54,6 +54,7 @@
 import eu.dzhw.fdz.metadatamanagement.variablemanagement.domain.RelatedQuestion;
 import eu.dzhw.fdz.metadatamanagement.variablemanagement.domain.ValidResponse;
 import eu.dzhw.fdz.metadatamanagement.variablemanagement.domain.Variable;
+import eu.dzhw.fdz.metadatamanagement.variablemanagement.domain.projections.VariableSubDocumentProjection;
 import eu.dzhw.fdz.metadatamanagement.variablemanagement.repository.VariableRepository;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
@@ -388,8 +389,8 @@ private Map<String, Object> createVariableDependingMaps(Map<String, Object> data
     Map<String, Instrument> instrumentMap = new HashMap<>();
     Map<String, List<ValidResponse>> firstTenValidResponses = new HashMap<>();
     Map<String, List<ValidResponse>> lastTenValidResponses = new HashMap<>();
-    Map<String, List<IdAndVersionProjection>> sameVariablesInPanel = new HashMap<>();
-
+    Map<String, List<VariableSubDocumentProjection>> sameVariablesInPanel = new HashMap<>();
+    Map<String, List<VariableSubDocumentProjection>> derivedVariables = new HashMap<>();
 
     for (Variable variable : variables) {
       int sizeValidResponses = 0;
@@ -428,17 +429,25 @@ private Map<String, Object> createVariableDependingMaps(Map<String, Object> data
             .subList(sizeValidResponses - 10, sizeValidResponses));
       }
 
-      if (variable.getPanelIdentifier() != null) {
-        List<IdAndVersionProjection> otherVariablesInPanel = this.variableRepository
+      if (!StringUtils.isEmpty(variable.getPanelIdentifier())) {
+        List<VariableSubDocumentProjection> otherVariablesInPanel = this.variableRepository
             .findAllIdsByPanelIdentifierAndIdNot(variable.getPanelIdentifier(), variable.getId());
         sameVariablesInPanel.put(variable.getId(), otherVariablesInPanel);
       }
+
+      if (!StringUtils.isEmpty(variable.getDerivedVariablesIdentifier())) {
+        List<VariableSubDocumentProjection> otherDerivedVariables =
+            this.variableRepository.findAllIdsByDerivedVariablesIdentifierAndIdNot(
+                variable.getDerivedVariablesIdentifier(), variable.getId());
+        derivedVariables.put(variable.getId(), otherDerivedVariables);
+      }
     }
     dataForTemplate.put("questions", questionsMap);
     dataForTemplate.put("instruments", instrumentMap);
     dataForTemplate.put("firstTenValidResponses", firstTenValidResponses);
     dataForTemplate.put("lastTenValidResponses", lastTenValidResponses);
     dataForTemplate.put("sameVariablesInPanel", sameVariablesInPanel);
+    dataForTemplate.put("derivedVariables", derivedVariables);
 
     return dataForTemplate;
 
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/repository/VariableRepository.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/repository/VariableRepository.java
index 3489935ac3..0809588998 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/repository/VariableRepository.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/repository/VariableRepository.java
@@ -22,7 +22,7 @@ public interface VariableRepository extends BaseRepository<Variable, String> {
   Stream<Variable> streamByDataAcquisitionProjectId(String dataAcquisitionProjectId);
 
   @RestResource(exported = false)
-  List<IdAndVersionProjection> findAllIdsByPanelIdentifierAndIdNot(String panelIdentifier,
+  List<VariableSubDocumentProjection> findAllIdsByPanelIdentifierAndIdNot(String panelIdentifier,
       String id);
 
   @RestResource(exported = true)
@@ -119,4 +119,8 @@ List<VariableSubDocumentProjection> findSubDocumentsByRelatedQuestionsQuestionId
   @RestResource(exported = false)
   Stream<Variable> findByDataAcquisitionProjectIdAndShadowIsTrueAndSuccessorIdIsNull(
       String dataAcquisitionProjectId);
+
+  @RestResource(exported = false)
+  List<VariableSubDocumentProjection> findAllIdsByDerivedVariablesIdentifierAndIdNot(
+      String derivedVariablesIdentifier, String id);
 }

From 37d3a067343b71cc1eee47be20f4434176cfd932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Wed, 12 Feb 2020 12:26:21 +0100
Subject: [PATCH 14/30] #2383 rename methods

---
 .../datasetmanagement/service/DataSetReportService.java       | 4 ++--
 .../variablemanagement/repository/VariableRepository.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/service/DataSetReportService.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/service/DataSetReportService.java
index e7bead86e6..4e99914509 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/service/DataSetReportService.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/service/DataSetReportService.java
@@ -431,13 +431,13 @@ private Map<String, Object> createVariableDependingMaps(Map<String, Object> data
 
       if (!StringUtils.isEmpty(variable.getPanelIdentifier())) {
         List<VariableSubDocumentProjection> otherVariablesInPanel = this.variableRepository
-            .findAllIdsByPanelIdentifierAndIdNot(variable.getPanelIdentifier(), variable.getId());
+            .findAllByPanelIdentifierAndIdNot(variable.getPanelIdentifier(), variable.getId());
         sameVariablesInPanel.put(variable.getId(), otherVariablesInPanel);
       }
 
       if (!StringUtils.isEmpty(variable.getDerivedVariablesIdentifier())) {
         List<VariableSubDocumentProjection> otherDerivedVariables =
-            this.variableRepository.findAllIdsByDerivedVariablesIdentifierAndIdNot(
+            this.variableRepository.findAllByDerivedVariablesIdentifierAndIdNot(
                 variable.getDerivedVariablesIdentifier(), variable.getId());
         derivedVariables.put(variable.getId(), otherDerivedVariables);
       }
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/repository/VariableRepository.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/repository/VariableRepository.java
index 0809588998..66dcef7ade 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/repository/VariableRepository.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/repository/VariableRepository.java
@@ -22,7 +22,7 @@ public interface VariableRepository extends BaseRepository<Variable, String> {
   Stream<Variable> streamByDataAcquisitionProjectId(String dataAcquisitionProjectId);
 
   @RestResource(exported = false)
-  List<VariableSubDocumentProjection> findAllIdsByPanelIdentifierAndIdNot(String panelIdentifier,
+  List<VariableSubDocumentProjection> findAllByPanelIdentifierAndIdNot(String panelIdentifier,
       String id);
 
   @RestResource(exported = true)
@@ -121,6 +121,6 @@ Stream<Variable> findByDataAcquisitionProjectIdAndShadowIsTrueAndSuccessorIdIsNu
       String dataAcquisitionProjectId);
 
   @RestResource(exported = false)
-  List<VariableSubDocumentProjection> findAllIdsByDerivedVariablesIdentifierAndIdNot(
+  List<VariableSubDocumentProjection> findAllByDerivedVariablesIdentifierAndIdNot(
       String derivedVariablesIdentifier, String id);
 }

From 4257b4a5761453f4e807bba1322fb759efaa328b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Thu, 13 Feb 2020 13:23:33 +0100
Subject: [PATCH 15/30] Fix robot tests for publisher (#2497)

---
 src/test/robotframework/common_variables.yaml   |  2 +-
 ... Back to Previous Version of a Concept.robot |  6 +-----
 .../Check Used Concept Unable to Delete.robot   |  4 +---
 .../Conceptmanagement/Create Concept.robot      | 12 ++++++------
 ...ishers Metadata Deleting Access Rights.robot |  4 ++--
 ...eleasing and Unreleasing Access Rights.robot | 16 ++++++++--------
 ...n and Unassign Publications from Study.robot | 17 ++++++++---------
 .../Related Publications Upload.robot           |  3 +--
 .../Studymanagement/Create_Study.robot          |  4 ++--
 .../Search Next and Previous.robot              |  5 +----
 .../resources/project_management_resource.robot |  8 ++++----
 11 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/src/test/robotframework/common_variables.yaml b/src/test/robotframework/common_variables.yaml
index dd8ad1b88b..a39f572c48 100644
--- a/src/test/robotframework/common_variables.yaml
+++ b/src/test/robotframework/common_variables.yaml
@@ -1,4 +1,4 @@
-website: https://metadatamanagement-dev.cfapps.io
+website: https://metadatamanagement-dev.cfapps.io/#!/de/start
 capabilities:
   chrome:
     name: Win10/Chrome
diff --git a/src/test/robotframework/publisher/Conceptmanagement/Check Roll Back to Previous Version of a Concept.robot b/src/test/robotframework/publisher/Conceptmanagement/Check Roll Back to Previous Version of a Concept.robot
index 9e444b4d1e..b7f2aeacf7 100644
--- a/src/test/robotframework/publisher/Conceptmanagement/Check Roll Back to Previous Version of a Concept.robot	
+++ b/src/test/robotframework/publisher/Conceptmanagement/Check Roll Back to Previous Version of a Concept.robot	
@@ -14,8 +14,7 @@ Check roll back concept changes
 *** Keywords ***
 Concept Roll Back
    Search for  Roll Back Concept ${BROWSER} De
-   Run Keyword if  '${BROWSER}' == 'chrome'  Sleep  3s  #chrome is too fast
-   Click on the first search result
+   Click on first search result
    Click Element Through Tooltips  xpath=//button[@ng-click="ctrl.conceptEdit()"]//md-icon[contains(., "mode_edit")]
    Click Element Through Tooltips  xpath=//button[@ng-click="ctrl.openRestorePreviousVersionDialog($event)"]//md-icon[contains(., "history")]
    Click Element Through Tooltips  xpath=//md-dialog-content//table//tr//td[contains(., "Roll Back Concept ${BROWSER} De_Rollback")]
@@ -23,6 +22,3 @@ Concept Roll Back
    Click Element Through Tooltips  xpath=//button[@ng-click="ctrl.openRestorePreviousVersionDialog($event)"]//md-icon[contains(., "history")]
    Click Element Through Tooltips  xpath=//md-dialog-content//table//tr[@class="ng-scope"]//td[contains(., "Roll Back Concept ${BROWSER} De")]
    Click Element Through Tooltips  xpath=//button[@ng-click="ctrl.saveConcept()"]//md-icon[contains(., "save")]
-
-Click on the first search result
-    Click Element Through Tooltips   xpath=//a[@class='fdz-search-result'][1]
diff --git a/src/test/robotframework/publisher/Conceptmanagement/Check Used Concept Unable to Delete.robot b/src/test/robotframework/publisher/Conceptmanagement/Check Used Concept Unable to Delete.robot
index 1f5467f528..3283edd267 100644
--- a/src/test/robotframework/publisher/Conceptmanagement/Check Used Concept Unable to Delete.robot	
+++ b/src/test/robotframework/publisher/Conceptmanagement/Check Used Concept Unable to Delete.robot	
@@ -16,11 +16,9 @@ Check already used concept can not be deleted
     Close The Toast Message
 
 *** Keywords ***
-
 Click on Concept Delete Button
    Search for  Referenced Concept ${BROWSER} De
-   Run Keyword if  '${BROWSER}' == 'chrome'  Sleep  2s  #chrome is too fast
-   Click Element Through Tooltips  xpath=//concept-search-result//div[@data-has-any-authority="ROLE_PUBLISHER"]//button[contains(., "delete_forever")][1]
+   Click Element Through Tooltips  xpath=(//concept-search-result//md-card-actions//button[normalize-space()="Löschen"])[1]
 
 Assert concept can not be deleted toast message
    Page Should Contain  Das Konzept kann nicht gelöscht werden
diff --git a/src/test/robotframework/publisher/Conceptmanagement/Create Concept.robot b/src/test/robotframework/publisher/Conceptmanagement/Create Concept.robot
index f7d48dcdc6..d8085cbcfd 100644
--- a/src/test/robotframework/publisher/Conceptmanagement/Create Concept.robot	
+++ b/src/test/robotframework/publisher/Conceptmanagement/Create Concept.robot	
@@ -27,8 +27,8 @@ Create Concepts by Publisher
     Input Text    name=authorsMiddleName_1    noMiddleName
     Input Text    name=authorsLastName_1    Raza
     Move Second Author To Place One
-    Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextDe"]//input[@type="search"]   Konzept Tag 007
-    Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextEn"]//input[@type="search"]   Concept Tag 007
+    Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextDe"]//input   Konzept Tag 007
+    Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextEn"]//input   Concept Tag 007
     Input Text    xpath=//textarea[@name="license"]    Concept License Agreement
     Select a language
     Save Changes
@@ -50,15 +50,15 @@ Move Second Author To Place One
     Click Element Through Tooltips    xpath=//md-card/descendant::button[md-icon[text()='keyboard_arrow_up']]
 
 Select a language
-    Click Element Through Tooltips    xpath=//md-autocomplete[@md-search-text="languageName"]//input[@type="search"]
+    Click Element    xpath=//md-autocomplete[@md-search-text="languageName"]//input
     Click Element Through Tooltips    xpath=//md-virtual-repeat-container[@ng-hide="$mdAutocompleteCtrl.hidden"]//ul//li//span[contains(., "Akan")]
 
 Delete Concept
-    Click Element Through Tooltips    xpath=//a[contains(., "RDC-ID-007_${BROWSER}")]//following::button[md-icon[text()='delete_forever']]
+    Click Element Through Tooltips    xpath=//concept-search-result//md-card-header[contains(., "RDC-ID-007_${BROWSER}")]/following::md-card-actions//button[normalize-space()="Löschen"]
     Click Element Through Tooltips    xpath=//button[text()='Ja']
 
 Assert created concept under concept list
-    Page Should Contain Element     xpath=//div[@class="md-title fdz-truncate-string"]//span[contains(., "Test Konzepte")]
+    Page Should Contain Element     xpath=//concept-search-result//span[contains(., "RDC-ID-007_${BROWSER}")]
 
 Upload concept attchment file
     Press Key   xpath=//input[@type='file' and @ngf-select="ctrl.upload($file)"][1]   ${CURDIR}/data/gra2005_MethodReport_de.pdf  # data folder contains the PDF file
@@ -88,7 +88,7 @@ Assert gra2005_W1_Questionnaire in the attachment
 
 Attach documents to the concept
     Search for  Test Konzepte_RDC-ID-007_${BROWSER}
-    Click Element Through Tooltips    xpath=//a[@aria-label="Klicken, um das Konzept zu bearbeiten"]//md-icon[text()="mode_edit"]
+    Click Element Through Tooltips    xpath=xpath=(//concept-search-result//md-card-actions//a[normalize-space()="Bearbeiten"])[1]
     Click Element Through Tooltips    xpath=//md-card-actions[@ng-if="!ctrl.createMode"]//button//md-icon[text()="add"]
     Upload concept attchment file
     Select concept data type
diff --git a/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot b/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot
index f2358a8897..94dba6fe63 100644
--- a/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot	
+++ b/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot	
@@ -39,8 +39,8 @@ Publisher Create But Can Not Delete Study When Publisher is Ready
    Input Text    name=authorsFirstName_0    Anne
    Input Text    name=authorsMiddleName_0    noMiddleName
    Input Text    name=authorsLastName_0    Droid
-   Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextDe"]//input[@type="search"]   Deutsche Tags Schlüsselwörter
-   Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextEn"]//input[@type="search"]   English Days Keyword
+   Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextDe"]//input   Deutsche Tags Schlüsselwörter
+   Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextEn"]//input   English Days Keyword
    Save Changes
    Click on Cockpit Button
    Click Publisher Ready Checkbox for Studies
diff --git a/src/test/robotframework/publisher/Projectmanagement/Check Publishers Project Releasing and Unreleasing Access Rights.robot b/src/test/robotframework/publisher/Projectmanagement/Check Publishers Project Releasing and Unreleasing Access Rights.robot
index 8256070e2e..8887ff10da 100644
--- a/src/test/robotframework/publisher/Projectmanagement/Check Publishers Project Releasing and Unreleasing Access Rights.robot	
+++ b/src/test/robotframework/publisher/Projectmanagement/Check Publishers Project Releasing and Unreleasing Access Rights.robot	
@@ -42,7 +42,7 @@ Close The Toast Message for Project Release Validation
   Click Element Through Tooltips  xpath=//button//following::md-icon[contains(.,"close")]
 
 Click Study Edit Button
-  Click Element Through Tooltips  xpath=//button[md-icon[text()="mode_edit"]]
+  Click Element Through Tooltips  xpath=(//study-search-result//md-card-actions//button[normalize-space()="Bearbeiten"])[1]
 
 Click Study Save Button
   Click Element Through Tooltips  xpath=//button[@type="submit"]//md-icon[contains(. , "save")]
@@ -61,9 +61,9 @@ Get back to home page and deselect project
 Verify The Released Project is Available under The Study Tab
   Sleep  60s  #We need explicit sleep to ensure the project is available under the study tab
   Publisher Logout   #explicit logout
-  Click on study tab
+  Navigate to search
   Search for  stu-robotprojectrelease4${BROWSER}$
-  Wait Until Page Contains Element  xpath=//md-card-header-text//span[contains(.,"stu-robotprojectrelease4${BROWSER}$")]  5s
+  Wait Until Page Contains Element  xpath=//md-card-header-text//span[contains(.,"Test Project Release Study ${BROWSER}")]  5s
 
 Verify The Unreleased Project is Still Available under The Study Tab with Shadow Copy
   Login as publisher
@@ -75,9 +75,9 @@ Verify The Unreleased Project is Still Available under The Study Tab with Shadow
   Click Publisher Ready Checkbox for Studies   #deselect the check box here
   Sleep  5s   #We need explicit sleep to ensure the project is not available under the study tab
   Publisher Logout
-  Click on study tab
+  Navigate to search
   Search for  stu-robotprojectrelease4${BROWSER}$
-  Wait Until Page Contains Element  xpath=//md-card-header-text//span[contains(.,"stu-robotprojectrelease4${BROWSER}$")]  5s
+  Wait Until Page Contains Element  xpath=//md-card-header-text//span[contains(.,"Test Project Release Study ${BROWSER}")]  5s
 
 Edit Project Title and Check it does not appear under study when unreleased
   Login as publisher  #we need explicit login to be synced with suite teardown
@@ -89,7 +89,7 @@ Edit Project Title and Check it does not appear under study when unreleased
   Get back to german home page
   Sleep  10s
   Publisher Logout
-  Click on study tab
+  Navigate to search
   Search for  Test Project Release Study ${BROWSER} DE
   Wait Until Page Contains Element  xpath=//md-card-header-text//span[contains(. ,"Test Project Release Study ${BROWSER} DE")]  10s
 
@@ -103,7 +103,7 @@ Check Edited Project appears under study when released
   Click on OK Button
   Sleep  90s  #We need explicit sleep to ensure the project is available under the study tab
   Publisher Logout   #explicit logout
-  Click on study tab
+  Navigate to search
   Search for  Test Project Release Study ${BROWSER} DE Edit_786
   Wait Until Page Contains Element  xpath=//md-card-header-text//span[contains(. ,"Test Project Release Study ${BROWSER} DE Edit_786")]  10s
 
@@ -128,7 +128,7 @@ Restore The Previous Project Version and Publish Again
 
 Verify The Re-Released Previous Project is Available under The Study Tab
   Publisher Logout
-  Click on study tab
+  Navigate to search
   Search for  Test Project Release Study ${BROWSER} DE
   Wait Until Page Contains Element  xpath=//md-card-header-text//span[contains(. ,"Test Project Release Study ${BROWSER} DE")]  10s
 
diff --git a/src/test/robotframework/publisher/Publicationmanagement/Assign and Unassign Publications from Study.robot b/src/test/robotframework/publisher/Publicationmanagement/Assign and Unassign Publications from Study.robot
index 5961b0a7b7..e4f9ff342e 100644
--- a/src/test/robotframework/publisher/Publicationmanagement/Assign and Unassign Publications from Study.robot	
+++ b/src/test/robotframework/publisher/Publicationmanagement/Assign and Unassign Publications from Study.robot	
@@ -11,12 +11,12 @@ Assigning and unassigning publications to a publisher project and assert it
     Assign a publication to the project
     Get back to german home page
     Click on study tab
-    Click on the first study in the list of studies
+    Click on first search result
     Assert the publication belongs to study selected study
     Unassign the publication from the project
     Get back to german home page
     Click on study tab
-    Click on the first study in the list of studies
+    Click on first search result
     Assert the publication has been unassigend from the selected study
     Get back to german home page
     click on cockpit button
@@ -37,8 +37,8 @@ Click on Publication Edit Button
    Click Element Through Tooltips    xpath=//md-card[@type="publications"]//button[@ng-disabled="ctrl.isProjectReleased()"]//span[text()="Bearbeiten"]
 
 Assign a publication to the project
-    Clear Element Text   xpath=//md-card//input[@type="search"]
-    Input Text  xpath=//md-card//input[@type="search"]   The labour market's requirement profiles for higher education graduates
+    Clear Element Text   xpath=//md-card//input
+    Input Text  xpath=//md-card//input   The labour market's requirement profiles for higher education graduates
     Click Element Through Tooltips   xpath=//div//ul//li//span//span[contains(., "The labour market's requirement profiles for higher education graduates")]
 
 Unassign the publication from the project
@@ -48,14 +48,13 @@ Unassign the publication from the project
     Click on Publication Edit Button
     Delete the publication from the study
 
-Click on the first study in the list of studies
-    Click Element Through Tooltips   xpath=//a[@class='fdz-search-result'][1]
-
 Assert the publication belongs to study selected study
-    Wait Until Page Contains Element  xpath=//div//a[contains(.,"The labour market's requirement profiles for higher education graduates")]
+    Click on publications tab
+    Wait Until Page Contains Element  xpath=//related-publication-search-result[contains(.,"The labour market's requirement profiles for higher education graduates")]
 
 Assert the publication has been unassigend from the selected study
-    Wait Until Page Contains Element  xpath=//div[@ng-if="ctrl.counts.publicationsCount == 0"][contains(.,"Publikationen zu dieser Studie: Nicht erfasst.")]
+    Click on publications tab
+    Wait Until Page Contains Element  xpath=//md-card[contains(.,"Keine Suchergebnisse gefunden")]
 
 Get back to home page and deselect project
     Get back to german home page
diff --git a/src/test/robotframework/publisher/Publicationmanagement/Related Publications Upload.robot b/src/test/robotframework/publisher/Publicationmanagement/Related Publications Upload.robot
index fec9ddc515..331fde80c4 100644
--- a/src/test/robotframework/publisher/Publicationmanagement/Related Publications Upload.robot	
+++ b/src/test/robotframework/publisher/Publicationmanagement/Related Publications Upload.robot	
@@ -23,5 +23,4 @@ Close The Toast Message for upload
    Click Element Through Tooltips  xpath=//button//following::md-icon[contains(.,"close")]
 
 Assert New Publication Entry with Excel Upload
-   Element Should Contain    xpath=//a//span[text()='pub-HossainPub2019$']   pub-HossainPub2019$
-
+   Page Should Contain Element   xpath=//related-publication-search-result[contains(.,"The related publicatoin title")]
diff --git a/src/test/robotframework/publisher/Studymanagement/Create_Study.robot b/src/test/robotframework/publisher/Studymanagement/Create_Study.robot
index 7a0e7e43ac..85ef71958f 100644
--- a/src/test/robotframework/publisher/Studymanagement/Create_Study.robot
+++ b/src/test/robotframework/publisher/Studymanagement/Create_Study.robot
@@ -37,8 +37,8 @@ Create Study by Publisher
     Input Text    name=authorsMiddleName_1    D2
     Input Text    name=authorsLastName_1    noLastName
     Move Second Author To Place One
-    Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextDe"]//input[@type="search"]   Deutsche Tags Schlüsselwörter
-    Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextEn"]//input[@type="search"]   English Days Keyword
+    Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextDe"]//input   Deutsche Tags Schlüsselwörter
+    Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextEn"]//input   English Days Keyword
     Save Changes
     Page Should Contain Element    xpath=//fdz-breadcrumbs//span[contains(.,'robotsproject${BROWSER}')]
     Delete Robotsproject
diff --git a/src/test/robotframework/publisher/Studymanagement/Search Next and Previous.robot b/src/test/robotframework/publisher/Studymanagement/Search Next and Previous.robot
index 2c5e128c96..9534f3d47a 100644
--- a/src/test/robotframework/publisher/Studymanagement/Search Next and Previous.robot	
+++ b/src/test/robotframework/publisher/Studymanagement/Search Next and Previous.robot	
@@ -6,14 +6,11 @@ Resource          ../../resources/click_element_resource.robot
 *** Test Cases ***
 Logged in Publisher Click On First Search Result
     Click on study tab
-    Click on First Search Result
+    Click on first search result
     Click on Next Content
     Click on Previous Content
 
 *** Keywords ***
-Click on First Search Result
-    Click Element Through Tooltips    xpath=//a[@class='fdz-search-result'][1]
-
 Click on Next Content
     Click Element Through Tooltips    xpath=//md-icon[@md-font-set='material-icons'][contains(.,'navigate_next')]
 
diff --git a/src/test/robotframework/resources/project_management_resource.robot b/src/test/robotframework/resources/project_management_resource.robot
index 718502049f..0a8dcad641 100644
--- a/src/test/robotframework/resources/project_management_resource.robot
+++ b/src/test/robotframework/resources/project_management_resource.robot
@@ -27,14 +27,14 @@ Discard Changes No
 
 Assign a dataprovider
    [Arguments]   ${dataprovidername}
-   Run Keyword If  '${BROWSER}' == 'ie'  Scroll Element Into View  xpath=//md-card[@group='dataProviders']//input[@type='search']
-   Input Text  xpath=//md-card[@group='dataProviders']//input[@type='search']  ${dataprovidername}
+   Run Keyword If  '${BROWSER}' == 'ie'  Scroll Element Into View  xpath=//md-card[@group='dataProviders']//input
+   Input Text  xpath=//md-card[@group='dataProviders']//input  ${dataprovidername}
    Click Element Through Tooltips  xpath=//md-virtual-repeat-container//span[text()='${dataprovidername}']
 
 Assign a publisher
    [Arguments]   ${publishername}
-   Run Keyword If  '${BROWSER}' == 'ie'  Scroll Element Into View  xpath=//md-card[@group='publishers']//input[@type='search']
-   Input Text  xpath=//md-card[@group='publishers']//input[@type='search']  ${publishername}
+   Run Keyword If  '${BROWSER}' == 'ie'  Scroll Element Into View  xpath=//md-card[@group='publishers']//input
+   Input Text  xpath=//md-card[@group='publishers']//input  ${publishername}
    Click Element Through Tooltips  xpath=//md-virtual-repeat-container//span[text()='${publishername}']
 
 Assign to publisher

From eb328218a691ba6532a4044ad828388a9c566f56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Thu, 13 Feb 2020 15:27:04 +0100
Subject: [PATCH 16/30] Add handling for autocompletable chips (#2497)

---
 .../webapp/scripts/common/navbar/views/navbar.controller.js     | 1 +
 .../webapp/scripts/common/toolbar/views/toolbar.controller.js   | 1 +
 .../publisher/Conceptmanagement/Create Concept.robot            | 2 ++
 .../Check Publishers Metadata Deleting Access Rights.robot      | 2 ++
 .../robotframework/publisher/Studymanagement/Create_Study.robot | 2 ++
 5 files changed, 8 insertions(+)

diff --git a/src/main/webapp/scripts/common/navbar/views/navbar.controller.js b/src/main/webapp/scripts/common/navbar/views/navbar.controller.js
index 0cf4059689..ae192ccab5 100644
--- a/src/main/webapp/scripts/common/navbar/views/navbar.controller.js
+++ b/src/main/webapp/scripts/common/navbar/views/navbar.controller.js
@@ -53,6 +53,7 @@ angular.module('metadatamanagementApp').controller('NavbarController',
     //Goto Logout Page
     $scope.logout = function() {
       Auth.logout();
+      $rootScope.searchQuery = '';
       $state.go('start', {
         lang: LanguageService.getCurrentInstantly()
       }, {
diff --git a/src/main/webapp/scripts/common/toolbar/views/toolbar.controller.js b/src/main/webapp/scripts/common/toolbar/views/toolbar.controller.js
index 24f07a4d94..82eaa16da1 100644
--- a/src/main/webapp/scripts/common/toolbar/views/toolbar.controller.js
+++ b/src/main/webapp/scripts/common/toolbar/views/toolbar.controller.js
@@ -21,6 +21,7 @@ angular.module('metadatamanagementApp').controller(
     //Goto Logout Page
     $scope.logout = function() {
       Auth.logout();
+      $scope.resetQuery();
       $state.go('start', {
         lang: LanguageService.getCurrentInstantly()
       }, {
diff --git a/src/test/robotframework/publisher/Conceptmanagement/Create Concept.robot b/src/test/robotframework/publisher/Conceptmanagement/Create Concept.robot
index d8085cbcfd..c3098280df 100644
--- a/src/test/robotframework/publisher/Conceptmanagement/Create Concept.robot	
+++ b/src/test/robotframework/publisher/Conceptmanagement/Create Concept.robot	
@@ -28,7 +28,9 @@ Create Concepts by Publisher
     Input Text    name=authorsLastName_1    Raza
     Move Second Author To Place One
     Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextDe"]//input   Konzept Tag 007
+    Run Keyword And Ignore Error  Click Element Through Tooltips    xpath=//md-virtual-repeat-container//span[text()='Konzept Tag 007']
     Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextEn"]//input   Concept Tag 007
+    Run Keyword And Ignore Error  Click Element Through Tooltips    xpath=//md-virtual-repeat-container//span[text()='Concept Tag 007']
     Input Text    xpath=//textarea[@name="license"]    Concept License Agreement
     Select a language
     Save Changes
diff --git a/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot b/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot
index 94dba6fe63..82b20f15e8 100644
--- a/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot	
+++ b/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot	
@@ -40,7 +40,9 @@ Publisher Create But Can Not Delete Study When Publisher is Ready
    Input Text    name=authorsMiddleName_0    noMiddleName
    Input Text    name=authorsLastName_0    Droid
    Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextDe"]//input   Deutsche Tags Schlüsselwörter
+   Run Keyword And Ignore Error  Click Element Through Tooltips    xpath=//md-virtual-repeat-container//span[text()='Deutsche Tags Schlüsselwörter']
    Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextEn"]//input   English Days Keyword
+   Run Keyword And Ignore Error  Click Element Through Tooltips    xpath=//md-virtual-repeat-container//span[text()='English Days Keyword']
    Save Changes
    Click on Cockpit Button
    Click Publisher Ready Checkbox for Studies
diff --git a/src/test/robotframework/publisher/Studymanagement/Create_Study.robot b/src/test/robotframework/publisher/Studymanagement/Create_Study.robot
index 85ef71958f..f2c3c22302 100644
--- a/src/test/robotframework/publisher/Studymanagement/Create_Study.robot
+++ b/src/test/robotframework/publisher/Studymanagement/Create_Study.robot
@@ -38,7 +38,9 @@ Create Study by Publisher
     Input Text    name=authorsLastName_1    noLastName
     Move Second Author To Place One
     Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextDe"]//input   Deutsche Tags Schlüsselwörter
+    Run Keyword And Ignore Error  Click Element Through Tooltips    xpath=//md-virtual-repeat-container//span[text()='Deutsche Tags Schlüsselwörter']
     Input Text    xpath=//md-autocomplete[@md-search-text="tagSearchTextEn"]//input   English Days Keyword
+    Run Keyword And Ignore Error  Click Element Through Tooltips    xpath=//md-virtual-repeat-container//span[text()='English Days Keyword']
     Save Changes
     Page Should Contain Element    xpath=//fdz-breadcrumbs//span[contains(.,'robotsproject${BROWSER}')]
     Delete Robotsproject

From 15d5a31b8dfd47ac3a73de9278d722827bd6fad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Fri, 14 Feb 2020 12:17:46 +0100
Subject: [PATCH 17/30] Some more fixes for public user tests and dataprovider
 tests (#2497)

---
 .travis.yml                                   | 28 +++++--------------
 .../create_dataset_report.robot               |  2 +-
 .../check_shoppingcart_funtionalities.robot   |  4 +--
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4ed12f7706..57afabd0be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -90,33 +90,25 @@ jobs:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox
-      -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include publicuserNOTchromeonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include publicuserNOTchromeonlyNOTlocalonly ./src/test/robotframework
   - name: Nightly IE11 Tests (Public User)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11
-      -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publicuserNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11 -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publicuserNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - name: Nightly Edge Tests (Public User)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge
-      -v USE_SAUCELABS:TRUE -v BROWSER:edge --include publicuserNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge -v USE_SAUCELABS:TRUE -v BROWSER:edge --include publicuserNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - name: Nightly Safari Tests (Public User)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari
-      -v USE_SAUCELABS:TRUE -v BROWSER:safari --include publicuserNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari -v USE_SAUCELABS:TRUE -v BROWSER:safari --include publicuserNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - stage: nightly e2e tests dataprovider
     name: Nightly Chrome Tests (Dataprovider)
     install:
@@ -129,17 +121,13 @@ jobs:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox
-      -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include dataproviderNOTchromeonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include dataproviderNOTchromeonlyNOTlocalonly ./src/test/robotframework
   - name: Nightly IE11 Tests (Dataprovider)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11
-      -v USE_SAUCELABS:TRUE -v BROWSER:ie --include dataproviderNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11 -v USE_SAUCELABS:TRUE -v BROWSER:ie --include dataproviderNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - name: Nightly Edge Tests (Dataprovider)
     install:
     - "./src/test/robotframework/setup.sh"
@@ -153,9 +141,7 @@ jobs:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari
-      -v USE_SAUCELABS:TRUE -v BROWSER:safari --include dataproviderNOTfirefoxonlyNOTchromeonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari -v USE_SAUCELABS:TRUE -v BROWSER:safari --include dataproviderNOTfirefoxonlyNOTchromeonlyNOTlocalonly ./src/test/robotframework
   - stage: nightly e2e tests publisher
     name: Nightly Chrome Tests (Publisher)
     install:
diff --git a/src/test/robotframework/data_provider/datasetmanagement/create_dataset_report.robot b/src/test/robotframework/data_provider/datasetmanagement/create_dataset_report.robot
index af9c0c7adb..375bd6bc92 100644
--- a/src/test/robotframework/data_provider/datasetmanagement/create_dataset_report.robot
+++ b/src/test/robotframework/data_provider/datasetmanagement/create_dataset_report.robot
@@ -12,7 +12,7 @@ Create Dataset Report
     Click on first search result
     Click Report Button
     Write Dataset Report Version
-    Page Should Contain  Der Datensatzreport wird jetzt erzeugt.
+    Page Should Not Contain Element  xpath=//md-toast[contains(@class,'md-accent')]
     Get back to home page and deselect project
 
 *** Keywords ***
diff --git a/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot b/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot
index 4df1fda7fb..cb559831e5 100644
--- a/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot
+++ b/src/test/robotframework/public_user/shoppingcartmanagement/check_shoppingcart_funtionalities.robot
@@ -28,7 +28,7 @@ Put all access ways in shopping cart
 
 Delete an Item
    Click Element Through Tooltips   xpath=//button[text()=' Löschen ']
-   Xpath Should Match X Times   //md-card[contains(@class, 'fdz-search-result')]  4
+   Xpath Should Match X Times   //md-card[contains(@class, 'fdz-search-result')]  3
 
 Select Access Way for the Data Package
    [Arguments]   ${accesswayname}
@@ -45,7 +45,7 @@ Put in Shopping Cart
 
 Go to Shopping Cart
    Click Element Through Tooltips    xpath=//a//md-icon[contains(., 'shopping_cart')]
-   Xpath Should Match X Times   //md-card[contains(@class, 'fdz-search-result')]  3
+   Xpath Should Match X Times   //md-card[contains(@class, 'fdz-search-result')]  4
 
 Confirm Order
    Click Element Through Tooltips   xpath=//span[contains(., 'Beantragen')]

From 29d5f51e790940920ed70a7e0b841a1af6ecef94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Fri, 14 Feb 2020 14:30:42 +0100
Subject: [PATCH 18/30] Some more fixes for data provider tests (#2497)

---
 .travis.yml                                   | 20 +++++--------------
 .../upload_instrument_attachment.robot        |  2 +-
 .../upload_study_attachment.robot             |  2 +-
 .../surveymanagement/upload_file.robot        |  2 +-
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 57afabd0be..d253223902 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -133,9 +133,7 @@ jobs:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge
-      -v USE_SAUCELABS:TRUE -v BROWSER:edge --include dataproviderNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge -v USE_SAUCELABS:TRUE -v BROWSER:edge --include dataproviderNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - name: Nightly Safari Tests (Dataprovider)
     install:
     - "./src/test/robotframework/setup.sh"
@@ -154,33 +152,25 @@ jobs:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox
-      -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include publisherNOTchromeonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include publisherNOTchromeonlyNOTlocalonly ./src/test/robotframework
   - name: Nightly IE11 Tests (Publisher)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11
-      -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publisherNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11 -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publisherNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - name: Nightly Edge Tests (Publisher)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge
-      -v USE_SAUCELABS:TRUE -v BROWSER:edge --include publisherNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge -v USE_SAUCELABS:TRUE -v BROWSER:edge --include publisherNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - name: Nightly Safari Tests (Publisher)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari
-      -v USE_SAUCELABS:TRUE -v BROWSER:safari --include publisherNOTfirefoxonlyNOTchromeonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari -v USE_SAUCELABS:TRUE -v BROWSER:safari --include publisherNOTfirefoxonlyNOTchromeonlyNOTlocalonly ./src/test/robotframework
 notifications:
   slack:
     secure: ZKX6G3hY9XvrgDpgpZ5DuKaJ77EvS6bzyd0yROE1rliezY9u66CpAkPO0B3eN+bcXEVMILv2Ye581JjysSUntBFKn0hZnxXedioeAeIRADlhuPpbVI2hP6Lwi6ZsdZ2wbsXpP3Fc0deQVRSuLxlInC+Zwf+ui3uEnSfAWbvwHZWpx72+a8P2xC22Z9S40vyvm0XcyBPGqwYVoqwnRMBtUvxdTJzKuU9t5Sx+PFuRIt/xvoe8CQyn/50Pn9IgFkqdD/sDgpwK9QYy3xVJpIPZGM2YPh2NaRWu2YnJhOfLt8ZFvEnzwBmGJfTS7udZgXLMZdvW91Mh0RYPZTctYXLz0tpEe6xFYy7fpSMQ80NWL5hoib3ElCqc/+qMibTD1P+A4ZXGlt0DcENc2MNPDaBlQSorNuelsXGj2DhMBDJiiBYZJs9vi9k5+AJbcxEufTgngLV+YU5N/8btG2d0dHLROCa+e7atS0lErnM+Eb9yujuXBW/KbJzeorEZWOIISkbRY8YIpMgwB+GlSFjPSprruUAaHO+aTtIMSYMA7zAivCW+/xZiT2gjw+YCJfYPrgYZ36/CINZnX40Oe4g29+IOnUaCJt+3Bm4OTGCgYv8SpAAxoWpP260UyAI61BFS3gFQNP6trIkkuap9HWGdbfxsz0NgODT28M81KW0ixP9Gtl4=
diff --git a/src/test/robotframework/data_provider/instrumentmanagement/upload_instrument_attachment.robot b/src/test/robotframework/data_provider/instrumentmanagement/upload_instrument_attachment.robot
index 47ad4872a4..39c88786ab 100644
--- a/src/test/robotframework/data_provider/instrumentmanagement/upload_instrument_attachment.robot
+++ b/src/test/robotframework/data_provider/instrumentmanagement/upload_instrument_attachment.robot
@@ -57,4 +57,4 @@ Assert gra2005_W1_Questionnaire in the attachment
 Delete uploaded document
     Click Element Through Tooltips    xpath=//button[md-icon[text()='delete_forever']]
     Click Element Through Tooltips    xpath=//button[text()='Ja']
-    Page Should Contain   Datei "gra2005_W1_Questionnaire_de.pdf" wurde gelöscht!
+    Page Should Not Contain Element   xpath=//a[@ng-href="/public/files/instruments/ins-fileuploadproject-ins1$/attachments/gra2005_W1_Questionnaire_de.pdf"]
diff --git a/src/test/robotframework/data_provider/studymanagement/upload_study_attachment.robot b/src/test/robotframework/data_provider/studymanagement/upload_study_attachment.robot
index b9ecdf7c44..4536e7c8e7 100644
--- a/src/test/robotframework/data_provider/studymanagement/upload_study_attachment.robot
+++ b/src/test/robotframework/data_provider/studymanagement/upload_study_attachment.robot
@@ -61,4 +61,4 @@ Assert gra2005_MethodReport in the attachment
 Delete study with uploaded document
     Click Element Through Tooltips    xpath=//button[md-icon[text()="delete_forever"]]
     Click Element Through Tooltips    xpath=//button[text()="Ja"]
-    Page Should Contain   Datei "gra2005_MethodReport_de.pdf" wurde gelöscht!
+    Page Should Not Contain Element    xpath=//a[@ng-href="/public/files/studies/stu-fileuploadproject$/attachments/gra2005_MethodReport_de.pdf"]
diff --git a/src/test/robotframework/data_provider/surveymanagement/upload_file.robot b/src/test/robotframework/data_provider/surveymanagement/upload_file.robot
index a6fb1854f1..d1c76a8aa2 100644
--- a/src/test/robotframework/data_provider/surveymanagement/upload_file.robot
+++ b/src/test/robotframework/data_provider/surveymanagement/upload_file.robot
@@ -17,7 +17,7 @@ Upload file in survey editor
     Click Edit Button on Survey Details
     Delete Response Rate Upload
     Save Response Rate Changes
-    Page Should Contain   gelöscht
+    Page Should Not Contain Element    xpath=//md-content//a[@ng-href="/public/files/surveys/sur-fileuploadproject-sy1$/1_responserate_de"]
     Get back to home page and deselect project
 
 *** Keywords ***

From 208043fccb813ef768f7ab00204730c8e1bed9fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Mon, 17 Feb 2020 13:22:00 +0100
Subject: [PATCH 19/30] Trying to fix robot test error (#2497)

---
 .../common/check_banner_as_dataproviders.robot        |  1 -
 .../common/check_external_links_status.robot          |  3 ---
 ..._and_unassign_concept_to_and_from_instrument.robot |  2 +-
 .../datasetmanagement/create_dataset.robot            | 11 -----------
 .../instrumentmanagement/create_instrument.robot      |  5 -----
 ...ject Releasing and Unreleasing Access Rights.robot |  8 ++++----
 .../robotframework/resources/login_resource.robot     |  3 ++-
 7 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/src/test/robotframework/data_provider/common/check_banner_as_dataproviders.robot b/src/test/robotframework/data_provider/common/check_banner_as_dataproviders.robot
index eb0174e15b..711b58c74b 100644
--- a/src/test/robotframework/data_provider/common/check_banner_as_dataproviders.robot
+++ b/src/test/robotframework/data_provider/common/check_banner_as_dataproviders.robot
@@ -7,7 +7,6 @@ Resource          ../../resources/check_url_resource.robot
 
 *** Test Cases ***
 Check for Dataproviders Welcome Banner Appears
-   Pass Execution If    '${BROWSER}' == 'ie'    Footer not visible on IE
    Data Provider Logout   # explicit logout to sync with suite setup
    Login as dataprovidertest
    Assert Welcome Text After Login
diff --git a/src/test/robotframework/data_provider/common/check_external_links_status.robot b/src/test/robotframework/data_provider/common/check_external_links_status.robot
index 35cb89b330..391a38536d 100644
--- a/src/test/robotframework/data_provider/common/check_external_links_status.robot
+++ b/src/test/robotframework/data_provider/common/check_external_links_status.robot
@@ -6,15 +6,12 @@ Resource          ../../resources/home_page_resource.robot
 
 *** Test Cases ***
 Check Link Status for MDM Documentation
-    Pass Execution If    '${BROWSER}' == 'ie'    Footer not visible on IE
     Check URL Status with xpath Locator   //a[contains(.,'Dokumentation')]
 
 Check Link Status for Data Access
-    Pass Execution If    '${BROWSER}' == 'ie'    Footer not visible on IE
     Check URL Status with xpath Locator   //a[contains(.,'Datenzugang')]
 
 Check Link Status for DZHW
-    Pass Execution If    '${BROWSER}' == 'ie'    Footer not visible on IE
     Check URL Status with xpath Locator   //a[contains(.,'Deutsches Zentrum für Hochschul- und Wissenschaftsforschung GmbH')]
     Get back to german home page  # to sync with the next test case
 
diff --git a/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot b/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot
index c4c42bb80f..5df6be12dd 100644
--- a/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot
+++ b/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot
@@ -14,7 +14,7 @@ Assign and Unassign concept to and from an instrument
     Click on Save Button
     Get back to german home page
     # wait for elasticsearch index beeing updated
-    Sleep  10s
+    Sleep  20s
     Assert the concept has been assigned to the instrument
     Assert the concept is assigned to a study
     Assert the concept is assigned to a survey
diff --git a/src/test/robotframework/data_provider/datasetmanagement/create_dataset.robot b/src/test/robotframework/data_provider/datasetmanagement/create_dataset.robot
index 5814328411..84885c0bad 100644
--- a/src/test/robotframework/data_provider/datasetmanagement/create_dataset.robot
+++ b/src/test/robotframework/data_provider/datasetmanagement/create_dataset.robot
@@ -25,58 +25,47 @@ Create Dataset by Dataprovider
 
 *** Keywords ***
 Go To Dataset Create Page
-    Pass Execution If    '${BROWSER}' == 'ie'    Dataset Creation not possible in IE
     Select project by name    robotproject4${BROWSER}
     Wait Until Angular Ready    6s
     Click on data set tab
     Click Element Through Tooltips    xpath=//ui-view/descendant::button[md-icon[text()='add']]
 
 Fill up the description and title
-    Pass Execution If    '${BROWSER}' == 'ie'    Dataset Creation not possible in IE
     Input Text   xpath=//input[@name='descriptionDe']    Dataset Description De
     Input Text   xpath=//input[@name='descriptionEn']    Dataset Description En
 
 Fill up the Subdatasets
-    Pass Execution If    '${BROWSER}' == 'ie'    Dataset Creation not possible in IE
     Input Text   xpath=//input[@name='subDataSetsName_0']    Subdataset Name
 
 Select Access Way for the Datasets from The List
     [Arguments]   ${accesswayname}
-    Pass Execution If    '${BROWSER}' == 'ie'    Dataset Creation not possible in IE
     Click Element Through Tooltips    xpath=//md-select[@name='subDataSetsAccessWay_0']
     Click Element Through Tooltips    xpath=//md-select-menu//md-option[contains(., '${accesswayname}')]
 
 Enter Number of Observations or Episodes
-    Pass Execution If    '${BROWSER}' == 'ie'    Dataset Creation not possible in IE
     Input Text   xpath=//input[@name='subDataSetsNumberOfObservations_0']    5
 
 Fill up the description of Subdatasets
-    Pass Execution If    '${BROWSER}' == 'ie'    Dataset Creation not possible in IE
     Input Text   xpath=//input[@name='subDataSetsDescriptionDe_0']    Subdataset Description De
     Input Text   xpath=//input[@name='subDataSetsDescriptionEn_0']    subdataset Description En
 
 Fill up the Citation Hint of Subdatasets
-    Pass Execution If    '${BROWSER}' == 'ie'    Dataset Creation not possible in IE
     Input Text   xpath=//textarea[@name='subDataSetsCitationHintDe_0']    Subdataset Citation Hint in De
     Input Text   xpath=//textarea[@name='subDataSetsCitationHintEn_0']    Subdataset Citation Hint in En
 
 Choose Format
-    Pass Execution If    '${BROWSER}' == 'ie'    Dataset Creation not possible in IE
     Click Element  xpath=//md-select[@name="format"]
     Click Element  xpath=//md-select-menu//md-content//md-option//div[contains(., 'lang')]
 
 Choose Type
-    Pass Execution If    '${BROWSER}' == 'ie'    Dataset Creation not possible in IE
     Click Element  xpath=//md-select[@name="type"]
     Click Element  xpath=//md-select-menu//md-content//md-option//div[contains(., 'Episodendatensatz')]
 
 Choose Survey
-    Pass Execution If    '${BROWSER}' == 'ie'     Dataset Creation not possible in IE
     Click Element   xpath=//md-chips[@name="surveys"]//md-autocomplete//input
     Click Element Through Tooltips  xpath=//span[contains(.,'sur-robotproject4${BROWSER}')]
 
 Fill up the Annotations
-    Pass Execution If    '${BROWSER}' == 'ie'     Dataset Creation not possible in IE
     Input Text  xpath=//textarea[contains(@name,'annotationsDe')]  This is Annotations in De
     Input Text  xpath=//textarea[contains(@name,'annotationsEn')]  This is Annotation in En
 
diff --git a/src/test/robotframework/data_provider/instrumentmanagement/create_instrument.robot b/src/test/robotframework/data_provider/instrumentmanagement/create_instrument.robot
index 54183f7fd6..82a05568f5 100644
--- a/src/test/robotframework/data_provider/instrumentmanagement/create_instrument.robot
+++ b/src/test/robotframework/data_provider/instrumentmanagement/create_instrument.robot
@@ -19,14 +19,12 @@ Create Instrument by Dataprovider
 
 *** Keywords ***
 Go To Instrument Create Page
-    Pass Execution If    '${BROWSER}' == 'ie'    Instrument Creation not possible in IE
     Select project by name    robotproject4${BROWSER}
     Wait Until Angular Ready    6s
     Click on instruments tab
     Click Element Through Tooltips    xpath=//ui-view/descendant::button[md-icon[text()='add']]
 
 Fill up the description and title
-    Pass Execution If    '${BROWSER}' == 'ie'    Instrument Creation not possible in IE
     Input Text   xpath=//input[@name='descriptionDe']    Instrument Description De
     Input Text   xpath=//input[@name='descriptionEn']    Instrument Description De
     Input Text   xpath=//input[@name='titleDe']    Instrument Title De
@@ -35,17 +33,14 @@ Fill up the description and title
     Input Text   xpath=//input[@name='subtitleEn']    Instrument Title En
 
 Choose Type
-    Pass Execution If    '${BROWSER}' == 'ie'    Instrument Creation not possible in IE
     Click Element  xpath=//md-select[@name="type"]
     Click Element  xpath=//md-select-menu//md-option[contains(., 'CAPI')]
 
 Choose Survey
-    Pass Execution If    '${BROWSER}' == 'ie'    Instrument Creation not possible in IE
     Click Element   xpath=//md-chips[@name="surveys"]//md-autocomplete//input
     Click Element Through Tooltips  xpath=//span[contains(.,'sur-robotproject4${BROWSER}')]
 
 Fill up the Annotations
-    Pass Execution If    '${BROWSER}' == 'ie'    Instrument Creation not possible in IE
     Input Text  xpath=//textarea[contains(@name,'annotationsDe')]  This is Annotations in De
     Input Text  xpath=//textarea[contains(@name,'annotationsEn')]  This is Annotation in En
 
diff --git a/src/test/robotframework/publisher/Projectmanagement/Check Publishers Project Releasing and Unreleasing Access Rights.robot b/src/test/robotframework/publisher/Projectmanagement/Check Publishers Project Releasing and Unreleasing Access Rights.robot
index 8887ff10da..34641fafa5 100644
--- a/src/test/robotframework/publisher/Projectmanagement/Check Publishers Project Releasing and Unreleasing Access Rights.robot	
+++ b/src/test/robotframework/publisher/Projectmanagement/Check Publishers Project Releasing and Unreleasing Access Rights.robot	
@@ -71,8 +71,8 @@ Verify The Unreleased Project is Still Available under The Study Tab with Shadow
   Click on Cockpit Button
   Change Project Release Status
   Click on OK Button
-  Sleep  2s  #to ensure enough time for the next checkbox to be ready
-  Click Publisher Ready Checkbox for Studies   #deselect the check box here
+  Wait Until Angular Ready    10s
+  Click Publisher Ready Checkbox for Studies
   Sleep  5s   #We need explicit sleep to ensure the project is not available under the study tab
   Publisher Logout
   Navigate to search
@@ -113,7 +113,7 @@ Restore The Previous Project Version and Publish Again
   Click on Cockpit Button
   Change Project Release Status
   Click on OK Button
-  Sleep  2s
+  Wait Until Angular Ready    10s
   Click Publisher Ready Checkbox for Studies
   Get back to german home page
   Click Study Edit Button
@@ -138,7 +138,7 @@ Unrelased The Project again to Sync with Intial Step
   Click on Cockpit Button
   Change Project Release Status  #unrelease the project to initial state
   Click on OK Button
-  Sleep  2s
+  Wait Until Angular Ready    10s
   Click Publisher Ready Checkbox for Studies
   Sleep  5s
   Get back to home page and deselect project
diff --git a/src/test/robotframework/resources/login_resource.robot b/src/test/robotframework/resources/login_resource.robot
index ae56d424a3..c8a71c1d61 100644
--- a/src/test/robotframework/resources/login_resource.robot
+++ b/src/test/robotframework/resources/login_resource.robot
@@ -23,9 +23,10 @@ Create Project
     Click Element Through Tooltips    xpath=//md-sidenav//button[md-icon[text()='add']]
     Input Text    name=id    ${projectname}
     Run Keyword If    '${BROWSER}' == 'safari'  Sleep  1s
+    Wait Until Angular Ready    10s
     Wait Until Keyword Succeeds    5s    0.5s    Page Should Contain Element    xpath=//button[@type='submit' and not(contains(@disabled, 'disabled'))]
     Click Element Through Tooltips    xpath=//button[@type='submit'][contains(.,'OK')]
-    Sleep  3s
+    Wait Until Angular Ready    10s
 
 Delete Robotsproject
     Pass Execution If    '${BROWSER}' == 'ie'    Study Creation not possible in IE

From a2c83e727fbf5a7c67f0c1c29ad7c618150656a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Tue, 18 Feb 2020 12:13:22 +0100
Subject: [PATCH 20/30] Fix timing problems in safari (#2497)

---
 .../Check Publishers Metadata Deleting Access Rights.robot      | 1 +
 src/test/robotframework/resources/login_resource.robot          | 2 +-
 src/test/robotframework/resources/search_resource.robot         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot b/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot
index 82b20f15e8..d29f38b056 100644
--- a/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot	
+++ b/src/test/robotframework/publisher/Projectmanagement/Check Publishers Metadata Deleting Access Rights.robot	
@@ -51,6 +51,7 @@ Publisher Create But Can Not Delete Study When Publisher is Ready
 
 Publisher Create and Can Delete Study When Both are Ready
    Click Dataprovider Ready Checkbox for Studies
+   Run Keyword If    '${BROWSER}' == 'safari'   Sleep  10s 
    Click on Delete Button for Metadata
    Close The Toast Message  ${TOAST_MSSG}
 
diff --git a/src/test/robotframework/resources/login_resource.robot b/src/test/robotframework/resources/login_resource.robot
index c8a71c1d61..4ffd39a98d 100644
--- a/src/test/robotframework/resources/login_resource.robot
+++ b/src/test/robotframework/resources/login_resource.robot
@@ -22,7 +22,7 @@ Create Project
     [Arguments]    ${projectname}
     Click Element Through Tooltips    xpath=//md-sidenav//button[md-icon[text()='add']]
     Input Text    name=id    ${projectname}
-    Run Keyword If    '${BROWSER}' == 'safari'  Sleep  1s
+    Run Keyword If    '${BROWSER}' == 'safari'  Sleep  10s
     Wait Until Angular Ready    10s
     Wait Until Keyword Succeeds    5s    0.5s    Page Should Contain Element    xpath=//button[@type='submit' and not(contains(@disabled, 'disabled'))]
     Click Element Through Tooltips    xpath=//button[@type='submit'][contains(.,'OK')]
diff --git a/src/test/robotframework/resources/search_resource.robot b/src/test/robotframework/resources/search_resource.robot
index 064fe9b258..d061d32e92 100644
--- a/src/test/robotframework/resources/search_resource.robot
+++ b/src/test/robotframework/resources/search_resource.robot
@@ -34,6 +34,7 @@ Delete project by name
     Input Text    xpath=//input[@placeholder = 'Projekt auswählen']    ${projectname}
     Click Element Through Tooltips    xpath=//md-sidenav/descendant::button[md-icon[text()='']]
     Click Element Through Tooltips    xpath=//button[text()='OK']
+    Run Keyword If    '${BROWSER}' == 'safari'    Sleep  10s 
 
 Click on search result by id
     [Arguments]    ${id}

From 510b15d1ccc65f6bae01a7d673d545e81b0efb3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Tue, 18 Feb 2020 12:31:58 +0100
Subject: [PATCH 21/30] Upgrade ui-router amongst others (#2505)

---
 package-lock.json | 100 ++++++++++++++++++++++++++++------------------
 package.json      |   8 ++--
 2 files changed, 65 insertions(+), 43 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5c7812319a..055e5d0b63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -440,19 +440,19 @@
       }
     },
     "@snyk/update-notifier": {
-      "version": "2.5.1-rc1",
-      "resolved": "https://registry.npmjs.org/@snyk/update-notifier/-/update-notifier-2.5.1-rc1.tgz",
-      "integrity": "sha512-cIK+dMUsXBl4K9AKg5EYhdxWts0tAUvyu1WePse+tjzX4E9poME/wojkDrWQl1/SKLlhA559ftiOODmVa1adCg==",
+      "version": "2.5.1-rc2",
+      "resolved": "https://registry.npmjs.org/@snyk/update-notifier/-/update-notifier-2.5.1-rc2.tgz",
+      "integrity": "sha512-dlled3mfpnAt3cQb5hxkFiqfPCj4Yk0xV8Yl5P8PeVv1pUmO7vI4Ka4Mjs4r6CYM5f9kZhviFPQQcWOIDlMRcw==",
       "dev": true,
       "requires": {
         "@snyk/configstore": "3.2.0-rc1",
-        "boxen": "^1.2.1",
-        "chalk": "^2.0.1",
+        "boxen": "^1.3.0",
+        "chalk": "^2.3.2",
         "import-lazy": "^2.1.0",
         "is-ci": "^1.0.10",
         "is-installed-globally": "^0.1.0",
         "is-npm": "^1.0.0",
-        "latest-version": "^3.0.0",
+        "latest-version": "^3.1.0",
         "semver-diff": "^2.0.0",
         "xdg-basedir": "^3.0.0"
       }
@@ -537,9 +537,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.0.tgz",
-      "integrity": "sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==",
+      "version": "13.7.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz",
+      "integrity": "sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==",
       "dev": true
     },
     "@types/q": {
@@ -575,9 +575,9 @@
       }
     },
     "@uirouter/core": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.3.tgz",
-      "integrity": "sha512-ftAQw9czKUSgLFC3LwOeJP97PDQ6naHcEK0NrbWw3X/r49oQJBMRFAsz9oEKqPFPD2vUDqkvG18BZXglLp8k+Q=="
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.4.tgz",
+      "integrity": "sha512-TQ9XOzZY+jmWKkU4993MAEBIy7Bs3kijDzj+A6RHR8gq/3UoQm3Q/l1igfao5GZyBjid7eRVeipPK14ovCYQ3g=="
     },
     "@yarnpkg/lockfile": {
       "version": "1.1.0",
@@ -899,11 +899,11 @@
       "integrity": "sha512-gpR2/v8BMzhVN5gEo67S6Wi3/NQBOjXKKT+FY9+2PNSCGg4vy5i7njfBbli98Se43dxEly++P4VUaZCIBCIeRA=="
     },
     "angular-ui-router": {
-      "version": "1.0.24",
-      "resolved": "https://registry.npmjs.org/angular-ui-router/-/angular-ui-router-1.0.24.tgz",
-      "integrity": "sha512-1bgarSWXSTvM/HFTCDn7HDRvdWo+zG1c0ceabcFR+VDAOgaUt0X11DscfMXA5fPSX+tprM606+wYSHcp86JbFg==",
+      "version": "1.0.25",
+      "resolved": "https://registry.npmjs.org/angular-ui-router/-/angular-ui-router-1.0.25.tgz",
+      "integrity": "sha512-NCjwfGWQiqBx22OyAm6hsAWvlo431uUlY2ccg9kXkvb3zCLQGSJ6pGo1AGLtRAKdZvrEHiIExhawyrVPkYp0VA==",
       "requires": {
-        "@uirouter/core": "6.0.3"
+        "@uirouter/core": "6.0.4"
       }
     },
     "ansi-align": {
@@ -2202,9 +2202,9 @@
       }
     },
     "clean-css": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
-      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
+      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
       "dev": true,
       "requires": {
         "source-map": "~0.6.0"
@@ -6873,9 +6873,9 @@
       }
     },
     "handlebars": {
-      "version": "4.4.5",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.5.tgz",
-      "integrity": "sha512-0Ce31oWVB7YidkaTq33ZxEbN+UDxMMgThvCe8ptgQViymL5DPis9uLdTA13MiRPhgvqyxIegugrP97iK3JeBHg==",
+      "version": "4.7.3",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.3.tgz",
+      "integrity": "sha512-SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg==",
       "dev": true,
       "requires": {
         "neo-async": "^2.6.0",
@@ -6885,9 +6885,9 @@
       },
       "dependencies": {
         "uglify-js": {
-          "version": "3.6.3",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.3.tgz",
-          "integrity": "sha512-KfQUgOqTkLp2aZxrMbCuKCDGW9slFYu2A23A36Gs7sGzTLcRBDORdOi5E21KWHFIfkY8kzgi/Pr1cXCh0yIp5g==",
+          "version": "3.7.7",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.7.tgz",
+          "integrity": "sha512-FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -8671,9 +8671,9 @@
       "dev": true
     },
     "karma-jasmine": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-3.1.0.tgz",
-      "integrity": "sha512-IVGbC8gap5x5NNCEOsAE77ic8rZtHDt6wmO0fFC5yT5FeB8qKnGTeud2mtKyQ41xl7vZkZ7ZxKr4wMGR6tWN+A==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-3.1.1.tgz",
+      "integrity": "sha512-pxBmv5K7IkBRLsFSTOpgiK/HzicQT3mfFF+oHAC7nxMfYKhaYFgxOa5qjnHW4sL5rUnmdkSajoudOnnOdPyW4Q==",
       "dev": true,
       "requires": {
         "jasmine-core": "^3.5.0"
@@ -9739,9 +9739,9 @@
       }
     },
     "needle": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz",
-      "integrity": "sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.2.tgz",
+      "integrity": "sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w==",
       "dev": true,
       "requires": {
         "debug": "^3.2.6",
@@ -12613,9 +12613,9 @@
       }
     },
     "snyk": {
-      "version": "1.290.1",
-      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.290.1.tgz",
-      "integrity": "sha512-8fB+b+trI5a6mU5cAKXOU2RG15xxr++4zYxkfNpkFkhbUqkcLsJtXD4H7Pcs6vXcOvoiEafyziPTpYurPFDXBQ==",
+      "version": "1.292.0",
+      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.292.0.tgz",
+      "integrity": "sha512-ga4ouBqRc897Ts80yzdZG25zqGgbU3ah8VKtLyRjK1ZmApHy+PRi2zBVJcwMspyfhyaCh47vr1siIqHler4rxg==",
       "dev": true,
       "requires": {
         "@snyk/cli-interface": "2.3.0",
@@ -12623,7 +12623,7 @@
         "@snyk/dep-graph": "1.13.1",
         "@snyk/gemfile": "1.2.0",
         "@snyk/snyk-cocoapods-plugin": "2.0.1",
-        "@snyk/update-notifier": "^2.5.1-rc1",
+        "@snyk/update-notifier": "^2.5.1-rc2",
         "@types/agent-base": "^4.2.0",
         "@types/restify": "^4.3.6",
         "abbrev": "^1.1.1",
@@ -12647,7 +12647,7 @@
         "snyk-go-plugin": "1.11.1",
         "snyk-gradle-plugin": "3.2.4",
         "snyk-module": "1.9.1",
-        "snyk-mvn-plugin": "2.8.0",
+        "snyk-mvn-plugin": "2.9.0",
         "snyk-nodejs-lockfile-parser": "1.17.0",
         "snyk-nuget-plugin": "1.16.0",
         "snyk-php-plugin": "1.7.0",
@@ -12984,9 +12984,9 @@
       }
     },
     "snyk-mvn-plugin": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.8.0.tgz",
-      "integrity": "sha512-Jt6lsVOFOYj7rp0H2IWz/BZS9xxaO0jEFTAoafLCocJIWWuGhPpVocCqmh/hrYAdKY9gS4gVOViMJ3EvcC1r1Q==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.9.0.tgz",
+      "integrity": "sha512-FBl78wCHNm0P/QOlipvOxzN2LrXlS6NBN0zXWYZ09P0hG65rmA3gKTg0QsHUjIBh1Pg9bw5aG4r/AHle6a6g6w==",
       "dev": true,
       "requires": {
         "@snyk/cli-interface": "2.3.1",
@@ -13015,6 +13015,28 @@
             "ms": "^2.1.1"
           }
         },
+        "needle": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz",
+          "integrity": "sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==",
+          "dev": true,
+          "requires": {
+            "debug": "^3.2.6",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "3.2.6",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+              "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+              "dev": true,
+              "requires": {
+                "ms": "^2.1.1"
+              }
+            }
+          }
+        },
         "tmp": {
           "version": "0.1.0",
           "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz",
diff --git a/package.json b/package.json
index fa36266cc8..bcbd1c1b15 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "angular-translate-interpolation-messageformat": "2.18.2",
     "angular-translate-storage-cookie": "2.18.2",
     "angular-ui-bootstrap": "https://github.com/angular-ui/bootstrap-bower/archive/2.5.0.tar.gz",
-    "angular-ui-router": "1.0.24",
+    "angular-ui-router": "1.0.25",
     "blob-polyfill": "https://github.com/bjornstar/blob-polyfill/archive/1.0.20150320.tar.gz",
     "bootstrap-sass": "3.4.1",
     "bowser": "https://github.com/lancedikson/bowser/archive/1.9.4.tar.gz",
@@ -60,7 +60,7 @@
   "devDependencies": {
     "angular-mocks": "1.7.9",
     "browser-sync": "2.26.7",
-    "clean-css": ">=4.2.1",
+    "clean-css": ">=4.2.3",
     "diff": ">=4.0.2",
     "event-stream": "4.0.1",
     "grunt": "1.0.4",
@@ -92,7 +92,7 @@
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage": "2.0.1",
     "karma-html2js-preprocessor": "1.1.0",
-    "karma-jasmine": "3.1.0",
+    "karma-jasmine": "3.1.1",
     "karma-ng-html2js-preprocessor": "1.0.0",
     "karma-phantomjs-launcher": "1.0.4",
     "karma-requirejs": "1.1.0",
@@ -102,7 +102,7 @@
     "node-sass": "4.13.1",
     "phantomjs-prebuilt": "2.1.16",
     "requirejs": "2.3",
-    "snyk": "^1.290.1",
+    "snyk": "^1.292.0",
     "tar": "5.0.5",
     "time-grunt": "2.0.0",
     "wiredep": "4.0.0",

From 33640b97faa8122b07782580399f0d63d22760f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Tue, 18 Feb 2020 12:43:50 +0100
Subject: [PATCH 22/30] Upgrade javers amongst others (#2506)

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f4c3ca2b65..bc5e79bc85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.19</version>
+            <version>1.20</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -121,7 +121,7 @@
         <dependency>
             <groupId>org.javers</groupId>
             <artifactId>javers-spring-boot-starter-mongo</artifactId>
-            <version>5.8.7</version>
+            <version>5.8.9</version>
         </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
@@ -141,12 +141,12 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-data-rest</artifactId>
-            <version>1.2.26</version>
+            <version>1.2.31</version>
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.2.26</version>
+            <version>1.2.31</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

From e70397d11781ac73638db711249e83ead3f005a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Wed, 19 Feb 2020 14:22:58 +0100
Subject: [PATCH 23/30] #2482 renamed and moved various components

---
 ...cket-theme.scss => dataPackage-theme.scss} |  2 +-
 src/main/scss/fdz.scss                        |  4 +-
 src/main/webapp/assets/styles/fdz.css         | 38 ++++++++--------
 src/main/webapp/index.html                    | 44 +++++++++----------
 .../health/health.controller.js               |  4 +-
 .../administration/logs/logs.controller.js    |  4 +-
 .../user-management-detail.controller.js      |  4 +-
 .../user-management.controller.js             |  4 +-
 .../breadcrumb.service.js}                    | 19 ++++----
 .../detail.component.js}                      |  0
 .../related-objects.component.js}             |  0
 .../related-objects.controller.js}            |  2 +-
 .../related-objects.html.tmpl}                |  0
 .../details}/search.detail.component.js       |  7 ++-
 .../details}/search.detail.controller.js      |  4 +-
 .../details}/search.detail.html.tmpl          |  2 +-
 src/main/webapp/scripts/common/error/error.js |  4 +-
 .../MessageBus.service.js                     |  0
 .../navbar/directives/navbar.directive.js     | 11 -----
 .../sidenav.controller.js}                    |  2 +-
 .../common/sidenav/sidenav.directive.js       | 11 +++++
 .../sidenav.html.tmpl}                        | 10 ++---
 .../toolbar/{views => }/toolbar.controller.js |  0
 .../{directives => }/toolbar.directive.js     |  2 +-
 .../toolbar/{views => }/toolbar.html.tmpl     |  0
 ...hments.html.tmpl => attachments.html.tmpl} |  0
 ...ail.html.tmpl => common-details.html.tmpl} |  0
 ...iption.html.tmpl => description.html.tmpl} |  0
 ...dp-license.html.tmpl => license.html.tmpl} |  0
 .../views/concept-detail.controller.js        |  4 +-
 .../views/concept-detail.html.tmpl            | 10 ++---
 .../concept-edit-or-create.controller.js      |  4 +-
 .../views/project-cockpit.controller.js       |  4 +-
 .../views/project-overview.controller.js      |  4 +-
 ...hments.html.tmpl => attachments.html.tmpl} |  0
 ...ail.html.tmpl => common-details.html.tmpl} |  0
 ...taset.html.tmpl => sub-datasets.html.tmpl} |  0
 .../data-set-edit-or-create.controller.js     |  6 +--
 .../views/dataSet-detail.controller.js        |  4 +-
 .../views/dataSet-detail.html.tmpl            |  8 ++--
 .../disclosure/views/disclosure.controller.js |  4 +-
 ...hments.html.tmpl => attachments.html.tmpl} |  0
 ...ail.html.tmpl => common-details.html.tmpl} |  0
 .../views/instrument-detail.controller.js     |  4 +-
 .../views/instrument-detail.html.tmpl         |  6 +--
 .../instrument-edit-or-create.controller.js   |  6 +--
 .../configurator/detail-component.js          | 14 ------
 .../data-package-configurator.component.js    | 14 ++++++
 ...> data-package-configurator.controller.js} |  9 ++--
 ...pl => data-package-configurator.html.tmpl} |  2 +-
 .../services/productChooserDialog.service.js  | 26 -----------
 .../access-way-info.controller.js             |  0
 .../access-way-info.html.tmpl                 |  0
 .../views/shopping-cart.controller.js         |  4 +-
 .../version-info.controller.js                |  0
 .../version-info.html.tmpl                    |  0
 ...ail.html.tmpl => common-details.html.tmpl} |  0
 .../{dp-image.html.tmpl => image.html.tmpl}   |  0
 ...tion.html.tmpl => next-question.html.tmpl} |  0
 ....html.tmpl => previous-question.html.tmpl} |  0
 ...mpl => technical-representation.html.tmpl} |  0
 .../views/question-detail.controller.js       |  4 +-
 .../views/question-detail.html.tmpl           | 12 ++---
 ...ail.html.tmpl => common-details.html.tmpl} |  0
 ...iption.html.tmpl => description.html.tmpl} |  0
 .../views/publicationAssignment.controller.js |  4 +-
 .../relatedPublicationDetail.controller.js    |  4 +-
 .../views/relatedPublicationDetail.html.tmpl  |  6 +--
 .../data-package-search.component.js          | 18 ++++++++
 ...r.js => data-package-search.controller.js} |  5 +--
 ...tml.tmpl => data-package-search.html.tmpl} |  2 +-
 ...-component.js => menu-toggle.component.js} |  0
 ...ontroller.js => menu-toggle.controller.js} |  0
 .../{menutoggle => }/menu-toggle.html.tmpl    |  0
 .../components/search/search.component.js     | 17 -------
 ...component.js => searchfilter.component.js} |  4 +-
 ...ntroller.js => searchfilter.controller.js} | 21 +++------
 ...ilter.html.tmpl => searchfilter.html.tmpl} |  4 +-
 .../configuration/translations-de.js          |  4 +-
 .../configuration/translations-en.js          |  4 +-
 .../directives/study-search-result.html.tmpl  |  2 +-
 .../services/searchResultNavigator.service.js |  4 +-
 .../views/search.controller.js                | 24 +++++-----
 .../configuration/translations-de.js          |  4 +-
 .../configuration/translations-en.js          |  4 +-
 ...hments.html.tmpl => attachments.html.tmpl} |  0
 ...=> common-details-authenticated.html.tmpl} |  0
 ...ail.html.tmpl => common-details.html.tmpl} |  0
 ...iption.html.tmpl => description.html.tmpl} |  0
 .../views/study-detail.controller.js          |  4 +-
 .../views/study-detail.html.tmpl              | 10 ++---
 .../views/study-edit-or-create.controller.js  |  4 +-
 ...hments.html.tmpl => attachments.html.tmpl} |  0
 ...ail.html.tmpl => common-details.html.tmpl} |  0
 ...tml.tmpl => response-rate-image.html.tmpl} |  0
 .../views/survey-detail.controller.js         |  4 +-
 .../views/survey-detail.html.tmpl             |  8 ++--
 .../views/survey-edit-or-create.controller.js |  6 +--
 .../account/activate/activate.controller.js   |  4 +-
 .../account/login/login.controller.js         |  4 +-
 .../account/password/password.controller.js   |  4 +-
 .../account/register/register.controller.js   |  4 +-
 .../reset/finish/reset.finish.controller.js   |  4 +-
 .../reset/request/reset.request.controller.js |  4 +-
 .../account/settings/settings.controller.js   |  4 +-
 ...dp-statistic.html.tmpl => chart.html.tmpl} |  0
 ...ail.html.tmpl => common-details.html.tmpl} |  0
 ...encies.html.tmpl => frequencies.html.tmpl} |  0
 ...html.tmpl => generation-details.html.tmpl} |  0
 ...ext.html.tmpl => next-variables.html.tmpl} |  0
 ...html.tmpl => previous-variables.html.tmpl} |  0
 ...-metric.html.tmpl => statistics.html.tmpl} |  0
 .../views/variable-detail.controller.js       |  4 +-
 .../views/variable-detail.html.tmpl           | 16 +++----
 114 files changed, 253 insertions(+), 289 deletions(-)
 rename src/main/scss/fdz-theme/components/fdz/{dataPacket-theme.scss => dataPackage-theme.scss} (98%)
 rename src/main/webapp/scripts/common/{services/toolbarHeader.service.js => breadcrumbs/breadcrumb.service.js} (97%)
 rename src/main/webapp/scripts/common/{detail/detail-component.js => details/detail.component.js} (100%)
 rename src/main/webapp/scripts/common/{detail/detail-related-objects-component.js => details/related-objects.component.js} (100%)
 rename src/main/webapp/scripts/common/{detail/detail-related-objects-component-controller.js => details/related-objects.controller.js} (99%)
 rename src/main/webapp/scripts/common/{detail/common/dp-related-objects.html.tmpl => details/related-objects.html.tmpl} (100%)
 rename src/main/webapp/scripts/{searchmanagement/components/search-detail => common/details}/search.detail.component.js (53%)
 rename src/main/webapp/scripts/{searchmanagement/components/search-detail => common/details}/search.detail.controller.js (91%)
 rename src/main/webapp/scripts/{searchmanagement/components/search-detail => common/details}/search.detail.html.tmpl (89%)
 rename src/main/webapp/scripts/common/{services => messagebus}/MessageBus.service.js (100%)
 delete mode 100644 src/main/webapp/scripts/common/navbar/directives/navbar.directive.js
 rename src/main/webapp/scripts/common/{navbar/views/navbar.controller.js => sidenav/sidenav.controller.js} (97%)
 create mode 100644 src/main/webapp/scripts/common/sidenav/sidenav.directive.js
 rename src/main/webapp/scripts/common/{navbar/views/navbar.html.tmpl => sidenav/sidenav.html.tmpl} (96%)
 rename src/main/webapp/scripts/common/toolbar/{views => }/toolbar.controller.js (100%)
 rename src/main/webapp/scripts/common/toolbar/{directives => }/toolbar.directive.js (74%)
 rename src/main/webapp/scripts/common/toolbar/{views => }/toolbar.html.tmpl (100%)
 rename src/main/webapp/scripts/conceptmanagement/templates/{dp-attachments.html.tmpl => attachments.html.tmpl} (100%)
 rename src/main/webapp/scripts/conceptmanagement/templates/{dp-detail.html.tmpl => common-details.html.tmpl} (100%)
 rename src/main/webapp/scripts/conceptmanagement/templates/{dp-description.html.tmpl => description.html.tmpl} (100%)
 rename src/main/webapp/scripts/conceptmanagement/templates/{dp-license.html.tmpl => license.html.tmpl} (100%)
 rename src/main/webapp/scripts/datasetmanagement/templates/{dp-attachments.html.tmpl => attachments.html.tmpl} (100%)
 rename src/main/webapp/scripts/datasetmanagement/templates/{dp-detail.html.tmpl => common-details.html.tmpl} (100%)
 rename src/main/webapp/scripts/datasetmanagement/templates/{dp-sub-dataset.html.tmpl => sub-datasets.html.tmpl} (100%)
 rename src/main/webapp/scripts/instrumentmanagement/templates/{dp-attachments.html.tmpl => attachments.html.tmpl} (100%)
 rename src/main/webapp/scripts/instrumentmanagement/templates/{dp-detail.html.tmpl => common-details.html.tmpl} (100%)
 delete mode 100644 src/main/webapp/scripts/ordermanagement/components/configurator/detail-component.js
 create mode 100644 src/main/webapp/scripts/ordermanagement/components/data-package-configurator.component.js
 rename src/main/webapp/scripts/ordermanagement/components/{configurator/detail-component-controller.js => data-package-configurator.controller.js} (95%)
 rename src/main/webapp/scripts/ordermanagement/components/{configurator/detail.html.tmpl => data-package-configurator.html.tmpl} (97%)
 delete mode 100644 src/main/webapp/scripts/ordermanagement/services/productChooserDialog.service.js
 rename src/main/webapp/scripts/ordermanagement/{components/configurator => views}/access-way-info.controller.js (100%)
 rename src/main/webapp/scripts/ordermanagement/{components/configurator => views}/access-way-info.html.tmpl (100%)
 rename src/main/webapp/scripts/ordermanagement/{components/configurator => views}/version-info.controller.js (100%)
 rename src/main/webapp/scripts/ordermanagement/{components/configurator => views}/version-info.html.tmpl (100%)
 rename src/main/webapp/scripts/questionmanagement/templates/{dp-detail.html.tmpl => common-details.html.tmpl} (100%)
 rename src/main/webapp/scripts/questionmanagement/templates/{dp-image.html.tmpl => image.html.tmpl} (100%)
 rename src/main/webapp/scripts/questionmanagement/templates/{dp-next-question.html.tmpl => next-question.html.tmpl} (100%)
 rename src/main/webapp/scripts/questionmanagement/templates/{dp-prev-question.html.tmpl => previous-question.html.tmpl} (100%)
 rename src/main/webapp/scripts/questionmanagement/templates/{dp-generation.html.tmpl => technical-representation.html.tmpl} (100%)
 rename src/main/webapp/scripts/relatedpublicationmanagement/templates/{dp-detail.html.tmpl => common-details.html.tmpl} (100%)
 rename src/main/webapp/scripts/relatedpublicationmanagement/templates/{dp-description.html.tmpl => description.html.tmpl} (100%)
 create mode 100644 src/main/webapp/scripts/searchmanagement/components/data-package-search.component.js
 rename src/main/webapp/scripts/searchmanagement/components/{search/search.controller.js => data-package-search.controller.js} (95%)
 rename src/main/webapp/scripts/searchmanagement/components/{search/search.html.tmpl => data-package-search.html.tmpl} (92%)
 rename src/main/webapp/scripts/searchmanagement/components/{menutoggle/menu-toggle-component.js => menu-toggle.component.js} (100%)
 rename src/main/webapp/scripts/searchmanagement/components/{menutoggle/menu-toggle-component-controller.js => menu-toggle.controller.js} (100%)
 rename src/main/webapp/scripts/searchmanagement/components/{menutoggle => }/menu-toggle.html.tmpl (100%)
 delete mode 100644 src/main/webapp/scripts/searchmanagement/components/search/search.component.js
 rename src/main/webapp/scripts/searchmanagement/components/{searchfilter/searchfilter-component.js => searchfilter.component.js} (70%)
 rename src/main/webapp/scripts/searchmanagement/components/{searchfilter/searchfilter-component-controller.js => searchfilter.controller.js} (89%)
 rename src/main/webapp/scripts/searchmanagement/components/{searchfilter/dp-search-filter.html.tmpl => searchfilter.html.tmpl} (87%)
 rename src/main/webapp/scripts/studymanagement/templates/{dp-attachments.html.tmpl => attachments.html.tmpl} (100%)
 rename src/main/webapp/scripts/studymanagement/templates/{dp-detail-auth.html.tmpl => common-details-authenticated.html.tmpl} (100%)
 rename src/main/webapp/scripts/studymanagement/templates/{dp-detail.html.tmpl => common-details.html.tmpl} (100%)
 rename src/main/webapp/scripts/studymanagement/templates/{dp-description.html.tmpl => description.html.tmpl} (100%)
 rename src/main/webapp/scripts/surveymanagement/templates/{dp-attachments.html.tmpl => attachments.html.tmpl} (100%)
 rename src/main/webapp/scripts/surveymanagement/templates/{dp-detail.html.tmpl => common-details.html.tmpl} (100%)
 rename src/main/webapp/scripts/surveymanagement/templates/{dp-response-rate-image.html.tmpl => response-rate-image.html.tmpl} (100%)
 rename src/main/webapp/scripts/variablemanagement/templates/{dp-statistic.html.tmpl => chart.html.tmpl} (100%)
 rename src/main/webapp/scripts/variablemanagement/templates/{dp-detail.html.tmpl => common-details.html.tmpl} (100%)
 rename src/main/webapp/scripts/variablemanagement/templates/{dp-frequencies.html.tmpl => frequencies.html.tmpl} (100%)
 rename src/main/webapp/scripts/variablemanagement/templates/{dp-generation.html.tmpl => generation-details.html.tmpl} (100%)
 rename src/main/webapp/scripts/variablemanagement/templates/{dp-next.html.tmpl => next-variables.html.tmpl} (100%)
 rename src/main/webapp/scripts/variablemanagement/templates/{dp-prev.html.tmpl => previous-variables.html.tmpl} (100%)
 rename src/main/webapp/scripts/variablemanagement/templates/{dp-metric.html.tmpl => statistics.html.tmpl} (100%)

diff --git a/src/main/scss/fdz-theme/components/fdz/dataPacket-theme.scss b/src/main/scss/fdz-theme/components/fdz/dataPackage-theme.scss
similarity index 98%
rename from src/main/scss/fdz-theme/components/fdz/dataPacket-theme.scss
rename to src/main/scss/fdz-theme/components/fdz/dataPackage-theme.scss
index 15a7ac702f..5c22eaa006 100644
--- a/src/main/scss/fdz-theme/components/fdz/dataPacket-theme.scss
+++ b/src/main/scss/fdz-theme/components/fdz/dataPackage-theme.scss
@@ -1,4 +1,4 @@
-.fdz-theme .fdz-data-packet {
+.fdz-theme .fdz-data-package {
   box-shadow: none;
   padding-top: 16px;
 
diff --git a/src/main/scss/fdz.scss b/src/main/scss/fdz.scss
index 2859610537..19a936ad5b 100644
--- a/src/main/scss/fdz.scss
+++ b/src/main/scss/fdz.scss
@@ -51,7 +51,7 @@
 @import "fdz-theme/components/fdz/detail-theme";
 @import "fdz-theme/components/fdz/table-theme";
 @import "fdz-theme/components/fdz/search-filter-theme";
-@import "fdz-theme/components/fdz/dataPacket-theme";
+@import "fdz-theme/components/fdz/dataPackage-theme";
 @import "fdz-theme/components/fdz/paginator";
 @import "fdz-theme/components/fdz/radio-button-theme";
 @import "fdz-theme/components/fdz/geographic-coverage";
@@ -61,5 +61,3 @@
 
 // Various
 @import "fdz-theme/common/various";
-
-
diff --git a/src/main/webapp/assets/styles/fdz.css b/src/main/webapp/assets/styles/fdz.css
index 41d63106f3..b47d5c7da2 100644
--- a/src/main/webapp/assets/styles/fdz.css
+++ b/src/main/webapp/assets/styles/fdz.css
@@ -2390,10 +2390,10 @@ tr:focus {
   margin-top: 0px;
   padding: 4px 12px 2px 12px; }
 
-.fdz-theme .fdz-data-packet {
+.fdz-theme .fdz-data-package {
   box-shadow: none;
   padding-top: 16px; }
-  .fdz-theme .fdz-data-packet md-card-header {
+  .fdz-theme .fdz-data-package md-card-header {
     display: block;
     border-top-width: 1px;
     border-top-style: solid;
@@ -2403,54 +2403,54 @@ tr:focus {
     border-bottom-color: rgba(0, 0, 0, 0.12);
     margin: 0;
     padding: 8px 0; }
-    .fdz-theme .fdz-data-packet md-card-header .title {
+    .fdz-theme .fdz-data-package md-card-header .title {
       font-size: 16px; }
       @media (min-width: 600px) {
-        .fdz-theme .fdz-data-packet md-card-header .title {
+        .fdz-theme .fdz-data-package md-card-header .title {
           font-size: 18px; } }
-  .fdz-theme .fdz-data-packet md-card-footer {
+  .fdz-theme .fdz-data-package md-card-footer {
     padding: 0; }
-  .fdz-theme .fdz-data-packet md-list {
+  .fdz-theme .fdz-data-package md-list {
     padding: 0; }
-  .fdz-theme .fdz-data-packet md-list-item,
-  .fdz-theme .fdz-data-packet md-list-item::before {
+  .fdz-theme .fdz-data-package md-list-item,
+  .fdz-theme .fdz-data-package md-list-item::before {
     min-height: auto; }
-  .fdz-theme .fdz-data-packet md-list-item {
+  .fdz-theme .fdz-data-package md-list-item {
     padding: 0;
     flex-flow: column;
     align-items: flex-start;
     margin-bottom: 8px; }
-    .fdz-theme .fdz-data-packet md-list-item md-select {
+    .fdz-theme .fdz-data-package md-list-item md-select {
       margin: 0;
       width: 100%;
       display: block; }
-    .fdz-theme .fdz-data-packet md-list-item h5 {
+    .fdz-theme .fdz-data-package md-list-item h5 {
       width: 100%; }
-    .fdz-theme .fdz-data-packet md-list-item .md-secondary-container {
+    .fdz-theme .fdz-data-package md-list-item .md-secondary-container {
       width: 100%;
       margin: 0;
       flex: 1 1 auto; }
-      .fdz-theme .fdz-data-packet md-list-item .md-secondary-container > span {
+      .fdz-theme .fdz-data-package md-list-item .md-secondary-container > span {
         overflow-wrap: break-word;
         word-wrap: break-word; }
-      .fdz-theme .fdz-data-packet md-list-item .md-secondary-container div {
+      .fdz-theme .fdz-data-package md-list-item .md-secondary-container div {
         flex-direction: row;
         display: flex;
         flex: 1 1 auto; }
-        .fdz-theme .fdz-data-packet md-list-item .md-secondary-container div .md-button {
+        .fdz-theme .fdz-data-package md-list-item .md-secondary-container div .md-button {
           margin: -4px 0px -6px 6px;
           height: 32px; }
     @media (min-width: 375px) {
-      .fdz-theme .fdz-data-packet md-list-item {
+      .fdz-theme .fdz-data-package md-list-item {
         flex-flow: row;
         align-items: center; }
-        .fdz-theme .fdz-data-packet md-list-item h5 {
+        .fdz-theme .fdz-data-package md-list-item h5 {
           width: 40%; }
-        .fdz-theme .fdz-data-packet md-list-item .md-secondary-container {
+        .fdz-theme .fdz-data-package md-list-item .md-secondary-container {
           width: 190px;
           overflow: hidden;
           word-break: break-all; } }
-    .fdz-theme .fdz-data-packet md-list-item .md-button.md-raised.md-accent {
+    .fdz-theme .fdz-data-package md-list-item .md-button.md-raised.md-accent {
       margin-left: 0;
       margin-top: 16px;
       text-transform: none;
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index dd65d323be..6a59d2c6e4 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -77,7 +77,7 @@
 </header>
 <!--    <main data-flex data-layout="column" data-ng-cloak data-block-ui="main" class="block-ui-main">-->
 <main data-flex data-layout="row" data-ng-cloak data-block-ui="main" class="block-ui-main">
-  <fdz-navbar data-ng-cloak></fdz-navbar>
+  <fdz-sidenav data-ng-cloak></fdz-sidenav>
   <md-content data-md-scroll-y data-layout="column" flex du-scroll-container class="fdz-theme content-center" data-ng-cloak>
     <div id="top"></div>
     <fdz-breadcrumbs items="toolbarHeaderItems"></fdz-breadcrumbs>
@@ -217,11 +217,10 @@
 <script src="scripts/common/easteregg/egg.js"></script>
 <script src="scripts/common/easteregg/thankyou.js"></script>
 <script src="scripts/common/easteregg/confused.js"></script>
-<script src="scripts/common/navbar/views/navbar.controller.js"></script>
-<script src="scripts/common/navbar/directives/navbar.directive.js"></script>
-<script src="scripts/common/toolbar/views/toolbar.controller.js"></script>
-<script src="scripts/common/toolbar/directives/toolbar.directive.js"></script>
-<script src="scripts/common/services/toolbarHeader.service.js"></script>
+<script src="scripts/common/sidenav/sidenav.controller.js"></script>
+<script src="scripts/common/sidenav/sidenav.directive.js"></script>
+<script src="scripts/common/toolbar/toolbar.controller.js"></script>
+<script src="scripts/common/toolbar/toolbar.directive.js"></script>
 <script src="scripts/common/joblogging/services/jobLogging.service.js"></script>
 <script src="scripts/common/joblogging/services/errorMessageResolver.service.js"></script>
 <script src="scripts/common/joblogging/services/jobCompleteToast.service.js"></script>
@@ -289,9 +288,10 @@
 <script src="scripts/common/i18n/directives/languagepicker/configuration/translations-en.js"></script>
 <script src="scripts/common/breadcrumbs/breadcrumbs.component.js"></script>
 <script src="scripts/common/breadcrumbs/breadcrumbs.controller.js"></script>
+<script src="scripts/common/breadcrumbs/breadcrumb.service.js"></script>
 <script src="scripts/common/footer/footer.component.js"></script>
 <script src="scripts/common/footer/footer.controller.js"></script>
-<script src="scripts/common/services/MessageBus.service.js"></script>
+<script src="scripts/common/messagebus/MessageBus.service.js"></script>
 
 <script src="scripts/filemanagement/resources/file.resource.js"></script>
 <script src="scripts/filemanagement/services/zipReader.service.js"></script>
@@ -401,9 +401,11 @@
 <script src="scripts/studymanagement/views/study-detail.controller.js"></script>
 <script src="scripts/studymanagement/views/study-edit-or-create.controller.js"></script>
 <script src="scripts/studymanagement/components/attachment-component.js"></script>
-<script src="scripts/common/detail/detail-component.js"></script>
-<script src="scripts/common/detail/detail-related-objects-component.js"></script>
-<script src="scripts/common/detail/detail-related-objects-component-controller.js"></script>
+<script src="scripts/common/details/detail.component.js"></script>
+<script src="scripts/common/details/related-objects.component.js"></script>
+<script src="scripts/common/details/related-objects.controller.js"></script>
+<script src="scripts/common/details/search.detail.component.js"></script>
+<script src="scripts/common/details/search.detail.controller.js"></script>
 
 <script src="scripts/instrumentmanagement/configuration/instrument.js"></script>
 <script src="scripts/instrumentmanagement/configuration/translations-de.js"></script>
@@ -535,14 +537,12 @@
 <script src="scripts/searchmanagement/services/genericFilterOptionsSearch.service.js"></script>
 <script src="scripts/searchmanagement/directives/concept-search-filter.controller.js"></script>
 <script src="scripts/searchmanagement/directives/concept-search-filter.directive.js"></script>
-<script src="scripts/searchmanagement/components/search/search.component.js"></script>
-<script src="scripts/searchmanagement/components/search/search.controller.js"></script>
-<script src="scripts/searchmanagement/components/search-detail/search.detail.component.js"></script>
-<script src="scripts/searchmanagement/components/search-detail/search.detail.controller.js"></script>
-<script src="scripts/searchmanagement/components/searchfilter/searchfilter-component.js"></script>
-<script src="scripts/searchmanagement/components/searchfilter/searchfilter-component-controller.js"></script>
-<script src="scripts/searchmanagement/components/menutoggle/menu-toggle-component.js"></script>
-<script src="scripts/searchmanagement/components/menutoggle/menu-toggle-component-controller.js"></script>
+<script src="scripts/searchmanagement/components/data-package-search.component.js"></script>
+<script src="scripts/searchmanagement/components/data-package-search.controller.js"></script>
+<script src="scripts/searchmanagement/components/searchfilter.component.js"></script>
+<script src="scripts/searchmanagement/components/searchfilter.controller.js"></script>
+<script src="scripts/searchmanagement/components/menu-toggle.component.js"></script>
+<script src="scripts/searchmanagement/components/menu-toggle.controller.js"></script>
 
 <script src="scripts/ordermanagement/configuration/shoppingCart.js"></script>
 <script src="scripts/ordermanagement/configuration/translations-de.js"></script>
@@ -550,10 +550,10 @@
 <script src="scripts/ordermanagement/views/shopping-cart.controller.js"></script>
 <script src="scripts/ordermanagement/services/shoppingCart.service.js"></script>
 <script src="scripts/ordermanagement/resources/order.resource.js"></script>
-<script src="scripts/ordermanagement/components/configurator/detail-component.js"></script>
-<script src="scripts/ordermanagement/components/configurator/version-info.controller.js"></script>
-<script src="scripts/ordermanagement/components/configurator/access-way-info.controller.js"></script>
-<script src="scripts/ordermanagement/components/configurator/detail-component-controller.js"></script>
+<script src="scripts/ordermanagement/components/data-package-configurator.component.js"></script>
+<script src="scripts/ordermanagement/views/version-info.controller.js"></script>
+<script src="scripts/ordermanagement/views/access-way-info.controller.js"></script>
+<script src="scripts/ordermanagement/components/data-package-configurator.controller.js"></script>
 
 <script src="scripts/conceptmanagement/configuration/concept.js"></script>
 <script src="scripts/conceptmanagement/configuration/translations-de.js"></script>
diff --git a/src/main/webapp/scripts/administration/health/health.controller.js b/src/main/webapp/scripts/administration/health/health.controller.js
index 9dc6afde50..82fa0805ec 100644
--- a/src/main/webapp/scripts/administration/health/health.controller.js
+++ b/src/main/webapp/scripts/administration/health/health.controller.js
@@ -3,7 +3,7 @@
 angular.module('metadatamanagementApp').controller(
   'HealthController',
   function($scope, MonitoringService, $uibModal, ElasticSearchAdminService,
-    PageTitleService, $state, ToolbarHeaderService, SimpleMessageToastService) {
+    PageTitleService, $state, BreadcrumbService, SimpleMessageToastService) {
     PageTitleService.setPageTitle('administration.health.title');
     $scope.isRecreatingIndices = false;
     $scope.updatingHealth = true;
@@ -169,6 +169,6 @@ angular.module('metadatamanagementApp').controller(
         return remainder ? ' - ' + remainder : '';
       }
     };
-    ToolbarHeaderService.updateToolbarHeader({'stateName': $state.current.
+    BreadcrumbService.updateToolbarHeader({'stateName': $state.current.
     name});
   });
diff --git a/src/main/webapp/scripts/administration/logs/logs.controller.js b/src/main/webapp/scripts/administration/logs/logs.controller.js
index 84faf9e79b..b8279aa786 100644
--- a/src/main/webapp/scripts/administration/logs/logs.controller.js
+++ b/src/main/webapp/scripts/administration/logs/logs.controller.js
@@ -2,7 +2,7 @@
 
 angular.module('metadatamanagementApp').controller('LogsController',
   function($scope, $state, LogsResource, PageTitleService,
-  ToolbarHeaderService) {
+  BreadcrumbService) {
     PageTitleService.setPageTitle('administration.logs.title');
     $scope.loggers = LogsResource.findAll();
 
@@ -14,6 +14,6 @@ angular.module('metadatamanagementApp').controller('LogsController',
         $scope.loggers = LogsResource.findAll();
       });
     };
-    ToolbarHeaderService.updateToolbarHeader({'stateName': $state.current.
+    BreadcrumbService.updateToolbarHeader({'stateName': $state.current.
     name});
   });
diff --git a/src/main/webapp/scripts/administration/usermanagement/user-management-detail.controller.js b/src/main/webapp/scripts/administration/usermanagement/user-management-detail.controller.js
index fad055a1b2..7c1077776f 100644
--- a/src/main/webapp/scripts/administration/usermanagement/user-management-detail.controller.js
+++ b/src/main/webapp/scripts/administration/usermanagement/user-management-detail.controller.js
@@ -3,7 +3,7 @@
 angular.module('metadatamanagementApp').controller(
   'UserManagementDetailController',
   function($scope, $stateParams, UserResource, PageTitleService, $translate,
-    $state, ToolbarHeaderService) {
+    $state, BreadcrumbService) {
     $translate('user-management.detail.title').then(function(title) {
       PageTitleService.setPageTitle(title + ' ' + $stateParams.login);
     });
@@ -16,6 +16,6 @@ angular.module('metadatamanagementApp').controller(
       });
     };
     $scope.load($stateParams.login);
-    ToolbarHeaderService.updateToolbarHeader({'stateName': $state.current.
+    BreadcrumbService.updateToolbarHeader({'stateName': $state.current.
     name});
   });
diff --git a/src/main/webapp/scripts/administration/usermanagement/user-management.controller.js b/src/main/webapp/scripts/administration/usermanagement/user-management.controller.js
index 2da0a5ad0e..73f0463e16 100644
--- a/src/main/webapp/scripts/administration/usermanagement/user-management.controller.js
+++ b/src/main/webapp/scripts/administration/usermanagement/user-management.controller.js
@@ -3,7 +3,7 @@
 
 angular.module('metadatamanagementApp').controller('UserManagementController',
   function($scope, UserResource, ParseLinks, $state,
-    PageTitleService, ToolbarHeaderService, $mdDialog, $uibModal,
+    PageTitleService, BreadcrumbService, $mdDialog, $uibModal,
     DataAcquisitionProjectRepositoryClient, SimpleMessageToastService) {
     PageTitleService.setPageTitle('user-management.home.title');
     $scope.users = [];
@@ -82,7 +82,7 @@ angular.module('metadatamanagementApp').controller('UserManagementController',
       $scope.loadAll();
     };
 
-    ToolbarHeaderService.updateToolbarHeader({'stateName': $state.current.
+    BreadcrumbService.updateToolbarHeader({'stateName': $state.current.
     name});
 
     $scope.openUserMessageDialog = function(event) {
diff --git a/src/main/webapp/scripts/common/services/toolbarHeader.service.js b/src/main/webapp/scripts/common/breadcrumbs/breadcrumb.service.js
similarity index 97%
rename from src/main/webapp/scripts/common/services/toolbarHeader.service.js
rename to src/main/webapp/scripts/common/breadcrumbs/breadcrumb.service.js
index 61aa011746..3f8fbdca3c 100644
--- a/src/main/webapp/scripts/common/services/toolbarHeader.service.js
+++ b/src/main/webapp/scripts/common/breadcrumbs/breadcrumb.service.js
@@ -1,8 +1,7 @@
 /*global _*/
 'use strict';
 
-// TODO: Move factory to the appropiate location
-angular.module('metadatamanagementApp').factory('ToolbarHeaderService',
+angular.module('metadatamanagementApp').factory('BreadcrumbService',
   function($rootScope, $log, Principal) {
     var isAuthenticated = Principal.isAuthenticated;
     var stripVersionSuffix = function(id) {
@@ -70,8 +69,8 @@ angular.module('metadatamanagementApp').factory('ToolbarHeaderService',
         'iconType': 'font',
         'icon': 'search'
       },
-      'dataPacketSearch': {
-        'type': 'search-management.detail.dataPacketSearch',
+      'dataPackageSearch': {
+        'type': 'search-management.detail.dataPackageSearch',
         'translateString': 'global.tooltips.toolbarHeader.data-packet'
       },
       'shoppingCart': {
@@ -95,8 +94,8 @@ angular.module('metadatamanagementApp').factory('ToolbarHeaderService',
         'iconType': 'svg',
         'icon': 'assets/images/icons/study.svg'
       },
-      'dataPacketDetail': {
-        'type': 'study-management.detail.label.dataPacket',
+      'dataPackageDetail': {
+        'type': 'study-management.detail.label.dataPackage',
         'translateString': 'global.tooltips.toolbarHeader.data-packet',
       },
       'surveyDetail': {
@@ -180,9 +179,9 @@ angular.module('metadatamanagementApp').factory('ToolbarHeaderService',
             this.item.tabName = 'search-management.tabs.all';
           }
         } else {
-          this.item.type = translationStringsMap.dataPacketSearch.type;
+          this.item.type = translationStringsMap.dataPackageSearch.type;
           this.item.tooltip = translationStringsMap
-            .dataPacketSearch.translateString;
+            .dataPackageSearch.translateString;
         }
         this.item.state = 'search(' + JSON.stringify(item.searchParams) +
         ')';
@@ -208,8 +207,8 @@ angular.module('metadatamanagementApp').factory('ToolbarHeaderService',
           studyItem.tooltip = translationStringsMap.studyDetail.translateString;
         } else {
           studyItem.tooltip = translationStringsMap
-            .dataPacketDetail.translateString;
-          studyItem.type = translationStringsMap.dataPacketDetail.type;
+            .dataPackageDetail.translateString;
+          studyItem.type = translationStringsMap.dataPackageDetail.type;
         }
         studyItem.projectId = stripVersionSuffix(item.projectId);
         studyItem.enableLastItem = item.enableLastItem;
diff --git a/src/main/webapp/scripts/common/detail/detail-component.js b/src/main/webapp/scripts/common/details/detail.component.js
similarity index 100%
rename from src/main/webapp/scripts/common/detail/detail-component.js
rename to src/main/webapp/scripts/common/details/detail.component.js
diff --git a/src/main/webapp/scripts/common/detail/detail-related-objects-component.js b/src/main/webapp/scripts/common/details/related-objects.component.js
similarity index 100%
rename from src/main/webapp/scripts/common/detail/detail-related-objects-component.js
rename to src/main/webapp/scripts/common/details/related-objects.component.js
diff --git a/src/main/webapp/scripts/common/detail/detail-related-objects-component-controller.js b/src/main/webapp/scripts/common/details/related-objects.controller.js
similarity index 99%
rename from src/main/webapp/scripts/common/detail/detail-related-objects-component-controller.js
rename to src/main/webapp/scripts/common/details/related-objects.controller.js
index 8d260f0907..9fde429800 100644
--- a/src/main/webapp/scripts/common/detail/detail-related-objects-component-controller.js
+++ b/src/main/webapp/scripts/common/details/related-objects.controller.js
@@ -16,7 +16,7 @@
     $ctrl.setCurrentSearchParams = setCurrentSearchParams;
     $ctrl.search = search;
     $ctrl.$onInit = init;
-    $ctrl.dataPacketFilter = {};
+    $ctrl.dataPackageFilter = {};
 
     $ctrl.options = {};
     $ctrl.searchResult = {};
diff --git a/src/main/webapp/scripts/common/detail/common/dp-related-objects.html.tmpl b/src/main/webapp/scripts/common/details/related-objects.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/common/detail/common/dp-related-objects.html.tmpl
rename to src/main/webapp/scripts/common/details/related-objects.html.tmpl
diff --git a/src/main/webapp/scripts/searchmanagement/components/search-detail/search.detail.component.js b/src/main/webapp/scripts/common/details/search.detail.component.js
similarity index 53%
rename from src/main/webapp/scripts/searchmanagement/components/search-detail/search.detail.component.js
rename to src/main/webapp/scripts/common/details/search.detail.component.js
index cca67baa5a..6e5ee33599 100644
--- a/src/main/webapp/scripts/searchmanagement/components/search-detail/search.detail.component.js
+++ b/src/main/webapp/scripts/common/details/search.detail.component.js
@@ -2,13 +2,12 @@
   'use strict';
 
   var SearchComponent = {
-    controller: 'searchDetailController',
-    templateUrl: 'scripts/searchmanagement/components' +
-      '/search-detail/search.detail.html.tmpl'
+    controller: 'SearchDetailController',
+    templateUrl: 'scripts/common/details/' +
+      'search.detail.html.tmpl'
   };
 
   angular
     .module('metadatamanagementApp')
     .component('fdzSearchDetail', SearchComponent);
 })();
-
diff --git a/src/main/webapp/scripts/searchmanagement/components/search-detail/search.detail.controller.js b/src/main/webapp/scripts/common/details/search.detail.controller.js
similarity index 91%
rename from src/main/webapp/scripts/searchmanagement/components/search-detail/search.detail.controller.js
rename to src/main/webapp/scripts/common/details/search.detail.controller.js
index c0877f85a5..32f817455e 100644
--- a/src/main/webapp/scripts/searchmanagement/components/search-detail/search.detail.controller.js
+++ b/src/main/webapp/scripts/common/details/search.detail.controller.js
@@ -3,9 +3,9 @@
 
   angular
     .module('metadatamanagementApp')
-    .controller('searchDetailController', searchDetailController);
+    .controller('SearchDetailController', SearchDetailController);
 
-  function searchDetailController(
+  function SearchDetailController(
     $rootScope, $state, LanguageService, $location
   ) {
     var $ctrl = this; // jshint ignore:line
diff --git a/src/main/webapp/scripts/searchmanagement/components/search-detail/search.detail.html.tmpl b/src/main/webapp/scripts/common/details/search.detail.html.tmpl
similarity index 89%
rename from src/main/webapp/scripts/searchmanagement/components/search-detail/search.detail.html.tmpl
rename to src/main/webapp/scripts/common/details/search.detail.html.tmpl
index c03463990d..cb0c47dcf5 100644
--- a/src/main/webapp/scripts/searchmanagement/components/search-detail/search.detail.html.tmpl
+++ b/src/main/webapp/scripts/common/details/search.detail.html.tmpl
@@ -12,7 +12,7 @@
       id="query"
       md-select-on-focus
       ng-model="$ctrl.query"
-      placeholder="{{'search-management.detail.dataPacketSearch'|translate}}"
+      placeholder="{{'search-management.detail.dataPackageSearch'|translate}}"
       tabindex="0"
       type="search">
     <md-button
diff --git a/src/main/webapp/scripts/common/error/error.js b/src/main/webapp/scripts/common/error/error.js
index 946635fa4a..cc6a7a9381 100644
--- a/src/main/webapp/scripts/common/error/error.js
+++ b/src/main/webapp/scripts/common/error/error.js
@@ -10,8 +10,8 @@ angular.module('metadatamanagementApp').config(
           authorities: [],
           pageTitle: 'global.error.title'
         },
-        onEnter: function(ToolbarHeaderService) {
-          ToolbarHeaderService.updateToolbarHeader({'stateName': 'error'});
+        onEnter: function(BreadcrumbService) {
+          BreadcrumbService.updateToolbarHeader({'stateName': 'error'});
         },
         views: {
           'content@': {
diff --git a/src/main/webapp/scripts/common/services/MessageBus.service.js b/src/main/webapp/scripts/common/messagebus/MessageBus.service.js
similarity index 100%
rename from src/main/webapp/scripts/common/services/MessageBus.service.js
rename to src/main/webapp/scripts/common/messagebus/MessageBus.service.js
diff --git a/src/main/webapp/scripts/common/navbar/directives/navbar.directive.js b/src/main/webapp/scripts/common/navbar/directives/navbar.directive.js
deleted file mode 100644
index 0db1d7ba1b..0000000000
--- a/src/main/webapp/scripts/common/navbar/directives/navbar.directive.js
+++ /dev/null
@@ -1,11 +0,0 @@
-'use strict';
-
-angular.module('metadatamanagementApp').directive('fdzNavbar',
-  function() {
-    return {
-      replace: true,
-      restrict: 'E',
-      templateUrl: 'scripts/common/navbar/views/navbar.html.tmpl',
-      controller: 'NavbarController'
-    };
-  });
diff --git a/src/main/webapp/scripts/common/navbar/views/navbar.controller.js b/src/main/webapp/scripts/common/sidenav/sidenav.controller.js
similarity index 97%
rename from src/main/webapp/scripts/common/navbar/views/navbar.controller.js
rename to src/main/webapp/scripts/common/sidenav/sidenav.controller.js
index ae192ccab5..d09bdd4183 100644
--- a/src/main/webapp/scripts/common/navbar/views/navbar.controller.js
+++ b/src/main/webapp/scripts/common/sidenav/sidenav.controller.js
@@ -1,7 +1,7 @@
 /* Author Daniel Katzberg */
 'use strict';
 
-angular.module('metadatamanagementApp').controller('NavbarController',
+angular.module('metadatamanagementApp').controller('SidenavController',
   function($scope, $rootScope, Principal, $mdSidenav, $document, $timeout,
            LanguageService, Auth, $state,
            WelcomeDialogService) {
diff --git a/src/main/webapp/scripts/common/sidenav/sidenav.directive.js b/src/main/webapp/scripts/common/sidenav/sidenav.directive.js
new file mode 100644
index 0000000000..688cc6d66e
--- /dev/null
+++ b/src/main/webapp/scripts/common/sidenav/sidenav.directive.js
@@ -0,0 +1,11 @@
+'use strict';
+
+angular.module('metadatamanagementApp').directive('fdzSidenav',
+  function() {
+    return {
+      replace: true,
+      restrict: 'E',
+      templateUrl: 'scripts/common/sidenav/sidenav.html.tmpl',
+      controller: 'SidenavController'
+    };
+  });
diff --git a/src/main/webapp/scripts/common/navbar/views/navbar.html.tmpl b/src/main/webapp/scripts/common/sidenav/sidenav.html.tmpl
similarity index 96%
rename from src/main/webapp/scripts/common/navbar/views/navbar.html.tmpl
rename to src/main/webapp/scripts/common/sidenav/sidenav.html.tmpl
index 8b233e689f..713cde0fa6 100644
--- a/src/main/webapp/scripts/common/navbar/views/navbar.html.tmpl
+++ b/src/main/webapp/scripts/common/sidenav/sidenav.html.tmpl
@@ -5,14 +5,14 @@
                 {{'global.menu.skip-navigation-tooltip'|translate}}
             </md-tooltip>
         </md-button>
-    <fdz-search ng-if="sidebarContent.search"></fdz-search>
+    <fdz-data-package-search ng-if="sidebarContent.search"></fdz-data-package-search>
     <fdz-search-detail ng-if="sidebarContent.detailSearch"></fdz-search-detail>
     <fdz-search-filter
       ng-if="sidebarContent.filter"
-      options="dataPacketFilter"
-      template-url="scripts/searchmanagement/components/searchfilter/dp-search-filter.html.tmpl"></fdz-search-filter>
-    <fdz-data-packet
-      ng-if="sidebarContent.configurator"></fdz-data-packet>
+      options="dataPackageFilter"
+      template-url="scripts/searchmanagement/components/searchfilter.html.tmpl"></fdz-search-filter>
+    <fdz-data-package-configurator
+      ng-if="sidebarContent.configurator"></fdz-data-package-configurator>
     <md-content ng-switch="isAuthenticated()" flex layout="column" role="navigation">
         <ul ng-if="isAuthenticated()" class="pa0 ma0 overflow-hidden">
           <li class="fdz-navbar-menu">
diff --git a/src/main/webapp/scripts/common/toolbar/views/toolbar.controller.js b/src/main/webapp/scripts/common/toolbar/toolbar.controller.js
similarity index 100%
rename from src/main/webapp/scripts/common/toolbar/views/toolbar.controller.js
rename to src/main/webapp/scripts/common/toolbar/toolbar.controller.js
diff --git a/src/main/webapp/scripts/common/toolbar/directives/toolbar.directive.js b/src/main/webapp/scripts/common/toolbar/toolbar.directive.js
similarity index 74%
rename from src/main/webapp/scripts/common/toolbar/directives/toolbar.directive.js
rename to src/main/webapp/scripts/common/toolbar/toolbar.directive.js
index a6617159c6..90eadfcb19 100644
--- a/src/main/webapp/scripts/common/toolbar/directives/toolbar.directive.js
+++ b/src/main/webapp/scripts/common/toolbar/toolbar.directive.js
@@ -5,7 +5,7 @@ angular.module('metadatamanagementApp').directive('fdzToolbar',
     return {
       restrict: 'E',
       replace: true,
-      templateUrl: 'scripts/common/toolbar/views/toolbar.html.tmpl',
+      templateUrl: 'scripts/common/toolbar/toolbar.html.tmpl',
       controller: 'ToolbarController'
     };
   });
diff --git a/src/main/webapp/scripts/common/toolbar/views/toolbar.html.tmpl b/src/main/webapp/scripts/common/toolbar/toolbar.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/common/toolbar/views/toolbar.html.tmpl
rename to src/main/webapp/scripts/common/toolbar/toolbar.html.tmpl
diff --git a/src/main/webapp/scripts/conceptmanagement/templates/dp-attachments.html.tmpl b/src/main/webapp/scripts/conceptmanagement/templates/attachments.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/conceptmanagement/templates/dp-attachments.html.tmpl
rename to src/main/webapp/scripts/conceptmanagement/templates/attachments.html.tmpl
diff --git a/src/main/webapp/scripts/conceptmanagement/templates/dp-detail.html.tmpl b/src/main/webapp/scripts/conceptmanagement/templates/common-details.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/conceptmanagement/templates/dp-detail.html.tmpl
rename to src/main/webapp/scripts/conceptmanagement/templates/common-details.html.tmpl
diff --git a/src/main/webapp/scripts/conceptmanagement/templates/dp-description.html.tmpl b/src/main/webapp/scripts/conceptmanagement/templates/description.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/conceptmanagement/templates/dp-description.html.tmpl
rename to src/main/webapp/scripts/conceptmanagement/templates/description.html.tmpl
diff --git a/src/main/webapp/scripts/conceptmanagement/templates/dp-license.html.tmpl b/src/main/webapp/scripts/conceptmanagement/templates/license.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/conceptmanagement/templates/dp-license.html.tmpl
rename to src/main/webapp/scripts/conceptmanagement/templates/license.html.tmpl
diff --git a/src/main/webapp/scripts/conceptmanagement/views/concept-detail.controller.js b/src/main/webapp/scripts/conceptmanagement/views/concept-detail.controller.js
index 347bbc8486..3cbf6c569f 100644
--- a/src/main/webapp/scripts/conceptmanagement/views/concept-detail.controller.js
+++ b/src/main/webapp/scripts/conceptmanagement/views/concept-detail.controller.js
@@ -3,7 +3,7 @@
 angular.module('metadatamanagementApp')
   .controller('ConceptDetailController',
     function(entity, PageTitleService, LanguageService,
-             $state, ToolbarHeaderService, Principal,
+             $state, BreadcrumbService, Principal,
              ConceptAttachmentResource, SearchResultNavigatorService,
              $stateParams, $log, blockUI) {
       blockUI.start();
@@ -53,7 +53,7 @@ angular.module('metadatamanagementApp')
           title: result.title[LanguageService.getCurrentInstantly()],
           conceptId: result.id
         });
-        ToolbarHeaderService.updateToolbarHeader({
+        BreadcrumbService.updateToolbarHeader({
           'stateName': $state.current.name,
           'id': result.id
         });
diff --git a/src/main/webapp/scripts/conceptmanagement/views/concept-detail.html.tmpl b/src/main/webapp/scripts/conceptmanagement/views/concept-detail.html.tmpl
index b3211c25cf..77f946fb82 100644
--- a/src/main/webapp/scripts/conceptmanagement/views/concept-detail.html.tmpl
+++ b/src/main/webapp/scripts/conceptmanagement/views/concept-detail.html.tmpl
@@ -35,13 +35,13 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.concept"
-          template-url="scripts/conceptmanagement/templates/dp-detail.html.tmpl"></fdz-detail>
+          template-url="scripts/conceptmanagement/templates/common-details.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-detail
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.concept.description"
-          template-url="scripts/conceptmanagement/templates/dp-description.html.tmpl"></fdz-detail>
+          template-url="scripts/conceptmanagement/templates/description.html.tmpl"></fdz-detail>
         <md-divider
           ng-if="ctrl.attachments && ctrl.attachments.length > 0"></md-divider>
         <fdz-detail
@@ -49,7 +49,7 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.attachments"
-          template-url="scripts/conceptmanagement/templates/dp-attachments.html.tmpl"></fdz-detail>
+          template-url="scripts/conceptmanagement/templates/attachments.html.tmpl"></fdz-detail>
         <md-divider
           ng-if="ctrl.concept.license"></md-divider>
         <fdz-detail
@@ -57,14 +57,14 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.concept.license"
-          template-url="scripts/conceptmanagement/templates/dp-license.html.tmpl"></fdz-detail>
+          template-url="scripts/conceptmanagement/templates/license.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-related-objects
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.counts"
           id="ctrl.concept.id"
-          template-url="scripts/common/detail/common/dp-related-objects.html.tmpl"></fdz-related-objects>
+          template-url="scripts/common/details/related-objects.html.tmpl"></fdz-related-objects>
       </div>
     </div>
   </div>
diff --git a/src/main/webapp/scripts/conceptmanagement/views/concept-edit-or-create.controller.js b/src/main/webapp/scripts/conceptmanagement/views/concept-edit-or-create.controller.js
index b481de0627..2d4c606109 100644
--- a/src/main/webapp/scripts/conceptmanagement/views/concept-edit-or-create.controller.js
+++ b/src/main/webapp/scripts/conceptmanagement/views/concept-edit-or-create.controller.js
@@ -4,7 +4,7 @@
 angular.module('metadatamanagementApp')
   .controller('ConceptEditOrCreateController',
     function(entity, PageTitleService, $document, $timeout,
-      $state, ToolbarHeaderService, Principal, SimpleMessageToastService,
+      $state, BreadcrumbService, Principal, SimpleMessageToastService,
       ConceptResource, ConceptSearchService, $scope, $q,
       ElasticSearchAdminService, $transitions,
       CommonDialogsService, LanguageService, ConceptAttachmentUploadService,
@@ -34,7 +34,7 @@ angular.module('metadatamanagementApp')
               conceptId: ctrl.concept.id
             });
         }
-        ToolbarHeaderService.updateToolbarHeader({
+        BreadcrumbService.updateToolbarHeader({
           'stateName': $state.current.name,
           'id': ctrl.concept.id,
           'enableLastItem': !ctrl.createMode
diff --git a/src/main/webapp/scripts/dataacquisitionprojectmanagement/views/project-cockpit.controller.js b/src/main/webapp/scripts/dataacquisitionprojectmanagement/views/project-cockpit.controller.js
index 02ad3d7ef4..a5514eb9f1 100644
--- a/src/main/webapp/scripts/dataacquisitionprojectmanagement/views/project-cockpit.controller.js
+++ b/src/main/webapp/scripts/dataacquisitionprojectmanagement/views/project-cockpit.controller.js
@@ -3,7 +3,7 @@
 
 angular.module('metadatamanagementApp').controller('ProjectCockpitController',
   function($scope, $state, $location, $transitions, Principal,
-           PageTitleService, LanguageService, ToolbarHeaderService,
+           PageTitleService, LanguageService, BreadcrumbService,
            CurrentProjectService, projectDeferred, CommonDialogsService,
            ProjectSaveService, blockUI) {
     blockUI.start();
@@ -11,7 +11,7 @@ angular.module('metadatamanagementApp').controller('ProjectCockpitController',
     var pageTitleKey = 'data-acquisition-project-management.project' +
       '-cockpit.title';
 
-    ToolbarHeaderService.updateToolbarHeader({
+    BreadcrumbService.updateToolbarHeader({
       stateName: $state.current.name
     });
 
diff --git a/src/main/webapp/scripts/dataacquisitionprojectmanagement/views/project-overview.controller.js b/src/main/webapp/scripts/dataacquisitionprojectmanagement/views/project-overview.controller.js
index 4aa4eeb4a9..28a4ab0e88 100644
--- a/src/main/webapp/scripts/dataacquisitionprojectmanagement/views/project-overview.controller.js
+++ b/src/main/webapp/scripts/dataacquisitionprojectmanagement/views/project-overview.controller.js
@@ -2,7 +2,7 @@
 
 angular.module('metadatamanagementApp')
   .controller('ProjectOverviewController', function($stateParams, $state,
-      DataAcquisitionProjectCollectionResource, ToolbarHeaderService,
+      DataAcquisitionProjectCollectionResource, BreadcrumbService,
       PageTitleService) {
     var ctrl = this;
     var sort = $stateParams.sort ? $stateParams.sort : 'id,asc';
@@ -32,7 +32,7 @@ angular.module('metadatamanagementApp')
     var init = function() {
       PageTitleService.setPageTitle('data-acquisition-project-' +
         'management.project-overview.header');
-      ToolbarHeaderService.updateToolbarHeader({'stateName': $state.current.
+      BreadcrumbService.updateToolbarHeader({'stateName': $state.current.
           name});
       var page = $stateParams.page ? $stateParams.page - 1 : 0;
       fetchData(page);
diff --git a/src/main/webapp/scripts/datasetmanagement/templates/dp-attachments.html.tmpl b/src/main/webapp/scripts/datasetmanagement/templates/attachments.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/datasetmanagement/templates/dp-attachments.html.tmpl
rename to src/main/webapp/scripts/datasetmanagement/templates/attachments.html.tmpl
diff --git a/src/main/webapp/scripts/datasetmanagement/templates/dp-detail.html.tmpl b/src/main/webapp/scripts/datasetmanagement/templates/common-details.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/datasetmanagement/templates/dp-detail.html.tmpl
rename to src/main/webapp/scripts/datasetmanagement/templates/common-details.html.tmpl
diff --git a/src/main/webapp/scripts/datasetmanagement/templates/dp-sub-dataset.html.tmpl b/src/main/webapp/scripts/datasetmanagement/templates/sub-datasets.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/datasetmanagement/templates/dp-sub-dataset.html.tmpl
rename to src/main/webapp/scripts/datasetmanagement/templates/sub-datasets.html.tmpl
diff --git a/src/main/webapp/scripts/datasetmanagement/views/data-set-edit-or-create.controller.js b/src/main/webapp/scripts/datasetmanagement/views/data-set-edit-or-create.controller.js
index b542212304..0dc76fc260 100644
--- a/src/main/webapp/scripts/datasetmanagement/views/data-set-edit-or-create.controller.js
+++ b/src/main/webapp/scripts/datasetmanagement/views/data-set-edit-or-create.controller.js
@@ -4,7 +4,7 @@
 angular.module('metadatamanagementApp')
   .controller('DataSetEditOrCreateController',
     function(entity, PageTitleService, $timeout,
-      $state, ToolbarHeaderService, Principal, SimpleMessageToastService,
+      $state, BreadcrumbService, Principal, SimpleMessageToastService,
       CurrentProjectService, DataSetIdBuilderService, DataSetResource,
       $scope, SurveyIdBuilderService, $document,
       ElasticSearchAdminService, $mdDialog, $transitions, StudyResource,
@@ -31,7 +31,7 @@ angular.module('metadatamanagementApp')
         $rootScope.$broadcast('start-ignoring-404');
         StudyResource.get({id: ctrl.dataSet.studyId}).$promise
           .then(function(study) {
-          ToolbarHeaderService.updateToolbarHeader({
+          BreadcrumbService.updateToolbarHeader({
             'stateName': $state.current.name,
             'dataSetId': ctrl.dataSet.id,
             'studyId': ctrl.dataSet.studyId,
@@ -42,7 +42,7 @@ angular.module('metadatamanagementApp')
             'dataSetIsPresent': !ctrl.createMode
           });
         }).catch(function() {
-          ToolbarHeaderService.updateToolbarHeader({
+          BreadcrumbService.updateToolbarHeader({
             'stateName': $state.current.name,
             'dataSetId': ctrl.dataSet.id,
             'studyId': ctrl.dataSet.studyId,
diff --git a/src/main/webapp/scripts/datasetmanagement/views/dataSet-detail.controller.js b/src/main/webapp/scripts/datasetmanagement/views/dataSet-detail.controller.js
index a147025598..f98b3a0010 100644
--- a/src/main/webapp/scripts/datasetmanagement/views/dataSet-detail.controller.js
+++ b/src/main/webapp/scripts/datasetmanagement/views/dataSet-detail.controller.js
@@ -6,7 +6,7 @@ angular.module('metadatamanagementApp')
     function(entity, Principal,
              VariableSearchService, ProjectUpdateAccessService,
              DataSetSearchService, DataSetReportResource, PageTitleService,
-             LanguageService, $state, ToolbarHeaderService,
+             LanguageService, $state, BreadcrumbService,
              CleanJSObjectService, SimpleMessageToastService,
              DataSetAttachmentResource, DataSetCitateDialogService,
              SearchResultNavigatorService,
@@ -69,7 +69,7 @@ angular.module('metadatamanagementApp')
             .description[currentLanguage] : result.description[secondLanguage],
           dataSetId: result.id
         });
-        ToolbarHeaderService.updateToolbarHeader({
+        BreadcrumbService.updateToolbarHeader({
           'stateName': $state.current.name,
           'id': result.id,
           'number': result.number,
diff --git a/src/main/webapp/scripts/datasetmanagement/views/dataSet-detail.html.tmpl b/src/main/webapp/scripts/datasetmanagement/views/dataSet-detail.html.tmpl
index e54ffee5a5..79fa43d0d7 100644
--- a/src/main/webapp/scripts/datasetmanagement/views/dataSet-detail.html.tmpl
+++ b/src/main/webapp/scripts/datasetmanagement/views/dataSet-detail.html.tmpl
@@ -17,27 +17,27 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.dataSet"
-          template-url="scripts/datasetmanagement/templates/dp-detail.html.tmpl"></fdz-detail>
+          template-url="scripts/datasetmanagement/templates/common-details.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-detail
           collapsed="false"
           lang="currentLanguage"
           options="ctrl"
-          template-url="scripts/datasetmanagement/templates/dp-sub-dataset.html.tmpl"></fdz-detail>
+          template-url="scripts/datasetmanagement/templates/sub-datasets.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-detail
           ng-if="ctrl.attachments"
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.attachments"
-          template-url="scripts/datasetmanagement/templates/dp-attachments.html.tmpl"></fdz-detail>
+          template-url="scripts/datasetmanagement/templates/attachments.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-related-objects
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.counts"
           id="ctrl.dataSet.id"
-          template-url="scripts/common/detail/common/dp-related-objects.html.tmpl"></fdz-related-objects>
+          template-url="scripts/common/details/related-objects.html.tmpl"></fdz-related-objects>
       </div>
     </div>
   </div>
diff --git a/src/main/webapp/scripts/disclosure/views/disclosure.controller.js b/src/main/webapp/scripts/disclosure/views/disclosure.controller.js
index d6a5120e91..b13cef3537 100644
--- a/src/main/webapp/scripts/disclosure/views/disclosure.controller.js
+++ b/src/main/webapp/scripts/disclosure/views/disclosure.controller.js
@@ -1,8 +1,8 @@
 'use strict';
 
 angular.module('metadatamanagementApp').controller('DisclosureController',
-  function(PageTitleService, $state, ToolbarHeaderService) {
+  function(PageTitleService, $state, BreadcrumbService) {
     PageTitleService.setPageTitle('disclosure.title');
-    ToolbarHeaderService.updateToolbarHeader({'stateName': $state.current.
+    BreadcrumbService.updateToolbarHeader({'stateName': $state.current.
     name});
   });
diff --git a/src/main/webapp/scripts/instrumentmanagement/templates/dp-attachments.html.tmpl b/src/main/webapp/scripts/instrumentmanagement/templates/attachments.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/instrumentmanagement/templates/dp-attachments.html.tmpl
rename to src/main/webapp/scripts/instrumentmanagement/templates/attachments.html.tmpl
diff --git a/src/main/webapp/scripts/instrumentmanagement/templates/dp-detail.html.tmpl b/src/main/webapp/scripts/instrumentmanagement/templates/common-details.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/instrumentmanagement/templates/dp-detail.html.tmpl
rename to src/main/webapp/scripts/instrumentmanagement/templates/common-details.html.tmpl
diff --git a/src/main/webapp/scripts/instrumentmanagement/views/instrument-detail.controller.js b/src/main/webapp/scripts/instrumentmanagement/views/instrument-detail.controller.js
index 6249899b03..8f9cd97394 100644
--- a/src/main/webapp/scripts/instrumentmanagement/views/instrument-detail.controller.js
+++ b/src/main/webapp/scripts/instrumentmanagement/views/instrument-detail.controller.js
@@ -5,7 +5,7 @@ angular.module('metadatamanagementApp')
   .controller('InstrumentDetailController',
     function(entity, InstrumentAttachmentResource, MessageBus,
              PageTitleService, LanguageService, $state, CleanJSObjectService,
-             ToolbarHeaderService, Principal, SimpleMessageToastService,
+             BreadcrumbService, Principal, SimpleMessageToastService,
              SearchResultNavigatorService,
              DataAcquisitionProjectResource, ProjectUpdateAccessService,
              InstrumentSearchService, OutdatedVersionNotifier, $stateParams,
@@ -54,7 +54,7 @@ angular.module('metadatamanagementApp')
             activeProject = project;
           });
         }
-        ToolbarHeaderService.updateToolbarHeader({
+        BreadcrumbService.updateToolbarHeader({
           'stateName': $state.current.name,
           'id': result.id,
           'number': result.number,
diff --git a/src/main/webapp/scripts/instrumentmanagement/views/instrument-detail.html.tmpl b/src/main/webapp/scripts/instrumentmanagement/views/instrument-detail.html.tmpl
index 13d3d128ba..10bd899a88 100644
--- a/src/main/webapp/scripts/instrumentmanagement/views/instrument-detail.html.tmpl
+++ b/src/main/webapp/scripts/instrumentmanagement/views/instrument-detail.html.tmpl
@@ -17,21 +17,21 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.instrument"
-          template-url="scripts/instrumentmanagement/templates/dp-detail.html.tmpl"></fdz-detail>
+          template-url="scripts/instrumentmanagement/templates/common-details.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-detail
           ng-if="ctrl.attachments"
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.attachments"
-          template-url="scripts/instrumentmanagement/templates/dp-attachments.html.tmpl"></fdz-detail>
+          template-url="scripts/instrumentmanagement/templates/attachments.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-related-objects
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.counts"
           id="ctrl.instrument.id"
-          template-url="scripts/common/detail/common/dp-related-objects.html.tmpl"></fdz-related-objects>
+          template-url="scripts/common/details/related-objects.html.tmpl"></fdz-related-objects>
       </div>
     </div>
   </div>
diff --git a/src/main/webapp/scripts/instrumentmanagement/views/instrument-edit-or-create.controller.js b/src/main/webapp/scripts/instrumentmanagement/views/instrument-edit-or-create.controller.js
index 92fa27ad55..fd6387f197 100644
--- a/src/main/webapp/scripts/instrumentmanagement/views/instrument-edit-or-create.controller.js
+++ b/src/main/webapp/scripts/instrumentmanagement/views/instrument-edit-or-create.controller.js
@@ -4,7 +4,7 @@
 angular.module('metadatamanagementApp')
   .controller('InstrumentEditOrCreateController',
     function(entity, PageTitleService, $timeout,
-      $state, ToolbarHeaderService, Principal, SimpleMessageToastService,
+      $state, BreadcrumbService, Principal, SimpleMessageToastService,
       CurrentProjectService, InstrumentIdBuilderService, InstrumentResource,
       $scope, SurveyIdBuilderService, AttachmentDialogService,
       ElasticSearchAdminService, $mdDialog, $transitions, StudyResource,
@@ -37,7 +37,7 @@ angular.module('metadatamanagementApp')
         $rootScope.$broadcast('start-ignoring-404');
         StudyResource.get({id: ctrl.instrument.studyId}).$promise
           .then(function(study) {
-          ToolbarHeaderService.updateToolbarHeader({
+          BreadcrumbService.updateToolbarHeader({
             'stateName': $state.current.name,
             'instrumentId': ctrl.instrument.id,
             'studyId': ctrl.instrument.studyId,
@@ -48,7 +48,7 @@ angular.module('metadatamanagementApp')
             'instrumentIsPresent': !ctrl.createMode
           });
         }).catch(function() {
-          ToolbarHeaderService.updateToolbarHeader({
+          BreadcrumbService.updateToolbarHeader({
             'stateName': $state.current.name,
             'instrumentId': ctrl.instrument.id,
             'studyId': ctrl.instrument.studyId,
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/detail-component.js b/src/main/webapp/scripts/ordermanagement/components/configurator/detail-component.js
deleted file mode 100644
index 00281ddee1..0000000000
--- a/src/main/webapp/scripts/ordermanagement/components/configurator/detail-component.js
+++ /dev/null
@@ -1,14 +0,0 @@
-(function() {
-  'use strict';
-
-  var Component = {
-    controller: 'DataPacketController',
-    templateUrl:
-      'scripts/ordermanagement/components/configurator/detail.html.tmpl'
-  };
-
-  angular
-    .module('metadatamanagementApp')
-    .component('fdzDataPacket', Component);
-
-})();
diff --git a/src/main/webapp/scripts/ordermanagement/components/data-package-configurator.component.js b/src/main/webapp/scripts/ordermanagement/components/data-package-configurator.component.js
new file mode 100644
index 0000000000..0c4811618d
--- /dev/null
+++ b/src/main/webapp/scripts/ordermanagement/components/data-package-configurator.component.js
@@ -0,0 +1,14 @@
+(function() {
+  'use strict';
+
+  var Component = {
+    controller: 'DataPackageConfiguratorController',
+    templateUrl:
+      'scripts/ordermanagement/components/data-package-configurator.html.tmpl'
+  };
+
+  angular
+    .module('metadatamanagementApp')
+    .component('fdzDataPackageConfigurator', Component);
+
+})();
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/detail-component-controller.js b/src/main/webapp/scripts/ordermanagement/components/data-package-configurator.controller.js
similarity index 95%
rename from src/main/webapp/scripts/ordermanagement/components/configurator/detail-component-controller.js
rename to src/main/webapp/scripts/ordermanagement/components/data-package-configurator.controller.js
index fdf24fedea..0b2098c88a 100644
--- a/src/main/webapp/scripts/ordermanagement/components/configurator/detail-component-controller.js
+++ b/src/main/webapp/scripts/ordermanagement/components/data-package-configurator.controller.js
@@ -2,7 +2,7 @@
 
   'use strict';
 
-  function DataPacketController($scope,
+  function DataPackageConfiguratorController($scope,
                                 $rootScope,
                                 $location,
                                 DataAcquisitionProjectReleasesResource,
@@ -158,7 +158,7 @@
     $ctrl.showVersionHelp = function($event) {
       $mdDialog.show({
         controller: 'VersionInfoController',
-        templateUrl: 'scripts/ordermanagement/components/configurator/' +
+        templateUrl: 'scripts/ordermanagement/views/' +
             'version-info.html.tmpl',
         clickOutsideToClose: true,
         fullscreen: true,
@@ -169,7 +169,7 @@
     $ctrl.showAccessWayHelp = function($event) {
       $mdDialog.show({
         controller: 'AccessWayInfoController',
-        templateUrl: 'scripts/ordermanagement/components/configurator/' +
+        templateUrl: 'scripts/ordermanagement/views/' +
             'access-way-info.html.tmpl',
         clickOutsideToClose: true,
         fullscreen: true,
@@ -180,6 +180,7 @@
 
   angular
     .module('metadatamanagementApp')
-    .controller('DataPacketController', DataPacketController);
+    .controller('DataPackageConfiguratorController',
+      DataPackageConfiguratorController);
 
 })();
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/detail.html.tmpl b/src/main/webapp/scripts/ordermanagement/components/data-package-configurator.html.tmpl
similarity index 97%
rename from src/main/webapp/scripts/ordermanagement/components/configurator/detail.html.tmpl
rename to src/main/webapp/scripts/ordermanagement/components/data-package-configurator.html.tmpl
index 30c837d1c5..52df5b2568 100644
--- a/src/main/webapp/scripts/ordermanagement/components/configurator/detail.html.tmpl
+++ b/src/main/webapp/scripts/ordermanagement/components/data-package-configurator.html.tmpl
@@ -1,4 +1,4 @@
-<md-card class="fdz-data-packet" ng-if="$ctrl.study && $ctrl.studyIdVersion.masterId && $ctrl.lang && $ctrl.accessWays && $ctrl.releases">
+<md-card class="fdz-data-package" ng-if="$ctrl.study && $ctrl.studyIdVersion.masterId && $ctrl.lang && $ctrl.accessWays && $ctrl.releases">
   <md-card-header>
     <md-card-header-text>
       <a ui-sref="studyDetail({id: $ctrl.studyIdVersion.masterId, version: $ctrl.studyIdVersion.version})" class="title">
diff --git a/src/main/webapp/scripts/ordermanagement/services/productChooserDialog.service.js b/src/main/webapp/scripts/ordermanagement/services/productChooserDialog.service.js
deleted file mode 100644
index 3072a3293b..0000000000
--- a/src/main/webapp/scripts/ordermanagement/services/productChooserDialog.service.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-
-angular.module('metadatamanagementApp').service('ProductChooserDialogService',
-  function($mdDialog) {
-    var showDialog = function(projectId, accessWays, study, version, event) {
-      $mdDialog.show({
-        templateUrl: 'scripts/ordermanagement/views/' +
-        'product-chooser.html.tmpl',
-        controller: 'ProductChooserController',
-        controllerAs: 'ctrl',
-        targetEvent: event,
-        locals: {
-          study: study,
-          accessWays: accessWays || [],
-          projectId: projectId,
-          version: version
-        },
-        clickOutsideToClose: false,
-        closeTo: '#shoppingCartButton',
-        fullscreen: true
-      });
-    };
-    return {
-      showDialog: showDialog
-    };
-  });
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/access-way-info.controller.js b/src/main/webapp/scripts/ordermanagement/views/access-way-info.controller.js
similarity index 100%
rename from src/main/webapp/scripts/ordermanagement/components/configurator/access-way-info.controller.js
rename to src/main/webapp/scripts/ordermanagement/views/access-way-info.controller.js
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/access-way-info.html.tmpl b/src/main/webapp/scripts/ordermanagement/views/access-way-info.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/ordermanagement/components/configurator/access-way-info.html.tmpl
rename to src/main/webapp/scripts/ordermanagement/views/access-way-info.html.tmpl
diff --git a/src/main/webapp/scripts/ordermanagement/views/shopping-cart.controller.js b/src/main/webapp/scripts/ordermanagement/views/shopping-cart.controller.js
index 5e452fdaa6..42853cd462 100644
--- a/src/main/webapp/scripts/ordermanagement/views/shopping-cart.controller.js
+++ b/src/main/webapp/scripts/ordermanagement/views/shopping-cart.controller.js
@@ -2,14 +2,14 @@
 'use strict';
 
 angular.module('metadatamanagementApp').controller('ShoppingCartController',
-  function(PageTitleService, $state, ToolbarHeaderService,
+  function(PageTitleService, $state, BreadcrumbService,
            ShoppingCartService, $scope, StudyResource, DataSetSearchService,
            VariableSearchService, DataAcquisitionProjectReleasesResource, $q,
            OrderResource, LanguageService, SimpleMessageToastService, order,
            ProjectReleaseService, $rootScope) {
 
     PageTitleService.setPageTitle('shopping-cart.title');
-    ToolbarHeaderService.updateToolbarHeader({
+    BreadcrumbService.updateToolbarHeader({
       'stateName': $state.current.name
     });
     var ctrl = this;
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/version-info.controller.js b/src/main/webapp/scripts/ordermanagement/views/version-info.controller.js
similarity index 100%
rename from src/main/webapp/scripts/ordermanagement/components/configurator/version-info.controller.js
rename to src/main/webapp/scripts/ordermanagement/views/version-info.controller.js
diff --git a/src/main/webapp/scripts/ordermanagement/components/configurator/version-info.html.tmpl b/src/main/webapp/scripts/ordermanagement/views/version-info.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/ordermanagement/components/configurator/version-info.html.tmpl
rename to src/main/webapp/scripts/ordermanagement/views/version-info.html.tmpl
diff --git a/src/main/webapp/scripts/questionmanagement/templates/dp-detail.html.tmpl b/src/main/webapp/scripts/questionmanagement/templates/common-details.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/questionmanagement/templates/dp-detail.html.tmpl
rename to src/main/webapp/scripts/questionmanagement/templates/common-details.html.tmpl
diff --git a/src/main/webapp/scripts/questionmanagement/templates/dp-image.html.tmpl b/src/main/webapp/scripts/questionmanagement/templates/image.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/questionmanagement/templates/dp-image.html.tmpl
rename to src/main/webapp/scripts/questionmanagement/templates/image.html.tmpl
diff --git a/src/main/webapp/scripts/questionmanagement/templates/dp-next-question.html.tmpl b/src/main/webapp/scripts/questionmanagement/templates/next-question.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/questionmanagement/templates/dp-next-question.html.tmpl
rename to src/main/webapp/scripts/questionmanagement/templates/next-question.html.tmpl
diff --git a/src/main/webapp/scripts/questionmanagement/templates/dp-prev-question.html.tmpl b/src/main/webapp/scripts/questionmanagement/templates/previous-question.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/questionmanagement/templates/dp-prev-question.html.tmpl
rename to src/main/webapp/scripts/questionmanagement/templates/previous-question.html.tmpl
diff --git a/src/main/webapp/scripts/questionmanagement/templates/dp-generation.html.tmpl b/src/main/webapp/scripts/questionmanagement/templates/technical-representation.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/questionmanagement/templates/dp-generation.html.tmpl
rename to src/main/webapp/scripts/questionmanagement/templates/technical-representation.html.tmpl
diff --git a/src/main/webapp/scripts/questionmanagement/views/question-detail.controller.js b/src/main/webapp/scripts/questionmanagement/views/question-detail.controller.js
index ea0474cd59..388b2ee64a 100644
--- a/src/main/webapp/scripts/questionmanagement/views/question-detail.controller.js
+++ b/src/main/webapp/scripts/questionmanagement/views/question-detail.controller.js
@@ -5,7 +5,7 @@
 
 angular.module('metadatamanagementApp')
   .controller('QuestionDetailController',
-    function(entity, $state, ToolbarHeaderService, MessageBus,
+    function(entity, $state, BreadcrumbService, MessageBus,
       SimpleMessageToastService, QuestionSearchService, CleanJSObjectService,
       PageTitleService, $rootScope, Principal, SearchResultNavigatorService,
       QuestionImageMetadataResource, $mdMenu, $timeout, $stateParams,
@@ -61,7 +61,7 @@ angular.module('metadatamanagementApp')
         }
         PageTitleService.
           setPageTitle('question-management.detail.title', title);
-        ToolbarHeaderService.updateToolbarHeader({
+        BreadcrumbService.updateToolbarHeader({
           'stateName': $state.current.name,
           'id': result.id,
           'questionNumber': result.number,
diff --git a/src/main/webapp/scripts/questionmanagement/views/question-detail.html.tmpl b/src/main/webapp/scripts/questionmanagement/views/question-detail.html.tmpl
index b4417948d7..28445bb5c4 100644
--- a/src/main/webapp/scripts/questionmanagement/views/question-detail.html.tmpl
+++ b/src/main/webapp/scripts/questionmanagement/views/question-detail.html.tmpl
@@ -21,25 +21,25 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.question"
-          template-url="scripts/questionmanagement/templates/dp-detail.html.tmpl"></fdz-detail>
+          template-url="scripts/questionmanagement/templates/common-details.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-detail
           collapsed="false"
           lang="currentLanguage"
           options="ctrl"
-          template-url="scripts/questionmanagement/templates/dp-image.html.tmpl"></fdz-detail>
+          template-url="scripts/questionmanagement/templates/image.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-detail
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.predecessors"
-          template-url="scripts/questionmanagement/templates/dp-prev-question.html.tmpl"></fdz-detail>
+          template-url="scripts/questionmanagement/templates/previous-question.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-detail
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.successors"
-          template-url="scripts/questionmanagement/templates/dp-next-question.html.tmpl"></fdz-detail>
+          template-url="scripts/questionmanagement/templates/next-question.html.tmpl"></fdz-detail>
         <md-divider
           ng-if="ctrl.question.technicalRepresentation"></md-divider>
         <fdz-detail
@@ -47,14 +47,14 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl"
-          template-url="scripts/questionmanagement/templates/dp-generation.html.tmpl"></fdz-detail>
+          template-url="scripts/questionmanagement/templates/technical-representation.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-related-objects
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.counts"
           id="ctrl.question.id"
-          template-url="scripts/common/detail/common/dp-related-objects.html.tmpl"></fdz-related-objects>
+          template-url="scripts/common/details/related-objects.html.tmpl"></fdz-related-objects>
       </div>
     </div>
   </div>
diff --git a/src/main/webapp/scripts/relatedpublicationmanagement/templates/dp-detail.html.tmpl b/src/main/webapp/scripts/relatedpublicationmanagement/templates/common-details.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/relatedpublicationmanagement/templates/dp-detail.html.tmpl
rename to src/main/webapp/scripts/relatedpublicationmanagement/templates/common-details.html.tmpl
diff --git a/src/main/webapp/scripts/relatedpublicationmanagement/templates/dp-description.html.tmpl b/src/main/webapp/scripts/relatedpublicationmanagement/templates/description.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/relatedpublicationmanagement/templates/dp-description.html.tmpl
rename to src/main/webapp/scripts/relatedpublicationmanagement/templates/description.html.tmpl
diff --git a/src/main/webapp/scripts/relatedpublicationmanagement/views/publicationAssignment.controller.js b/src/main/webapp/scripts/relatedpublicationmanagement/views/publicationAssignment.controller.js
index 66968fb435..507a7a5cb0 100644
--- a/src/main/webapp/scripts/relatedpublicationmanagement/views/publicationAssignment.controller.js
+++ b/src/main/webapp/scripts/relatedpublicationmanagement/views/publicationAssignment.controller.js
@@ -6,7 +6,7 @@ angular.module('metadatamanagementApp')
     function(CurrentProjectService, StudyIdBuilderService,
       RelatedPublicationSearchService, DataAcquisitionProjectResource,
       LanguageService, $timeout, SimpleMessageToastService, $state,
-      ProjectUpdateAccessService, PageTitleService, ToolbarHeaderService, $q,
+      ProjectUpdateAccessService, PageTitleService, BreadcrumbService, $q,
       SearchDao, PublicationAssignmentResource, ElasticSearchAdminService,
       $scope, DeleteMetadataService, blockUI) {
       var ctrl = this;
@@ -33,7 +33,7 @@ angular.module('metadatamanagementApp')
             projectId: ctrl.project.id
           });
 
-        ToolbarHeaderService.updateToolbarHeader({
+        BreadcrumbService.updateToolbarHeader({
           'stateName': $state.current.name,
           'id': ctrl.project.id,
           'projectId': ctrl.project.id,
diff --git a/src/main/webapp/scripts/relatedpublicationmanagement/views/relatedPublicationDetail.controller.js b/src/main/webapp/scripts/relatedpublicationmanagement/views/relatedPublicationDetail.controller.js
index 3367d2c98c..81d6d17efa 100644
--- a/src/main/webapp/scripts/relatedpublicationmanagement/views/relatedPublicationDetail.controller.js
+++ b/src/main/webapp/scripts/relatedpublicationmanagement/views/relatedPublicationDetail.controller.js
@@ -2,7 +2,7 @@
 
 angular.module('metadatamanagementApp')
   .controller('RelatedPublicationDetailController',
-    function(entity, PageTitleService, $state, ToolbarHeaderService,
+    function(entity, PageTitleService, $state, BreadcrumbService,
     SearchResultNavigatorService, Principal, $stateParams) {
 
       SearchResultNavigatorService
@@ -30,7 +30,7 @@ angular.module('metadatamanagementApp')
           title: ctrl.relatedPublication.title,
           publicationId: ctrl.relatedPublication.id
         });
-        ToolbarHeaderService.updateToolbarHeader({
+        BreadcrumbService.updateToolbarHeader({
           'stateName': $state.current.name,
           'id': ctrl.relatedPublication.id});
       });
diff --git a/src/main/webapp/scripts/relatedpublicationmanagement/views/relatedPublicationDetail.html.tmpl b/src/main/webapp/scripts/relatedpublicationmanagement/views/relatedPublicationDetail.html.tmpl
index 02d4bcaedd..c3a11f70a4 100644
--- a/src/main/webapp/scripts/relatedpublicationmanagement/views/relatedPublicationDetail.html.tmpl
+++ b/src/main/webapp/scripts/relatedpublicationmanagement/views/relatedPublicationDetail.html.tmpl
@@ -18,7 +18,7 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.relatedPublication"
-          template-url="scripts/relatedpublicationmanagement/templates/dp-detail.html.tmpl"></fdz-detail>
+          template-url="scripts/relatedpublicationmanagement/templates/common-details.html.tmpl"></fdz-detail>
         <md-divider
           ng-if="ctrl.relatedPublication.publicationAbstract"></md-divider>
         <fdz-detail
@@ -26,14 +26,14 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.relatedPublication"
-          template-url="scripts/relatedpublicationmanagement/templates/dp-description.html.tmpl"></fdz-detail>
+          template-url="scripts/relatedpublicationmanagement/templates/description.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-related-objects
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.counts"
           id="ctrl.relatedPublication.id"
-          template-url="scripts/common/detail/common/dp-related-objects.html.tmpl"></fdz-related-objects>
+          template-url="scripts/common/details/related-objects.html.tmpl"></fdz-related-objects>
       </div>
     </div>
   </div>
diff --git a/src/main/webapp/scripts/searchmanagement/components/data-package-search.component.js b/src/main/webapp/scripts/searchmanagement/components/data-package-search.component.js
new file mode 100644
index 0000000000..9b5b3d3371
--- /dev/null
+++ b/src/main/webapp/scripts/searchmanagement/components/data-package-search.component.js
@@ -0,0 +1,18 @@
+(function() {
+  'use strict';
+
+  var DataPackageSearchComponent = {
+    bindings: {
+      // items: '<',
+      name: '<'
+    },
+    controller: 'DataPackageSearchController',
+    templateUrl: 'scripts/searchmanagement/components/' +
+      'data-package-search.html.tmpl'
+  };
+
+  angular
+    .module('metadatamanagementApp')
+    .component('fdzDataPackageSearch', DataPackageSearchComponent);
+
+})();
diff --git a/src/main/webapp/scripts/searchmanagement/components/search/search.controller.js b/src/main/webapp/scripts/searchmanagement/components/data-package-search.controller.js
similarity index 95%
rename from src/main/webapp/scripts/searchmanagement/components/search/search.controller.js
rename to src/main/webapp/scripts/searchmanagement/components/data-package-search.controller.js
index a3de1b81d8..2b95b4fb75 100644
--- a/src/main/webapp/scripts/searchmanagement/components/search/search.controller.js
+++ b/src/main/webapp/scripts/searchmanagement/components/data-package-search.controller.js
@@ -3,7 +3,7 @@
 (function() {
   'use strict';
 
-  function DataPacketSearchController(
+  function DataPackageSearchController(
     $scope,
     $location,
     $rootScope,
@@ -80,6 +80,5 @@
 
   angular
     .module('metadatamanagementApp')
-    .controller('DataPacketSearchController', DataPacketSearchController);
+    .controller('DataPackageSearchController', DataPackageSearchController);
 })();
-
diff --git a/src/main/webapp/scripts/searchmanagement/components/search/search.html.tmpl b/src/main/webapp/scripts/searchmanagement/components/data-package-search.html.tmpl
similarity index 92%
rename from src/main/webapp/scripts/searchmanagement/components/search/search.html.tmpl
rename to src/main/webapp/scripts/searchmanagement/components/data-package-search.html.tmpl
index d6a660698f..bea86d000e 100644
--- a/src/main/webapp/scripts/searchmanagement/components/search/search.html.tmpl
+++ b/src/main/webapp/scripts/searchmanagement/components/data-package-search.html.tmpl
@@ -14,7 +14,7 @@
       ng-model="$ctrl.query"
       ng-model-options="{debounce: 300}"
       ng-change="$ctrl.change()"
-      placeholder="{{'search-management.detail.dataPacketSearch'|translate}}"
+      placeholder="{{'search-management.detail.dataPackageSearch'|translate}}"
       tabindex="0"
       type="search">
     <md-button
diff --git a/src/main/webapp/scripts/searchmanagement/components/menutoggle/menu-toggle-component.js b/src/main/webapp/scripts/searchmanagement/components/menu-toggle.component.js
similarity index 100%
rename from src/main/webapp/scripts/searchmanagement/components/menutoggle/menu-toggle-component.js
rename to src/main/webapp/scripts/searchmanagement/components/menu-toggle.component.js
diff --git a/src/main/webapp/scripts/searchmanagement/components/menutoggle/menu-toggle-component-controller.js b/src/main/webapp/scripts/searchmanagement/components/menu-toggle.controller.js
similarity index 100%
rename from src/main/webapp/scripts/searchmanagement/components/menutoggle/menu-toggle-component-controller.js
rename to src/main/webapp/scripts/searchmanagement/components/menu-toggle.controller.js
diff --git a/src/main/webapp/scripts/searchmanagement/components/menutoggle/menu-toggle.html.tmpl b/src/main/webapp/scripts/searchmanagement/components/menu-toggle.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/searchmanagement/components/menutoggle/menu-toggle.html.tmpl
rename to src/main/webapp/scripts/searchmanagement/components/menu-toggle.html.tmpl
diff --git a/src/main/webapp/scripts/searchmanagement/components/search/search.component.js b/src/main/webapp/scripts/searchmanagement/components/search/search.component.js
deleted file mode 100644
index a0cee702f9..0000000000
--- a/src/main/webapp/scripts/searchmanagement/components/search/search.component.js
+++ /dev/null
@@ -1,17 +0,0 @@
-(function() {
-  'use strict';
-
-  var SearchComponent = {
-    bindings: {
-      // items: '<',
-      name: '<'
-    },
-    controller: 'DataPacketSearchController',
-    templateUrl: 'scripts/searchmanagement/components/search/search.html.tmpl'
-  };
-
-  angular
-    .module('metadatamanagementApp')
-    .component('fdzSearch', SearchComponent);
-
-})();
diff --git a/src/main/webapp/scripts/searchmanagement/components/searchfilter/searchfilter-component.js b/src/main/webapp/scripts/searchmanagement/components/searchfilter.component.js
similarity index 70%
rename from src/main/webapp/scripts/searchmanagement/components/searchfilter/searchfilter-component.js
rename to src/main/webapp/scripts/searchmanagement/components/searchfilter.component.js
index d2effd0013..8e8e53c939 100644
--- a/src/main/webapp/scripts/searchmanagement/components/searchfilter/searchfilter-component.js
+++ b/src/main/webapp/scripts/searchmanagement/components/searchfilter.component.js
@@ -1,7 +1,7 @@
 (function() {
   'use strict';
 
-  var SearchfilterComponent = {
+  var SearchFilterComponent = {
     controller: 'SearchFilterController',
     templateUrl: ['$attrs', function($attrs) {
       return $attrs.templateUrl;
@@ -10,5 +10,5 @@
 
   angular
     .module('metadatamanagementApp')
-    .component('fdzSearchFilter', SearchfilterComponent);
+    .component('fdzSearchFilter', SearchFilterComponent);
 })();
diff --git a/src/main/webapp/scripts/searchmanagement/components/searchfilter/searchfilter-component-controller.js b/src/main/webapp/scripts/searchmanagement/components/searchfilter.controller.js
similarity index 89%
rename from src/main/webapp/scripts/searchmanagement/components/searchfilter/searchfilter-component-controller.js
rename to src/main/webapp/scripts/searchmanagement/components/searchfilter.controller.js
index ce041efa96..fee96354c3 100644
--- a/src/main/webapp/scripts/searchmanagement/components/searchfilter/searchfilter-component-controller.js
+++ b/src/main/webapp/scripts/searchmanagement/components/searchfilter.controller.js
@@ -4,9 +4,8 @@
 
   function SearchFilterController($scope, $location, MessageBus) {
     var $ctrl = this;
-    // var registerScope = null;
-    $ctrl.onDataPacketFilterChange = MessageBus;
-    $ctrl.dataPacketFilter = {};
+    $ctrl.onDataPackageFilterChange = MessageBus;
+    $ctrl.dataPackageFilter = {};
     $ctrl.searchFilterMapping = {};
     $ctrl.searchParams = {};
     $ctrl.filterValues = [
@@ -148,23 +147,17 @@
       $ctrl.searchParams.filter = _.omit(locationSearch, ['page', 'size',
         'type', 'query', 'sort-by'
       ]);
-      // if (_.isEmpty($ctrl.searchParams.filter)) {
-      //   var filter = MessageBus.get('searchFilter');
-      //   if (filter) {
-      //     $ctrl.searchParams.filter = filter;
-      //   }
-      // }
     }
 
     $scope.$watch(function() {
-        return $ctrl.onDataPacketFilterChange;
+        return $ctrl.onDataPackageFilterChange;
       },
       function() {
-        if ($ctrl.onDataPacketFilterChange.get('onDataPacketFilterChange')) {
-          $ctrl.dataPacketFilter = $ctrl.onDataPacketFilterChange
-            .get('onDataPacketFilterChange', true);
+        if ($ctrl.onDataPackageFilterChange.get('onDataPackageFilterChange')) {
+          $ctrl.dataPackageFilter = $ctrl.onDataPackageFilterChange
+            .get('onDataPackageFilterChange', true);
         }
-        if ($ctrl.onDataPacketFilterChange.get('searchInit', true)) {
+        if ($ctrl.onDataPackageFilterChange.get('searchInit', true)) {
           init();
         }
       }, true);
diff --git a/src/main/webapp/scripts/searchmanagement/components/searchfilter/dp-search-filter.html.tmpl b/src/main/webapp/scripts/searchmanagement/components/searchfilter.html.tmpl
similarity index 87%
rename from src/main/webapp/scripts/searchmanagement/components/searchfilter/dp-search-filter.html.tmpl
rename to src/main/webapp/scripts/searchmanagement/components/searchfilter.html.tmpl
index 23c42aecbf..c015a9e1c1 100644
--- a/src/main/webapp/scripts/searchmanagement/components/searchfilter/dp-search-filter.html.tmpl
+++ b/src/main/webapp/scripts/searchmanagement/components/searchfilter.html.tmpl
@@ -15,8 +15,8 @@
           collapsed = "item.collapsed"
           name = "item.name"
           property = "item.property"
-          options = $ctrl.dataPacketFilter[item.property]
-          template-url="scripts/searchmanagement/components/menutoggle/menu-toggle.html.tmpl"></fdz-menu-toggle>
+          options = $ctrl.dataPackageFilter[item.property]
+          template-url="scripts/searchmanagement/components/menu-toggle.html.tmpl"></fdz-menu-toggle>
       </li>
     </ul>
   </md-card-content>
diff --git a/src/main/webapp/scripts/searchmanagement/configuration/translations-de.js b/src/main/webapp/scripts/searchmanagement/configuration/translations-de.js
index 24c2e7cf85..2fab730951 100644
--- a/src/main/webapp/scripts/searchmanagement/configuration/translations-de.js
+++ b/src/main/webapp/scripts/searchmanagement/configuration/translations-de.js
@@ -22,11 +22,11 @@ angular.module('metadatamanagementApp').config(
           'delete-instruments': 'Sind Sie sicher, dass Sie alle Instrumente innerhalb des Datenaufbereitungsprojekts mit der FDZ-ID "{{ id }}" mit den übergebenen Daten ersetzen möchten?',
         },
         'search-result': {
-          'dataPacketSearch': 'Suche "{{ searchQuery }}" im Datenpaket'
+          'dataPackageSearch': 'Suche "{{ searchQuery }}" im Datenpaket'
         },
         'detail': {
           'search': 'Datensuche',
-          'dataPacketSearch': 'Datensuche',
+          'dataPackageSearch': 'Datensuche',
           'noresult': 'Keine Suchergebnisse gefunden.',
           'versions': 'Versionen',
           'access-ways': 'Zugangswege',
diff --git a/src/main/webapp/scripts/searchmanagement/configuration/translations-en.js b/src/main/webapp/scripts/searchmanagement/configuration/translations-en.js
index 88baf6a8bb..ca1ff295ef 100644
--- a/src/main/webapp/scripts/searchmanagement/configuration/translations-en.js
+++ b/src/main/webapp/scripts/searchmanagement/configuration/translations-en.js
@@ -22,11 +22,11 @@ angular.module('metadatamanagementApp').config(
           'delete-instruments': 'Are you sure you want to replace all Instruments within the Data Acquisition Project with RDC-ID "{{ id }}"?'
         },
         'search-result': {
-          'dataPacketSearch': 'Search "{{ searchQuery }}" in Data Package'
+          'dataPackageSearch': 'Search "{{ searchQuery }}" in Data Package'
         },
         'detail': {
           'search': 'Data Search',
-          'dataPacketSearch': 'Data Search',
+          'dataPackageSearch': 'Data Search',
           'noresult': 'No search results found.',
           'versions': 'Versions',
           'access-ways': 'Access ways',
diff --git a/src/main/webapp/scripts/searchmanagement/directives/study-search-result.html.tmpl b/src/main/webapp/scripts/searchmanagement/directives/study-search-result.html.tmpl
index 6db3469b46..7d2f82bc9e 100644
--- a/src/main/webapp/scripts/searchmanagement/directives/study-search-result.html.tmpl
+++ b/src/main/webapp/scripts/searchmanagement/directives/study-search-result.html.tmpl
@@ -29,7 +29,7 @@
     <a class="md-small md-primary"
        ng-if="!$ctrl.isAuthenticated()"
        ui-sref="studyDetail({id: $ctrl.searchResult.masterId, 'search-result-index': $ctrl.searchResultIndex, version: $ctrl.searchResult.shadow ? $ctrl.searchResult.release.version: '', 'query': $ctrl.query})">
-      {{'search-management.search-result.dataPacketSearch' | translate:{searchQuery: $ctrl.query} }}</a>
+      {{'search-management.search-result.dataPackageSearch' | translate:{searchQuery: $ctrl.query} }}</a>
   </md-card-actions>
   <md-card-actions style="margin-bottom: -10px;"
     data-has-any-authority="ROLE_PUBLISHER, ROLE_DATA_PROVIDER"
diff --git a/src/main/webapp/scripts/searchmanagement/services/searchResultNavigator.service.js b/src/main/webapp/scripts/searchmanagement/services/searchResultNavigator.service.js
index 4f87a21bc7..597fa5c16b 100644
--- a/src/main/webapp/scripts/searchmanagement/services/searchResultNavigator.service.js
+++ b/src/main/webapp/scripts/searchmanagement/services/searchResultNavigator.service.js
@@ -2,7 +2,7 @@
 
 angular.module('metadatamanagementApp').factory(
   'SearchResultNavigatorService',
-  function(SearchDao, $q, ToolbarHeaderService) {
+  function(SearchDao, $q, BreadcrumbService) {
     var searchIndex = null;
     var lastSearchParams = {};
     var lastProjectId;
@@ -33,7 +33,7 @@ angular.module('metadatamanagementApp').factory(
         currentSearchResultIndex = parseInt(searchResultIndex);
         var currentPage = Math.floor((currentSearchResultIndex - 1) /
         lastPageObject.size) + 1;
-        ToolbarHeaderService.setCurrentSearchPage(currentPage);
+        BreadcrumbService.setCurrentSearchPage(currentPage);
         if (currentSearchResultIndex < lastPageObject.totalHits &&
           currentSearchResultIndex < 10000) {
           SearchDao.search(lastSearchParams.query,
diff --git a/src/main/webapp/scripts/searchmanagement/views/search.controller.js b/src/main/webapp/scripts/searchmanagement/views/search.controller.js
index 07760dece6..682ea2850e 100644
--- a/src/main/webapp/scripts/searchmanagement/views/search.controller.js
+++ b/src/main/webapp/scripts/searchmanagement/views/search.controller.js
@@ -9,7 +9,7 @@ angular.module('metadatamanagementApp').controller('SearchController',
            VariableUploadService, ProjectUpdateAccessService,
            QuestionUploadService, RelatedPublicationUploadService,
            CleanJSObjectService, CurrentProjectService, $timeout,
-           PageTitleService, ToolbarHeaderService, SearchHelperService,
+           PageTitleService, BreadcrumbService, SearchHelperService,
            SearchResultNavigatorService, StudyResource, StudyIdBuilderService,
            $rootScope, ProjectStatusScoringService, DeleteMetadataService,
            SimpleMessageToastService) {
@@ -270,7 +270,7 @@ angular.module('metadatamanagementApp').controller('SearchController',
       group: 'concepts'
     }];
 
-    function createDataPacketFilterContent(data, prop) {
+    function createDataPackageFilterContent(data, prop) {
       _.map(data.all.filtered[prop].buckets, function(val1, i1) {
         data.all.filtered[prop].buckets[i1].doc_count = 0;
         _.find(data[prop].buckets, function(val2, i2) {
@@ -282,21 +282,21 @@ angular.module('metadatamanagementApp').controller('SearchController',
       });
       return data.all.filtered[prop].buckets;
     }
-    function createDataPacketFilterObject(data) {
+    function createDataPackageFilterObject(data) {
       if (Principal.isAuthenticated()) { return null; }
-      var dataPacketFilter = {
-        'study-series': createDataPacketFilterContent(data,
+      var dataPackageFilter = {
+        'study-series': createDataPackageFilterContent(data,
           'study-series'),
-        'survey-data-types': createDataPacketFilterContent(data,
+        'survey-data-types': createDataPackageFilterContent(data,
           'survey-data-types'),
-        'tags': createDataPacketFilterContent(data,
+        'tags': createDataPackageFilterContent(data,
           'tags'),
-        'sponsor': createDataPacketFilterContent(data,
+        'sponsor': createDataPackageFilterContent(data,
           'sponsor'),
-        'institutions': createDataPacketFilterContent(data,
+        'institutions': createDataPackageFilterContent(data,
           'institutions')
       };
-      MessageBus.set('onDataPacketFilterChange', dataPacketFilter);
+      MessageBus.set('onDataPackageFilterChange', dataPackageFilter);
     }
     $scope.setCurrentSearchParams = function(projectId) {
       if (!projectId) {
@@ -334,7 +334,7 @@ angular.module('metadatamanagementApp').controller('SearchController',
         // })
         $scope.searchFilterMapping)
         .then(function(data) {
-          createDataPacketFilterObject(data.aggregations);
+          createDataPackageFilterObject(data.aggregations);
           $scope.searchResult = data.hits.hits;
           $scope.options.pageObject.totalHits = data.hits.total.value;
           //Count information by aggregations
@@ -419,7 +419,7 @@ angular.module('metadatamanagementApp').controller('SearchController',
     $scope.$watchCollection(function() {
       return $location.search();
     }, function(newValue, oldValue) {
-      ToolbarHeaderService.updateToolbarHeader({
+      BreadcrumbService.updateToolbarHeader({
         'stateName': $state.current.name,
         'tabName': $scope.tabs[$scope.searchParams.selectedTabIndex].title,
         'searchUrl': $location.absUrl(),
diff --git a/src/main/webapp/scripts/studymanagement/configuration/translations-de.js b/src/main/webapp/scripts/studymanagement/configuration/translations-de.js
index 86f980a8ee..b7d60fa08f 100644
--- a/src/main/webapp/scripts/studymanagement/configuration/translations-de.js
+++ b/src/main/webapp/scripts/studymanagement/configuration/translations-de.js
@@ -10,8 +10,8 @@ angular.module('metadatamanagementApp').config(
             'study': 'Studie',
             'studies': 'Studien',
             'studySeries': 'Studienreihe',
-            'dataPacket': 'Datenpaket',
-            'dataPackets': 'Datenpakete',
+            'dataPackage': 'Datenpaket',
+            'dataPackages': 'Datenpakete',
             'institution': 'Erhebende Institution',
             'institutions': 'Erhebende Institution(en)',
             'authors': 'Projektmitarbeiter(innen)',
diff --git a/src/main/webapp/scripts/studymanagement/configuration/translations-en.js b/src/main/webapp/scripts/studymanagement/configuration/translations-en.js
index 2bea53c7a8..3736346ea9 100644
--- a/src/main/webapp/scripts/studymanagement/configuration/translations-en.js
+++ b/src/main/webapp/scripts/studymanagement/configuration/translations-en.js
@@ -10,8 +10,8 @@ angular.module('metadatamanagementApp').config(
             'study': 'Study',
             'studies': 'Studies',
             'studySeries': 'Study Series',
-            'dataPacket': 'Data package',
-            'dataPackets': 'Data package',
+            'dataPackage': 'Data package',
+            'dataPackages': 'Data package',
             'institution': 'Institution',
             'institutions': 'Institution(s)',
             'authors': 'Authors',
diff --git a/src/main/webapp/scripts/studymanagement/templates/dp-attachments.html.tmpl b/src/main/webapp/scripts/studymanagement/templates/attachments.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/studymanagement/templates/dp-attachments.html.tmpl
rename to src/main/webapp/scripts/studymanagement/templates/attachments.html.tmpl
diff --git a/src/main/webapp/scripts/studymanagement/templates/dp-detail-auth.html.tmpl b/src/main/webapp/scripts/studymanagement/templates/common-details-authenticated.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/studymanagement/templates/dp-detail-auth.html.tmpl
rename to src/main/webapp/scripts/studymanagement/templates/common-details-authenticated.html.tmpl
diff --git a/src/main/webapp/scripts/studymanagement/templates/dp-detail.html.tmpl b/src/main/webapp/scripts/studymanagement/templates/common-details.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/studymanagement/templates/dp-detail.html.tmpl
rename to src/main/webapp/scripts/studymanagement/templates/common-details.html.tmpl
diff --git a/src/main/webapp/scripts/studymanagement/templates/dp-description.html.tmpl b/src/main/webapp/scripts/studymanagement/templates/description.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/studymanagement/templates/dp-description.html.tmpl
rename to src/main/webapp/scripts/studymanagement/templates/description.html.tmpl
diff --git a/src/main/webapp/scripts/studymanagement/views/study-detail.controller.js b/src/main/webapp/scripts/studymanagement/views/study-detail.controller.js
index d14d04bdb1..ded6d93195 100644
--- a/src/main/webapp/scripts/studymanagement/views/study-detail.controller.js
+++ b/src/main/webapp/scripts/studymanagement/views/study-detail.controller.js
@@ -7,7 +7,7 @@ angular.module('metadatamanagementApp')
              PageTitleService,
              LanguageService,
              $state, $location,
-             ToolbarHeaderService, Principal, SimpleMessageToastService,
+             BreadcrumbService, Principal, SimpleMessageToastService,
              SearchResultNavigatorService,
              $stateParams,
              DataAcquisitionProjectAttachmentsResource,
@@ -102,7 +102,7 @@ angular.module('metadatamanagementApp')
           title: result.title[LanguageService.getCurrentInstantly()],
           studyId: result.id
         });
-        ToolbarHeaderService.updateToolbarHeader({
+        BreadcrumbService.updateToolbarHeader({
           'stateName': $state.current.name,
           'id': result.id,
           'studyIsPresent': true,
diff --git a/src/main/webapp/scripts/studymanagement/views/study-detail.html.tmpl b/src/main/webapp/scripts/studymanagement/views/study-detail.html.tmpl
index cee8dcb396..426f2f8455 100644
--- a/src/main/webapp/scripts/studymanagement/views/study-detail.html.tmpl
+++ b/src/main/webapp/scripts/studymanagement/views/study-detail.html.tmpl
@@ -36,33 +36,33 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.study"
-          template-url="scripts/studymanagement/templates/dp-detail.html.tmpl"></fdz-detail>
+          template-url="scripts/studymanagement/templates/common-details.html.tmpl"></fdz-detail>
         <fdz-detail
           ng-if="isAuthenticated()"
           collapsed="false"
           lang="currentLanguage"
           options="ctrl"
-          template-url="scripts/studymanagement/templates/dp-detail-auth.html.tmpl"></fdz-detail>
+          template-url="scripts/studymanagement/templates/common-details-authenticated.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-detail
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.study.description"
-          template-url="scripts/studymanagement/templates/dp-description.html.tmpl"></fdz-detail>
+          template-url="scripts/studymanagement/templates/description.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-detail
           ng-if="ctrl.attachments.study.length > 0 || ctrl.attachments.instruments.length > 0 || ctrl.attachments.surveys.length > 0 || ctrl.attachments.dataSets.length > 0"
           collapsed="true"
           lang="currentLanguage"
           options="ctrl.attachments"
-          template-url="scripts/studymanagement/templates/dp-attachments.html.tmpl"></fdz-detail>
+          template-url="scripts/studymanagement/templates/attachments.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-related-objects
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.counts"
           id="ctrl.study.id"
-          template-url="scripts/common/detail/common/dp-related-objects.html.tmpl"></fdz-related-objects>
+          template-url="scripts/common/details/related-objects.html.tmpl"></fdz-related-objects>
       </div>
     </div>
   </div>
diff --git a/src/main/webapp/scripts/studymanagement/views/study-edit-or-create.controller.js b/src/main/webapp/scripts/studymanagement/views/study-edit-or-create.controller.js
index 8f32d055ba..d271ee2a9c 100644
--- a/src/main/webapp/scripts/studymanagement/views/study-edit-or-create.controller.js
+++ b/src/main/webapp/scripts/studymanagement/views/study-edit-or-create.controller.js
@@ -4,7 +4,7 @@
 angular.module('metadatamanagementApp')
   .controller('StudyEditOrCreateController',
     function(entity, PageTitleService, $document, $timeout,
-      $state, ToolbarHeaderService, Principal, SimpleMessageToastService,
+      $state, BreadcrumbService, Principal, SimpleMessageToastService,
       CurrentProjectService, StudyIdBuilderService, StudyResource, $scope,
       ElasticSearchAdminService, $transitions,
       CommonDialogsService, LanguageService, StudySearchService,
@@ -63,7 +63,7 @@ angular.module('metadatamanagementApp')
               studyId: ctrl.study.id
             });
         }
-        ToolbarHeaderService.updateToolbarHeader({
+        BreadcrumbService.updateToolbarHeader({
           'stateName': $state.current.name,
           'id': ctrl.study.id,
           'studyId': ctrl.study.id,
diff --git a/src/main/webapp/scripts/surveymanagement/templates/dp-attachments.html.tmpl b/src/main/webapp/scripts/surveymanagement/templates/attachments.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/surveymanagement/templates/dp-attachments.html.tmpl
rename to src/main/webapp/scripts/surveymanagement/templates/attachments.html.tmpl
diff --git a/src/main/webapp/scripts/surveymanagement/templates/dp-detail.html.tmpl b/src/main/webapp/scripts/surveymanagement/templates/common-details.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/surveymanagement/templates/dp-detail.html.tmpl
rename to src/main/webapp/scripts/surveymanagement/templates/common-details.html.tmpl
diff --git a/src/main/webapp/scripts/surveymanagement/templates/dp-response-rate-image.html.tmpl b/src/main/webapp/scripts/surveymanagement/templates/response-rate-image.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/surveymanagement/templates/dp-response-rate-image.html.tmpl
rename to src/main/webapp/scripts/surveymanagement/templates/response-rate-image.html.tmpl
diff --git a/src/main/webapp/scripts/surveymanagement/views/survey-detail.controller.js b/src/main/webapp/scripts/surveymanagement/views/survey-detail.controller.js
index 0372ff9d06..d6fb515da0 100644
--- a/src/main/webapp/scripts/surveymanagement/views/survey-detail.controller.js
+++ b/src/main/webapp/scripts/surveymanagement/views/survey-detail.controller.js
@@ -4,7 +4,7 @@
 angular.module('metadatamanagementApp')
   .controller('SurveyDetailController',
     function(entity, LanguageService, CleanJSObjectService,
-             PageTitleService, $state, ToolbarHeaderService, MessageBus,
+             PageTitleService, $state, BreadcrumbService, MessageBus,
              SurveySearchService, SurveyAttachmentResource, Principal,
              SimpleMessageToastService, SearchResultNavigatorService,
              SurveyResponseRateImageUploadService, OutdatedVersionNotifier,
@@ -65,7 +65,7 @@ angular.module('metadatamanagementApp')
               version: survey.release.version
             });
         }
-        ToolbarHeaderService.updateToolbarHeader({
+        BreadcrumbService.updateToolbarHeader({
           'stateName': $state.current.name,
           'id': survey.id,
           'number': survey.number,
diff --git a/src/main/webapp/scripts/surveymanagement/views/survey-detail.html.tmpl b/src/main/webapp/scripts/surveymanagement/views/survey-detail.html.tmpl
index 7787dc13fc..cb07894223 100644
--- a/src/main/webapp/scripts/surveymanagement/views/survey-detail.html.tmpl
+++ b/src/main/webapp/scripts/surveymanagement/views/survey-detail.html.tmpl
@@ -16,14 +16,14 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl"
-          template-url="scripts/surveymanagement/templates/dp-detail.html.tmpl"></fdz-detail>
+          template-url="scripts/surveymanagement/templates/common-details.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-detail
           ng-if="ctrl.responseRateImage"
           collapsed="false"
           lang="currentLanguage"
           options="ctrl"
-          template-url="scripts/surveymanagement/templates/dp-response-rate-image.html.tmpl"></fdz-detail>
+          template-url="scripts/surveymanagement/templates/response-rate-image.html.tmpl"></fdz-detail>
         <md-divider
           ng-if="ctrl.attachments && ctrl.attachments.length > 0"></md-divider>
         <fdz-detail
@@ -31,14 +31,14 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.attachments"
-          template-url="scripts/surveymanagement/templates/dp-attachments.html.tmpl"></fdz-detail>
+          template-url="scripts/surveymanagement/templates/attachments.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-related-objects
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.counts"
           id="ctrl.survey.id"
-          template-url="scripts/common/detail/common/dp-related-objects.html.tmpl"></fdz-related-objects>
+          template-url="scripts/common/details/related-objects.html.tmpl"></fdz-related-objects>
       </div>
     </div>
   </div>
diff --git a/src/main/webapp/scripts/surveymanagement/views/survey-edit-or-create.controller.js b/src/main/webapp/scripts/surveymanagement/views/survey-edit-or-create.controller.js
index 9fe7274ded..3f16914586 100644
--- a/src/main/webapp/scripts/surveymanagement/views/survey-edit-or-create.controller.js
+++ b/src/main/webapp/scripts/surveymanagement/views/survey-edit-or-create.controller.js
@@ -4,7 +4,7 @@
 angular.module('metadatamanagementApp')
   .controller('SurveyEditOrCreateController',
     function(entity, PageTitleService, $timeout,
-      $state, ToolbarHeaderService, Principal, SimpleMessageToastService,
+      $state, BreadcrumbService, Principal, SimpleMessageToastService,
       CurrentProjectService, SurveyIdBuilderService, SurveyResource, $scope,
       ElasticSearchAdminService, $mdDialog, $transitions, StudyResource,
       CommonDialogsService, LanguageService, AvailableSurveyNumbersResource,
@@ -31,7 +31,7 @@ angular.module('metadatamanagementApp')
         $rootScope.$broadcast('start-ignoring-404');
         StudyResource.get({id: ctrl.survey.studyId}).$promise
           .then(function(study) {
-          ToolbarHeaderService.updateToolbarHeader({
+          BreadcrumbService.updateToolbarHeader({
             'stateName': $state.current.name,
             'id': ctrl.survey.id,
             'studyId': ctrl.survey.studyId,
@@ -41,7 +41,7 @@ angular.module('metadatamanagementApp')
             'enableLastItem': !ctrl.createMode
           });
         }).catch(function() {
-          ToolbarHeaderService.updateToolbarHeader({
+          BreadcrumbService.updateToolbarHeader({
             'stateName': $state.current.name,
             'id': ctrl.survey.id,
             'studyId': ctrl.survey.studyId,
diff --git a/src/main/webapp/scripts/usermanagement/account/activate/activate.controller.js b/src/main/webapp/scripts/usermanagement/account/activate/activate.controller.js
index 3b5961b8a4..d0d859e2ce 100644
--- a/src/main/webapp/scripts/usermanagement/account/activate/activate.controller.js
+++ b/src/main/webapp/scripts/usermanagement/account/activate/activate.controller.js
@@ -2,7 +2,7 @@
 
 angular.module('metadatamanagementApp').controller('ActivationController',
   function($scope, $state, $stateParams, Auth, PageTitleService,
-    ToolbarHeaderService) {
+    BreadcrumbService) {
     PageTitleService.setPageTitle('user-management.activate.title');
     Auth.activateAccount({
       key: $stateParams.key
@@ -13,6 +13,6 @@ angular.module('metadatamanagementApp').controller('ActivationController',
       $scope.success = null;
       $scope.error = 'ERROR';
     });
-    ToolbarHeaderService.updateToolbarHeader({'stateName': $state.current.
+    BreadcrumbService.updateToolbarHeader({'stateName': $state.current.
     name});
   });
diff --git a/src/main/webapp/scripts/usermanagement/account/login/login.controller.js b/src/main/webapp/scripts/usermanagement/account/login/login.controller.js
index c60586b60d..093fb3f1bb 100644
--- a/src/main/webapp/scripts/usermanagement/account/login/login.controller.js
+++ b/src/main/webapp/scripts/usermanagement/account/login/login.controller.js
@@ -2,7 +2,7 @@
 
 angular.module('metadatamanagementApp').controller('LoginController',
   function($rootScope, $scope, $state, $timeout, Auth, PageTitleService,
-    LanguageService, ToolbarHeaderService) {
+    LanguageService, BreadcrumbService) {
     PageTitleService.setPageTitle('user-management.login.title');
     $scope.user = {};
     $scope.errors = {};
@@ -29,6 +29,6 @@ angular.module('metadatamanagementApp').controller('LoginController',
         $scope.authenticationError = true;
       });
     };
-    ToolbarHeaderService.updateToolbarHeader({'stateName': $state.current.
+    BreadcrumbService.updateToolbarHeader({'stateName': $state.current.
     name});
   });
diff --git a/src/main/webapp/scripts/usermanagement/account/password/password.controller.js b/src/main/webapp/scripts/usermanagement/account/password/password.controller.js
index ce30f2c13e..3b43739ddd 100644
--- a/src/main/webapp/scripts/usermanagement/account/password/password.controller.js
+++ b/src/main/webapp/scripts/usermanagement/account/password/password.controller.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('metadatamanagementApp').controller('PasswordController',
-  function($scope, $state, ToolbarHeaderService, Auth, Principal,
+  function($scope, $state, BreadcrumbService, Auth, Principal,
     PageTitleService) {
     PageTitleService.setPageTitle('global.menu.account.password');
     Principal.identity().then(function(account) {
@@ -25,6 +25,6 @@ angular.module('metadatamanagementApp').controller('PasswordController',
         });
       }
     };
-    ToolbarHeaderService.updateToolbarHeader({'stateName': $state.current.
+    BreadcrumbService.updateToolbarHeader({'stateName': $state.current.
     name});
   });
diff --git a/src/main/webapp/scripts/usermanagement/account/register/register.controller.js b/src/main/webapp/scripts/usermanagement/account/register/register.controller.js
index b81abb9f6b..3afb9e0a8f 100644
--- a/src/main/webapp/scripts/usermanagement/account/register/register.controller.js
+++ b/src/main/webapp/scripts/usermanagement/account/register/register.controller.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('metadatamanagementApp').controller('RegisterController',
-  function($scope, $state, ToolbarHeaderService, LanguageService, $timeout,
+  function($scope, $state, BreadcrumbService, LanguageService, $timeout,
     Auth, PageTitleService) {
     PageTitleService.setPageTitle('user-management.register.title');
     $scope.success = null;
@@ -39,6 +39,6 @@ angular.module('metadatamanagementApp').controller('RegisterController',
         });
       }
     };
-    ToolbarHeaderService.updateToolbarHeader({'stateName': $state.current.
+    BreadcrumbService.updateToolbarHeader({'stateName': $state.current.
     name});
   });
diff --git a/src/main/webapp/scripts/usermanagement/account/reset/finish/reset.finish.controller.js b/src/main/webapp/scripts/usermanagement/account/reset/finish/reset.finish.controller.js
index 3558c0c19f..94f20c9d34 100644
--- a/src/main/webapp/scripts/usermanagement/account/reset/finish/reset.finish.controller.js
+++ b/src/main/webapp/scripts/usermanagement/account/reset/finish/reset.finish.controller.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('metadatamanagementApp').controller('ResetFinishController',
-  function($scope, $state, $stateParams, $timeout, Auth, ToolbarHeaderService,
+  function($scope, $state, $stateParams, $timeout, Auth, BreadcrumbService,
     PageTitleService) {
     PageTitleService.setPageTitle('user-management.reset.finish.title');
 
@@ -28,6 +28,6 @@ angular.module('metadatamanagementApp').controller('ResetFinishController',
         });
       }
     };
-    ToolbarHeaderService.updateToolbarHeader({'stateName': $state.current.
+    BreadcrumbService.updateToolbarHeader({'stateName': $state.current.
     name});
   });
diff --git a/src/main/webapp/scripts/usermanagement/account/reset/request/reset.request.controller.js b/src/main/webapp/scripts/usermanagement/account/reset/request/reset.request.controller.js
index 4244daf1ff..d3918e68b8 100644
--- a/src/main/webapp/scripts/usermanagement/account/reset/request/reset.request.controller.js
+++ b/src/main/webapp/scripts/usermanagement/account/reset/request/reset.request.controller.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('metadatamanagementApp').controller('RequestResetController',
-  function($scope, $state, ToolbarHeaderService, $timeout, Auth,
+  function($scope, $state, BreadcrumbService, $timeout, Auth,
     PageTitleService) {
     PageTitleService.setPageTitle('user-management.reset.request.title');
     $scope.success = null;
@@ -29,6 +29,6 @@ angular.module('metadatamanagementApp').controller('RequestResetController',
         }
       });
     };
-    ToolbarHeaderService.updateToolbarHeader({'stateName': $state.current.
+    BreadcrumbService.updateToolbarHeader({'stateName': $state.current.
     name});
   });
diff --git a/src/main/webapp/scripts/usermanagement/account/settings/settings.controller.js b/src/main/webapp/scripts/usermanagement/account/settings/settings.controller.js
index 577be921b2..ea41c82687 100644
--- a/src/main/webapp/scripts/usermanagement/account/settings/settings.controller.js
+++ b/src/main/webapp/scripts/usermanagement/account/settings/settings.controller.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('metadatamanagementApp').controller('SettingsController',
-  function($scope, Principal, $state, ToolbarHeaderService,
+  function($scope, Principal, $state, BreadcrumbService,
     Auth, LanguageService, PageTitleService) {
     PageTitleService.setPageTitle('global.menu.account.settings');
     $scope.success = null;
@@ -27,6 +27,6 @@ angular.module('metadatamanagementApp').controller('SettingsController',
         $scope.error = 'ERROR';
       });
     };
-    ToolbarHeaderService.updateToolbarHeader({'stateName': $state.current.
+    BreadcrumbService.updateToolbarHeader({'stateName': $state.current.
     name});
   });
diff --git a/src/main/webapp/scripts/variablemanagement/templates/dp-statistic.html.tmpl b/src/main/webapp/scripts/variablemanagement/templates/chart.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/variablemanagement/templates/dp-statistic.html.tmpl
rename to src/main/webapp/scripts/variablemanagement/templates/chart.html.tmpl
diff --git a/src/main/webapp/scripts/variablemanagement/templates/dp-detail.html.tmpl b/src/main/webapp/scripts/variablemanagement/templates/common-details.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/variablemanagement/templates/dp-detail.html.tmpl
rename to src/main/webapp/scripts/variablemanagement/templates/common-details.html.tmpl
diff --git a/src/main/webapp/scripts/variablemanagement/templates/dp-frequencies.html.tmpl b/src/main/webapp/scripts/variablemanagement/templates/frequencies.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/variablemanagement/templates/dp-frequencies.html.tmpl
rename to src/main/webapp/scripts/variablemanagement/templates/frequencies.html.tmpl
diff --git a/src/main/webapp/scripts/variablemanagement/templates/dp-generation.html.tmpl b/src/main/webapp/scripts/variablemanagement/templates/generation-details.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/variablemanagement/templates/dp-generation.html.tmpl
rename to src/main/webapp/scripts/variablemanagement/templates/generation-details.html.tmpl
diff --git a/src/main/webapp/scripts/variablemanagement/templates/dp-next.html.tmpl b/src/main/webapp/scripts/variablemanagement/templates/next-variables.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/variablemanagement/templates/dp-next.html.tmpl
rename to src/main/webapp/scripts/variablemanagement/templates/next-variables.html.tmpl
diff --git a/src/main/webapp/scripts/variablemanagement/templates/dp-prev.html.tmpl b/src/main/webapp/scripts/variablemanagement/templates/previous-variables.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/variablemanagement/templates/dp-prev.html.tmpl
rename to src/main/webapp/scripts/variablemanagement/templates/previous-variables.html.tmpl
diff --git a/src/main/webapp/scripts/variablemanagement/templates/dp-metric.html.tmpl b/src/main/webapp/scripts/variablemanagement/templates/statistics.html.tmpl
similarity index 100%
rename from src/main/webapp/scripts/variablemanagement/templates/dp-metric.html.tmpl
rename to src/main/webapp/scripts/variablemanagement/templates/statistics.html.tmpl
diff --git a/src/main/webapp/scripts/variablemanagement/views/variable-detail.controller.js b/src/main/webapp/scripts/variablemanagement/views/variable-detail.controller.js
index fdbdd72062..33da96b670 100644
--- a/src/main/webapp/scripts/variablemanagement/views/variable-detail.controller.js
+++ b/src/main/webapp/scripts/variablemanagement/views/variable-detail.controller.js
@@ -9,7 +9,7 @@ angular.module('metadatamanagementApp')
     SimpleMessageToastService,
     PageTitleService, LanguageService,
     CleanJSObjectService,
-    $state, ToolbarHeaderService,
+    $state, BreadcrumbService,
     SearchResultNavigatorService,
     OutdatedVersionNotifier,
     $stateParams, blockUI) {
@@ -52,7 +52,7 @@ angular.module('metadatamanagementApp')
           currenLanguage] : result.label[secondLanguage],
         variableId: result.id
       });
-      ToolbarHeaderService.updateToolbarHeader({
+      BreadcrumbService.updateToolbarHeader({
         'stateName': $state.current.name,
         'id': result.id,
         'name': result.name,
diff --git a/src/main/webapp/scripts/variablemanagement/views/variable-detail.html.tmpl b/src/main/webapp/scripts/variablemanagement/views/variable-detail.html.tmpl
index 603c7e8cb9..2268084c8b 100644
--- a/src/main/webapp/scripts/variablemanagement/views/variable-detail.html.tmpl
+++ b/src/main/webapp/scripts/variablemanagement/views/variable-detail.html.tmpl
@@ -16,7 +16,7 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl"
-          template-url="scripts/variablemanagement/templates/dp-detail.html.tmpl"></fdz-detail>
+          template-url="scripts/variablemanagement/templates/common-details.html.tmpl"></fdz-detail>
         <md-divider
           ng-if="ctrl.isDiagramVisible()"></md-divider>
         <fdz-detail
@@ -24,7 +24,7 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.variable"
-          template-url="scripts/variablemanagement/templates/dp-statistic.html.tmpl"></fdz-detail>
+          template-url="scripts/variablemanagement/templates/chart.html.tmpl"></fdz-detail>
         <md-divider
           ng-if="ctrl.variable.accessWays != 'not-accessible' && ctrl.variable.distribution.statistics"></md-divider>
         <fdz-detail
@@ -32,7 +32,7 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl"
-          template-url="scripts/variablemanagement/templates/dp-metric.html.tmpl"></fdz-detail>
+          template-url="scripts/variablemanagement/templates/statistics.html.tmpl"></fdz-detail>
         <md-divider
           ng-if="ctrl.validResponsesOrMissingsAvailable"></md-divider>
         <fdz-detail
@@ -40,7 +40,7 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl"
-          template-url="scripts/variablemanagement/templates/dp-frequencies.html.tmpl"></fdz-detail>
+          template-url="scripts/variablemanagement/templates/frequencies.html.tmpl"></fdz-detail>
         <md-divider
           ng-if="ctrl.variable.generationDetails"></md-divider>
         <fdz-detail
@@ -48,26 +48,26 @@
           collapsed="false"
           lang="currentLanguage"
           options="ctrl"
-          template-url="scripts/variablemanagement/templates/dp-generation.html.tmpl"></fdz-detail>
+          template-url="scripts/variablemanagement/templates/generation-details.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-detail
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.previousVariables"
-          template-url="scripts/variablemanagement/templates/dp-prev.html.tmpl"></fdz-detail>
+          template-url="scripts/variablemanagement/templates/previous-variables.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-detail
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.nextVariables"
-          template-url="scripts/variablemanagement/templates/dp-next.html.tmpl"></fdz-detail>
+          template-url="scripts/variablemanagement/templates/next-variables.html.tmpl"></fdz-detail>
         <md-divider></md-divider>
         <fdz-related-objects
           collapsed="false"
           lang="currentLanguage"
           options="ctrl.counts"
           id="ctrl.variable.id"
-          template-url="scripts/common/detail/common/dp-related-objects.html.tmpl"></fdz-related-objects>
+          template-url="scripts/common/details/related-objects.html.tmpl"></fdz-related-objects>
       </div>
     </div>
   </div>

From a4c5bdfb450963f3e384a4c8fc5ed5a9b022b13a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Wed, 19 Feb 2020 14:26:39 +0100
Subject: [PATCH 24/30] Enable saucelabs status again (#2497)

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index b82ca66d0f..4e0c7c8d13 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,11 @@
 [![Build Status](https://travis-ci.org/dzhw/metadatamanagement.svg?branch=master)](https://travis-ci.org/dzhw/metadatamanagement) [![Documentation Status](https://readthedocs.org/projects/metadatamanagement/badge/?version=latest)](https://metadatamanagement.readthedocs.io/de/latest/?badge=latest)
+[![Sauce Test Status](https://saucelabs.com/buildstatus/rreitmann)](https://saucelabs.com/u/rreitmann)
 [![Known Backend Vulnerabilities](https://snyk.io/test/github/dzhw/metadatamanagement/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/dzhw/metadatamanagement?targetFile=pom.xml
 )[![Known Frontend Vulnerabilities](https://snyk.io/test/github/dzhw/metadatamanagement/badge.svg?targetFile=package.json)](https://snyk.io/test/github/dzhw/metadatamanagement?targetFile=package.json
 )[![codecov](https://codecov.io/gh/dzhw/metadatamanagement/branch/development/graph/badge.svg)](https://codecov.io/gh/dzhw/metadatamanagement)[![Mergify Status](https://gh.mergify.io/badges/dzhw/metadatamanagement.png?style=cut)](https://mergify.io)
 [![DOI](https://zenodo.org/badge/39431147.svg)](https://zenodo.org/badge/latestdoi/39431147)
 
+[![Sauce Build Matrix](https://saucelabs.com/browser-matrix/rreitmann.svg)](https://saucelabs.com/u/rreitmann)
 # Metadatamanagement (MDM)
 
 The MDM holds the metadata of the studies which are available as data products in our Research Data Center [FDZ](https://fdz.dzhw.eu). It enables researchers to browse our data products before signing a contract for using the data.

From 6b75bd031b19806e983888df40ddd7369cd9200d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Thu, 20 Feb 2020 10:49:37 +0100
Subject: [PATCH 25/30] remove maven plugin which depends on bower (#2507)

---
 .travis.yml  |   2 -
 Gruntfile.js |  12 +--
 README.md    |   7 +-
 pom.xml      | 290 ++++++++++++++++++++++++++-------------------------
 4 files changed, 154 insertions(+), 157 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d253223902..aed8c84ed5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,6 @@ jobs:
     - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd
       ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh
       && nvm install 12.11.0
-    - npm install -g bower
     - npm install -g grunt-cli
     script:
     - "./deploy/build.sh unused $TRAVIS_BRANCH"
@@ -65,7 +64,6 @@ jobs:
     - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd
       ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh
       && nvm install 12.11.0
-    - npm install -g bower
     - npm install -g grunt-cli
     - wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key
       | sudo apt-key add -
diff --git a/Gruntfile.js b/Gruntfile.js
index 8c3035c3ca..b7da89a934 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -781,8 +781,7 @@ module.exports = function(grunt) {
       }
     });
 
-  grunt.registerTask('serve', ['createJavaSourceCodeFromTranslations',
-    'clean:server', 'ngconstant:local',
+  grunt.registerTask('serve', ['clean:server', 'ngconstant:local',
     'sass:server', 'copy:localfonts', 'browserSync', 'watch'
   ]);
 
@@ -797,7 +796,7 @@ module.exports = function(grunt) {
     'jshint', 'jscs'
   ]);
 
-  grunt.registerTask('builddev', ['createJavaSourceCodeFromTranslations',
+  grunt.registerTask('builddev', [
     'test', /*'htmlangular:default',
     'htmlangular:index',*/ 'clean:dist',
     'ngconstant:dev',
@@ -806,7 +805,7 @@ module.exports = function(grunt) {
     'autoprefixer', 'uglify', 'rev', 'usemin', 'htmlmin'
   ]);
 
-  grunt.registerTask('buildtest', ['createJavaSourceCodeFromTranslations',
+  grunt.registerTask('buildtest', [
     'test', /*'htmlangular:default',
     'htmlangular:index',*/ 'clean:dist',
     'ngconstant:test',
@@ -815,7 +814,7 @@ module.exports = function(grunt) {
     'autoprefixer', 'uglify', 'rev', 'usemin', 'htmlmin'
   ]);
 
-  grunt.registerTask('buildprod', ['createJavaSourceCodeFromTranslations',
+  grunt.registerTask('buildprod', [
     'test', /*'htmlangular:default',
     'htmlangular:index',*/ 'clean:dist',
     'ngconstant:prod',
@@ -825,7 +824,6 @@ module.exports = function(grunt) {
   ]);
 
   grunt.registerTask('buildlocalminified', [
-    'createJavaSourceCodeFromTranslations',
     'test', /*'htmlangular:default',
     'htmlangular:index',*/ 'clean:dist',
     'test', 'clean:dist',
@@ -835,7 +833,7 @@ module.exports = function(grunt) {
     'autoprefixer', 'uglify', 'rev', 'usemin', 'htmlmin'
   ]);
 
-  grunt.registerTask('buildlocal', ['createJavaSourceCodeFromTranslations',
+  grunt.registerTask('buildlocal', [
     'test', 'clean:dist', 'copy:localfonts',
     'ngconstant:local', 'ngAnnotate'
   ]);
diff --git a/README.md b/README.md
index 4e0c7c8d13..4588248858 100644
--- a/README.md
+++ b/README.md
@@ -27,10 +27,6 @@ We use [Grunt][] as our client build system. Install the grunt command-line tool
 
     npm install -g grunt-cli
 
-You need to install [Bower][] globally as well:
-
-    npm install -g bower
-
 On Windows, `patch.exe` has to exist in the PATH. It is distributed as part of git bash, or can be downloaded manually from [GnuWin32][].
 
 ## Running on your local machine
@@ -49,7 +45,7 @@ Make sure that you have read-write-access on the ***data*** directory (in your p
 
 to start all services the metadatamanagement depends on. Mongodb and Elasticsearch will be listening on its default ports.
 
-In order to have all java dependencies for the server and  all bower dependencies for the client and in order to build everything, simply run (and lean back for a while):
+In order to have all java dependencies for the server and  all nodejs dependencies for the client and in order to build everything, simply run (and lean back for a while):
 
     mvn clean install
 
@@ -106,7 +102,6 @@ Continuous Integration Platform provided by [Travis CI][TravisCI]
 [saucelabs]: https://saucelabs.com
 [JHipster]: https://jhipster.github.io/
 [Node.js]: https://nodejs.org/
-[Bower]: http://bower.io/
 [Grunt]: http://gruntjs.com/
 [BrowserSync]: http://www.browsersync.io/
 [Karma]: http://karma-runner.github.io/
diff --git a/pom.xml b/pom.xml
index bc5e79bc85..a54a5bfd4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,19 +337,6 @@
                                         <ignore />
                                     </action>
                                 </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>com.github.trecloux</groupId>
-                                        <artifactId>yeoman-maven-plugin</artifactId>
-                                        <versionRange>[0.5,)</versionRange>
-                                        <goals>
-                                            <goal>build</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore />
-                                    </action>
-                                </pluginExecution>
                                 <pluginExecution>
                                     <pluginExecutionFilter>
                                         <groupId>org.apache.maven.plugins</groupId>
@@ -610,44 +597,70 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
                 <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>create-java-source-code</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>grunt</executable>
+                            <arguments>
+                                <argument>createJavaSourceCodeFromTranslations</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>javasphinx-apidoc</id>
                         <phase>generate-resources</phase>
                         <goals>
                             <goal>exec</goal>
                         </goals>
+                        <configuration>
+                            <executable>javasphinx-apidoc</executable>
+                            <arguments>
+                                <argument>src/main/java/eu/dzhw/fdz/metadatamanagement</argument>
+                                <argument>-o</argument>
+                                <argument>./docs/source/javadoc</argument>
+                                <argument>-I</argument>
+                                <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/common/domain</argument>
+                                <argument>-I</argument>
+                                <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain</argument>
+                                <argument>-I</argument>
+                                <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/conceptmanagement/domain</argument>
+                                <argument>-I</argument>
+                                <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/studymanagement/domain</argument>
+                                <argument>-I</argument>
+                                <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/surveymanagement/domain</argument>
+                                <argument>-I</argument>
+                                <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/instrumentmanagement/domain</argument>
+                                <argument>-I</argument>
+                                <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/questionmanagement/domain</argument>
+                                <argument>-I</argument>
+                                <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/domain</argument>
+                                <argument>-I</argument>
+                                <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/domain</argument>
+                                <argument>-I</argument>
+                                <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/relatedpublicationmanagement/domain</argument>
+                                <argument>-I</argument>
+                                <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/ordermanagement/domain</argument>
+                            </arguments>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <executable>javasphinx-apidoc</executable>
-                    <arguments>
-                        <argument>src/main/java/eu/dzhw/fdz/metadatamanagement</argument>
-                        <argument>-o</argument>
-                        <argument>./docs/source/javadoc</argument>
-                        <argument>-I</argument>
-                        <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/common/domain</argument>
-                        <argument>-I</argument>
-                        <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain</argument>
-                        <argument>-I</argument>
-                        <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/conceptmanagement/domain</argument>
-                        <argument>-I</argument>
-                        <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/studymanagement/domain</argument>
-                        <argument>-I</argument>
-                        <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/surveymanagement/domain</argument>
-                        <argument>-I</argument>
-                        <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/instrumentmanagement/domain</argument>
-                        <argument>-I</argument>
-                        <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/questionmanagement/domain</argument>
-                        <argument>-I</argument>
-                        <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/domain</argument>
-                        <argument>-I</argument>
-                        <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/domain</argument>
-                        <argument>-I</argument>
-                        <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/relatedpublicationmanagement/domain</argument>
-                        <argument>-I</argument>
-                        <argument>src/main/java/eu/dzhw/fdz/metadatamanagement/ordermanagement/domain</argument>
-                    </arguments>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
@@ -716,27 +729,36 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>com.github.trecloux</groupId>
-                        <artifactId>yeoman-maven-plugin</artifactId>
-                        <version>0.5</version>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>run-frontend-build</id>
+                                <id>npm-install</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>npm</executable>
+                                    <arguments>
+                                        <argument>install</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>create-java-source-code</id>
                                 <phase>generate-resources</phase>
                                 <goals>
-                                    <goal>build</goal>
+                                    <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <skipTests>true</skipTests>
-                                    <bowerInstallArgs>--version</bowerInstallArgs>
-                                    <buildTool>grunt</buildTool>
-                                    <buildArgs>createJavaSourceCodeFromTranslations</buildArgs>
+                                    <executable>grunt</executable>
+                                    <arguments>
+                                        <argument>createJavaSourceCodeFromTranslations</argument>
+                                    </arguments>
                                 </configuration>
                             </execution>
                         </executions>
-                        <configuration>
-                            <yeomanProjectDirectory>${project.basedir}</yeomanProjectDirectory>
-                        </configuration>
                     </plugin>
                 </plugins>
             </build>
@@ -753,29 +775,6 @@
             <id>local-minified</id>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>com.github.trecloux</groupId>
-                        <artifactId>yeoman-maven-plugin</artifactId>
-                        <version>0.5</version>
-                        <executions>
-                            <execution>
-                                <id>run-frontend-build</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>build</goal>
-                                </goals>
-                                <configuration>
-                                    <skipTests>true</skipTests>
-                                    <bowerInstallArgs>--version</bowerInstallArgs>
-                                    <buildTool>grunt</buildTool>
-                                    <buildArgs>buildlocalminified</buildArgs>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <yeomanProjectDirectory>${project.basedir}</yeomanProjectDirectory>
-                        </configuration>
-                    </plugin>
                     <plugin>
                         <artifactId>maven-clean-plugin</artifactId>
                         <version>3.1.0</version>
@@ -797,40 +796,36 @@
                         <artifactId>maven-war-plugin</artifactId>
                         <version>3.2.2</version>
                         <configuration>
-                            <warSourceExcludes>/index.html,%regex[bower_components/(?!angular-i18n|sockjs-client).*],/scripts/**,/assets/**</warSourceExcludes>
+                            <warSourceExcludes>/index.html,/scripts/**,/assets/**</warSourceExcludes>
                         </configuration>
                     </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>dev</id>
-            <build>
-                <finalName>metadatamanagement-dev</finalName>
-                <plugins>
                     <plugin>
-                        <groupId>com.github.trecloux</groupId>
-                        <artifactId>yeoman-maven-plugin</artifactId>
-                        <version>0.5</version>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>run-frontend-build</id>
+                                <id>grunt-buildlocalminified</id>
                                 <phase>generate-resources</phase>
                                 <goals>
-                                    <goal>build</goal>
+                                    <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <skipTests>true</skipTests>
-                                    <bowerInstallArgs>--version</bowerInstallArgs>
-                                    <buildTool>grunt</buildTool>
-                                    <buildArgs>builddev</buildArgs>
+                                    <executable>grunt</executable>
+                                    <arguments>
+                                        <argument>buildlocalminified</argument>
+                                    </arguments>
                                 </configuration>
                             </execution>
                         </executions>
-                        <configuration>
-                            <yeomanProjectDirectory>${project.basedir}</yeomanProjectDirectory>
-                        </configuration>
                     </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>dev</id>
+            <build>
+                <finalName>metadatamanagement-dev</finalName>
+                <plugins>
                     <plugin>
                         <artifactId>maven-clean-plugin</artifactId>
                         <version>3.0.0</version>
@@ -851,40 +846,36 @@
                     <plugin>
                         <artifactId>maven-war-plugin</artifactId>
                         <configuration>
-                            <warSourceExcludes>/index.html,%regex[bower_components/(?!angular-i18n|sockjs-client).*],/scripts/**,/assets/**</warSourceExcludes>
+                            <warSourceExcludes>/index.html,/scripts/**,/assets/**</warSourceExcludes>
                         </configuration>
                     </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>test</id>
-            <build>
-                <finalName>metadatamanagement-test</finalName>
-                <plugins>
                     <plugin>
-                        <groupId>com.github.trecloux</groupId>
-                        <artifactId>yeoman-maven-plugin</artifactId>
-                        <version>0.5</version>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>run-frontend-build</id>
+                                <id>grunt-builddev</id>
                                 <phase>generate-resources</phase>
                                 <goals>
-                                    <goal>build</goal>
+                                    <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <skipTests>true</skipTests>
-                                    <bowerInstallArgs>--version</bowerInstallArgs>
-                                    <buildTool>grunt</buildTool>
-                                    <buildArgs>buildtest</buildArgs>
+                                    <executable>grunt</executable>
+                                    <arguments>
+                                        <argument>builddev</argument>
+                                    </arguments>
                                 </configuration>
                             </execution>
                         </executions>
-                        <configuration>
-                            <yeomanProjectDirectory>${project.basedir}</yeomanProjectDirectory>
-                        </configuration>
                     </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>test</id>
+            <build>
+                <finalName>metadatamanagement-test</finalName>
+                <plugins>
                     <plugin>
                         <artifactId>maven-clean-plugin</artifactId>
                         <version>3.0.0</version>
@@ -905,40 +896,36 @@
                     <plugin>
                         <artifactId>maven-war-plugin</artifactId>
                         <configuration>
-                            <warSourceExcludes>/index.html,%regex[node_modules/(?!angular-i18n|sockjs-client).*],/scripts/**,/assets/**</warSourceExcludes>
+                            <warSourceExcludes>/index.html,/scripts/**,/assets/**</warSourceExcludes>
                         </configuration>
                     </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <build>
-                <finalName>metadatamanagement-prod</finalName>
-                <plugins>
                     <plugin>
-                        <groupId>com.github.trecloux</groupId>
-                        <artifactId>yeoman-maven-plugin</artifactId>
-                        <version>0.5</version>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>run-frontend-build</id>
+                                <id>grunt-buildtest</id>
                                 <phase>generate-resources</phase>
                                 <goals>
-                                    <goal>build</goal>
+                                    <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <skipTests>true</skipTests>
-                                    <bowerInstallArgs>--version</bowerInstallArgs>
-                                    <buildTool>grunt</buildTool>
-                                    <buildArgs>buildprod</buildArgs>
+                                    <executable>grunt</executable>
+                                    <arguments>
+                                        <argument>buildtest</argument>
+                                    </arguments>
                                 </configuration>
                             </execution>
                         </executions>
-                        <configuration>
-                            <yeomanProjectDirectory>${project.basedir}</yeomanProjectDirectory>
-                        </configuration>
                     </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <build>
+                <finalName>metadatamanagement-prod</finalName>
+                <plugins>
                     <plugin>
                         <artifactId>maven-clean-plugin</artifactId>
                         <version>3.0.0</version>
@@ -959,9 +946,28 @@
                     <plugin>
                         <artifactId>maven-war-plugin</artifactId>
                         <configuration>
-                            <warSourceExcludes>/index.html,%regex[node_modules/(?!angular-i18n|sockjs-client).*],/scripts/**,/assets/**</warSourceExcludes>
+                            <warSourceExcludes>/index.html,/scripts/**,/assets/**</warSourceExcludes>
                         </configuration>
                     </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>grunt-builddev</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>grunt</executable>
+                                    <arguments>
+                                        <argument>builddev</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

From 61f3afc26b13e10adbb6ba25e7faec615444adf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Thu, 20 Feb 2020 12:18:58 +0100
Subject: [PATCH 26/30] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4588248858..3945689c44 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 [![Sauce Build Matrix](https://saucelabs.com/browser-matrix/rreitmann.svg)](https://saucelabs.com/u/rreitmann)
 # Metadatamanagement (MDM)
 
-The MDM holds the metadata of the studies which are available as data products in our Research Data Center [FDZ](https://fdz.dzhw.eu). It enables researchers to browse our data products before signing a contract for using the data.
+The MDM holds the metadata of the data packages which are available in our Research Data Center [FDZ](https://fdz.dzhw.eu). It enables researchers to browse our data packages before signing a contract for using the data.
 
 # Developing the MDM system
 

From 8d35e28a2655b93c50b9fadf9a81617b0fcfac7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Thu, 20 Feb 2020 12:40:16 +0100
Subject: [PATCH 27/30] #2505 update node

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aed8c84ed5..bea7534468 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ jobs:
     - pip install git+https://github.com/dzhw/javasphinx.git --user
     - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd
       ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh
-      && nvm install 12.11.0
+      && nvm install 13.9.0
     - npm install -g grunt-cli
     script:
     - "./deploy/build.sh unused $TRAVIS_BRANCH"
@@ -63,7 +63,7 @@ jobs:
     - pip install git+https://github.com/dzhw/javasphinx.git --user
     - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd
       ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh
-      && nvm install 12.11.0
+      && nvm install 13.9.0
     - npm install -g grunt-cli
     - wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key
       | sudo apt-key add -

From 81b85acc1b4a5c50fd13157e437a09b8abd27df4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Fri, 21 Feb 2020 10:07:06 +0100
Subject: [PATCH 28/30] add first release date computation to dara export
 (#2443)

---
 .../projectmanagement/service/DaraService.java     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/projectmanagement/service/DaraService.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/projectmanagement/service/DaraService.java
index 555c0af154..6221145f7b 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/projectmanagement/service/DaraService.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/projectmanagement/service/DaraService.java
@@ -6,12 +6,13 @@
 import java.io.Writer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -275,6 +276,15 @@ private Map<String, Object> getDataForTemplate(DataAcquisitionProject project) {
     if (release == null) {
       release = dataAcquisitionProjectVersionsService.findLastRelease(project.getMasterId());
     }
+    if (release.getFirstDate() == null) {
+      Optional<DataAcquisitionProject> previousRelease = projectRepository
+          .findById(project.getMasterId() + "-" + release.getVersion());
+      if (previousRelease.isPresent()) {
+        release.setFirstDate(previousRelease.get().getRelease().getFirstDate());
+      } else {
+        release.setFirstDate(LocalDateTime.now());
+      }
+    }
 
     String doi = doiBuilder.buildStudyDoi(study, release);
     dataForTemplate.put("doi", doi);
@@ -312,7 +322,7 @@ private Map<String, Object> getDataForTemplate(DataAcquisitionProject project) {
 
     // Add Date
     DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE;
-    dataForTemplate.put("releaseDate", formatter.format(LocalDate.now()));
+    dataForTemplate.put("releaseDate", formatter.format(release.getFirstDate()));
 
     // Add Availability Controlled
     dataForTemplate.put("availabilityControlled", availabilityControlled);

From 643db4e7a583baf07da72d4ad78e3a5ba986251e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Mon, 24 Feb 2020 11:55:26 +0100
Subject: [PATCH 29/30] Increase sleep delay to wait for search index update
 (#2497)

---
 .../assign_and_unassign_concept_to_and_from_instrument.robot    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot b/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot
index 5df6be12dd..b098b5e03f 100644
--- a/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot
+++ b/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot
@@ -14,7 +14,7 @@ Assign and Unassign concept to and from an instrument
     Click on Save Button
     Get back to german home page
     # wait for elasticsearch index beeing updated
-    Sleep  20s
+    Sleep  60s
     Assert the concept has been assigned to the instrument
     Assert the concept is assigned to a study
     Assert the concept is assigned to a survey

From f428fa971ac97f6672bb93aa40ab9eea097f4f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Mon, 24 Feb 2020 13:03:13 +0100
Subject: [PATCH 30/30] #2496 release v1.0.98

---
 pom.xml                                  | 2 +-
 src/main/webapp/scripts/app.constants.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a54a5bfd4b..2dbce0ea43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>eu.dzhw.fdz.metadatamanagement</groupId>
     <artifactId>metadatamanagement</artifactId>
-    <version>1.0.98-SNAPSHOT</version>
+    <version>1.0.98</version>
     <packaging>war</packaging>
     <name>metadatamanagement</name>
 
diff --git a/src/main/webapp/scripts/app.constants.js b/src/main/webapp/scripts/app.constants.js
index ddb720aab7..ea1b6288c2 100644
--- a/src/main/webapp/scripts/app.constants.js
+++ b/src/main/webapp/scripts/app.constants.js
@@ -6,7 +6,7 @@ angular.module('metadatamanagementApp')
 
 .constant('ENV', 'local')
 
-.constant('VERSION', '1.0.98-SNAPSHOT')
+.constant('VERSION', '1.0.98')
 
 .constant('ElasticSearchProperties', {apiVersion:'7.3',logLevel:'error',pageSize:10})