SXDEDPCXZIC-217 / remove extras from the package form

ckanext/datavic_iar_theme/config.py

@@ -2,21 +2,20 @@
 
 import ckan.plugins.toolkit as tk
 
-
 CONFIG_PARENT_SITE_URL = "ckan.parent_site_url"
-DEFAULT_PARENT_SITE_URL = "https://www.data.vic.gov.au/"
-
 CONFIG_HOTJAR_ENABLED = "ckan.tracking.hotjar_enabled"
 CONFIG_HOTJAR_HJID = "ckan.tracking.hotjar.hjid"
 CONFIG_HOTJAR_HJSV = "ckan.tracking.hotjar.hjsv"
+CONFIG_SHOW_BLOG = "ckan.pages.show_blog_button"
+CONFIG_PAGES_BASE_URL = "ckan.pages.base_url"
 
 
 def get_parent_site_url() -> str:
-    return tk.config.get(CONFIG_PARENT_SITE_URL, DEFAULT_PARENT_SITE_URL)
+    return tk.config[CONFIG_PARENT_SITE_URL]
 
 
 def hotjar_tracking_enabled() -> bool:
-    return tk.asbool(tk.config.get(CONFIG_HOTJAR_ENABLED))
+    return tk.config[CONFIG_HOTJAR_ENABLED]
 
 
 def get_hotjar_hsid() -> str | None:
@@ -26,3 +25,10 @@ def get_hotjar_hsid() -> str | None:
 def get_hotjar_hjsv() -> str | None:
     return tk.config.get(CONFIG_HOTJAR_HJSV)
 
+
+def show_blog_button() -> bool:
+    return tk.config[CONFIG_SHOW_BLOG]
+
+
+def get_pages_base_url() -> str:
+    return tk.config[CONFIG_PAGES_BASE_URL]

ckanext/datavic_iar_theme/config_declaration.yaml

@@ -0,0 +1,14 @@
+version: 1
+groups:
+  - annotation: ckanext-datavic-iar-theme
+    options:
+      - key: ckan.parent_site_url
+        default: https://www.data.vic.gov.au/
+
+      - key: ckan.tracking.hotjar_enabled
+        type: bool
+        default: False
+
+      - key: ckan.tracking.hotjar.hjid
+
+      - key: ckan.tracking.hotjar.hjsv

ckanext/datavic_iar_theme/grunt/sass/_dataset.scss

@@ -0,0 +1,95 @@
+.via-iar-delwp-dataset {
+    .delwp-resource-list {
+        .resource-item {
+            align-items: center;
+            gap: 1rem;
+            padding-bottom: 1rem;
+
+            .resource-icon img {
+                width: 50px;
+            }
+
+            .resource-summary {
+                p {
+                    margin: 0;
+                }
+
+                .resource-summary__formats {
+                    font-size: rpl-font-size('xs');
+                }
+            }
+
+            .btn-group .btn {
+                border: 2px rpl-color() solid;
+                background: rpl-color('white');
+                color: #545454;
+            }
+        }
+    }
+
+    .delwp-access-notes {
+        margin-top: 2rem;
+        margin-bottom: 1rem;
+    }
+
+    #data-request-form {
+        margin-top: 4rem;
+
+        & > h3 {
+            margin-bottom: 1rem;
+        }
+
+        & > p {
+            font-size: rpl-font-size('m');
+            margin-bottom: 2rem;
+        }
+
+        .form {
+            .form-group {
+                label {
+                    float: unset;
+                    width: auto;
+                    color: #1a1a1a;
+                    font-size: rpl-font-size('m');
+                    font-family: rpl-font('bold');
+                    margin-bottom: 1rem;
+
+                    span.required {
+                        color: #aa0028;
+                        font-family: rpl-font('regular');
+                        font-size: rpl-font-size('s');
+                        font-weight: normal;
+                    }
+                }
+
+                .controls {
+                    margin-left: 0;
+                }
+
+                input {
+                    height: 50px;
+                }
+
+                input,
+                textarea {
+                    background-color: #f5f5f5;
+                    border-color: #666666;
+                    box-shadow: none;
+                }
+            }
+
+            .form-actions {
+                float: left;
+            }
+        }
+
+        @include rpl_breakpoint('m') {
+            max-width: 75%;
+        }
+    }
+
+
+    #dataset-contact {
+        display: none;
+    }
+}

ckanext/datavic_iar_theme/grunt/sass/_login.scss

@@ -51,7 +51,8 @@ a.close {
 
 
 .row.user-login-page,
-.row.user-register-page {
+.row.user-register-page,
+.row.user-reset-page {
     .primary {
         float: none;
 
@@ -139,9 +140,11 @@ a.close {
                 gap: 30px;
                 justify-content: space-between;
                 align-items: center;
-
                 margin-top: rem(48px);
 
+                &.form-reset {
+                    justify-content: flex-end;
+                }
 
                 .sign-up {
                     font-family: "Vic-Bold", arial, sans-serif;
@@ -154,6 +157,10 @@ a.close {
                 .btn {
                     width: 25%;
 
+                    &.btn-reset {
+                        width: 35%;
+                    }
+
                     &:disabled {
                         width: unset;
                         margin-left: auto;
@@ -201,6 +208,10 @@ a.close {
 
                     .btn {
                         padding: 16px;
+
+                        &.btn-reset {
+                            width: fit-content;
+                        }
                     }
                 }
             }
@@ -212,7 +223,6 @@ a.close {
     }
 }
 
-
 .row.user-register-page {
     .division-line {
         margin-bottom: rem(24px);
@@ -237,7 +247,6 @@ a.close {
             margin-bottom: rem(36px);
         }
     }
-
 }
 
 .division-line {

ckanext/datavic_iar_theme/grunt/sass/_menu.scss

@@ -356,3 +356,113 @@ $rpl-menu-gutter: rpl_grid_get_gutter($rpl-grid) !default;
     height: 3rem;
   }
 }
+
+.pages-menu {
+  .rpl-link {
+    color: rpl-color('secondary');
+
+    &::after {
+      content: none;
+      border: none;
+    }
+  }
+
+  .dropdown {
+    display: none;
+    position: absolute;
+    top: 100%;
+    z-index: 100;
+    background-color: rpl-color('primary');
+    transition: background-color 0.3s ease;
+    inset: -40px 60px auto -40px;
+
+    .container {
+      display: flex;
+      flex-direction: column;
+      padding: 28px 48px 40px;
+
+      .dropdown-header {
+        padding: 0;
+
+        h3 {
+          color: #1A1A1A;
+          font-size: 20px;
+          font-weight: 700;
+          padding: 0 8px;
+        }
+      }
+
+      .dropdown-items {
+        list-style-type: none;
+        padding: 0;
+
+        li {
+          border-bottom: 1px solid rpl-color('light_primary');
+
+          a {
+            color: #1A1A1A;
+            font-size: 14px;
+            padding: 12px 8px;
+          }
+        }
+
+        .dropdown-item:hover {
+          background-color: rpl-color('primary');
+        }
+      }
+    }
+  }
+}
+
+#main-menu {
+  .pages-menu {
+    .rpl-link {
+      @include rpl_typography_font('xs', 1em, 'bold');
+      background-color: transparent;
+      padding: 0;
+      position: relative;
+      margin: $rpl-menu-horizontal-items-root-margin;
+
+      &::after {
+        content: "";
+        display: inline-block;
+        font-family: FontAwesome;
+        color: rpl-color('secondary');
+      }
+
+      &.show {
+        &::after {
+          transform: rotate(180deg);
+          transition: transform 0.3s ease;
+        }
+      }
+    }
+
+    .dropdown {
+      margin-left: 20px;
+      inset: 0 60px auto -40px;
+
+      .container {
+        flex-direction: row;
+
+        .dropdown-header {
+          width: 25%;
+        }
+
+        .dropdown-items {
+          width: 25%
+        }
+      }
+    }
+  }
+}
+
+.dropdown-shown {
+  background-color: rpl-color('light_primary_2') !important;
+  transition: background-color 0.3s ease;
+}
+
+.dropdown-hidden {
+  background-color: rpl-color('primary') !important;
+  transition: background-color 0.3s ease;
+}