Merge branch 'analysis-packages' into development

dzhw · Dec 7, 2021 · 1d948e4 · 1d948e4
2 parents e2b7a85 + c9a9d28
commit 1d948e4
Show file tree

Hide file tree

Showing 10 changed files with 173 additions and 120 deletions.
diff --git a/src/main/scss/fdz-theme/abstract/utility.scss b/src/main/scss/fdz-theme/abstract/utility.scss
@@ -96,6 +96,11 @@
     margin: 8px!important;
   }
 
+  .mh0 {
+    margin-left: 0!important;
+    margin-right: 0!important;
+  }
+
   .mv0 {
     margin-top: 0!important;
     margin-bottom: 0!important;
@@ -106,6 +111,11 @@
     margin-bottom: 8px!important;
   }
 
+  .mv16 {
+    margin-top: 16px!important;
+    margin-bottom: 16px!important;
+  }
+
   .mt0 {
     margin-top: 0!important;
   }
@@ -118,6 +128,10 @@
     margin-top: 16px!important;
   }
 
+  .mt18 {
+    margin-top: 18px!important;
+  }
+
   .mb0 {
     margin-bottom: 0!important;
   }
@@ -126,6 +140,18 @@
     margin-bottom: 8px!important;
   }
 
+  .mb12 {
+    margin-bottom: 12px!important;
+  }
+
+  .mb16 {
+    margin-bottom: 16px!important;
+  }
+
+  .mb18 {
+    margin-bottom: 18px!important;
+  }
+
   .mh0 {
     margin-left: 0!important;
     margin-right: 0!important;
@@ -334,6 +360,9 @@
   .fg {
     flex-grow: 1;
   }
+  .flex-wrap    { flex-wrap: wrap; }
+  .items-center { align-items: center; }
+  .self-start { align-self: flex-start; }
 
   // TODO: Check if this is necessary. Copied from style tags
   .ms-flex {

diff --git a/src/main/webapp/assets/styles/fdz.css b/src/main/webapp/assets/styles/fdz.css
@@ -66,6 +66,10 @@
 .fdz-theme .ma8 {
   margin: 8px !important; }
 
+.fdz-theme .mh0 {
+  margin-left: 0 !important;
+  margin-right: 0 !important; }
+
 .fdz-theme .mv0 {
   margin-top: 0 !important;
   margin-bottom: 0 !important; }
@@ -74,6 +78,10 @@
   margin-top: 8px !important;
   margin-bottom: 8px !important; }
 
+.fdz-theme .mv16 {
+  margin-top: 16px !important;
+  margin-bottom: 16px !important; }
+
 .fdz-theme .mt0 {
   margin-top: 0 !important; }
 
@@ -83,12 +91,24 @@
 .fdz-theme .mt16 {
   margin-top: 16px !important; }
 
+.fdz-theme .mt18 {
+  margin-top: 18px !important; }
+
 .fdz-theme .mb0 {
   margin-bottom: 0 !important; }
 
 .fdz-theme .mb8 {
   margin-bottom: 8px !important; }
 
+.fdz-theme .mb12 {
+  margin-bottom: 12px !important; }
+
+.fdz-theme .mb16 {
+  margin-bottom: 16px !important; }
+
+.fdz-theme .mb18 {
+  margin-bottom: 18px !important; }
+
 .fdz-theme .mh0 {
   margin-left: 0 !important;
   margin-right: 0 !important; }
@@ -241,6 +261,15 @@
 .fdz-theme .fg {
   flex-grow: 1; }
 
+.fdz-theme .flex-wrap {
+  flex-wrap: wrap; }
+
+.fdz-theme .items-center {
+  align-items: center; }
+
+.fdz-theme .self-start {
+  align-self: flex-start; }
+
 .fdz-theme .ms-flex {
   -ms-flex: auto !important; }
 

diff --git a/.../scripts/analysispackagemanagement/components/listdatapackage/list-data-package.html.tmpl b/.../scripts/analysispackagemanagement/components/listdatapackage/list-data-package.html.tmpl
@@ -19,31 +19,28 @@
              layout-gt-sm="column"
              flex="2"
              class="ms-flex">
-          <md-button class="md-primary md-icon-button"
-                     ng-click="$ctrl.deletePackage($index)"
-                     style="margin-top: 18px; margin-left: 0px; margin-right: -8px; padding-left: 0px;">
+          <md-button class="md-primary md-icon-button mt18 mh0 pl0"
+                     ng-click="$ctrl.deletePackage($index)">
             <md-tooltip md-autohide="true"
                         md-direction="bottom"
                         md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
               {{'analysis-package-management.edit.delete-script-tooltip' | translate}}
             </md-tooltip>
             <md-icon md-font-set="material-icons">delete_forever</md-icon>
           </md-button>
-          <md-button class="md-primary md-icon-button"
+          <md-button class="md-primary md-icon-button mt18 mh0 pl0"
                      ng-click="$ctrl.move('up', $index)"
-                     ng-disabled="$index === 0"
-                     style="margin-top: 18px; margin-left: 0px; margin-right: -8px; padding-left: 0px;">
+                     ng-disabled="$index === 0">
             <md-tooltip md-autohide="true"
                         md-direction="bottom"
                         md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
               {{'analysis-package-management.edit.move-analysis-data-up-tooltip' | translate}}
             </md-tooltip>
             <md-icon md-font-set="material-icons">keyboard_arrow_up</md-icon>
           </md-button>
-          <md-button class="md-primary md-icon-button"
+          <md-button class="md-primary md-icon-button mt18 mh0 pl0"
                      ng-click="$ctrl.move('down', $index)"
-                     ng-disabled="$index === $ctrl.packages.length - 1"
-                     style="margin-left: 0px; margin-right: -8px; padding-left: 0px;">
+                     ng-disabled="$index === $ctrl.packages.length - 1">
             <md-tooltip md-autohide="true"
                         md-direction="bottom"
                         md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
@@ -55,7 +52,7 @@
         <div layout="row"
              flex="100"
              layout-gt-sm="row"
-             class="ms-flex" style="flex-wrap: wrap;">
+             class="ms-flex flex-wrap">
           <div flex="100">
             <md-input-container flex="50"
                                 class="mr8 ms-flex"
@@ -110,8 +107,7 @@
     </div>
 
   </md-card-content>
-  <md-card-actions layout="row" layout-align="begin center"
-                   style="margin-top: 8px; margin-bottom: 12px;">
+  <md-card-actions layout="row" layout-align="begin center" class="mt8 mb12">
     <md-button class="md-primary md-raised md-icon-button ml6"
                ng-click="$ctrl.addPackage()">
       <md-tooltip md-autohide="true"

diff --git a/.../scripts/analysispackagemanagement/components/scriptsection/edit-script-section.html.tmpl b/.../scripts/analysispackagemanagement/components/scriptsection/edit-script-section.html.tmpl
@@ -20,30 +20,27 @@
              class="ms-flex">
           <md-button class="md-primary md-icon-button"
                      ng-if="$ctrl.scripts.length > 1"
-                     ng-click="$ctrl.deleteScript($index, script.uuid)"
-                     style="margin-top: 18px; margin-left: 0px; padding-left: 0px;">
+                     ng-click="$ctrl.deleteScript($index, script.uuid)">
             <md-tooltip md-autohide="true"
                         md-direction="bottom"
                         md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
               {{'analysis-package-management.edit.delete-script-tooltip' | translate}}
             </md-tooltip>
             <md-icon md-font-set="material-icons">delete_forever</md-icon>
           </md-button>
-          <md-button class="md-primary md-icon-button"
+          <md-button class="md-primary md-icon-button mt18 mh0 pl0"
                      ng-click="$ctrl.moveScript('up', $index)"
-                     ng-disabled="$index === 0""
-                     style="margin-top: 18px; margin-left: 0px; padding-left: 0px;">
+                     ng-disabled="$index === 0">
             <md-tooltip md-autohide="true"
                         md-direction="bottom"
                         md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
               {{'analysis-package-management.edit.move-script-up-tooltip' | translate}}
             </md-tooltip>
             <md-icon md-font-set="material-icons">keyboard_arrow_up</md-icon>
           </md-button>
-          <md-button class="md-primary md-icon-button"
+          <md-button class="md-primary md-icon-button mt18 mh0 pl0"
                      ng-click="$ctrl.moveScript('down', $index)"
-                     ng-disabled="$index === $ctrl.scripts.length - 1"
-                     style="margin-left: 0px; padding-left: 0px;">
+                     ng-disabled="$index === $ctrl.scripts.length - 1">
             <md-tooltip md-autohide="true"
                         md-direction="bottom"
                         md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
@@ -229,12 +226,10 @@
             <div flex="100"
                  layout="row"
                  layout-gt-sm="row"
-                 class="mr8"
-                 style="align-items: center;">
+                 class="mr8 items-center">
               <p class="ma0" ng-if="$ctrl.createMode">{{'analysis-package-management.detail.label.save-file' | translate}}</p>
-              <md-input-container class="pa0 ms-flex"
+              <md-input-container class="pa0 ms-flex w-100"
                                   ng-if="!$ctrl.createMode"
-                                  style="width: 100%;"
                                   ngf-drop="$ctrl.addScriptAttachment($file, $index, $event)"
                                   ngf-drag-over-class="{accept:'fdz-file-drop-accept', delay:0}"
                                   ngf-select="$ctrl.addScriptAttachment($file, $index, $event)"
@@ -265,8 +260,7 @@
                   </div>
                 </div>
               </md-input-container>
-              <div class="fdz-button-wrapper"
-                   style="align-self: flex-start; margin-top: 18px;">
+              <div class="fdz-button-wrapper mt18 self-start">
                 <md-button class="md-primary md-icon-button ma0"
                            ng-click="$ctrl.addScriptAttachmentButton($index)"
                            ng-if="!$ctrl.createMode && !($ctrl.scriptAttachments | filter: { scriptUuid: script.uuid }).length > 0">
@@ -296,8 +290,7 @@
                   style="margin: 24px 0 16px 0;"></md-divider>
     </div>
   </md-card-content>
-  <md-card-actions layout="row" layout-align="begin center"
-                   style="margin-top: 0px; margin-bottom: 12px;">
+  <md-card-actions layout="row" layout-align="begin center" class="mb12">
     <md-button class="md-primary md-raised md-icon-button ml6"
                ng-click="$ctrl.addScript()">
       <md-tooltip md-autohide="true"

diff --git a/src/main/webapp/scripts/analysispackagemanagement/templates/packages.html.tmpl b/src/main/webapp/scripts/analysispackagemanagement/templates/packages.html.tmpl
@@ -20,7 +20,7 @@
     <md-card-content>
       <md-list
         ng-repeat="item in $ctrl.options.analysisPackage.analysisDataPackages">
-        <md-list-item ng-if="item.type" style="margin-bottom: 16px;">
+        <md-list-item ng-if="item.type" class="mb16">
           <h5>{{ 'analysis-package-management.detail.label.type-of-data' | translate}}:</h5>
           <span
             class="md-secondary pre">{{$ctrl.options.dataPackageList[item.type][$ctrl.lang]}}</span>
@@ -90,7 +90,7 @@
           <span class="md-secondary pre">{{item.availabilityType[$ctrl.lang]}}</span>
         </md-list-item>
 
-        <md-divider ng-if="!$last" style="margin: 16px 0"></md-divider>
+        <md-divider ng-if="!$last" class="mv16 mh0"></md-divider>
       </md-list>
     </md-card-content>
   </div>

diff --git a/.../webapp/scripts/analysispackagemanagement/views/analysis-package-edit-or-create.html.tmpl b/.../webapp/scripts/analysispackagemanagement/views/analysis-package-edit-or-create.html.tmpl
@@ -102,18 +102,19 @@
           </md-card-header-text>
         </md-card-header>
         <md-divider></md-divider>
-        <md-card-content style="padding-bottom: 0px; padding-left: 0px;">
+        <md-card-content>
           <div id="move-institution-container" layout="row"
                ng-repeat="institution in ctrl.currentInstitutions track by $index">
-            <md-button class="md-primary md-icon-button"
-                       ng-click="ctrl.deleteInstitution($index)"
-                       style="margin-top: 18px; margin-left: 0px; padding-left: 0px;">
-              <md-tooltip md-autohide="true" md-direction="bottom"
-                          md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
-                {{'analysis-package-management.edit.delete-institution-tooltip' | translate}}
-              </md-tooltip>
-              <md-icon md-font-set="material-icons">delete_forever</md-icon>
-            </md-button>
+            <div>
+              <md-button class="md-primary md-icon-button mt18 mh0 pl0"
+                         ng-click="ctrl.deleteInstitution($index)">
+                <md-tooltip md-autohide="true" md-direction="bottom"
+                            md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
+                  {{'analysis-package-management.edit.delete-institution-tooltip' | translate}}
+                </md-tooltip>
+                <md-icon md-font-set="material-icons">delete_forever</md-icon>
+              </md-button>
+            </div>
             <md-autocomplete flex="50" md-clear-button="true" md-delay="250"
                              md-floating-label="{{'analysis-package-management.detail.label.institution' | translate}} ({{'global.in-german' | translate}})"
                              md-input-maxlength="512"
@@ -198,8 +199,7 @@
             </md-autocomplete>
           </div>
         </md-card-content>
-        <md-card-actions layout="row" layout-align="begin center"
-                         style="margin-top: 0px; margin-bottom: 12px;">
+        <md-card-actions layout="row" layout-align="begin center" class="mb12">
           <md-button class="md-primary md-raised md-icon-button ml6"
                      ng-click="ctrl.addInstitution()">
             <md-tooltip md-autohide="true" md-direction="bottom"
@@ -238,18 +238,19 @@
           </md-card-header-text>
         </md-card-header>
         <md-divider></md-divider>
-        <md-card-content style="padding-bottom: 0px; padding-left: 0px;">
+        <md-card-content>
           <div id="move-sponsor-container" layout="row"
                ng-repeat="sponsor in ctrl.currentSponsors track by $index">
-            <md-button class="md-primary md-icon-button"
-                       ng-click="ctrl.deleteSponsor($index)"
-                       style="margin-top: 18px; margin-left: 0px; padding-left: 0px;">
-              <md-tooltip md-autohide="true" md-direction="bottom"
-                          md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
-                {{'analysis-package-management.edit.delete-sponsor-tooltip' | translate}}
-              </md-tooltip>
-              <md-icon md-font-set="material-icons">delete_forever</md-icon>
-            </md-button>
+            <div>
+              <md-button class="md-primary md-icon-button mt18 mh0 pl0"
+                         ng-click="ctrl.deleteSponsor($index)">
+                <md-tooltip md-autohide="true" md-direction="bottom"
+                            md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
+                  {{'analysis-package-management.edit.delete-sponsor-tooltip' | translate}}
+                </md-tooltip>
+                <md-icon md-font-set="material-icons">delete_forever</md-icon>
+              </md-button>
+            </div>
             <md-autocomplete flex="50" md-clear-button="true" md-delay="250"
                              md-floating-label="{{'analysis-package-management.edit.label.sponsor' | translate}} ({{'global.in-german' | translate}})"
                              md-input-maxlength="512"
@@ -334,8 +335,7 @@
             </md-autocomplete>
           </div>
         </md-card-content>
-        <md-card-actions layout="row" layout-align="begin center"
-                         style="margin-top: 0px; margin-bottom: 12px;">
+        <md-card-actions layout="row" layout-align="begin center" class="mb12">
           <md-button class="md-primary md-raised md-icon-button ml6"
                      ng-click="ctrl.addSponsor()">
             <md-tooltip md-autohide="true" md-direction="bottom"
@@ -500,8 +500,7 @@
         {{'analysis-package-management.detail.attachments.save-analysis-package-before-adding-attachment' | translate}}
       </md-card-content>
       <md-card-actions layout="row" layout-align="begin center"
-                       ng-if="!ctrl.createMode"
-                       style="margin-top: 12px; margin-bottom: 12px;">
+                       ng-if="!ctrl.createMode" class="mt16 mb12">
         <md-button class="md-primary md-raised md-icon-button ml6"
                    ng-click="ctrl.addAttachment($event)">
           <md-tooltip md-autohide="true" md-direction="bottom"

diff --git a/src/main/webapp/scripts/common/datasource/datasource.html.tmpl b/src/main/webapp/scripts/common/datasource/datasource.html.tmpl
@@ -9,15 +9,16 @@
   <md-content class="pt16" style="background-color: #FFFFFF;">
   <div id="dataSource-{{$index}}" layout="row"
        ng-repeat="link in $ctrl.content track by $index">
-    <md-button class="md-primary md-icon-button"
-               ng-click="$ctrl.deleteLink()"
-               style="margin-top: 18px; margin-left: 0px; padding-left: 0px; padding-right: 12px;">
-      <md-tooltip md-autohide="true" md-direction="bottom"
-                  md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
-        {{'analysis-package-management.edit.delete-data-source-tooltip' | translate}}
-      </md-tooltip>
-      <md-icon md-font-set="material-icons">delete_forever</md-icon>
-    </md-button>
+    <div>
+      <md-button class="md-primary md-icon-button mt18 mh0 pl0"
+                 ng-click="$ctrl.deleteLink()">
+        <md-tooltip md-autohide="true" md-direction="bottom"
+                    md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
+          {{'analysis-package-management.edit.delete-data-source-tooltip' | translate}}
+        </md-tooltip>
+        <md-icon md-font-set="material-icons">delete_forever</md-icon>
+      </md-button>
+    </div>
     <md-input-container flex="33" class="mr8"
                         md-is-error="!$ctrl.currentForm['analysisDataPackagesDisplayTextDe' + $ctrl.index + '_' + $index].$valid && ($ctrl.currentForm['analysisDataPackagesDisplayTextDe' + $ctrl.index + '_' + $index].$dirty || $ctrl.currentForm['analysisDataPackagesDisplayTextDe' + $ctrl.index + '_' + $index].$touched)">
       <label class='fdz-input-required'>{{'analysis-package-management.detail.label.custom-data-package.data-source' | translate}}