Feature/4202 4203 flags combined

cms/data/notifications.yml

@@ -128,12 +128,30 @@ bg:job:admin_reports:export_available:
   short:
     Report "{name}" ready for download
 
+bg:job:approaching_flag_deadline:notify:
+  long: |
+    "The deadline for the flag in "{journal_title}" (id: {id}) is in 7 days."
+  short:
+    Deadline reminder
+
+flag:assigned:notify:
+  long: |
+    "A new flag in "{journal_title}" (id: {id}) has been assigned to you"
+  short:
+    New flag
+
 journal:assed:assigned:notify:
   long: |
     The journal **{journal_name}** has been assigned to you by the Editor of your group **{group_name}**. Please start work on this within 10 days.
   short:
     New journal ({issns}) assigned to you
 
+journal:maned:discontinuing_soon:notify:
+  long: |
+    Journal "{title}" (id: {id}) will discontinue in {days} days.
+  short:
+     Journal discontinuing
+
 journal:editor_group:assigned:notify:
   long: |
     The journal **{journal_name}** has been assigned to your group by a Managing Editor. Please assign this to an Associate Editor within 5 working days.
@@ -186,9 +204,3 @@ update_request:publisher:submitted:notify:
     **This is an automated message.**
   short:
     Your update request ({issns}) has been submitted
-
-journal:maned:discontinuing_soon:notify:
-  long: |
-    Journal "{title}" (id: {id}) will discontinue in {days} days.
-  short:
-     Journal discontinuing

cms/sass/layout/_editorial-panel.scss

@@ -1,45 +1,80 @@
 .editorial-panel {
-  margin-top: 0;
+    .spanPretendingToBeInput {
+        display: block;
 
-  fieldset {
-    padding: 0 !important;
-  }
+        &:has(svg) {
+            display: flex;
+            align-items: flex-start;
+            gap: .5rem;
+        }
+
+        background-color: $disabled;
+        width: 100%;
+        padding: 0.5rem;
+        margin-bottom: .375rem;
+        font-style: italic;
+
+        span {
+            white-space: normal;
+        }
+    }
+
+    margin-top: 0;
+
+    fieldset {
+        padding: 0 !important;
+    }
+
+    .form__question {
+        margin: 0 !important;
 
-  .form__question {
-    margin: 0 !important;
-    select, textarea, input {
-      width: 100%;
+        select, textarea, input {
+            width: 100%;
+        }
     }
-  }
 
-  hr {
-    margin: $spacing-02;
-  }
+    hr {
+        margin: $spacing-02;
+    }
 
-  @media (min-width: 992px) {
-    position: -webkit-sticky;
-    position: sticky;
-    top: 100px;
+    @media (min-width: 992px) {
+        position: -webkit-sticky;
+        position: sticky;
+        top: 100px;
 
         &__wrapper {
-          display: flex;
-          flex-direction: column;
-          max-height: calc(100vh - 75px - 1.5rem - 25px); //(full viewport)-(nav height)-(top padding)-(bottom padding)
+            display: flex;
+            flex-direction: column;
+            max-height: calc(100vh - 75px - 1.5rem - 25px); //(full viewport)-(nav height)-(top padding)-(bottom padding)
         }
 
         &__content {
-          flex: 1;
-          overflow-y: scroll;
+            flex: 1;
+            overflow-y: scroll;
 
-          select, textarea, input {
-            display: block;
-          }
+            select, textarea, input {
+                display: block;
+            }
         }
-      }
+    }
 
     .flag--resolved {
         position: relative;
         opacity: 0.2; /* Set opacity of entire div */
+        .pretendInputWrapper {
+            .pretendLabel {
+                margin-bottom: .75rem;
+                font-size: 1.125em;
+            }
+            .pretendInput {
+                margin-bottom: .375rem;
+                width: 100% !important;
+                border: 1px solid #A9A7A5;
+                padding: .5em;
+                font-size: 1em;
+            }
+        }
+
     }
 
     .flag--resolved::before {
@@ -56,77 +91,70 @@
         letter-spacing: 0.2em; /* Adjust the spacing between letters for the stamp */
         font-weight: bold;
     }
+
     .editorial-panel__content {
         .form__question.editorial-panel__question {
             padding: 0 !important;
+
             .editorial-panel__question-header {
                 padding: .5rem;
                 align-items: flex-start;
+
                 label, p {
                     margin: 0;
                 }
             }
+
             .editorial-panel__legend {
-                    display: flex;
-                    align-items: center;
-                    gap: .5rem;
-                    padding: 0 .5rem;
-                    margin-bottom: .375rem;
+                display: flex;
+                align-items: center;
+                gap: .5rem;
+                padding: 0 .5rem;
+                margin-bottom: .375rem;
             }
+
             .editorial-panel__questions-content {
                 .form-inputs--container {
                     &:has(input[type="hidden"]) {
 
                     }
+
                     &:has(label) {
                         label {
                             font-size: .75rem;
                             margin-bottom: 0;
                             margin-left: .5rem;
+
                             .form__question--optional {
                                 font-size: .75rem;
                             }
                         }
                     }
+
                     &:has(svg) {
                         position: relative;
-                        width:100%;
+                        width: 100%;
+
                         svg {
                             position: absolute;
                             left: .5rem;
                             bottom: 22px;
                             z-index: 1;
                         }
+
                         .select2-choice {
                             .select2-chosen {
                                 padding-left: calc(.5rem + 20px);
                             }
                         }
                     }
+
                     input {
                         white-space: nowrap;
                         overflow: hidden;
                         text-overflow: ellipsis;
                     }
 
-                    span.spanPretendingToBeInput {
-                        display: block;
-                        &:has(svg) {
-                            display: flex;
-                            align-items: flex-start;
-                            gap: .5rem;
-                        }
-                        background-color: $disabled;
-                        width: 100%;
-                        padding: 0.5rem;
-                        margin-bottom: .375rem;
-                        font-style: italic;
-
-                        span {
-                            white-space: normal;
-                        }
-                    }
-
                     input:disabled ~ label {
                         display: none;
                     }

dev.template.cfg

@@ -87,7 +87,8 @@ HUEY_SCHEDULE = {
     "datalog_journal_added_update": CRON_NEVER,
     "auto_assign_editor_group_data": CRON_NEVER,
     "ris_export": CRON_NEVER,
-    "site_statistics": CRON_NEVER
+    "site_statistics": CRON_NEVER,
+    "approaching_flag_deadline": CRON_NEVER
 }
 
 ###########################################