From 3c0ac3032ea1fa3249a3d90af0af186313d7a2db Mon Sep 17 00:00:00 2001 From: Solene Desvaux Date: Thu, 30 Jun 2022 11:26:53 +0200 Subject: [PATCH] Bug 30952: correction includes --- .../prog/css/src/staff-global.scss | 12 +- .../intranet-tmpl/prog/css/staff-global.css | 12 +- .../includes/acquisitions-add-to-basket.inc | 20 +- .../prog/en/includes/acquisitions-search.inc | 6 +- .../prog/en/includes/auth-finder-search.inc | 2 +- .../prog/en/includes/borrower_debarments.inc | 2 +- .../en/includes/budgets-active-currency.inc | 2 +- .../en/includes/category-out-of-age-limit.inc | 2 +- .../prog/en/includes/checkouts-table.inc | 2 +- .../en/includes/contracts-admin-search.inc | 1 + .../prog/en/includes/html_helpers.inc | 2 +- .../prog/en/includes/intranet-bottom.inc | 6 +- .../prog/en/includes/langmenu-staff-top.inc | 8 +- .../prog/en/includes/letters-search.inc | 8 +- .../prog/en/includes/lis-search.inc | 10 +- .../prog/en/includes/noadd-warnings.inc | 4 +- .../prog/en/includes/patron-return-claims.inc | 8 +- .../prog/en/includes/patron-search-header.inc | 89 ++- .../prog/en/includes/patron_messages.inc | 2 +- .../prog/en/includes/patronfields.inc | 2 +- .../prog/en/includes/patrons-admin-search.inc | 2 +- .../prog/en/includes/subscriptions-search.inc | 28 +- .../prog/en/modules/acqui/addorderiso2709.tt | 28 +- .../prog/en/modules/acqui/duplicate_orders.tt | 16 +- .../prog/en/modules/acqui/invoices.tt | 536 ++++++------------ .../prog/en/modules/acqui/neworderempty.tt | 24 +- .../en/modules/acqui/newordersubscription.tt | 4 +- .../prog/en/modules/acqui/z3950_search.tt | 6 +- .../prog/en/modules/catalogue/results.tt | 10 +- .../prog/en/modules/cataloguing/additem.tt | 25 +- .../prog/en/modules/circ/reserveratios.tt | 143 ++--- .../en/modules/members/member-password.tt | 4 - .../prog/en/modules/members/search.tt | 2 +- .../prog/en/modules/tools/upload-images.tt | 2 +- 34 files changed, 460 insertions(+), 570 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 f9d7162869..8c271f99bc 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -483,6 +483,14 @@ div { height: 500px; } +#filtres{ + width: 100%; + display: block; + position: absolute; + left: 0px; + height: 500px; +} + button { //@include default-button; @@ -1161,7 +1169,7 @@ ul { //height: 50px; li { - list-style-type: disc; + list-style-type: none; input { &.submit { @@ -4496,7 +4504,7 @@ nav { background-color: transparent; //font-weight: bold; text-decoration: none; - + color: #71B443; } } diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index ecc1aa00b5..7c26e91a7c 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -1539,6 +1539,13 @@ div { left: 0px; height: 500px; } +#filtres { + width: 100%; + display: block; + position: absolute; + left: 0px; + height: 500px; } + button:active { border: 1px inset #999999; } @@ -2060,7 +2067,7 @@ label, ul { padding-left: 1.1em; } ul li { - list-style-type: disc; } + list-style-type: none; } ul li input.submit { font-size: 87%; padding: 2px; } @@ -4401,7 +4408,8 @@ nav { vertical-align: middle; } .navbar-nav li .filteraction a:hover, .navbar-nav li .filteraction a:active { background-color: transparent; - text-decoration: none; } + text-decoration: none; + color: #71B443; } .navbar-nav li .residentsearch { border: 0; cursor: text; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc index 0fecc7788c..1b1d2eaaef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc @@ -7,21 +7,21 @@ - + -
  • From a suggestion
    • -
  • From a subscription
    • -
  • From a new (empty) record
    • -
  • From existing orders (copy)
    • -
  • From an external source
    • -
  • From a new file
    • -
  • From a staged file
    • - [% IF ( CAN_user_circulate ) %]
  • From titles with highest hold ratios
    • [% END %] +
  • From a suggestion
    • +
  • From a subscription
    • +
  • From a new (empty) record
    • +
  • From existing orders (copy)
    • +
  • From an external source
    • +
  • From a new file
    • +
  • From a staged file
    • + [% IF ( CAN_user_circulate ) %]
  • From titles with highest hold ratios
    • [% END %] [% ELSE %]
    -

    You can't create any orders unless you first define a budget and a fund.

    +

    You can't create any orders unless you first define a budget and a fund.

    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index c20bb93eb2..d53ec64665 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -13,11 +13,11 @@ - - [+] + + [+] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc index 3ef66e1f9c..4aee275871 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc @@ -158,6 +158,6 @@ [% END %] -
    Cancel +
    Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc index 0519084585..9e4a3863f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc @@ -52,7 +52,7 @@ [% END %] [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %] -

    Add manual restriction

    +

    Add manual restriction

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc index dfa669022d..da957379c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc @@ -6,7 +6,7 @@

    No active currency is defined

    [% IF CAN_user_acquisition_currencies_manage %] -

    Please specify an active currency.

    +

    Please specify an active currency.

    [% ELSE %]

    Your administrator must specify an active currency.

    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc index 09a39bb293..f75e892e68 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc @@ -1,5 +1,5 @@
  • Patron's age is incorrect for their category. Ages allowed are [% age_low | html %]-[% age_high | html %]. - Change category + Change category
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc index 6ea6120e20..e3b04aba1f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -3,7 +3,7 @@ [% IF ( issuecount ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc index 9972462d50..c247070c4c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc @@ -9,6 +9,7 @@
    [% INCLUDE 'patron-search-box.inc' %] + [% INCLUDE 'catalogue-search-box.inc' %]
    + + + [% ELSE %] +

    Sorry, but there are no results for your search.

    +

    Search was: +

    +

    + [% END %] + [% ELSE %] +

    Use the search form on the left to find invoices.

    + [% END %] + + -
    - -
    - -=======
    ->>>>>>> Bug 30952: Search bar [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] @@ -571,19 +381,7 @@ [% INCLUDE 'calendar.inc' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt index a3dc21983e..c4e54cfb3c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt @@ -90,11 +90,7 @@ [% END %] -<<<<<<< HEAD -

    Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]

     -=======

    Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]

    ->>>>>>> Bug 30952: Search bar
      2. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt index fecba041ea..0a8216028a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt @@ -22,7 +22,7 @@ [% PROCESS patron_search_table table_id => 'memberresultst' columns => columns %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt index b818fc03e3..4e32afe4e0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt @@ -268,7 +268,7 @@
    - + [% IF ( biblionumber ) %] Cancel [% ELSE %] -- 2.17.1