diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersForm.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersForm.vue index 25c0ba0298..2aa6b69f56 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersForm.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersForm.vue @@ -20,7 +20,7 @@ -
+
{{ $__("Loading rule set information...") }}

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmReset.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmReset.vue index 3b74058848..eb195f21a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmReset.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmReset.vue @@ -2,271 +2,45 @@ -
-
-

- {{ - $__( - "Resetting this rule set for the chosen context will have an impact on all the contexts that used to fall back on this rule set." - ) - }} -

-

- {{ - $__( - "To better understand which contexts will be affected, use 'Display: all applied rules.' on the circulations triggers page." - ) - }} -

-
- {{ $__("Trigger context") }} -
    -
  1. -

    - {{ $__("Library") }}: -

    -

    - {{ handleContext(library_id, libraries, "library_id") }} -

    -
  2. -
  3. -

    - {{ $__("Patron category") }}: -

    -

    - {{ - handleContext( - patron_category_id, - patronCategories, - "patron_category_id" - ) - }} -

    -
  4. -
  5. -

    - {{ $__("Item type") }}: -

    -

    - {{ - handleContext( - item_type_id, - itemTypes, - "item_type_id", - "description" - ) - }} -

    -
  6. -
-
-

{{ $__("Loading circulation context...") }}

-
-
- -
- - {{ $__("Rules (overrides) which will be deleted") }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ - $__("Loading circulation rule set...") - }} - - -
- {{ $__("Delay") }} - - {{ $__("Notice") }} - - {{ $__("Email") }} - - {{ $__("Print") }} - - {{ $__("SMS") }} - - {{ $__("Restricts checkouts") }} -
- - {{ - effectiveRuleSet[ - `overdue_${triggerNumber}_delay` - ].value - }} - - - - {{ - handleNotice( - effectiveRuleSet[ - `overdue_${triggerNumber}_notice` - ].value - ) - }} - - - - {{ - handleTransport( - effectiveRuleSet[ - `overdue_${triggerNumber}_mtt` - ].value, - "email", - !effectiveRuleSet[ - `overdue_${modal ? i + 1 : triggerNumber}_notice` - ].value - ) - }} - - - - {{ - handleTransport( - effectiveRuleSet[ - `overdue_${triggerNumber}_mtt` - ].value, - "print", - !effectiveRuleSet[ - `overdue_${modal ? i + 1 : triggerNumber}_notice` - ].value - ) - }} - - - - {{ - handleTransport( - effectiveRuleSet[ - `overdue_${triggerNumber}_mtt` - ].value, - !effectiveRuleSet[ - `overdue_${modal ? i + 1 : triggerNumber}_notice` - ].value - ) - }} - - - - {{ - handleRestrictions( - effectiveRuleSet[ - `overdue_${triggerNumber}_restrict` - ].value - ) - }} - -
-
+
{{ alertMessage }}
+
+
+ +
+
@@ -377,11 +170,15 @@ export default { max-height: 90vh; } -form li { +form ol li { display: flex; align-items: center; } +.page-section ul li { + float: none; +} + .numeric-input-wrapper { position: relative; display: inline-block; diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmTriggerDelete.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmTriggerDelete.vue index ae672fb0a9..9ff6cf0fcc 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmTriggerDelete.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmTriggerDelete.vue @@ -1,26 +1,21 @@