From 2cc0c300a47a075c0e0607f56d52e7b139634e34 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 14 Oct 2022 14:22:02 +0100 Subject: [PATCH] Bug 31162: (follow-up) Restore toolbar This patch reverts to having the 'New' options in the top toolbar as feedback suggested. --- .../prog/css/src/staff-global.scss | 36 ----- .../en/modules/cataloguing/cataloging-home.tt | 133 ++++++++++-------- 2 files changed, 78 insertions(+), 91 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index c82e2af6bc..82baa544f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -2743,42 +2743,6 @@ td.bundle { } } } - - button { - &.circ-button { - // Class used for each module link - background-color: #F4F8F9; - background-position: 5px 3px; - background-repeat: no-repeat; - border: 2px solid #B9D8D9; - border-radius: 6px; - box-sizing: content-box; - color: #000000; - display: block; - font-size: 110%; - font-weight: bold; - margin: .5em 0; - max-width: 260px; - padding: 8px; - text-decoration: none; - - &:hover { - // Class used for each module link hover state - border-color: #538200; - color: #538200; - } - } - } - - div { - &.btn-group { - button { - &.btn:first-child { - width: 238px; - } - } - } - } } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt index 80938efde4..0115278325 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt @@ -25,49 +25,41 @@
+ [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] +
+ [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %] + Advanced editor + [% END %] +
+ + + +
+ [% IF servers.count > 0 %] +
+ + + +
+ [% END # /IF servers.count %] +
+ [% END # /IF CAN_user_editcatalogue_edit_catalogue %] +

Cataloging

- - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] -

New

- - [% END # /IF CAN_user_editcatalogue_edit_catalogue %] - [% IF ( CAN_user_tools_stage_marc_import || CAN_user_tools_manage_staged_marc ) %]

Import

    @@ -96,6 +88,17 @@
[% END %] + [% IF ( CAN_user_tools_inventory ) %] +

Reports

+
    + [% IF ( CAN_user_tools_inventory ) %] +
  • + Inventory +
  • + [% END %] +
+ [% END %] +
@@ -136,17 +139,6 @@
- [% IF ( CAN_user_tools_inventory ) %] -

Reports

-
    - [% IF ( CAN_user_tools_inventory ) %] -
  • - Inventory -
  • - [% END %] -
- [% END %] - [% IF ( CAN_user_tools_label_creator || CAN_user_tools_upload_local_cover_images ) %]

Tools

    @@ -196,12 +188,43 @@ [% MACRO jsinclude BLOCK %] [% END %] -- 2.20.1