Merge branch 'main' into remove_actiontext_summernote

Gemfile

@@ -27,6 +27,8 @@ gem "font-awesome-sass"
 gem "front_matter_parser"
 gem "gdpr"
 gem "gitlab"
+gem "hal_openscience", "~> 0.1"
+# gem "hal_openscience", path: "../hal_openscience"
 gem "has_scope", "~> 0.8.0"
 gem "hash_dot"
 gem "image_processing"

Gemfile.lock

@@ -226,6 +226,10 @@ GEM
       terminal-table (>= 1.5.1)
     globalid (1.0.0)
       activesupport (>= 5.0)
+    hal_openscience (0.1.0)
+      json
+      net-http
+      open-uri
     has_scope (0.8.0)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -307,6 +311,8 @@ GEM
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
     nesty (1.0.2)
+    net-http (0.3.2)
+      uri
     net-imap (0.3.4)
       date
       net-protocol
@@ -343,6 +349,10 @@ GEM
     omniauth-saml (2.1.0)
       omniauth (~> 2.0)
       ruby-saml (~> 1.12)
+    open-uri (0.3.0)
+      stringio
+      time
+      uri
     orm_adapter (0.5.0)
     pexels (0.5.0)
       requests (~> 1.0.2)
@@ -467,10 +477,13 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
+    stringio (3.0.4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.2.1)
     tilt (2.0.11)
+    time (0.2.1)
+      date
     timeout (0.3.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
@@ -485,6 +498,7 @@ GEM
       faraday-multipart (~> 1.0.4)
       httparty (~> 0.20)
       oauth2 (>= 2.0.8)
+    uri (0.12.0)
     vcr (6.1.0)
     version_gem (1.1.1)
     warden (1.2.9)
@@ -546,6 +560,7 @@ DEPENDENCIES
   front_matter_parser
   gdpr
   gitlab
+  hal_openscience (~> 0.1)
   has_scope (~> 0.8.0)
   hash_dot
   image_processing

app/assets/javascripts/admin/communication/websites.js

@@ -5,8 +5,10 @@ window.osuny.communication.websites = {
         this.languagesCheckboxes = document.querySelectorAll('.js-languages input[type="checkbox"]');
         this.defaultLanguageSelect = document.querySelector('.js-default-language');
         this.defaultLanguageOptions = this.defaultLanguageSelect.querySelectorAll('option');
-        this.initEvents();
-        this.onChangeCheckbox();
+        if (this.defaultLanguageSelect) {
+            this.initEvents();
+            this.onChangeCheckbox();
+        }
     },
 
     initEvents: function () {

app/assets/stylesheets/admin/appstack/style.sass

@@ -72,7 +72,7 @@ p
     pointer-events: none
 .sidebar-link, a.sidebar-link
     color: rgba(255, 255, 255, 0.8)
-.sidebar-item.active .sidebar-link:hover, 
+.sidebar-item.active .sidebar-link:hover,
 .sidebar-item.active > .sidebar-link
     color: white
 
@@ -147,4 +147,8 @@ p
             &:nth-child(even)
                 background: $table-striped-bg
             &:hover
-                background: $table-hover-bg
\ No newline at end of file
+                background: $table-hover-bg
+
+/* used in admin/communication/websites/XXX and the selected item is over the bottom menu bar */
+.list-group-item.active
+    z-index: auto
\ No newline at end of file

app/assets/stylesheets/admin/commons/table.sass

@@ -3,6 +3,7 @@
     td:first-of-type
         padding-left: 0
     &--with-actions
-        td:last-of-type
+        td:last-of-type,
+        th:last-of-type
             padding-right: 0
             text-align: right
\ No newline at end of file

app/assets/stylesheets/admin/pure/navigation.sass

@@ -22,21 +22,22 @@
     right: 0
     top: 0
     z-index: 1000
-    .avatar
-        width: 80px
+    .image
+        border-radius: 100%
+        margin-bottom: 20px
+        width: 100px
     .menu-content
         margin-top: 150px
         position: relative
+        h2
+            font-weight: bold
         ul
             list-style-type: none
             padding: 0
             li
-                padding: 5px 0
+                padding-bottom: 5px
                 span
                     opacity: 0.2
         a
             color: white
-            text-decoration-color: rgba(255, 255, 255, 0.2)
-            text-decoration-line: underline
-            &:hover
-                text-decoration-color: rgba(255, 255, 255, 1)
+            text-decoration: none

app/assets/stylesheets/admin/pure/style.sass

@@ -14,6 +14,10 @@
     &__separation
         border-width: 10px
         margin-bottom: $spacing3
+    &__chapter
+        &__image
+            @media (min-width: 992px)
+                margin-top: -200px
 
 .dashboard-index
     .pure__section
@@ -87,7 +91,7 @@ p + .form-label
     &.kind--selected
         background: $color-accent
         border-color: $color-accent
-        &, p
+        &, p, label
             color: $color-background
         
 

app/controllers/admin/administration/application_controller.rb

 class Admin::Administration::ApplicationController < Admin::ApplicationController
+ 
+  protected
+
   def breadcrumb
     super
-    add_breadcrumb Administration.model_name.human
+    add_breadcrumb Administration.model_name.human, admin_administration_root_path
   end
 end

app/controllers/admin/administration/dashboard_controller.rb

+class Admin::Administration::DashboardController < Admin::Administration::ApplicationController
+
+  def index
+    @namespace = Administration
+    breadcrumb
+    render 'admin/dashboard/namespace'
+  end
+
+end