Redo the initial commit with a fresh start and the latest changes fro…

…m the default view
GeoCat · Feb 16, 2022 · 6f065a4 · 6f065a4
1 parent d6cc698
commit 6f065a4
Show file tree

Hide file tree

Showing 29 changed files with 853 additions and 1,775 deletions.
diff --git a/README.md b/README.md
@@ -21,38 +21,10 @@ git submodule init
 - Grab a zip of http://eos.geocat.net/gitlab/geocat/inspireportalview.git/tree/main
 - Unzip it in `TOMCAT_DIR/webapps/geonetwork/catalog/views/inspireportal`
 
-## Overwrite
-
-While the view itself is completely independent, the EU style and script includes are done outside of the view.
-These includes require changes to `src/main/webapp/xslt/base-layout-cssjs-loader.xsl`. This changed file is included in the view directory,,
-but has to be copied to: `src/main/webapp/xslt/`.
-
 ## Activate
 
 - Change the setting `View` to `inspireportal` in  `Administration` > `Settings`
 
 ## Changes
 
 This view is based on the `default` theme of GeoNetwork opensource. The files have been renamed to match the new name: `inspireportal`, apart from renaming the contents are still default.
-However, a couple of files have been changed or added:
-
-### New files (follows the names of the EU)
-
-**HTML**
-- src/main/resources/catalog/views/inspireportal/templates/pageHeader.html
-- src/main/resources/catalog/views/inspireportal/templates/siteHeader.html
-- src/main/resources/catalog/views/inspireportal/templates/top-toolbar.html
-
-**IMAGES/SVG**
-- src/main/resources/catalog/views/inspireportal/images/icons.3cf410f9.svg
-- src/main/resources/catalog/views/inspireportal/images/logo--en.5055ef4f.svg
-
-### Changed files
-
-**HTML**
-- src/main/resources/catalog/views/inspireportal/templates/footer.html
-- src/main/resources/catalog/views/inspireportal/templates/home.html
-- src/main/resources/catalog/views/inspireportal/templates/index.html
-
-**Less**
-- src/main/resources/catalog/views/inspireportal/less/gn_view_inspireportal.less
diff --git a/base-layout-cssjs-loader.xsl b/base-layout-cssjs-loader.xsl
diff --git a/directives/partials/infolist.html b/directives/partials/infolist.html
@@ -10,7 +10,7 @@
     <div class="panel-heading gn-card-heading">
       <div class="gn-md-title">
         <a href=""
-           title="{{md.title || md.defaultTitle}}"
+           title="{{md.resourceTitle}}"
            gn-metadata-open="md"
            gn-records="searchResults.records"
            gn-formatter="formatter.defaultUrl">

diff --git a/directives/partials/mdactionmenu.html b/directives/partials/mdactionmenu.html
@@ -28,8 +28,9 @@
           <span class="fa fa-fw fa-user"></span>&nbsp;
           <span data-translate="">transferOwnership</span>
         </a></li>
+      <!-- Retired metadata can't be published -->
       <li role="menuitem"
-          data-ng-if="user.canEditRecord(md) && (user.isAdmin() || user.isReviewerForGroup(md.groupOwner)) && md.draft != 'y'"
+          data-ng-if="user.canEditRecord(md) && (user.isAdmin() || user.isReviewerForGroup(md.groupOwner)) && md.draft != 'y' && md.mdStatus != 3"
           data-ng-class="
             (md.isPublished() || (allowPublishInvalidMd() === true) ||
             (!md.isPublished() && (allowPublishInvalidMd() === false) &&
@@ -135,9 +136,10 @@
         </a>
       </li>
       <!-- user = reviewer, status = 4, statusToSelect = 3 -->
+      <!-- To be able to retire the metadata, it should be approved, without a draft version -->
       <li role="menuitem"
           data-ng-if="user.canEditRecord(md) && (user.isAdmin() || user.isReviewerForGroup(md.groupOwner)) &&
-          md.mdStatus == 4  && isMdWorkflowEnable && md.isWorkflowEnabled()">
+          md.mdStatus == 2  && isMdWorkflowEnable && md.isWorkflowEnabled() && md.draft == 'n'">
         <a href=""
            data-ng-click="mdService.openUpdateStatusPanel(getScope(), 'workflow', null, 3, 33)">
           <span class="fa fa-fw fa-archive"></span>&nbsp;

diff --git a/images/icons.3cf410f9.svg b/images/icons.3cf410f9.svg
diff --git a/images/logo--en.5055ef4f.svg b/images/logo--en.5055ef4f.svg
diff --git a/less/gn_admin_inspireportal.less b/less/gn_admin_inspireportal.less
@@ -4,18 +4,6 @@
 @gn-sidebar-width: 300px;
 @gn-col-main-width: 65px;
 
-//@keyframes fadein{
-//  0% { opacity:0; }
-//  66% { opacity:0; }
-//  100% { opacity:1; }
-//}
-//
-//@-webkit-keyframes fadein{
-//  0% { opacity:0; }
-//  66% { opacity:0; }
-//  100% { opacity:1; }
-//}
-
 ul.gn-resultview li.list-group-item {
   margin-bottom: 0;
 }
@@ -330,7 +318,12 @@ ul.gn-resultview li.list-group-item {
       }
       .panel {
         .panel-heading {
-          .clearfix();
+          line-height: 34px !important;
+          padding: 6px 15px;
+          height: auto !important;
+          p {
+            line-height: 1.5;
+          }
           .btn-toolbar {
             float: right;
           }
@@ -365,6 +358,39 @@ ul.gn-resultview li.list-group-item {
             width: 75%;
           }
         }
+        &.active {
+          background-color: lighten(@brand-primary, 46.7%);
+          border-color: lighten(@brand-primary, 46.7%);
+          color: @gray-base;
+          .table {
+            background-color: #fff;
+          }
+        }
+      }
+      #gn-harvest-container {
+        .timeline-panel {
+          box-shadow: none;
+        }
+        .timeline-title {
+          display: inline-block;
+        }
+        #gn-harvest-history-panel, #gn-harvest-settings-panel {
+          .panel-heading {
+            height: auto;
+            line-height: 3em;
+            .btn-toolbar {
+              margin: 5px 0;
+            }
+          }
+          legend {
+            padding-top: 15px;
+          }
+          fieldset[id^="gn-harvest-settings-"] {
+            .col-lg-8 {
+              margin-bottom: 8px;
+            }
+          }
+        }
       }
       #gn-harvest-records-panel {
         .gn-harvester-facets {

diff --git a/less/gn_card_inspireportal.less b/less/gn_card_inspireportal.less
@@ -1,36 +1,6 @@
 @import "../../../style/gn_bootstrap.less";
 @import "gn_variables_inspireportal.less";
 
-// status
-.gn-status, .gn-workflow-status {
-  position: relative;
-  float: left;
-  color: darken(@brand-info, 25%);
-}
-.gn-status-completed {
-  color: darken(@brand-success, 20%);
-}
-.gn-status-historicalArchive {
-  color: darken(@brand-warning, 20%);
-}
-.gn-status-obsolete {
-  color: darken(@brand-danger, 20%);
-}
-.gn-workflow-status {
-  background-color: rgba(255, 255, 255 , 0.7);
-  border-color: darken(@brand-success, 5%);
-  color: @brand-success;
-}
-/* Decide here which status should be displayed or not and with which colors */
-.gn-workingcopy-status {
-  margin-top: 0;
-  i {
-    height: 34px;
-    width: 34px;
-    margin-top: -1px;
-  }
-}
-
 // cards
 @gn-card-thumbnail-width: 140px;
 @gn-card-height: 24em;
@@ -245,6 +215,66 @@
         margin-right: 5px;
       }
     }
+    //background colors
+    &.gn-status-bg {
+      background-color: #fff;
+      .gn-status {
+        background: none;
+        border-radius: 5px;
+        margin-left: 4px;
+      }
+    }
+    &.gn-status-bg-default,
+    &.gn-status-ongoing-bg {
+      background-color: darken(@brand-info, 5%);
+      .gn-status {
+        border-color: #fff;
+        color: #fff;
+      }
+    }
+    &.gn-status-completed-bg {
+      background-color: darken(@brand-success, 5%);
+      .gn-status {
+        border-color: #fff;
+        color: #fff;
+      }
+    }
+    &.gn-status-historicalArchive-bg {
+      background-color: darken(@brand-warning, 5%);
+      .gn-status {
+        border-color: #fff;
+        color: #fff;
+      }
+    }
+    &.gn-status-obsolete-bg,
+    &.gn-status-superseded-bg {
+      background-color: darken(@brand-danger, 5%);
+      .gn-status {
+        border-color: #fff;
+        color: #fff;
+      }
+    }
+    &.gn-workflow-status-bg {
+      background-color: rgba(255, 255, 255 , 0.7);
+      .gn-status {
+        border-color: #fff;
+        color: #fff;
+      }
+    }
+    &.gn-workflow-status-mdview-bg {
+      background-color: darken(@brand-success, 5%);
+      .gn-status {
+        border-color: #fff;
+        color: #fff;
+      }
+    }
+    &.gn-workflow-status-1-bg {
+      background-color: darken(@brand-danger, 5%);
+      .gn-status {
+        border-color: #fff;
+        color: #fff;
+      }
+    }
   }
   &:hover, &.gn-record-selected {
     background-color: @panel-footer-bg;
@@ -265,6 +295,41 @@
   }
 }
 
+// status
+.gn-status, .gn-workflow-status {
+  position: relative;
+  float: left;
+  color: darken(@brand-info, 25%);
+}
+.gn-status-completed {
+  color: darken(@brand-success, 20%);
+}
+.gn-status-historicalArchive {
+  color: darken(@brand-warning, 20%);
+}
+.gn-status-obsolete {
+  color: darken(@brand-danger, 20%);
+}
+.gn-status-superseded {
+  color: darken(@brand-danger, 20%);
+}
+.gn-workflow-status {
+  //background-color: rgba(255, 255, 255 , 0.7);
+  //border-color: darken(@brand-success, 5%);
+  //color: @brand-success;
+}
+/* Decide here which status should be displayed or not and with which colors */
+.gn-workingcopy-status {
+  margin-top: 0;
+  i {
+    height: 34px;
+    width: 34px;
+    margin-top: -1px;
+  }
+}
+
+
+
 // styling for all search results
 ul.gn-resultview {
   margin-right: -15px;

diff --git a/less/gn_editor_inspireportal.less b/less/gn_editor_inspireportal.less
@@ -1,16 +1,24 @@
 @import "gn_search_inspireportal.less";
 @import "../../../style/gn_editor.less";
-@import "gn_view.less";
+@import "gn_view_inspireportal.less";
 
 
 .gn-results-editor {
   .gn-status {
     font-weight: 500;
+    color: @text-muted;
+    border: 1px solid @btn-default-border;
+    padding: 0 5px;
+    margin-right: 5px;
+    border-radius: 3px;
   }
   tr:hover {
     background-color: @panel-footer-bg;
     transition: background-color ease 0.5s;
   }
+  .gn-record-details {
+    margin-top: 5px;
+  }
 }
 
 [ng-app="gn_editor"] {
@@ -82,10 +90,10 @@
   .gn-search-facet {
     padding-bottom: 15px;
   }
-  // modal dialog (wider for for multilingual)
-  @media (min-width: @screen-sm-min) {
-    .modal-dialog {
-      width: 760px;
+  .modal-dialog {
+    .modal-body {
+      max-height: 85vh;
+      overflow: auto;
     }
   }
   form.gn-editor {
@@ -595,7 +603,7 @@ form.gn-editor.gn-indent-bluescale {
 // inspire
 // md type widget (used only in editor for now)
 .fa-inspire {
-  background: url('../catalog/views/inspireportal/images/inspire.png');
+  background: url('../catalog/views/default/images/inspire.png');
   background-repeat: no-repeat;
   background-size: 16px 16px;
   width: 16px;

diff --git a/less/gn_infolist_inspireportal.less b/less/gn_infolist_inspireportal.less
@@ -4,6 +4,9 @@
 // row for the info lists
 .gn-row-info {
   padding: 30px 20px 40px 20px;
+  @media (max-width: @screen-xs-max) {
+    padding: 30px 10px;
+  }
   background-color: @gn-info-background-color;
   .nav-pills {
     text-align: left !important;

diff --git a/less/gn_layout_inspireportal.less b/less/gn_layout_inspireportal.less
@@ -69,13 +69,24 @@ html, body {
     }
     .btn {
       background-color: @gn-search-button-background-color;
-      border-color: darken(@gn-search-button-background-color, 5%);
+      border-color: @gn-search-button-border-color;
       color: @gn-search-button-color;
       &:hover {
         background-color: darken(@gn-search-button-background-color, 10%);
         border-color: darken(@gn-search-button-background-color, 15%);
       }
     }
+    .dropdown-menu {
+      margin: 0;
+      border-radius: 0;
+    }
+    .dropdown-menu > li > a {
+      padding: 6px 16px;
+    }
+    .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus {
+      color: @dropdown-link-hover-color;
+      background-color: @dropdown-link-hover-bg;
+    }
   }
 }
 
@@ -90,3 +101,11 @@ html, body {
   position: absolute;
   z-index: 100;
 }
+
+// no padding for containers on small screens
+@media (max-width: @screen-xs-max) {
+  .container-fluid {
+    padding-right: 0;
+    padding-left: 0;
+  }
+}