From 2e2e44055f49a44a307f8d1f9e040f921e75112c Mon Sep 17 00:00:00 2001 From: Solene Desvaux Date: Tue, 21 Jun 2022 09:52:48 +0200 Subject: [PATCH] Bug 30952: update include --- koha-tmpl/intranet-tmpl/prog/css/calendar.css | 2 +- koha-tmpl/intranet-tmpl/prog/css/login.css | 18 +- .../intranet-tmpl/prog/css/src/calendar.scss | 2 +- .../prog/css/src/staff-global.scss | 141 ++++++++++++- .../intranet-tmpl/prog/css/staff-global.css | 121 +++++++++-- .../prog/en/includes/.patron-search.inc.swp | Bin 0 -> 16384 bytes .../includes/acquisitions-add-to-basket.inc | 2 +- .../prog/en/includes/acquisitions-search.inc | 49 ++--- .../prog/en/includes/acquisitions-toolbar.inc | 65 +++--- .../en/includes/additional-fields-entry.inc | 2 +- .../prog/en/includes/adv-search.inc | 110 +++++----- .../prog/en/includes/auth-finder-search.inc | 6 +- .../prog/en/includes/authorities-search.inc | 8 +- .../en/includes/authority-detail-modal.inc | 2 +- .../prog/en/includes/blocked-fines.inc | 4 +- .../prog/en/includes/budgets-admin-search.inc | 89 +++++++- .../cat-search-pareilquecirc-search.inc | 37 ---- .../prog/en/includes/cat-search.inc | 73 +++++++ .../prog/en/includes/cataloging-search.inc | 12 +- .../en/includes/category-out-of-age-limit.inc | 5 +- .../intranet-tmpl/prog/en/includes/chart.inc | 4 +- .../prog/en/includes/checkin-search.inc | 2 +- .../prog/en/includes/checkouts-table.inc | 2 +- .../prog/en/includes/circ-search.inc | 22 +- .../prog/en/includes/cities-admin-search.inc | 11 +- .../prog/en/includes/clubs-table.inc | 12 +- .../en/includes/contracts-admin-search.inc | 14 +- .../en/includes/currencies-admin-search.inc | 7 +- .../prog/en/includes/desks-admin-search.inc | 30 +-- .../intranet-tmpl/prog/en/includes/facets.inc | 4 +- .../prog/en/includes/holds_table.inc | 2 +- .../prog/en/includes/home-search.inc | 8 +- .../prog/en/includes/ill-toolbar.inc | 12 +- .../prog/en/includes/langmenu-staff-top.inc | 2 +- .../prog/en/includes/letters-search.inc | 6 +- .../prog/en/includes/lis-search.inc | 98 ++++----- .../prog/en/includes/patron-search-header.inc | 198 +++++++++--------- .../prog/en/includes/patron-search.inc | 8 - .../prog/en/includes/patron_messages.inc | 4 +- .../prog/en/includes/patrons-admin-search.inc | 20 +- .../prog/en/includes/pos-menu.inc | 4 +- .../prog/en/includes/prefs-admin-search.inc | 6 +- .../prog/en/includes/recalls.inc | 12 +- .../includes/rotating-collections-toolbar.inc | 8 +- .../prog/en/includes/serials-search.inc | 121 ++++++++--- .../en/includes/stockrotation-toolbar.inc | 11 +- .../en/includes/suggestions-add-search.inc | 34 +-- .../prog/en/includes/vendor-menu.inc | 5 +- .../prog/en/includes/waiting_holds.inc | 4 +- .../prog/en/includes/z3950-admin-search.inc | 6 +- .../prog/en/modules/acqui/acqui-home.tt | 2 +- .../prog/en/modules/acqui/basketgroup.tt | 49 +++-- .../prog/en/modules/acqui/basketheader.tt | 6 +- .../prog/en/modules/acqui/booksellers.tt | 16 +- .../prog/en/modules/acqui/histsearch.tt | 8 +- .../prog/en/modules/acqui/invoice.tt | 11 +- .../prog/en/modules/acqui/parcel.tt | 5 +- .../prog/en/modules/acqui/parcels.tt | 11 +- .../prog/en/modules/acqui/supplier.tt | 37 ++-- .../prog/en/modules/acqui/uncertainprice.tt | 8 +- .../prog/en/modules/admin/aqcontract.tt | 28 +-- .../prog/en/modules/admin/aqplan.tt | 8 +- .../prog/en/modules/catalogue/advsearch.tt | 14 +- .../prog/en/modules/catalogue/itemsearch.tt | 6 - .../prog/en/modules/cataloguing/addbiblio.tt | 7 +- .../prog/en/modules/cataloguing/addbooks.tt | 7 +- .../prog/en/modules/cataloguing/additem.tt | 2 +- .../prog/en/modules/cataloguing/editor.tt | 5 +- .../prog/en/modules/cataloguing/merge.tt | 2 +- .../prog/en/modules/circ/circulation-home.tt | 4 +- .../prog/en/modules/intranet-main.tt | 4 - .../prog/en/modules/members/apikeys.tt | 2 +- .../prog/en/modules/members/boraccount.tt | 2 +- .../prog/en/modules/members/deletemem.tt | 2 +- .../prog/en/modules/members/discharge.tt | 2 +- .../prog/en/modules/members/discharges.tt | 55 +++-- .../prog/en/modules/members/files.tt | 2 +- .../prog/en/modules/members/holdshistory.tt | 2 +- .../prog/en/modules/members/housebound.tt | 2 +- .../prog/en/modules/members/ill-requests.tt | 2 +- .../prog/en/modules/members/mancredit.tt | 2 +- .../prog/en/modules/members/maninvoice.tt | 2 +- .../prog/en/modules/members/member-flags.tt | 8 +- .../en/modules/members/member-password.tt | 2 +- .../prog/en/modules/members/member.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/members/merge-patrons.tt | 2 +- .../prog/en/modules/members/moremember.tt | 2 +- .../prog/en/modules/members/notices.tt | 2 +- .../prog/en/modules/members/pay.tt | 2 +- .../prog/en/modules/members/paycollect.tt | 2 +- .../modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 2 +- .../prog/en/modules/members/recallshistory.tt | 6 +- .../prog/en/modules/members/routing-lists.tt | 2 +- .../prog/en/modules/members/statistics.tt | 2 +- .../en/modules/members/two_factor_auth.tt | 6 +- .../en/modules/onboarding/onboardingstep1.tt | 2 +- .../en/modules/onboarding/onboardingstep2.tt | 2 +- .../en/modules/onboarding/onboardingstep3.tt | 2 +- .../en/modules/onboarding/onboardingstep4.tt | 2 +- .../en/modules/onboarding/onboardingstep5.tt | 2 +- .../en/modules/tools/additional-contents.tt | 6 +- .../prog/en/modules/tools/holidays.tt | 30 ++- .../prog/en/modules/virtualshelves/shelves.tt | 6 +- 105 files changed, 1111 insertions(+), 725 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/.patron-search.inc.swp delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cat-search-pareilquecirc-search.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc diff --git a/koha-tmpl/intranet-tmpl/prog/css/calendar.css b/koha-tmpl/intranet-tmpl/prog/css/calendar.css index 4de58aafdb..a44a114e7b 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/calendar.css +++ b/koha-tmpl/intranet-tmpl/prog/css/calendar.css @@ -770,7 +770,7 @@ fieldset.brief li.radio { .flatpickr-calendar { border-radius: 0; - border: 1px solid #B9D8D9; + border: 1px solid #71B344; -webkit-box-shadow: none; box-shadow: none; } diff --git a/koha-tmpl/intranet-tmpl/prog/css/login.css b/koha-tmpl/intranet-tmpl/prog/css/login.css index 1a8c06a3a3..8a5201a430 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/login.css +++ b/koha-tmpl/intranet-tmpl/prog/css/login.css @@ -20,7 +20,7 @@ a:hover { } body { - background: #f5f5f5; + background: #f3f4f4; } form, label input { @@ -42,7 +42,8 @@ label { #login { background: #fff; - border: 1px solid #a2a2a2; + border: none; + box-shadow: 8px 8px 12px rgb(170 170 170); margin: 4em auto; padding: 1.5em; position : relative; @@ -107,6 +108,14 @@ label { #login #submit-button, #login .button { font-size: 1.4em; padding : .3em .6em; + background: rgba(254, 195, 44, 1); + border: none; + color: #000; +} + +#login #submit-button:hover, #login #submit-button:focus, #login #submit-button:active{ + background: rgba(254, 195, 44, 0.7) !important; + border: none; } #login #onerror_actions { @@ -145,7 +154,7 @@ label { } .submit input:active, .button:active { - background: #f4f4f4; + background: #fff; border: 1px solid #999; border-left-color: #999; border-top-color: #999; @@ -155,8 +164,9 @@ label { text-align: right; } + textarea, input, select { - background: #f4f4f4; + background: #fff; border: 1px solid #b2b2b2; color: #000; font: 13px Verdana, Arial, Helvetica, sans-serif; diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss b/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss index e53a1b9bd8..2f160e06ec 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss @@ -153,7 +153,7 @@ fieldset.brief li.radio { .flatpickr-calendar { border-radius: 0; - border: 1px solid #B9D8D9; + border: 1px solid #71B344; box-shadow: none; } 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 ef2bcd2e5c..4882ea4ed8 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -37,7 +37,7 @@ a { &.btn { &:link, &:visited { - color: #71B443; + //color: #71B443; padding: 6px 25px; } @@ -55,6 +55,27 @@ a { } + &.lientype{ + color: #71B443; + padding: .3em; + border: none; + background-color: transparent; + border: none; + box-shadow: none; + font-size: 100%; + + &:hover, &:focus, &:active{ + text-decoration: underline; + color: #71B443; + padding: .3em; + border: none; + background-color: transparent; + border: none; + box-shadow: none; + font-size: 100%; + } + } + &.cancel { background-color: transparent; @@ -640,6 +661,39 @@ hr { p { margin: .7em 0; + + &.plus{ + background-color: #352C2E; + height: 100% !important; + top: 30px; + border-bottom-left-radius: 17px; + border-bottom-right-radius: 17px; + + input{ + outline-offset: 0px; + outline: 1px black; + float: right; + height: 30px; + border-radius: 17px; + padding-left: 2em; + padding-right: 1.5em; + border: none; + margin-left: 0px; + position: absolute; + top: -5px; + right: 30px; + z-index: 100; + display: inline-block !important; + letter-spacing: normal; + word-spacing: normal; + text-transform: none; + text-indent: 0px; + text-shadow: none; + text-align: start; + cursor: text; + font: 400 13.3333px Arial; + } + } } strong { @@ -832,7 +886,7 @@ label, align-items: center; justify-content: center; flex-wrap: wrap; - width: 150px; + width: 200px; height: 150px; margin-right: auto; margin-left: auto; @@ -885,9 +939,6 @@ label, border-color: #418940; } - h1{ - font-weight: bold; - } } } @@ -1204,6 +1255,7 @@ ol { } fieldset { + overflow: auto; background-color: #FFF; position: relative; color: #696969; @@ -2088,6 +2140,7 @@ dd { position: relative; float: right; height: 100%; + padding: 0.3em; .dropdown-menu { /*border-top-width: 1px; @@ -2154,6 +2207,14 @@ dd { } } + #up{ + display: table; + } + + #down{ + display: table; + } + #patdrop{ border-top-width: 1px; text-align: center; @@ -2197,6 +2258,8 @@ dd { border-radius: 0; margin-top: 0; z-index: 300; + left: auto !important; + width: 851px; } a.addtocart { @@ -3258,7 +3321,7 @@ td { } } -#lientype, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #addauth, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #z3950submit, #add_manual_restriction{ +#lientype, #show_invoice_adjustment, #cancel_invoice_adjustment, #show_active_vendors, #add-contact, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #addauth, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #z3950submit, #add_manual_restriction{ color: #71B443; padding: .3em; border: none; @@ -4311,7 +4374,8 @@ nav { // top: 0px; //position: absolute; //right: 5px; - overflow-x: hidden; + //overflow-x: hidden; + //overflow-y: visible; display: block !important; height: auto !important; } @@ -4353,6 +4417,32 @@ nav { li { list-style: none; + .filteraction{ + position: absolute; + right: 30px; + top: -5px; + width: 25px; + height: 30px; + border: none; + padding-left: 5px; + padding-right: 5px; + margin: 0; + display: inline; + + a{ + color: #71B443; + vertical-align: middle; + + &:hover, &:active{ + background-color: transparent; + //font-weight: bold; + text-decoration: none; + + } + } + + } + .residentsearch { border: 0; //border-bottom: 1px solid #85CA11; @@ -4387,8 +4477,9 @@ nav { position: relative; left: 0px; top: 0px; + width: 500px; //line-height: 40px; - overflow: hidden; + // overflow: hidden; display: block; margin: 10px 0; } @@ -4396,8 +4487,8 @@ nav { #submit, #autocsubmit{ background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%; position: absolute; - // right : 0px; - right : -65px; + min-width: 7px; + right: 0; top: 0px; width: 25px; height: 30px; @@ -6130,6 +6221,7 @@ input.renew { //font-size: 150%; i{ + &.fa{ color: #fff; border-radius: 50%; @@ -6146,6 +6238,20 @@ input.renew { border: solid 3px #71B443; } + &.fond{ + opacity: 70%; + position: relative; + top: 5px; + border: none; + right: 20px; + border-radius: 0; + background-color: transparent; + width: auto; + height: auto; + margin: 0; + padding: 0; + } + } h1 { @@ -6163,10 +6269,23 @@ input.renew { background-color: #418940; border: solid 3px #418940; } + &.fond{ + opacity: 70%; + position: relative; + top: 5px; + border: none; + right: 20px; + border-radius: 0; + background-color: transparent; + width: auto; + height: auto; + margin: 0; + padding: 0; + } } h1{ - font-weight: bold; + //font-weight: bold; } } } diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index cf4d572d41..3108c119ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -1199,7 +1199,6 @@ a.authlink { padding: 2px 4px; } a.btn:link, a.btn:visited { - color: #71B443; padding: 6px 25px; } a.btn.btn-link:link, a.btn.btn-link:visited { @@ -1209,6 +1208,26 @@ a.btn.btn-link:hover { text-decoration: underline; font-weight: bold; } +a.lientype { + color: #71B443; + padding: .3em; + border: none; + background-color: transparent; + border: none; + -webkit-box-shadow: none; + box-shadow: none; + font-size: 100%; } + a.lientype:hover, a.lientype:focus, a.lientype:active { + text-decoration: underline; + color: #71B443; + padding: .3em; + border: none; + background-color: transparent; + border: none; + -webkit-box-shadow: none; + box-shadow: none; + font-size: 100%; } + a.cancel { background-color: transparent; color: #696969; @@ -1640,6 +1659,35 @@ hr { p { margin: .7em 0; } + p.plus { + background-color: #352C2E; + height: 100% !important; + top: 30px; + border-bottom-left-radius: 17px; + border-bottom-right-radius: 17px; } + p.plus input { + outline-offset: 0px; + outline: 1px black; + float: right; + height: 30px; + border-radius: 17px; + padding-left: 2em; + padding-right: 1.5em; + border: none; + margin-left: 0px; + position: absolute; + top: -5px; + right: 30px; + z-index: 100; + display: inline-block !important; + letter-spacing: normal; + word-spacing: normal; + text-transform: none; + text-indent: 0px; + text-shadow: none; + text-align: start; + cursor: text; + font: 400 13.3333px Arial; } strong { font-weight: bold; } @@ -1810,7 +1858,7 @@ label, justify-content: center; -ms-flex-wrap: wrap; flex-wrap: wrap; - width: 150px; + width: 200px; height: 150px; margin-right: auto; margin-left: auto; } @@ -1851,8 +1899,6 @@ label, .accueil:hover i { background-color: #418940; border-color: #418940; } - .accueil:hover h1 { - font-weight: bold; } #reglages i, #reglages img { text-align: center; @@ -2049,6 +2095,7 @@ ol { font-weight: bold; } fieldset { + overflow: auto; background-color: #FFF; position: relative; color: #696969; @@ -2652,7 +2699,8 @@ dd { display: inline-block; position: relative; float: right; - height: 100%; } + height: 100%; + padding: 0.3em; } #toolbar div .dropdown-menu, .btn-toolbar div .dropdown-menu { /*border-top-width: 1px; @@ -2697,6 +2745,12 @@ dd { font-weight: bold; background-color: #fff; background-image: none; } + #toolbar div #up, + .btn-toolbar div #up { + display: table; } + #toolbar div #down, + .btn-toolbar div #down { + display: table; } #toolbar div #patdrop, .btn-toolbar div #patdrop { border-top-width: 1px; @@ -2736,7 +2790,9 @@ dd { .btn-toolbar.floating { border-radius: 0; margin-top: 0; - z-index: 300; } + z-index: 300; + left: auto !important; + width: 851px; } #toolbar a.addtocart, .btn-toolbar a.addtocart { display: block; } @@ -3461,7 +3517,7 @@ td.credit, td.debit, td.total { tfoot td.credit, tfoot td.debit, tfoot td.total { color: #000; } -#lientype, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #addauth, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #z3950submit, #add_manual_restriction { +#lientype, #show_invoice_adjustment, #cancel_invoice_adjustment, #show_active_vendors, #add-contact, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #addauth, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #z3950submit, #add_manual_restriction { color: #71B443; padding: .3em; border: none; @@ -3470,7 +3526,7 @@ td.credit, td.debit, td.total { -webkit-box-shadow: none; box-shadow: none; font-size: 100%; } - #lientype:hover, #multi_hold_submit:hover, #show-picture-upload:hover, #edit_suggester:hover, #expand_all:hover, #collapse_all:hover, #hide_inactive:hover, #show_inactive:hover, #addnewmessageLabel:hover, #results_batch_ops:hover, #highlight_toggle_off:hover, #selectall:hover, #clearall:hover, #highlight_toggle_on:hover, #addColumn:hover, #remove_from_cart:hover, #place_hold:hover, #add_to_list:hover, #batch_modify:hover, #batch_delete:hover, #delColumn:hover, #edit_manager:hover, #addauth:hover, #unset:hover, #UncheckAll:hover, #check-all:hover, #results_batch_ops #uncheck-all:hover, #frameworkactions:hover, #authtypeactions:hover, #modify_sru_fields:hover, #cartsubmit:hover, #z3950submit:hover, #add_manual_restriction:hover { + #lientype:hover, #show_invoice_adjustment:hover, #cancel_invoice_adjustment:hover, #show_active_vendors:hover, #add-contact:hover, #multi_hold_submit:hover, #show-picture-upload:hover, #edit_suggester:hover, #expand_all:hover, #collapse_all:hover, #hide_inactive:hover, #show_inactive:hover, #addnewmessageLabel:hover, #results_batch_ops:hover, #highlight_toggle_off:hover, #selectall:hover, #clearall:hover, #highlight_toggle_on:hover, #addColumn:hover, #remove_from_cart:hover, #place_hold:hover, #add_to_list:hover, #batch_modify:hover, #batch_delete:hover, #delColumn:hover, #edit_manager:hover, #addauth:hover, #unset:hover, #UncheckAll:hover, #check-all:hover, #results_batch_ops #uncheck-all:hover, #frameworkactions:hover, #authtypeactions:hover, #modify_sru_fields:hover, #cartsubmit:hover, #z3950submit:hover, #add_manual_restriction:hover { text-decoration: underline; } .highlight_toggle { @@ -4179,7 +4235,6 @@ nav { line-height: 40px; } .navbar-head { - overflow-x: hidden; display: block !important; height: auto !important; } @@ -4275,6 +4330,23 @@ nav { } }*/ } + .navbar-nav li .filteraction { + position: absolute; + right: 30px; + top: -5px; + width: 25px; + height: 30px; + border: none; + padding-left: 5px; + padding-right: 5px; + margin: 0; + display: inline; } + .navbar-nav li .filteraction a { + color: #71B443; + vertical-align: middle; } + .navbar-nav li .filteraction a:hover, .navbar-nav li .filteraction a:active { + background-color: transparent; + text-decoration: none; } .navbar-nav li .residentsearch { border: 0; cursor: text; @@ -4293,13 +4365,14 @@ nav { position: relative; left: 0px; top: 0px; - overflow: hidden; + width: 500px; display: block; margin: 10px 0; } .navbar-nav li #submit, .navbar-nav li #autocsubmit { background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%; position: absolute; - right: -65px; + min-width: 7px; + right: 0; top: 0px; width: 25px; height: 30px; @@ -5505,6 +5578,18 @@ input.renew { justify-content: center; display: inline; border: solid 3px #71B443; } + .buttons-list li a.menucirc i.fond { + opacity: 70%; + position: relative; + top: 5px; + border: none; + right: 20px; + border-radius: 0; + background-color: transparent; + width: auto; + height: auto; + margin: 0; + padding: 0; } .buttons-list li a.menucirc h1 { font-size: 150%; font-weight: normal; @@ -5515,8 +5600,18 @@ input.renew { .buttons-list li a.menucirc:hover i.fa { background-color: #418940; border: solid 3px #418940; } - .buttons-list li a.menucirc:hover h1 { - font-weight: bold; } + .buttons-list li a.menucirc:hover i.fond { + opacity: 70%; + position: relative; + top: 5px; + border: none; + right: 20px; + border-radius: 0; + background-color: transparent; + width: auto; + height: auto; + margin: 0; + padding: 0; } .about h2 { border-bottom: 1px solid #B9D8D9; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/.patron-search.inc.swp b/koha-tmpl/intranet-tmpl/prog/en/includes/.patron-search.inc.swp new file mode 100644 index 0000000000000000000000000000000000000000..4c9496a048b2bae1f74c3bc559a4e30a71e1609c GIT binary patch literal 16384 zcmeHNO^*~s7%ox1R6c@`a8Zj!vb)ilS%d(=o*}!-f*W8LS zPd)usS9Mi}pPbl7x8;Wkek%z%cH;fY+SNPA&@-FKQNM2SCuhx zqrTo)NAFv8s8>dvt{Kn_Xa+O`ngPv#W%gHO~*8Q@+UL)E7JaiEdN=?{Gy|Fe&46Y=GoTsJ3}^yz68;rumn zSEH29gJUpu;0PB<7PBCn_SM#1QwPRJ#vV_qr4y6tzr(_Qx{>LEQ5x~)`fGxc8<$nO zw>K}TuBFE$lea@ks)GNFjNE($XQ%9X7xgF;f6Cj!>Tk%T!j)=VE*IB9RY9L>xuwVB zCbT6RI)uNxp`{hAi_qiTYq7OKwyJ7#Ox3U5|R#l z{D1GTYdT)D6;VFx6pe@-kJ58bSseURoTXxC67czq)RwkEZPyCJqEYkhR%p;d_sDqt z9F?i5Bqpfd1Yb8LnZDaums#H=z3{n^ik_GSq$cc`V#Z~WYIOzAR!z>YCQ3Epd03L5 zx{PFG0rR7Kr^fb3$7N-Wr|5VP4sTdbb5y2tez#L4NyGNN$Z|Y`qGd)HSwTc+ov3b< z_#k%_6jO9kQnW=(+<0QbC{;p5&UQUAw=!f42<^4Ai|{hnneA!6g=xy8QJs0{Y#352 z&OrTIT5_V%a@eR)RnoSdPS|vM}M z;Xti&J{L82D6WgNd0Z+Qn}_EUd8dM{R^*FDM=0snYMoV7onuNobsVBKO5+}XAQIw( zD)m~83X)rS=Gpi%LT z`a;XGj|w#>q;KpXLphSX%Yl(p$D^f+i)f=puuG6I!zLuBMk0QuEStZ+32!3QiIg%D zOVqT)qw4agQx90JXspKz+`~uAf>pvRCEVc>_pYs{q`@~+8x+v9x?H+CqTH*iZ@LC;u&D0iJ+tYDcphRF;!60tXGbVadK$3Mfzl!= zj}jqC0Zsx7WOPjm)X-BkCbNAbn905a=kV%jM#Dz5l?}*!c7` z9T2S$!JnUIk7r+mo+JZb0hH^^ZL%OtXE=nl&Ou*1X_ViLgdt{+IA+K9fi;`D89Gg#9f1tx*3Skr$Ed;**W-U4QU2CxlS z16)D*Pl30A=YeTpE06;o1i1gzfc|L)Gy|Fe&46Y=GoTsJ3}^;41Db(<6$9DLAn^gF zy?j5>vBI8pysAH&w_QJEgF}yX*x)I>ucQ{_{MyWm&rRi4$b!L&9|Zm^3&ftyBeZHo zRySXJvG&8VE$v7+LrpgJtSgp%w7o0ZuUl-PCxtWKk6GAM!p6AlrQc*83)-EmwY+$H z1RHAnv*J9Rp)Vz^&hTeBQ5kzhW#KzZVP|IE+3Qn!r*g|fgT{KttNF%IKCJt**$Q|T z^-E>tOYy<-pdr@xbYMd`KrQS`RrBz}x3;XPO)oyP3}uE(xjaFc8?sdIl|fy3oeZNN f^w~a@w_5`pY?8VGwl3xFrom an existing record: - +
  • From a suggestion
    • 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 8da5376457..a9b17bcf69 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -1,33 +1,31 @@ -[% USE Koha %] -[% PROCESS 'html_helpers.inc' %] -[% PROCESS 'patronfields.inc' %] - + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index c00fd218ee..ef7e4128c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -3,37 +3,44 @@
    [% IF ( booksellerid ) %]
    - New - - -
      - [% IF CAN_user_acquisition_order_manage && active %] -
    • Basket
      • - [% END %] - [% IF CAN_user_acquisition_contracts_manage && active %] -
    • Contract
      • - [% END %] - [% IF ( CAN_user_acquisition_vendors_manage ) %] -
    • Vendor
      • - [% END %] -
    -
    - [% IF ( CAN_user_acquisition_vendors_manage ) %] -
    Edit vendor
    - [% UNLESS ( basketcount OR subscriptioncount ) %] -
    -
    - - - -
    + New + + +
      + [% IF CAN_user_acquisition_order_manage && active %] +
    • Basket
      • [% END %] + [% IF CAN_user_acquisition_contracts_manage && active %] +
    • Contract
      • + [% END %] + [% IF ( CAN_user_acquisition_vendors_manage ) %] +
    • Vendor
      • + [% END %] +
    +
    + [% IF ( CAN_user_acquisition_vendors_manage ) %] +
    + Edit vendor +
    + [% UNLESS ( basketcount OR subscriptioncount ) %] +
    +
    + + + +
    +
    [% END %] - [% IF CAN_user_acquisition_order_receive && basketcount %] -
    Receive shipments
    - [% END %] - [% ELSE %] -
    New vendor
    [% END %] + [% IF CAN_user_acquisition_order_receive && basketcount %] +
    + Receive shipments +
    + [% END %] + [% ELSE %] +
    + New vendor +
    + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc index 775c04d167..8f9c83acaa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc @@ -1,7 +1,7 @@ [% USE AuthorisedValues %] [% IF wrap_fieldset != 0 %]
    - Additional fields +

    Additional fields

      [% END %] [% FOR field IN available %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc index 4b4227ba20..7cff97878f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc @@ -1,58 +1,52 @@ + + - + \ No newline at end of file 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 9453e3f40b..3ef66e1f9c 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 @@ -1,8 +1,8 @@ [% PROCESS 'form-blocks.inc' %]
      @@ -158,6 +158,6 @@
    [% END %] -
    Cancel +
    Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc index 4bb44b205a..05e740501a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -54,7 +54,7 @@ [% END %] - +
    @@ -110,7 +110,7 @@ [% END %] - +
    @@ -220,7 +220,7 @@ [% END %] - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc index 7cb0f9864f..9de0c3ebe1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc @@ -10,7 +10,7 @@
      - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc index 7625708ecf..fe01f2c998 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc @@ -8,8 +8,8 @@ Checkouts are BLOCKED because fine balance is OVER THE LIMIT. [% END %] [% IF CAN_user_updatecharges_remaining_permissions %] - Make payment - Pay all charges + Make payment + Pay all charges [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc index 632ed7099b..a0e850e3e9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc @@ -17,7 +17,7 @@ [% END %] - + @@ -25,14 +25,89 @@ [% INCLUDE 'catalogue-search-box.inc' %] -
        -
        • - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
        • [% END %] +
          +
          • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
          • [% END %] [% IF ( CAN_user_catalogue ) %]
          • [% END %] - Search funds - Check out - Search the catalog + Search funds + Check out +
        + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search-pareilquecirc-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search-pareilquecirc-search.inc deleted file mode 100644 index 56450d6616..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search-pareilquecirc-search.inc +++ /dev/null @@ -1,37 +0,0 @@ -[% USE Koha %] -
        - - -
        - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc new file mode 100644 index 0000000000..a595bb4117 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc @@ -0,0 +1,73 @@ +[% USE Koha %] + + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc index 16a20ff4c0..73391f1663 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc @@ -8,7 +8,7 @@
        @@ -18,14 +18,14 @@ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] @@ -33,7 +33,7 @@ [% INCLUDE 'catalogue-search-box.inc' %] -
          +
            • [% END %] [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
            • [% END %] [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
            • [% END %] @@ -41,8 +41,8 @@
            • [% END %] Cataloging search - Check-out - Check-in + Check out + Check in Renew Search catalog
          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 0eca171626..09a39bb293 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,4 +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/chart.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc index 553d3c0286..0c654dfea5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc @@ -102,8 +102,8 @@ [% header_row.unshift(item) | html %]
        - - + +
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc index 0f5565bc21..a2071ad38e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc @@ -21,7 +21,7 @@ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
        • [% END %] [% IF ( CAN_user_catalogue ) %]
        • [% END %] - Check-out + Check out Renew Search catalog
      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 59646ddd7e..6ea6120e20 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -121,7 +121,7 @@
      - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc index b449bc66bf..a71a12b208 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc @@ -4,7 +4,6 @@
    - - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc index 1d30abea14..7034066c61 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc @@ -8,16 +8,17 @@ [% INCLUDE 'patron-search-box.inc' %] + [% INCLUDE 'catalogue-search-box.inc' %] -
      -
      • +
        +
        • [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
        • [% END %] [% IF ( CAN_user_catalogue ) %]
        • [% END %] - Search cities - Check out - Search the catalog + Search cities + Check out + Search the catalog
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc index f6df1bbc18..e59aa8c751 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc @@ -72,10 +72,10 @@ [% UNLESS destination == 'holds' %]
      - + Actions -
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 9f00ccc907..f18316489d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -54,7 +54,7 @@ [% END %] - [% IF contact.id %]
    • [% END %] + [% IF contact.id %]
    • [% END %] [% END %] @@ -147,26 +147,27 @@ [% IF ( enter ) %] [% IF ( booksellerid ) %] -

    Update: [% name | html %]

    +

    Update: [% name | html %]

    [% ELSE %] -

    Add vendor

    +

    Add vendor

    [% END %] [% END %] [% UNLESS ( enter ) %][% INCLUDE 'acquisitions-toolbar.inc' %][% END %] [% IF ( enter ) %]
    - +
    + [% IF ( booksellerid ) %] - + [% ELSE %] - + [% END %] Cancel -
    +
    - Company details +

    Company details

    1. Required
    2. @@ -183,14 +184,14 @@
    - Contacts +

    Contacts

    - Contact details + Contact details [% INCLUDE edit_contact %]
    [% FOREACH contact IN contacts %]
    - Contact details + Contact details [% INCLUDE edit_contact %]
    [% END %] @@ -198,7 +199,7 @@
    - Ordering information +

    Ordering information

    1. [% IF ( active ) %]
    -
    [% IF ( booksellerid ) %] +
    [% IF ( booksellerid ) %] [% ELSE %] [% END %]Cancel
    @@ -323,6 +324,7 @@

    [% name | html %]

    +

    Vendor details

    Company name: [% name | html %]

    Postal address: [% postal | html %]

    @@ -363,9 +365,11 @@ [% IF ( notes ) %]

    Notes: [% notes | html %]

    [% END %]
    +
    +

    Contact

    [% FOREACH contact IN contacts %] @@ -383,9 +387,8 @@ [% END %]

    -
    - +
    [% IF ( contracts ) %] @@ -414,8 +417,8 @@ [% contract.contractenddate | $KohaDates %] [% IF CAN_user_acquisition_contracts_manage %] - Edit - Delete + Edit + Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index 1e90d95185..7f6b8f0fcb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -87,7 +87,8 @@ [% END %] [% END %] -

    Orders with uncertain prices

    +
    +

    Orders with uncertain prices

    @@ -100,7 +101,7 @@ [% END %] - +
    @@ -158,8 +159,9 @@ [% END %] -
    +
    +
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt index 0070a73e54..a82d47c18c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -119,12 +119,12 @@ +
    [% IF ( contractnumber ) %] -

    Modify contract [% contractname | html %] for [% booksellername | html %]

    +

    Modify contract [% contractname | html %] for [% booksellername | html %]

    [% ELSE %] -

    New contract for [% booksellername | html %]

    +

    New contract for [% booksellername | html %]

    [% END %] -
      [% IF ( contractnumber ) %]
    1. Contract id [% contractnumber | html %] @@ -150,21 +150,19 @@
      [% INCLUDE 'date-format.inc' %]
    -
    -
    - Cancel + Cancel
    [% END %] [% IF ( add_validate ) %] -

    Data recorded

    +

    Data recorded

    - +
    [% END %] [% IF ( delete_confirm ) %]
    -

    Confirm deletion of contract [% contractname | html %]

    +

    Confirm deletion of contract [% contractname | html %]

    @@ -187,15 +185,16 @@ [% END %] [% IF ( delete_confirmed ) %] -

    Contract deleted

    +

    Contract deleted

    - + [% END %] [% IF ( else ) %]

    Contract(s) of [% booksellername | html %]

    [% IF ( loop ) %] +
    Contract number:[% contractnumber | html %]
    Contract name:[% contractname | html %]
    @@ -213,17 +212,18 @@ [% END %] +
    Name[% loo.contractstartdate | html %] [% loo.contractenddate | html %] - Edit - Delete + Edit + Delete
    [% ELSE %]
    There are no contracts with this vendor. [% IF active %] - Add a contract. + Add a contract. [% END %]
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt index 6fae38b743..9ca36bd8f8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -159,8 +159,8 @@ [% UNLESS ( budget_line.budget_lock ) %] - - + + [% ELSE %]
    not owned
    [% END %] @@ -172,10 +172,10 @@ [% IF ( budget_period_locked ) %] - + [% ELSE %] -
    +
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt index ef149c04df..5a376ed62c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -187,6 +187,7 @@
    +
      [% FOREACH advsearchloo IN advancedsearchesloop %]
    [% END # /FOREACH advsearchloo %]
    +
    @@ -281,10 +283,10 @@ [% PROCESS 'subtype_limits.inc' %]
    - Subtype limits

    +

    Subtype limits

    [% PROCESS subtype_dropdowns %]

    - Current subtype limits +

    Current subtype limits

    [% FOREACH subtype IN ['aud','fic','bio','ctype','l-format'] %] [% FOREACH limit IN limits.$subtype %] @@ -301,7 +303,7 @@
    - Location and availability +

    Location and availability

    [% IF limit_available %]

    @@ -345,8 +347,8 @@ [% IF limits.size %] -
    - Other limits +
    +

    Other limits

    [% FOREACH key IN limits.keys %] [% FOREACH limit IN limits.$key %] @@ -364,7 +366,7 @@

    - Sorting +

    Sorting

    -

    +

    Edit this holiday

      @@ -87,7 +81,11 @@
    1. - holiday Holiday repeating weekly Holiday repeatintion for this repeated holiday. + +
      2. +
    2. +
      + [?]
      You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.
      @@ -132,18 +130,18 @@
      If checked, changes for this holiday will be copied to all libraries. If the holiday doesn't exists for a library, no change is made.
    -
    ay Unique holiday Holiday repeating weekly Holiday - +
    + Cancel
    -
    +
    -
    +

    Add new holiday

    1. @@ -220,10 +218,10 @@
    - + Cancel
    -
    +
    œ
    @@ -241,7 +239,7 @@ [% END %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 97571f7dd6..293d1e9ed8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -4,7 +4,7 @@ [% USE KohaDates %] [% SET footerjs = 1 %] [% formulaire = BLOCK %] - [% INCLUDE 'lis-search.inc' %] + [% INCLUDE 'circ-search.inc' %] [% END %] [% INCLUDE 'doc-head-open.inc' %] @@ -398,10 +398,6 @@ [% END %] [% IF op == 'list' %] -<<<<<<< HEAD - <h2>Lists</h2> -======= ->>>>>>> Bug 30952: Virtualshelves Module <div id="tabs" class="toptabs"> <fieldset class="briefgr"> <ul> -- 2.17.1