From 63dcebc6cf9c92379bc8d08baacd3774d3344b81 Mon Sep 17 00:00:00 2001 From: Solene Desvaux Date: Fri, 8 Jul 2022 14:01:52 +0200 Subject: [PATCH] Bug 30952: renaming classes --- .../prog/css/src/_flatpickr.scss | 2 +- .../intranet-tmpl/prog/css/src/_tables.scss | 19 +- .../prog/css/src/staff-global.scss | 1965 ++++++++--------- .../prog/en/modules/acqui/acqui-home.tt | 4 +- .../prog/en/modules/acqui/addorderiso2709.tt | 4 +- .../prog/en/modules/acqui/basket.tt | 2 +- .../prog/en/modules/acqui/basketgroup.tt | 20 +- .../prog/en/modules/acqui/booksellers.tt | 16 +- .../prog/en/modules/acqui/duplicate_orders.tt | 2 +- .../prog/en/modules/acqui/invoice.tt | 14 +- .../prog/en/modules/acqui/invoices.tt | 4 +- .../prog/en/modules/acqui/lateorders.tt | 20 +- .../en/modules/acqui/newordersubscription.tt | 2 - .../prog/en/modules/acqui/parcel.tt | 4 +- .../prog/en/modules/acqui/parcels.tt | 4 +- .../prog/en/modules/acqui/supplier.tt | 10 +- .../prog/en/modules/acqui/uncertainprice.tt | 2 +- .../en/modules/admin/additional-fields.tt | 4 +- .../prog/en/modules/admin/admin-home.tt | 2 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 6 +- .../prog/en/modules/admin/aqbudgets.tt | 18 +- .../prog/en/modules/admin/aqcontract.tt | 10 +- .../prog/en/modules/admin/aqplan.tt | 37 +- .../prog/en/modules/admin/audio_alerts.tt | 8 +- .../en/modules/admin/authorised_values.tt | 17 +- .../prog/en/modules/admin/authtypes.tt | 6 +- .../prog/en/modules/admin/background_jobs.tt | 4 +- .../prog/en/modules/admin/biblio_framework.tt | 12 +- .../modules/admin/branch_transfer_limits.tt | 11 +- .../prog/en/modules/admin/branches.tt | 8 +- .../prog/en/modules/admin/cash_registers.tt | 2 +- .../prog/en/modules/admin/categories.tt | 10 +- .../prog/en/modules/admin/cities.tt | 8 +- .../prog/en/modules/admin/classsources.tt | 30 +- .../prog/en/modules/admin/clone-rules.tt | 2 +- .../prog/en/modules/admin/columns_settings.tt | 2 +- .../prog/en/modules/admin/credit_types.tt | 12 +- .../prog/en/modules/admin/currency.tt | 10 +- .../prog/en/modules/admin/debit_types.tt | 14 +- .../prog/en/modules/admin/desks.tt | 2 +- .../prog/en/modules/admin/edi_accounts.tt | 8 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 10 +- .../modules/admin/item_circulation_alerts.tt | 4 +- .../en/modules/admin/items_search_fields.tt | 10 +- .../prog/en/modules/admin/itemtypes.tt | 16 +- .../prog/en/modules/admin/koha2marclinks.tt | 8 +- .../prog/en/modules/admin/library_groups.tt | 14 +- .../modules/admin/marc_subfields_structure.tt | 10 +- .../prog/en/modules/admin/marctagstructure.tt | 8 +- .../prog/en/modules/admin/matching-rules.tt | 30 +- .../prog/en/modules/admin/oai_sets.tt | 18 +- .../en/modules/admin/patron-attr-types.tt | 10 +- .../searchengine/elasticsearch/mappings.tt | 6 +- .../prog/en/modules/admin/smart-rules.tt | 64 +- .../prog/en/modules/admin/sms_providers.tt | 2 +- .../prog/en/modules/admin/smtp_servers.tt | 6 +- .../en/modules/admin/systempreferences.tt | 10 +- .../prog/en/modules/admin/transfer_limits.tt | 12 +- .../en/modules/admin/transport-cost-matrix.tt | 2 +- .../prog/en/modules/admin/z3950servers.tt | 10 +- .../en/modules/authorities/authorities.tt | 6 +- .../modules/authorities/searchresultlist.tt | 2 +- .../prog/en/modules/catalogue/advsearch.tt | 8 +- .../prog/en/modules/catalogue/detail.tt | 6 +- .../prog/en/modules/catalogue/issuehistory.tt | 4 +- .../prog/en/modules/catalogue/itemsearch.tt | 20 +- .../prog/en/modules/catalogue/moredetail.tt | 8 +- .../prog/en/modules/catalogue/results.tt | 38 +- .../prog/en/modules/cataloguing/addbiblio.tt | 45 +- .../prog/en/modules/cataloguing/addbooks.tt | 8 +- .../prog/en/modules/cataloguing/additem.tt | 8 +- .../prog/en/modules/cataloguing/editor.tt | 20 +- .../modules/cataloguing/z3950_auth_search.tt | 4 +- .../en/modules/cataloguing/z3950_search.tt | 4 +- .../prog/en/modules/circ/branchoverdues.tt | 2 +- .../prog/en/modules/circ/branchtransfers.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 35 +- .../prog/en/modules/circ/overdue.tt | 61 +- .../prog/en/modules/circ/pendingreserves.tt | 18 +- .../prog/en/modules/circ/renew.tt | 2 +- .../prog/en/modules/circ/reserveratios.tt | 24 +- .../prog/en/modules/circ/returns.tt | 4 +- .../prog/en/modules/circ/set-library.tt | 6 +- .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- .../prog/en/modules/clubs/clubs.tt | 10 +- .../prog/en/modules/clubs/patron-clubs-tab.tt | 4 +- .../en/modules/clubs/templates-add-modify.tt | 8 +- .../modules/course_reserves/course-details.tt | 10 +- .../course_reserves/course-reserves.tt | 4 +- .../prog/en/modules/ill/ill-requests.tt | 2 +- .../prog/en/modules/intranet-main.tt | 42 +- .../en/modules/labels/label-edit-batch.tt | 18 +- .../en/modules/labels/label-edit-template.tt | 2 +- .../prog/en/modules/labels/label-manage.tt | 7 +- .../prog/en/modules/labels/label-print.tt | 18 +- .../prog/en/modules/labels/result.tt | 2 +- .../prog/en/modules/members/boraccount.tt | 12 +- .../prog/en/modules/members/files.tt | 2 +- .../prog/en/modules/members/holdshistory.tt | 2 + .../prog/en/modules/members/member-flags.tt | 2 +- .../prog/en/modules/members/member.tt | 6 +- .../prog/en/modules/members/memberentrygen.tt | 6 +- .../prog/en/modules/members/merge-patrons.tt | 4 +- .../prog/en/modules/members/moremember.tt | 42 +- .../prog/en/modules/members/notices.tt | 4 +- .../modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/members/statistics.tt | 3 +- .../en/modules/offline_circ/process_koc.tt | 2 +- .../en/modules/patron_lists/add-modify.tt | 2 +- .../prog/en/modules/patron_lists/list.tt | 6 +- .../prog/en/modules/patron_lists/lists.tt | 8 +- .../prog/en/modules/patroncards/edit-batch.tt | 18 +- .../en/modules/patroncards/image-manage.tt | 4 +- .../prog/en/modules/patroncards/manage.tt | 6 +- .../prog/en/modules/plugins/plugins-home.tt | 6 +- .../prog/en/modules/pos/register.tt | 2 +- .../prog/en/modules/pos/registers.tt | 2 +- .../prog/en/modules/reports/dictionary.tt | 6 +- .../modules/reports/guided_reports_start.tt | 68 +- .../prog/en/modules/reports/reports-home.tt | 6 +- .../prog/en/modules/reserve/request.tt | 28 +- .../modules/rotating_collections/addItems.tt | 4 +- .../rotating_collections/editCollections.tt | 2 +- .../rotatingCollections.tt | 2 +- .../transferCollection.tt | 4 +- .../prog/en/modules/serials/serials-search.tt | 46 +- .../en/modules/serials/subscription-add.tt | 16 +- .../serials/subscription-frequencies.tt | 4 +- .../serials/subscription-numberpatterns.tt | 6 +- .../prog/en/modules/suggestion/suggestion.tt | 102 +- .../prog/en/modules/tags/review.tt | 6 +- .../en/modules/tools/additional-contents.tt | 50 +- .../automatic_item_modification_by_age.tt | 22 +- .../prog/en/modules/tools/batchMod-del.tt | 2 +- .../prog/en/modules/tools/batchMod-edit.tt | 22 +- .../en/modules/tools/batch_delete_records.tt | 12 +- .../tools/batch_record_modification.tt | 18 +- .../prog/en/modules/tools/csv-profiles.tt | 8 +- .../prog/en/modules/tools/export.tt | 2 +- .../prog/en/modules/tools/import_borrowers.tt | 2 +- .../prog/en/modules/tools/inventory.tt | 10 +- .../prog/en/modules/tools/letter.tt | 16 +- .../en/modules/tools/manage-marc-import.tt | 25 +- .../tools/marc_modification_templates.tt | 24 +- .../prog/en/modules/tools/modborrowers.tt | 2 +- .../prog/en/modules/tools/quotes.tt | 10 +- .../prog/en/modules/tools/upload-images.tt | 6 +- .../prog/en/modules/virtualshelves/shelves.tt | 2 +- 148 files changed, 1793 insertions(+), 1932 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_flatpickr.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_flatpickr.scss index 5d7baac93b..46d6adb1fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_flatpickr.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_flatpickr.scss @@ -526,7 +526,7 @@ .flatpickr-monthDropdown-months { appearance: none; - background-image: url('data:image/svg+xml;charset=utf8,%3csvg fill="%23000000" fill-opacity="0.54" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"%3e%3cpath d="M7 10l5 5 5-5z"/%3e%3cpath d="M0 0h24v24H0z" fill="none"/%3e%3c/svg%3e'); + // background-image: url('data:image/svg+xml;charset=utf8,%3csvg fill="%23000000" fill-opacity="0.54" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"%3e%3cpath d="M7 10l5 5 5-5z"/%3e%3cpath d="M0 0h24v24H0z" fill="none"/%3e%3c/svg%3e'); background-position: 100% 50%; background-repeat: no-repeat; background-size: 24px 24px; diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss index abf322c520..5eb7969780 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss @@ -93,7 +93,6 @@ table { border-right: none; border: none; padding: .5em; - } tr { @@ -194,6 +193,24 @@ td { white-space: nowrap; } + button, a{ + &.btn-default{ + color: #71B443; + padding: .3em; + border: none; + background-color: transparent; + border: none; + box-shadow: none; + font-size: 100%; + + &:hover, &:active, &:focus, &:active:hover, &:active:focus{ + background-color: transparent; + color: #71B443; + text-decoration: underline; + } + } + } + &.borderless { border: 0 none; border-collapse: separate; 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 7cb12ce6f4..0395a8e182 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -10,14 +10,23 @@ a { &:link, &:visited { - color: #000; - text-decoration: none; + color: #71B443; + padding: .3em; + border: none; + background-color: transparent; + box-shadow: none; + font-size: 100%; } &:hover, - &:active { - color: #000; + &:active, &:focus { text-decoration: underline; + color: #71B443; + padding: .3em; + border: none; + background-color: transparent; + box-shadow: none; + font-size: 100%; } &:hover { @@ -35,12 +44,6 @@ a { } &.btn { - &:link, - &:visited { - //color: #71B443; - // padding: 6px 25px; - } - &.btn-link { &:link, &:visited { @@ -54,26 +57,11 @@ a { } } - - &.lientype{ - color: #71B443; - padding: .3em; - border: none; - background-color: transparent; - border: none; - box-shadow: none; - font-size: 100%; - - &:hover, &:focus, &:active, &:active:hover, &:active:focus{ - text-decoration: underline; - color: #71B443; - padding: .3em; - border: none; - background-color: transparent; - border: none; - box-shadow: none; - font-size: 100%; - } + + &.edit-patronimage{ + color: #333; + background-color: #e6e6e6; + border-color: #adadad; } &.cancel { @@ -83,9 +71,7 @@ a { border: #696969 double 1px; margin: 5px; - //font-family: $font-main; font-family: 'Poppins', sans-serif; - //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%); display: inline-block; font-weight: normal; text-align: center; @@ -127,12 +113,6 @@ a { } } - &.close { - &:hover { - //color: #418940; - } - } - &.csv { background-image: url("../img/famfamfam/silk/page_white_excel.png"); } @@ -145,6 +125,24 @@ a { color: #666; } + &.principal{ + background-color: #FEC32C; + color: #000; + text-shadow: 0 1px 0 #fff; + padding: 6px 25px; + border: none; + background-image: none; + margin: 5px; + + &:hover, + &:active, + &:focus{ + background-color: #fec22c9f; + color: #000; + border: none; + } + } + &.disabled { color: #999999; } @@ -194,7 +192,7 @@ a { background-image: url("../img/famfamfam/silk/page_white_code.png"); } - &.pat{ + &.toolbar-btn{ font-family: 'Poppins', sans-serif; font-weight: normal; text-align: center; @@ -206,7 +204,6 @@ a { background-image: none; padding: 6px 12px; font-size: 12px; - //line-height: 1.42857143; border-radius: 4px; -webkit-user-select: none; -moz-user-select: none; @@ -219,13 +216,47 @@ a { margin: 5px 10px; color: #696969; - &:hover{ + &:hover, &:focus{ text-decoration: none; + background-color: #dadada; } &:active{ border: none; } + + &.word{ + margin-right: 0; + padding-right: .1em; + } + + &.arrow{ + margin-left: 0; + border-radius: 4px; + padding-left: .1em; + + &:active{ + border: 1px solid #000; + border-radius: 4px; + } + } + } + + &.more_link{ + color: #71B443; + background-color: transparent; + + display: block; + position: absolute; + right: 45px; + bottom: 10px; + line-height: 15px; + + &:hover{ + text-decoration: none; + color:#71B443; + background-color: transparent; + } } } @@ -235,51 +266,24 @@ a { color: #71B443; } -#plus{ - color: #71B443; - background-color: transparent; - - display: block; - position: absolute; - right: 45px; - bottom: 10px; - line-height: 15px; - - &:hover{ - text-decoration: none; - color:#71B443; - background-color: transparent; - } -} - a.ctrl_link { display: inline-block; padding-right: 1rem; } - -aside { - h5 { - font-size: 100%; - margin: .5em 0; - } - .radio, .checkbox { - margin: 0; - } - p{ - margin: 0; - } +aside { + position: absolute; + left: 0px; + width: 100%; - fieldset { - &.brief { - padding: 1.4em 1.7em; - //height: auto; + fieldset{ + &.sidebar{ + box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); + padding: 0.9em; width: 100%; left: 0px; - overflow: auto; - //white-space: nowrap; height: auto; max-height: 500px; @@ -290,9 +294,6 @@ aside { &::-webkit-scrollbar-track { background: #eeeeee; - //border-color: #696969; - //border-radius: 20px; - } &::-webkit-scrollbar-thumb { @@ -301,6 +302,228 @@ aside { border: 3px solid #eeeeee; } + button + button, + input + input { + margin-left: 5px; + } + + input{ + &.cancel { + + background-color: transparent; + color: #696969; + border: #696969 double 1px; + margin: 5px; + + font-family: 'Poppins', sans-serif; + display: inline-block; + font-weight: normal; + text-align: center; + white-space: nowrap; + vertical-align: middle; + touch-action: manipulation; + width: 90px; + cursor: pointer; + background-image: none; + padding: 6px 12px; + font-size: 12px; + line-height: 1.42857143; + border-radius: 4px; + user-select: none; + + &:hover{ + font-weight: bold; + background-color: #f1f1f1; + border: #696969 double 1px; + text-decoration: none; + } + } + } + + fieldset.brief{ + width: 100%; + + legend{ + color: #696969; + font-weight: bold; + font-size: 13px; + margin: 0; + border-bottom: 0; + } + + li{ + margin-top: 0; + padding: 0; + + &.radio{ + padding: 0; + } + + label { + color: #696969; + font-size: 13px; + padding: 0.5em 0.3em 0 0; + margin: 0; + font-weight: normal; + } + + input, select { + height: calc(1.5em + .75rem + 2px); + width: calc(100% - 20px); + } + } + } + + ol{ + padding: 0; + li { + list-style: none; + left: 0px; + flex-direction: row; + width: 100%; + height: auto; + padding: 0.9em 0; + + fieldset{ + width: 100%; + + legend{ + color: #696969; + font-weight: bold; + font-size: 13px; + margin: 0; + border-bottom: 0; + } + + li{ + margin-top: 0; + padding: 0; + + label { + color: #696969; + font-size: 13px; + padding: 0.5em 0.3em 0 0; + margin: 0; + font-weight: normal; + } + + input, select { + height: calc(1.5em + .75rem + 2px); + width: calc(100% - 20px); + } + } + + } + + label { + color: #696969; + padding: 0.5em 0.3em 0 0; + margin: 0; + } + + input, select { + height: calc(1.5em + .75rem + 2px); + width: calc(100% - 20px); + + + &[type="checkbox"], + &[type="radio"] { + width: auto; + margin: 0; + vertical-align: middle; + } + } + + + + &.checkbox { + label { + display: inline; + margin-left: 0; + } + } + + &.dateinsert { + label { + display: inline; + } + + span { + &.label { + display: inline; + } + } + } + + &.radio { + // padding: .3em 0; + + input { + padding: .3em 0; + } + + label { + display: inline; + } + + span { + &.label { + display: inline; + } + } + + select, + [type="text"] { + width: 100%; + } + + .flatpickr-input { + margin-right: 3px; + width: calc(100% - 20px); + } + + &+.action { + margin-left: 0; + padding: 0; + } + + .radio, .checkbox { + margin: 0; + } + + select, + [type="text"] { + width: 100%; + } + + .flatpickr-input { + margin-right: 3px; + width: calc(100% - 20px); + } + + &.action { + margin-left: 0; + padding: 0; + } + } + } + } + } + } + + + /* + + + + + ol { + margin: 0; + padding: 0; + } + + + button + button, input + input { margin-left: 5px; @@ -342,11 +565,124 @@ aside { } &.dateinsert { - label { + label {goto display: inline; } - span { + &.menu { + padding: 1.4em 1.7em; + width: 100%; + left: 0px; + overflow: auto; + height: auto; + max-height: 500px; + + + &::-webkit-scrollbar { + width: 12px; + } + + &::-webkit-scrollbar-track { + background: #eeeeee; + } + + &::-webkit-scrollbar-thumb { + background: #696969; + border-radius: 20px; + border: 3px solid #eeeeee; + } + + button + button, + input + input { + margin-left: 5px; + } + + fieldset { + border-width: 1px; + border-radius: 0; + margin: 0 0 .5em 0; + padding: .5em; + + legend { + font-size: 95%; + margin: 0; + border-bottom: none; + } + + &.action { + margin-left: 0; + padding: .5em 0; + } + } + + input, select { + height: calc(1.5em + .75rem + 2px); + } + + label { + margin: .5em 0 0 0; + border-top : 1px inset #999999; + } + + li { + &.checkbox { + label { + display: inline; + margin-left: 0; + } + } + + &.dateinsert { + label { + display: inline; + } + + span { + &.label { + display: inline; + } + } + } + + &.radio { + padding: .3em 0; + + input { + padding: .3em 0; + } + + label { + display: inline; + } + + span { + &.label { + display: inline; + } + } + } + } + + ol { + margin: 0; + padding: 0; + } + + select, + [type="text"] { + width: 100%; + } + + .flatpickr-input { + margin-right: 3px; + width: calc(100% - 20px); + } + + &+.action { + margin-left: 0; + padding: 0; + } + } span { &.label { display: inline; } @@ -391,32 +727,119 @@ aside { margin-left: 0; padding: 0; } + } +*/ +} + +#navmenulist{ + background-color: #e6e6e6; + width: 100%; + overflow: auto; + display: block; + // position: absolute; + // left: 0px; + max-height: 700px; + height: auto; + + &::-webkit-scrollbar { + width: 12px; + } + + &::-webkit-scrollbar-track { + background: #eeeeee; + + } + + &::-webkit-scrollbar-thumb { + background: #696969; + border-radius: 20px; + border: 3px solid #eeeeee; + } + + h2{ + width: 100%; + text-align: center; + + a, a:link, a:visited{ + text-align: center; + color: #000; + + &:hover, &.current{ + text-decoration: none; + } + } + } + + h4 { + margin: .5em 0; + padding-left: 0.5em; + padding-bottom: 0.2em; + color: #696969; + border-bottom: 1px solid #696969; + font-weight: normal; + } + + ul { + margin-bottom: 10px; + padding-left: 0px; + + &.goto{ + margin-bottom: 13px; + margin-left: 0; + margin-right: 0; + padding-left: 0px; + position: relative; + top: 0px; + + li{ + a{ + font-size: 75%; + } + } + } + + li { + list-style: none; + left: 0px; + flex-direction: row; + width: 100%; + height: auto; + + a, a:link, a:visited { + color: #000; + width: 100%; + display: block; + text-decoration: none; + padding: 0.7em 0.3em 0.7em 1.2em; + + &.current, &:hover, &:active, &:focus { + background-color: #F3F4F4; + text-decoration: none; + color: #418940; + border-left: solid 5px #418940; + font-weight: bold; + } + } } } } + div { display: block; - &.menuspe{ + &.mainmenu{ display: inline; - //align-items: center; - //justify-content: center; } - &.menuspebas{ - ///display: inline; + &.koha-mainpage{ display: flex; - //-webkit-box-align: center; - //-ms-flex-align: center; align-items: center; - //-webkit-box-pack: center; - //-ms-flex-pack: center; justify-content: center; } - &.vert{ + &.settings-links{ display: block; float: right; top: 0px; @@ -430,24 +853,25 @@ div { height: 150px; margin-right: auto; margin-left: auto; + + a, a:visited, a:link{ + color: #000; + } } } - &.bas{ + &.koha-bottom{ background: transparent url(../img/koha-logo-medium.png) no-repeat center; width: 150px; background-size: 70%; height: 50px; margin: 25px; - // position: inherit; bottom: 0px; text-align: center; display: flex; align-items: center; justify-content: center; position: fixed; - //right: 0; - //left: 0; z-index: 1030; a{ @@ -455,46 +879,97 @@ div { height: 100%; } } +} - /* &.plus{ - display: block; - background-color: #352C2E; - padding: 10px; - border-radius: 4px; - padding: 10px; - border-radius: 4px; - position: absolute; +.settings{ + i, img{ text-align: center; - right: 0px; - bottom: -80px; - - label{ - color: #fff; - font-weight: bold; + color: #71B443; + border: solid 3px #71B443; + border-radius: 50%; + background-color: transparent; + width: 40px; + height: 40px; + margin-bottom: 5px; + margin-left: auto; + margin-right: auto; + padding: 5px; + align-items: center; + justify-content: center; + -webkit-box-sizing: content-box; + box-sizing: content-box; + display: flex; + + } + + &:hover{ + color: #418940; + text-decoration: none; + font-weight: bold; + + i, img{ + border-color: #418940; + color: #418940; } - }*/ -} + + } -#filters{ - width: 100%; - display: block; - position: absolute; - left: 0px; - height: 500px; + img{ + max-width: 30px; + height: auto; + padding: 10px; + } } -#filtres{ - width: 100%; - display: block; - position: absolute; - left: 0px; - height: 500px; +.home-page{ + text-align: center; + text-decoration: none; + font-family: 'Poppins', sans-serif; + + h1 { + font-size: 150%; + font-weight: normal; + color: #000; + } + + i{ + text-align: center; + color: #fff; + border: solid 3px #71B443; + border-radius: 50%; + background-color: #71B443; + width: 40px; + height: 40px; + margin-bottom: 5px; + margin-left: auto; + margin-right: auto; + padding: 5px; + align-items: center; + justify-content: center; + -webkit-box-sizing: content-box; + box-sizing: content-box; + display: flex; + + } + + &:hover{ + text-decoration: none; + + i{ + background-color: #418940; + border-color: #418940; + } + + h1{ + color: #418940; + } + } } button { - //@include default-button; + @include default-button; - &:active { + &:active, &:hover { border: 1px inset #999999; } @@ -590,26 +1065,6 @@ h1 { font-weight: bold; } -#logo { - background: transparent url("../img/koha-logo-medium.png") no-repeat 50% 50%; - border: 0 none; - margin: 2rem 1rem; - padding: 0; - width: 180px; - - a { - border: 0; - cursor: pointer; - display: block; - height: 0 !important; - margin: 0; - overflow: hidden; - padding: 44px 0 0; - text-decoration: none; - width: 180px; - } -} - h2 { font-size: 150%; font-weight: bold; @@ -629,7 +1084,6 @@ h4 { h5 { font-size: 100%; - //font-weight: bold; } h6 { @@ -637,15 +1091,6 @@ h6 { font-weight: bold; } -h7 { - font-size: 93%; - font-weight: bold; - text-align: center; - //padding: 5px; - position: relative; - left: 0px; - bottom: 0px; -} h1, @@ -653,9 +1098,12 @@ h2, h3, h4, h5, -h6, -h7 { +h6 { margin: .5em 0; + + a, a:link, a:visited{ + color: #000; + } } hr { @@ -666,12 +1114,19 @@ hr { p { margin: .7em 0; - &.plus{ - background-color: #352C2E; + &.more{ height: 100% !important; top: 30px; - border-bottom-left-radius: 17px; - border-bottom-right-radius: 17px; + width: 100%; + display: block; + position: absolute; + left: 0px; + background-color: #352C2E; + padding: 10px; + border-radius: 4px; + text-align: center; + right: 0px; + bottom: -70px; input{ outline-offset: 0px; @@ -687,7 +1142,7 @@ p { top: -5px; right: 30px; z-index: 100; - display: inline-block !important; + display: inline !important; letter-spacing: normal; word-spacing: normal; text-transform: none; @@ -699,7 +1154,7 @@ p { } } - &.plusdessous{ + &.more_bottom{ background-color: #352C2E; height: auto !important; padding: 0 5px 10px 5px; @@ -707,6 +1162,10 @@ p { border-bottom-left-radius: 17px; border-bottom-right-radius: 17px; + label{ + color: #fff; + } + input{ outline-offset: 0px; outline: 1px black; @@ -732,6 +1191,12 @@ p { } } +#patron_search { + .address { + font-size: 100%; + } +} + strong { font-weight: bold; @@ -774,7 +1239,6 @@ input { //font-family: $font-main; font-family: 'Poppins', sans-serif; text-shadow: 0 1px 0 #fff; - //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%); display: inline-block; margin-bottom: 0; font-weight: normal; @@ -802,7 +1266,6 @@ input { display: inline-block; font-size: inherit; line-height: 1.42857143; - //padding: .3em .8em; margin: 5px; text-align: center; text-shadow: 0 1px 0 #fff; @@ -829,6 +1292,24 @@ input { @include disabled-button; } } + + &.principal{ + background-color: #FEC32C; + color: #000; + text-shadow: 0 1px 0 #fff; + border: none; + background-image: none; + margin: 5px; + padding: 6px 25px; + + &:hover, + &:active, + &:focus{ + background-color: #fec22c9f; + color: #000; + border: none; + } + } } .input-warning { @@ -837,7 +1318,6 @@ input { } -//a suppr label, .label { color: #000; @@ -858,299 +1338,70 @@ label, } &.circ_barcode { - display: inline-block; - font-size: 105%; - font-weight: bold; - margin-bottom: 1rem; - max-width: 75%; - } - - &.required { - color: #C00; - } -} - -.subfield-label { - font-style: italic; - - span { - &.subfield-code { - font-weight: bold; - } - } -} - -.members-update-table { - padding-top: 10px; -} - -.col-sm-3 { - width: 25%; -} - -.col-sm-6 { - width: 100%; -} - -#area-news{ - background-color: #FFF; - color: #696969; - margin: 0em 0em 1em 0em; - display: block; - padding: 1em; - - h3{ - background-color: #fff; - } -} - -.col-sm-9 { - width: 75%; -} - - -.biglinks-list{ - padding: 0px; - margin: 10px 30px; - align-items: center; - height: 150px; - - li{ - list-style-type: none; - display: flex; - float: left; - text-align: center; - margin-bottom: 5px; - padding: 10px; - //display: flex; - align-items: center; - justify-content: center; - flex-wrap: wrap; - width: 200px; - height: 150px; - margin-right: auto; - margin-left: auto; - } -} - -.accueil{ - text-align: center; - //display: block; - text-decoration: none; - font-family: verdana, arial; - - h1 { - font-size: 150%; - font-weight: normal; - } - - i{ - text-align: center; - //max-height: 100%; - //max-width: 100%; - color: #fff; - border: solid 3px #71B443; - border-radius: 50%; - background-color: #71B443; - width: 40px; - height: 40px; - margin-bottom: 5px; - margin-left: auto; - margin-right: auto; - padding: 5px; - align-items: center; - justify-content: center; - -webkit-box-sizing: content-box; - box-sizing: content-box; - //font-weight: bold; - //font-size: large; - display: flex; - - } - - &:hover{ - color: #418940; - //border-color: #418940; - text-decoration: none; - //font-weight: bold; - - i{ - background-color: #418940; - border-color: #418940; - } - - } -} - -#reglages{ - i, img{ - text-align: center; - //max-height: 100%; - //max-width: 100%; - color: #71B443; - border: solid 3px #71B443; - border-radius: 50%; - background-color: transparent; - width: 40px; - height: 40px; - margin-bottom: 5px; - margin-left: auto; - margin-right: auto; - padding: 5px; - align-items: center; - justify-content: center; - -webkit-box-sizing: content-box; - box-sizing: content-box; - //font-weight: bold; - //font-size: large; - display: flex; - - } - - &:hover{ - color: #418940; - //border-color: #418940; - text-decoration: none; - font-weight: bold; - - i, img{ - border-color: #418940; - color: #418940; - } - - } - - img{ - max-width: 30px; - height: auto; - padding: 10px; - } -} - - - -#navmenulist { - background-color: #e6e6e6; - width: 100%; - overflow: auto; - //white-space: nowrap; - display: block; - position: absolute; - left: 0px; - max-height: 700px; - height: auto; - - &::-webkit-scrollbar { - width: 12px; - } - - &::-webkit-scrollbar-track { - background: #eeeeee; - //border-color: #696969; - //border-radius: 20px; - - } - - &::-webkit-scrollbar-thumb { - background: #696969; - border-radius: 20px; - border: 3px solid #eeeeee; - } - - - - - ul { - margin-bottom: 8.5px; - margin-left: 0; - margin-right: 0; - padding-left: 0px; - // position: relative; - // top: 30px; - - h5{ - padding-left: 0.5em; - padding-bottom: 0.5em; - font-size: 120%; - margin-top: 15px; - margin-left: 0; - margin-right: 0; - margin-bottom: 5px; - color: #696969; + display: inline-block; + font-size: 105%; + font-weight: bold; + margin-bottom: 1rem; + max-width: 75%; + } - border-bottom: 1px solid #696969; - //position: absolute; - //top: 0px; - } - - &.sousmenu{ - margin-bottom: 13px; - margin-left: 0; - margin-right: 0; - padding-left: 0px; - position: relative; - top: 0px; + &.required { + color: #C00; + } +} - li{ - a{ - font-size: 75%; - } - } +.subfield-label { + font-style: italic; + + span { + &.subfield-code { + font-weight: bold; } + } +} - li { - //border-bottom: 1px solid #352C2E; - list-style: $nav-menu-bullet; - list-style: none; - //padding: .2em 0; - //background-color: #a8a8a8; - //position: block; - //position: absolute; - left: 0px; - flex-direction: row; - width: 100%; - height: auto; +.members-update-table { + padding-top: 10px; +} - a { - //text-decoration: none; - color: #000; - width: 100%; - display: block; - //margin: .5em 0; - //padding: .4em .3em; - text-decoration: none; - padding: 0.5em 0.3em 0.5em 1.2em; +#area-news{ + background-color: #FFF; + color: #696969; + margin: 0em 0em 1em 0em; + display: block; + padding: 1em; - &.current, &:hover { - background-color: #F3F4F4; - color: #418940; - border-left: solid 5px #418940; - font-weight: bold; - } + h3{ + background-color: #fff; + } +} - &.titre{ - width: 100%; - font-size: 146.5%; - font-weight: bold; - text-align: center; - color: #000; +.biglinks-list{ + padding: 0px; + margin: 10px 30px; + align-items: center; + height: 150px; - &:hover, &.current{ - background-color: #e6e6e6; - color: #000; - border-left: none; - font-weight: bold; - } - } - } - } + li{ + list-style-type: none; + display: flex; + float: left; + text-align: center; + margin-bottom: 5px; + padding: 10px; + //display: flex; + align-items: center; + justify-content: center; + flex-wrap: wrap; + width: 200px; + height: 150px; + margin-right: auto; + margin-left: auto; } } - .main { margin-bottom: $language-footer-min-height * 1.5; - //display: block; margin-top: 1em; } @@ -1162,7 +1413,6 @@ label, ul { padding-left: 1.1em; - //height: 50px; li { list-style-type: none; @@ -1183,7 +1433,6 @@ ul { padding-left: 0; button { - //font-family: $font-main; font-family: 'Poppins', sans-serif; padding-bottom: 2px; } @@ -1199,8 +1448,6 @@ ul { padding: .2em 1.4em 0 1.4em; } - - &.budget_hierarchy { margin-left: 0; padding-left: 0; @@ -1226,7 +1473,6 @@ ul { } } - // For Font Awesome icon bullets &.fa-ul { li { list-style-type: none; @@ -1271,9 +1517,6 @@ ol { font-weight: bold; } - - - .strong { font-weight: bold; } @@ -1284,16 +1527,15 @@ ol { } fieldset { - //overflow: auto; + width: 100%; + color: #71B443; background-color: #FFF; position: relative; color: #696969; left: 0px; top: 0px; - //border: 2px solid #bfd9b9; - //border-radius: 5px; margin: 0em 1em 1em 0em; - //display: block; + box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); padding: 1em; + fieldset { @@ -1302,6 +1544,16 @@ fieldset { } } + legend{ + position: relative; + top: 1.5em; + margin: .5em 0; + font-size: 131%; + font-weight: bold; + color: #696969; + border-bottom: none; + } + &.lastchecked { border-bottom-left-radius: 0; border-bottom-right-radius: 0; @@ -1310,11 +1562,11 @@ fieldset { margin-right: 0; } - .standard { + &.standard { background-color:#F4F8F9 !important; } - .contrast { + &.contrast { background-color:#F3F3F3 !important; } @@ -1322,22 +1574,16 @@ fieldset { background-color: transparent; border: 0; clear: both; + box-shadow: none; float: none; margin: .9em 0 0; padding: .4em; width: auto; } - &.briefgr { - box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); - display: inline-block; - } - &.brief { - //border: 2px solid #bfd9b9; width: 50%; - box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); overflow: visible; div { @@ -1347,7 +1593,6 @@ fieldset { } label { - //display: block; font-weight: bold; padding: .3em 0; @@ -1388,7 +1633,6 @@ fieldset { ol, li { list-style-type: none; - //margin-bottom: 1.9em; } span { @@ -1414,7 +1658,6 @@ fieldset { &.rows { border: none; - box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); clear: left; float: left; font-size: 90%; @@ -1519,11 +1762,11 @@ fieldset { } } - legend { + /*legend { font-size: 110%; font-weight: bold; margin-left: 1em; - } + }*/ li { clear: left; @@ -1559,8 +1802,6 @@ fieldset { } fieldset { - //margin-left: 10em; - label { width: 6em; } @@ -1677,14 +1918,9 @@ fieldset { } } -} - -#select-libs{ - box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); -} - -#searchterms{ - box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); + fieldset{ + box-shadow: none; + } } #multi_receiving { @@ -1697,19 +1933,6 @@ fieldset { } } - -/* -legend { - background-color: #FFFFFF; - border: 2px solid #bfd9b9; - border-radius: 3px; - font-size: 123.1%; - font-weight: bold; - margin-bottom: 0; - padding: .2em .5em; - width: auto; -}*/ - details { > summary { cursor: pointer; @@ -1747,7 +1970,7 @@ details[open] { } #breadcrumbs { - background-color: transparent;//derrière la maison + background-color: transparent; clear: both; margin: 0; padding: .8em .5em .8em 10px; @@ -1782,7 +2005,6 @@ div { .renew_formfield { margin-bottom: 1em; - //itemtype } .circmessage { @@ -1823,7 +2045,6 @@ div { } } - // Tools > automatic_item_modification_by_age &.rules { display: block; } @@ -1986,145 +2207,8 @@ div { } } - -/* -#header_search { - //position : relative; - //right : - 500px; - //top: -45px; - //line-height: 40px; - //width: 500px; - padding: 0px 50px; - border-radius: 28px; - background-color: #71B443; - height: 2.2em; - background-position: .2em .5em; - background-repeat: no-repeat; - float: left; - margin: .3em 0 .5em; - - input { - &[type="submit"] { - border-radius: 3px; - padding: .2em .8em; - position: relative; - right: .2em; - - } - } - - div { - &.residentsearch { - border: 0; - //border-bottom: 1px solid #85CA11; - padding: 0 0 .2em; - } - } - - ul { - &.ui-tabs-nav { - margin-left: 1em; - padding-top: 0; - - - li { - - &.ui-state-default { - //background: transparent none; - //border: 0; - //top: 0; - - //position: absolute; - // line-height: 40px; - top: 0; - left: 0; - display: flex; - justify-content: space-around; - align-items: center; - color: white; - box-shadow: 0px 0px 3px 0px #0000004d; - - //padding: 10px 20px; - border-radius: 28px; - background: #71B443; - height: 1.5em; - - a { - padding: .3em .6em; - } - } - - &.ui-tabs-active { - background-color: #FFFFF1; - border: 1px solid #85CA11; - border-top-width: 0; - top: -2px; - - a { - text-decoration: none; - } - } - } - } - } - - .ui-corner-top { - border-radius: 0 0 4px 4px; - } - - > div, - > ul { - display: none; - - > li { - display: none; - - &:first-of-type { - display: block; - } - } - - &:first-of-type { - display: block; - } - } - - .head-searchbox { - font-size: 1.3em; - //width: 30em; - - //min-height: 2.5em; - border-radius: 17px; - padding-left: 1.5em; - border: none; - margin-left: 0px; - transition: 0.5s; - - //-webkit-writing-mode: horizontal-tb !important; - text-rendering: auto; - //color: -internal-light-dark(black, white); - letter-spacing: normal; - word-spacing: normal; - text-transform: none; - text-indent: 10px; - text-shadow: none; - display: inline-block; - text-align: start; - appearance: auto; - //background-color: -internal-light-dark(rgb(255, 255, 255), rgb(59, 59, 59)); - -webkit-rtl-ordering: logical; - cursor: text; - margin: 0em; - font: 400 13.3333px Arial; - padding: 1px 2px; - } -} - -*/ - #reserves, #checkouts { - //border-top: 3px solid #418940; padding: 1em; } @@ -2162,26 +2246,69 @@ dd { border-radius: 5px 5px 0 0; margin: 0; padding: 5px; - //height: 50px; display: block; + // width: 851px !important; - div{ + /*a{ + font-family: 'Poppins', sans-serif; + font-weight: normal; + text-align: center; + white-space: nowrap; + vertical-align: middle; + -ms-touch-action: manipulation; + touch-action: manipulation; + cursor: pointer; + background-image: none; + padding: 6px 12px; + font-size: 12px; + border-radius: 4px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + font-size: 105%; + background-color: transparent; + border: none; display: inline-block; + margin: 5px 10px; + color: #696969; + + &:hover{ + text-decoration: none; + background-color: #dadada; + } + + &:active{ + border: none; + } + }*/ + + div{ position: relative; - float: right; height: 100%; - // padding: 0.3em; + float: right; - .dropdown-menu { - /*border-top-width: 1px; - font-size: 13px; - background-color: #F3F4F4; - border: none; - box-shadow: none; - position: absolute;*/ - //right: 10px; - //top: 30px; + a{ + &.principal{ + background-color: #FEC32C; + color: #000; + text-shadow: 0 1px 0 #fff; + border: none; + background-image: none; + margin: 5px; + padding: 6px 25px; + + &:hover, + &:active, + &:focus{ + background-color: #fec22c9f; + color: #000; + border: none; + } + } + } + .dropdown-menu { border-top-width: 1px; text-align: center; padding: 0; @@ -2203,10 +2330,6 @@ dd { right: 0; a{ - //color: #696969; - //float: right; - //padding: .2em .5em; - //border-bottom: 1px solid #000; color: #000; display: block; padding: 3px 20px; @@ -2214,20 +2337,11 @@ dd { font-weight: normal; line-height: 1.42857143; white-space: nowrap; - border-bottom: none; - float: left; - - &:hover, - &:focus{ - //text-decoration: none; - //background-color: #F3F4F4; - //background-image: none; - //font-weight: bold; - //border: 1px solid #696969; - //border-radius: 4px; - - + border-bottom: none; + float: left; + &:hover, + &:focus{ text-decoration: none; font-weight: bold; background-color: #fff; @@ -2288,7 +2402,7 @@ dd { border-radius: 0; margin-top: 0; z-index: 300; - left: auto !important; + // left: auto !important; width: 851px; } @@ -2311,15 +2425,6 @@ dd { } } -.btn-toolbar-pat{ - border: none; - background-color: transparent; - position: relative; - right: 0px; - height: 50px; - line-height: 25px; -} - #disabled { a { color: #999; @@ -2338,18 +2443,14 @@ dd { .patroninfo { - //margin-top: -.5em; margin-right: .5em; - //padding-bottom: 2em; padding-top: 1em; background-color: #e6e6e6; - //position: absolute; left: -10px; width: 100%; padding-bottom: 25px; h5 { - //border-right: 1px solid #bfd9b9; margin-bottom: 0; padding: .5em .9em; font-weight: bold; @@ -2364,7 +2465,6 @@ dd { font-size: 75%; font-weight: normal; list-style-type: none; - //display: table; text-align: center; } } @@ -2387,15 +2487,8 @@ dd { } > div { - //border-right: 1px solid #bfd9b9; width: 100%; } - - &.is-staff { - h5 { - //background-color: #EEE; - } - } } .patroninfo-section { @@ -2408,7 +2501,6 @@ dd { } .patroninfo-heading { - // background-color: rgba(237, 244, 246, .4); padding: .5em; margin-bottom: .3em; clear: both; @@ -2422,8 +2514,6 @@ dd { } } -/* Patron image */ - .patronimage-container { padding: .2em; position: relative; @@ -2495,6 +2585,7 @@ dd { background-color: #F3F4F4; li { list-style-type: none; + display: flex; a{ color: #000; @@ -2514,7 +2605,7 @@ dd { fieldset { &.action { margin-top: 0; - float: left; + float: right; } } @@ -2624,9 +2715,7 @@ i { } .circ-settings { - //background-color: #F4F8F9; border-radius: 0; - //border-top: 2px solid #bfd9b9; display: none; margin-left: -1em; margin-right: -1em; @@ -2638,11 +2727,11 @@ i { margin-top: .5em; display: inline; background: transparent url("../img/UIKit/setting.svg") no-repeat scroll 0%; - background-size: 100%; + background-size: 70%; position: relative; margin: 3px; align-items: center; - right: 25px; + right: 35px; opacity: 0.3; &:hover{ @@ -2701,11 +2790,11 @@ i { } .dialog { - //border: 1px solid #BCBCBC; border-radius: 2px; margin: 1em auto; padding: .5em; text-align: center; + display: table; width: 65%; max-width: 600px; @@ -2743,7 +2832,6 @@ i { input { background-color: #FFFFFF; - //border: 1px solid #BCBCBC; margin: .4em; padding: .4em; @@ -2776,9 +2864,7 @@ i { margin-top: 5px; margin-left: 5px; - //font-family: $font-main; font-family: 'Poppins', sans-serif; - //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%); display: inline-block; margin-bottom: 0; font-weight: normal; @@ -2786,7 +2872,6 @@ i { white-space: nowrap; vertical-align: middle; touch-action: manipulation; - //width: 90px; cursor: pointer; background-image: none; padding: 6px 12px; @@ -2833,12 +2918,9 @@ i { } &.message { - //background: linear-gradient(to bottom, #FFFFFF 0%, #F4F6FA 2%, #EAEEF5 23%, #E8EDF6 94%, #CDDBF2 100%); - //border: 1px solid #BCBCBC; color: #000000; text-align: center; background-color: transparent; - // box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); ul, @@ -2854,8 +2936,6 @@ i { &.alert, &.error { - //background: linear-gradient(to bottom, #FEF8D3 0%, #FFEC91 9%, #FFED87 89%, #F9DC00 100%); - //border: 1px solid #E0C726; color: inherit; background-color: #fff; text-align: center; @@ -2985,38 +3065,8 @@ i { } } } - - - - /* a { - //text-decoration: none; - color: #000; - width: 100%; - display: block; - margin: .5em 0; - //padding: .4em .3em; - text-decoration: none; - padding: 0.5em 0.3em 0.5em 1.2em; - - - - &.current, &.hover { - background-color: #F3F4F4; - color: #418940; - border-left: solid 5px #418940; - font-weight: bold; - } - }*/ - - - - - - - - +/* #menu-side { - //border-right: 1px solid #B9D8D9; margin-right: .5em; padding-bottom: 2em; padding-top: 1em; @@ -3036,12 +3086,6 @@ i { left: 0px; color: #000; display: block; - //margin: .5em 0; - //padding: .4em .3em; - //padding: 0.5em 0.3em 0.5em 1.2em; - //flex-direction: row; - //width: 100%; - //height: 2.1em; &:hover { background-color: #F3F4F4; @@ -3073,8 +3117,7 @@ i { list-style-type: none; } } -} - +}*/ #closewindow { margin-top: 2em; @@ -3089,35 +3132,13 @@ i { font-size: 100%; vertical-align: middle; font-style: italic; - - //background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%; - //position: absolute;20px - //right : 0px; - //top: 0px; width: 250px; height: 30px; - //border: none; padding-left: 5px; padding-right: 30px; border-radius: 0; } -.petit-barcode{ - background-repeat: no-repeat; - background-position: 3px; - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='#369' class='bi bi-calendar3'%3E%3Cg stroke-width='1.333'%3E%3Cpath d='M10.5 0h-9A1.5 1.5 0 0 0 0 1.5v9A1.5 1.5 0 0 0 1.5 12h9a1.5 1.5 0 0 0 1.5-1.5v-9A1.5 1.5 0 0 0 10.5 0zM.75 2.893c0-.355.336-.643.75-.643h9c.414 0 .75.288.75.643v7.714c0 .355-.336.643-.75.643h-9c-.414 0-.75-.288-.75-.643z'/%3E%3Cpath d='M4.875 5.25a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zM2.625 7.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm-6.75 2.25a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5z'/%3E%3C/g%3E%3C/svg%3E"); - border-style: inset; - border-width: 1px; - padding: 5px; - font-style: italic; - border-radius: 0; - - font-size: 90%; - vertical-align: middle; - height: 25px; - margin-right: 5px; -} - li { &.email { overflow: hidden; @@ -3198,10 +3219,12 @@ li { margin-top: 20px; min-width: 100%; width: fit-content; - // overflow: auto; - box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); padding: 20px; + fieldset{ + box-shadow: none; + } + h3{ padding-bottom: .7em; margin: 0; @@ -3211,6 +3234,25 @@ li { td { border: none; + + button, a{ + &.btn-default{ + color: #71B443; + padding: .3em; + border: none; + background-color: transparent; + border: none; + box-shadow: none; + font-size: 100%; + + &:hover, &:active, &:focus, &:active:hover, &:active:focus{ + background-color: transparent; + color: #71B443; + text-decoration: underline; + } + } + } + ul { li { clear: left; @@ -3278,8 +3320,6 @@ li { } .dropdown-menu { - //position: absolute; - //top: 50px; background-color: #fff; color: #000; height: fit-content; @@ -3307,7 +3347,6 @@ li { margin-bottom: .5em; padding: 5px; width: 100%; - //padding: .4em 1em .4em 1em; color: #696969; display: block; @@ -3350,9 +3389,6 @@ li { #search-facets { - //border: 3px solid #71B443; - //border-radius: 4px; - h4 { background-color: #71B443; border-bottom: 1px solid #71B443; @@ -3459,6 +3495,7 @@ td { } } +/* #lientype, #add, #merge-patrons, #btn_batchremove, #doedit, #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, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #add_manual_restriction{ color: #71B443; padding: .3em; @@ -3471,7 +3508,7 @@ td { &:hover, &:active, &:focus, &:active:hover, &:active:focus{ text-decoration: underline; } -} +}*/ .highlight_toggle{ color: #71B443; @@ -3633,7 +3670,6 @@ td { #cartDetails { background-color: #352C2E; - //border: 1px solid #739ACF; box-shadow: 1px 1px 3px 0 #666; color: #fff; display: none; @@ -3645,14 +3681,9 @@ td { } #cartmenulink { - //padding-left: 15px; position: relative; left: 0px; top: 0px; - - /* i.fa.fa-shopping-cart { - //padding-right: 7px; - }*/ } #basketcount { @@ -3711,7 +3742,7 @@ td { } .container { - border: 1px solid #EEE; + // border: 1px solid #EEE; margin: 1em 0; padding: 1em; } @@ -3803,8 +3834,6 @@ td { } .advsearch { - //margin: 0; - //box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); margin: 0em 1em 1em 0em; table { @@ -3939,7 +3968,6 @@ td { .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - // background: #F4F8F9 none; border: 1px solid #bfd9b9; color: #555555; font-weight: normal; @@ -3957,15 +3985,6 @@ td { font-weight: normal; } -// .ui-state-active, -// .ui-widget-content .ui-state-active, -// .ui-widget-header .ui-state-active { -// background: #FFFFFF none; -// border: 1px solid #AAAAAA; -// color: #212121; -// font-weight: normal; -// } - .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { @@ -4030,7 +4049,6 @@ td { .ui-tabs-nav { - .ui-tabs-active a, a:hover, a:focus, @@ -4062,7 +4080,6 @@ td { background: #71B443; border: none; margin-right: .4em; - //top: 1px; border-radius: 4px 4px 0 0; &.ui-tabs-active, &.ui-state-hover { @@ -4074,7 +4091,6 @@ td { a { color: #FFF; - //font-weight: bold; } @@ -4087,7 +4103,7 @@ td { border: 0; } - .ui-state-default {//le menu de la barre de recherche du haut + .ui-state-default { a { color: #fff; @@ -4178,10 +4194,6 @@ td { > ul { background: none repeat scroll 0 0 transparent; border: 0 none; - // border-bottom-left-radius: 4px; - // border-bottom-right-radius: 4px; - //border-top-left-radius: 4px; - // border-top-right-radius: 4px; color: #222222; font-size: 100%; font-weight: bold; @@ -4203,15 +4215,10 @@ td { } li { - //background: none repeat scroll 0 0 #e3f1df; - //border: 1px solid #bfd9b9; - // border-bottom: 0 none; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; - // border-radius: 0; - //color: #555555; float: left; font-weight: normal; list-style: none outside none; @@ -4221,29 +4228,19 @@ td { position: relative; top: 1px; white-space: nowrap; - background: #71B443; - // border: none; - //margin-right: .4em; - //top: 1px; - // border-radius: 4px; &.active, &:hover { - //background-color: #FFFFFF; - //color: #212121; font-weight: normal; padding-bottom: 1px; background-color: #418940; border: none; border-bottom-width: 0; - //padding-bottom: 0; a { background: none repeat scroll 0 0 transparent; color: #fff; - // cursor: text; - //font-weight: bold; outline: 0 none; top: 1px; } @@ -4257,10 +4254,8 @@ td { text-decoration: none; &:hover { - //background-color: #EDF4F5; border-top-left-radius: 4px; border-top-right-radius: 4px; - //color: #418940; } } } @@ -4446,7 +4441,6 @@ nav { background-color: transparent; clear: both; margin: 0; - //padding: .8em .5em .8em 10px; position: absolute; top: 0px; left: Opx; @@ -4477,7 +4471,6 @@ nav { [aria-current="page"] { color: #696969; - //font-weight: 700; text-decoration: none; } } @@ -4485,36 +4478,21 @@ nav { .navbar{ background-color: #352C2E; - //display: inline-block; - // float: left; width: 100%; - // overflow: hidden; } .navbar-header, .collapse{ - /* //background-image: linear-gradient(to right, #352C2E , #3A4F2A); - //background-color: #352C2E; - box-shadow: none; - height: 50px; - // width: 100%;*/ padding-left: 10px; padding-right: 10px; - /*display: inline-block;*/ float: left; a{ color: #fff; - // display: inline-block; line-height: 40px; } } .navbar-head{ - // top: 0px; - //position: absolute; - //right: 5px; - //overflow-x: hidden; - //overflow-y: visible; display: block !important; height: auto !important; } @@ -4546,7 +4524,6 @@ nav { #toplevelmenu{ background-color: transparent; box-shadow: none; - //height: 50px; position: relative; left: 0px; top: 0px; @@ -4556,7 +4533,7 @@ nav { li { list-style: none; - .haut{ + .upper{ position: relative; bottom: 3px; left: 300px; @@ -4580,7 +4557,6 @@ nav { &:hover, &:active{ background-color: transparent; - //font-weight: bold; text-decoration: none; color: #71B443; } @@ -4590,7 +4566,6 @@ nav { .residentsearch { border: 0; - //border-bottom: 1px solid #85CA11; cursor: text; padding: 0 0 .2em; background-color: transparent; @@ -4603,23 +4578,16 @@ nav { #buttonssearch,#header_search{ padding: 10px; border-radius: 28px; - //height: 2.2em; height: 30px; background-image: linear-gradient(to right, #418940, #71B443); z-index: 1; } #header_search{ - //position: relative; - //top : 10px; - //left: 0px; - position: relative; left: 0px; top: 0px; width: 500px; - //line-height: 40px; - // overflow: hidden; display: block; margin: 10px 0; } @@ -4642,12 +4610,6 @@ nav { #header_search{ width: 500px; } - - - - - - .ui-tabs-nav { background-image: linear-gradient(to right, #418940, #71B443); @@ -4665,8 +4627,6 @@ nav { li { background: transparent; border: none; - // margin-right: .4em; - //top: 1px; border-radius: 0; &.ui-tabs-active, &.ui-state-hover { @@ -4678,13 +4638,10 @@ nav { a { color: #FFF; - //font-weight: bold; cursor: pointer; padding: 3px; font-size: .9em; } - - } } } @@ -4694,7 +4651,7 @@ nav { border: 0; } - .ui-state-default {//le menu de la barre de recherche du haut + .ui-state-default { a { color: #fff; cursor: pointer; @@ -4713,7 +4670,6 @@ nav { .ui-state-hover, .ui-state-active { a { font-size: 1em; - // box-shadow: inset 0px 0px 8px 0px rgba(0, 0, 0, 0.10); cursor: pointer; padding: 3px; font-size: .9em; @@ -4726,43 +4682,30 @@ nav { } } - - .ui-widget { - font-family: inherit; - font-size: inherit; - - input, - select, - textarea, - button { + .ui-widget { font-family: inherit; font-size: inherit; + + input, + select, + textarea, + button { + font-family: inherit; + font-size: inherit; + } } - } - - - - - - - - - .buttonsearch{ display: none; } - + .buttonsearch:hover, .buttonsearch.active{ - // border-bottom: 2px solid white; margin-right: 0; font-size: 0.85em; cursor: text; padding: 0.25em; - //border-bottom: 2px solid transparent; margin: 0; - // transition: 0.25s; display: inline-block; overflow: hidden; opacity: 1; @@ -4770,33 +4713,22 @@ nav { input{ display: none; - } - - input{ - - + &.focus{ outline-offset: 0px; outline: 1px black; float: right; - // width: calc(301px); - - - // width: 0%; height: 30px; border-radius: 17px; padding-left: 2em; padding-right: 1.5em; border: none ; margin-left: 0px; - // transition: 0.5s; - position:absolute; top: 0px; right: 30px; z-index : -2; - display: inline-block; - + display: inline; letter-spacing: normal; word-spacing: normal; text-transform: none; @@ -4818,10 +4750,8 @@ nav { bottom: 15px; right: -115px; } - } - #header_search.fold .buttonsearch:not(.active){ width: 0px; opacity: 0; @@ -4834,32 +4764,12 @@ nav { font-size: 1em; } - - /* .iconsearch{ - display: none; - font-size: 1em; - }*/ #header_search.fold #backsearch{ display: inline-block; cursor: pointer; } - /* .iconsearch{ - display: inline-block; - cursor: pointer; - padding: 3px; - font-size: .9em; - - &:hover{ - font-size: 1em; - box-shadow: inset 0px 0px 8px 0px rgba(0, 0, 0, 0.10); - // border: 1px solid #fff; - // border-radius: 50%; - - } - }*/ - .description{ opacity: 0.6; max-width: 50em; @@ -4873,7 +4783,6 @@ nav { &.open { li { background-color: #352C2E; - //padding: 2px; a { font-weight: normal; @@ -4891,9 +4800,6 @@ nav { } a { - //font-weight: bold; - //padding-bottom: .4em; - //padding-top: .4em; line-height: 40px; overflow: hidden; color: #fff; @@ -4914,15 +4820,10 @@ nav { #logged-in-menu{ - // background-color: #352C2E; - //z-index: 999; position: relative; left: 0px; top: 0px; - //white-space: pre; - //flex-direction: column; height: 50px; - //display: block; &:hover{ text-decoration: none; @@ -4930,19 +4831,12 @@ nav { } .loggedinusername{ - /* font-size: 0.85em; */ - /* font-weight: normal; */ - /* position: relative; */ - /* left: 135px; */ bottom: 5px; - /* height: 20px; */ - /* width: 100%; */ text-decoration: none; position: relative; float: right; right: 0px; height: 20px; - /* top: 10px; */ width: 100%; } @@ -4950,9 +4844,6 @@ nav { position: relative; right: 0px; height: 20px; - //line-height: normal; - //padding-bottom: 10px; - //padding-right: 10px; top: 10px; width: 100%; @@ -4971,7 +4862,6 @@ nav { .nav > li > a:hover, .nav > li > a:focus { background-color: transparent; - //text-decoration: none; } .pagination { @@ -4979,24 +4869,24 @@ nav { .active { a { - background-color: #5A9EAA; - border-color: #5A9EAA; + background-color: #6daa5a; + border-color: #6daa5a; &:hover, &:focus { - background-color: #5A9EAA; - border-color: #5A9EAA; + background-color: #6daa5a; + border-color: #6daa5a; } } span { - background-color: #5A9EAA; - border-color: #5A9EAA; + background-color: #6daa5a; + border-color: #6daa5a; &:hover, &:focus { - background-color: #5A9EAA; - border-color: #5A9EAA; + background-color: #6daa5a; + border-color: #6daa5a; } } } @@ -5004,9 +4894,7 @@ nav { button, .btn { - //font-family: $font-main; font-family: 'Poppins', sans-serif; - //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%); display: inline-block; margin-bottom: 0; font-weight: normal; @@ -5022,21 +4910,68 @@ button, border-radius: 4px; user-select: none; + &.toolbar-btn{ + font-family: 'Poppins', sans-serif; + font-weight: normal; + text-align: center; + white-space: nowrap; + vertical-align: middle; + -ms-touch-action: manipulation; + touch-action: manipulation; + cursor: pointer; + background-image: none; + padding: 6px 12px; + font-size: 12px; + border-radius: 4px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + font-size: 105%; + background-color: transparent; + border: none; + display: inline-block; + margin: 5px 10px; + color: #696969; + + &:hover, &:focus{ + text-decoration: none; + background-color: #dadada; + } + + &:active{ + border: none; + } + + &.word{ + margin-right: 0; + padding-right: .1em; + } + + &.arrow{ + margin-left: 0; + border-radius: 4px; + padding-left: .1em; + + &:active{ + border: 1px solid #000; + border-radius: 4px; + } + } + } + &.btn-link { border: 0; } &.cancel { - background-color: transparent; color: #696969; border: #696969 double 1px; margin-top: 5px; margin-left: 5px; - //font-family: $font-main; font-family: 'Poppins', sans-serif; - //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%); display: inline-block; margin-bottom: 0; font-weight: normal; @@ -5062,15 +4997,15 @@ button, } } } + #merge-patrons{ padding: 0 25px; - //float: right; } #patronlist-menu{ padding: 0 25px; } - +/* .pat{ /* background-color: transparent; border: none; @@ -5092,7 +5027,7 @@ button, &:focus{ background-color: #d8d8d8; - }*/ + } @@ -5128,47 +5063,15 @@ button, &:active{ border: none; } -} - -.mot{ - margin-right: 0; - //padding-right: 0; -} - -.fleche{ - margin-left: 0; - //border: 1px solid #000; - border-radius: 4px; - padding: 0 5px 0 3px; - - &:active{ - - border: 1px solid #000; - border-radius: 4px; - } -} - - -#principal{ - background-color: #FEC32C; - color: #000; - text-shadow: 0 1px 0 #fff; - border: none; - background-image: none; - margin: 5px; +}*/ - &:hover, - &:active, - &:focus{ - background-color: #fec22c9f; - } -} .principal{ background-color: #FEC32C; color: #000; text-shadow: 0 1px 0 #fff; border: none; + padding: 6px 25px; background-image: none; margin: 5px; @@ -5177,6 +5080,7 @@ button, &:focus{ background-color: #fec22c9f; color: #000; + border: none; } } @@ -5455,6 +5359,10 @@ label { .modal-content { background-color: rgb(211, 223, 204); + + fieldset{ + box-shadow: none; + } } .btn-group { @@ -5499,7 +5407,6 @@ code { border: 3px solid #418940; border-radius: 4px; overflow: auto; - //border-top-width: 0; padding: 1em; } @@ -5507,8 +5414,6 @@ code { > li { > a { background-color: #71B443; - //border: none; - // border-radius: 4px; color: #fff; line-height: 1.42857143; margin-right: .4em; @@ -5530,9 +5435,6 @@ code { background-color: #418940; border-radius: 4px 4px 0 0; color: #fff; - //border: none; - //border-bottom-color: transparent; - //color: #000; cursor: default; font-weight: bold; } @@ -5800,7 +5702,6 @@ input.renew { .date-select { label { - //display: inline-block; width: 40%; } } @@ -5924,7 +5825,6 @@ input.renew { } } - .form-message { background-color: #FFF; border: 1px solid #A4BEDD; @@ -5943,31 +5843,6 @@ input.renew { } } -#patron_search { - #filters { - display: none; - //display: block; - background-color: #352C2E; - padding: 10px; - //border-radius: 4px; - padding: 10px; - border-radius: 4px; - position: absolute; - text-align: center; - right: 0px; - height: 70px; - bottom: -70px; - - label{ - color: #fff; - } - } - - .address { - font-size: 100%; - } -} - #fixedlengthbuilderaction { border: 3px solid #e3f1df; left: 80%; @@ -6261,9 +6136,7 @@ input.renew { } .lastborrower { - //background-color: #71B443; background-image: linear-gradient(to left, #418940, #71B443); - //@at-root: 1px solid #95C6D0; box-shadow: 1px 1px 1px 0 #999; color: #fff; margin: .4em 0; @@ -6286,7 +6159,6 @@ input.renew { } #lastborrower-remove { - //border-radius: 0px 5px 5px 0px; cursor: pointer; float: right; margin: .0em .4em .0em .4em; @@ -6329,7 +6201,6 @@ input.renew { display: block; height: 60px; margin: 5px; - //font-size: 150%; i{ @@ -6369,12 +6240,16 @@ input.renew { font-size: 150%; font-weight: normal; display: inline; + color: #000; } - &:hover{ - color: #418940; + &:hover, &:active, &:focus{ text-decoration: none; + h1{ + color: #418940; + } + i{ &.fa{ background-color: #418940; @@ -6394,10 +6269,6 @@ input.renew { padding: 0; } } - - h1{ - //font-weight: bold; - } } } } @@ -6427,13 +6298,6 @@ input.renew { // ==== MODULE LINKS - End ==== -/*#catalog-search-link { - //color : #fff; - //border-right: 1px solid lighten( #e3f1df, 15% ); - //padding-right: .3em; - -}*/ - #tools_holidays { .radio, .checkbox { @@ -6533,30 +6397,14 @@ input.renew { } .header-menu-link { - // background-color: #352C2E; display: none; - // font-weight: bold; padding: .4em .6em; } #user-menu { - //position: absolute; - //right: 5px; - //top: 0; - // position: relative; - //left: 0px; top: 0px; position: absolute; right: 5px; - - //background-color: #352C2E; - // box-shadow: none; - // height: 50px; - // width: 100%; - // padding-left: 10px; - //padding-right: 10px; - // display: inline-block; - //float: left; } div#makechart ol li { @@ -6592,7 +6440,6 @@ div .suggestion_note { } .currentlibrary { - //background-color: #E6FCB7; display: inline-block; padding: 2px 4px; } @@ -6697,7 +6544,6 @@ div .suggestion_note { #header { background-color: #352C2E; - // border: 1px solid #352C2E; margin-bottom: 1em; a { @@ -6722,16 +6568,13 @@ div .suggestion_note { &.dropdown-menu { display: block; - // background-color : #352C2E; } } .dropdown-menu-brown { li { - // background-color: #352C2E; a { - //color: #fff; &:hover { color: #FFF; text-decoration: underline; @@ -6767,7 +6610,6 @@ div .suggestion_note { .open { .dropdown-menu { background-color: #352c35; - // border: 1px solid #ccc; position: absolute; } } @@ -6819,10 +6661,9 @@ div .suggestion_note { i {background-color: #352C2E; box-shadow: none; height: 50px; - // width: 100%; padding-left: 10px; padding-right: 10px; - display: inline-block; + display: inline; float: left; display: none; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index 8fb8be7d3b..ac68643325 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -96,7 +96,7 @@ [% IF ( loop_budget ) %] -
+

All available funds

@@ -208,7 +208,7 @@ [% END %] -
+ [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 3394a5369b..ca0e7bef32 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -124,7 +124,7 @@ [% biblio.citation | html %] - ( MARC | Card | Add order ) + ( MARC | Card | Add order )
@@ -515,7 +515,7 @@ [% batch_lis.num_records | html %] - Add orders + Add orders [% END # /FOREACH batch_lis %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index ee83208529..d694b8a62e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -264,7 +264,7 @@ [% END %]
  • - Add user + Add user
  • [% MACRO jsinclude BLOCK %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index aa1b3e6422..e369c133e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -308,9 +308,8 @@
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index a6c111db01..d6f46e42fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -231,25 +231,24 @@
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt index e1051c533d..728122b9e8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -119,10 +119,8 @@
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index c4f53a433f..173ca3cd30 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -120,7 +120,7 @@ [% UNLESS (invoiceclosedate) %] + [% ELSE %]

    Invoice is closed, so you can't receive orders anymore. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index 79da1ac88c..8760af9d11 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -205,8 +205,8 @@

    @@ -417,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 7f6b8f0fcb..3f47a135d2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -101,7 +101,7 @@ [% END %] - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt index 061ed4ee95..3c799989f8 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt @@ -157,8 +157,8 @@ [% IF field.searchable %]Yes[% ELSE %]No[% END %] - Edit - Delete + Edit + Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt index efaa338180..d3cf5bb94a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -48,7 +48,7 @@ [% IF ( Koha.Preference('Mana') == 2 ) %]

    Share content with Mana KB?

    -

    You haven't decided if you want to activate Mana Knowledge Base. Change your Mana KB settings.

    +

    You haven't decided if you want to activate Mana Knowledge Base. Change your Mana KB settings.

    [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index 9b0e1905be..a7ed262d2f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -8,7 +8,7 @@ [% END %] [%- BLOCK action_menu %]
    - + Actions
    -
    + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index 8775921377..b6543074ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -122,7 +122,6 @@ [% END %] -
    @@ -221,7 +220,7 @@ [% ELSE %]
    - + Actions
    -
    No fund found

    @@ -309,8 +307,8 @@ [% ELSE %] [% END %] - Select owner - Remove owner + Select owner + Remove owner @@ -334,10 +332,10 @@ [% user.firstname | html %] [% user.surname | html %] - • Remove + • Remove [% END %] -
  • Add users
  • +
  • Add users
  • @@ -448,12 +446,11 @@
    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 a82d47c18c..bb9253ed7c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -193,8 +193,8 @@ [% END %] [% IF ( else ) %]

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

    +
    [% IF ( loop ) %] -
    @@ -212,21 +212,21 @@ [% 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 %] +
    [% 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 850d835b71..0d03235cae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -161,8 +161,8 @@ [% UNLESS ( budget_line.budget_lock ) %] - - + + [% ELSE %]
    not owned
    [% END %] @@ -208,12 +208,10 @@
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt index aa5585cff3..ae8c275bb6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt @@ -99,13 +99,13 @@

    Audio alerts are disabled

    [% IF ( CAN_user_parameters_manage_sysprefs ) %] -

    Please enable system preference AudioAlerts to activate sounds.

    +

    Please enable system preference AudioAlerts to activate sounds.

    [% ELSE %]

    The system preference AudioAlerts must be enabled to activate sounds.

    [% END %]
    [% END %] -
    +
    @@ -143,17 +143,17 @@ + Edit [% END %]
    [% a.selector | html %] [% a.sound | html %] - Edit
    +

    -
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index 481b184070..e034e9c20d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -312,9 +312,9 @@ [% END # /FOR m IN messages %] -
    [% IF ( searchfield ) %]
    +

    +
    +
    [% IF loop %] @@ -369,8 +371,8 @@ No limitation [% END # /IF loo.branches.size > 0 %] - + [% END # /FOREACH loop %] @@ -381,20 +383,21 @@ - + [% UNLESS category.is_system %] - + [% END %] [% END # /IF loop %] + [% ELSE # category was selected %] - +
    Edit - Delete Edit + Delete
    @@ -417,7 +420,7 @@ [% END # /FOR c %]
    -
    + [% END # /IF ( searchfield )%] [% END # /IF op == 'list' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index dcfb7b71b0..54279d03d4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -177,7 +177,7 @@ Authority types › Administration › Koha

    Authority types

    Define authority types, then authority MARC structure in the same way you define itemtypes and bibliographic MARC tag structure. Authority values are managed through plugins

    -
    +
    @@ -197,7 +197,7 @@ Authority types › Administration › Koha
    [% authority_type.auth_tag_to_report | html %]
    - + Actions
    -
    + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt index f1a0ff8cbe..661fd9c92b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt @@ -164,8 +164,8 @@

    Background jobs

    +
    [% IF jobs.count %] -
    @@ -203,12 +203,12 @@ [% END %]
    -
    [% ELSE %]
    There are no background jobs yet.
    [% END %] +
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index b4bd08131d..0b5c601f39 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -107,7 +107,7 @@ MARC frameworks › Administration › Koha [% IF op == 'list'%]
    - New framework + New framework
    [% END %] @@ -150,7 +150,7 @@ MARC frameworks › Administration › Koha

    [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])

    The framework is used [% biblios_use_this_framework | html %] times.

    - +
    [% ELSE %]

    Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])?

    @@ -169,7 +169,7 @@ MARC frameworks › Administration › Koha [% IF op == 'list' %]

    MARC frameworks

    -
    +
    @@ -184,7 +184,7 @@ MARC frameworks › Administration › Koha
    Default framework
    - + Actions
    [% loo.frameworktext | html %]
    - + Actions
    -
    + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt index 22ea436dda..851c2784de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt @@ -51,14 +51,14 @@

    Check the boxes for the libraries you allow your items to be transferred to.

    -
    +
    [% IF ( limitType == 'ccode' ) %]For all collection codes: [% ELSE %]For all item types: [% END %] - Select all + Select all | - Clear all + Clear all | - Switch to advanced editor + Switch to advanced editor
    @@ -77,7 +77,7 @@

    Policy for [% codes_loo.limit_phrase | html %]: [% codes_loo.code | html %]

    -

    Select all | Clear all

    +

    Select all | Clear all

    @@ -113,7 +113,6 @@ Cancel - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index 668ebca25e..a8222a8ca3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -137,14 +137,14 @@ Libraries › Administration › Koha [% IF op == 'list' || op == 'view' %]
    - New library + New library [% IF op == 'view' && library %] - Edit library + Edit library [% END %]
    [% END %] -
    + [% IF op == 'add_form' %]

    [% IF library %]Modify library[% ELSE %]New library[% END %]

    @@ -345,7 +345,7 @@ Libraries › Administration › Koha
    There are no libraries defined. Start defining libraries.
    [% END %] [% END %] -
    + [% IF op == 'view' && library %]

    [% library.branchname | html %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt index 1ed17ec8ca..db3de83eab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt @@ -160,7 +160,7 @@ Cash registers › Administration › Koha [% IF op == 'list' %]

    Cash registers

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index 7aaf8390c2..eed8ddf236 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -530,11 +530,11 @@

    Patron categories

    -
    +
    [% IF searchfield %] You searched for [% searchfield | html %] [% END %] @@ -697,8 +697,8 @@ [% END %]
    [% END %] @@ -707,7 +707,7 @@ [% ELSE %]
    No categories have been defined. Create a new category.
    [% END %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index b8aec5179b..79bdd3ead8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -178,7 +178,7 @@

    Cities

    @@ -186,8 +186,8 @@ Searching: [% city_name_filter | html %] [% END %] +
    [% IF cities_count > 0 %] -
    - Edit - Delete + Edit + Delete
    @@ -201,12 +201,12 @@
    -
    [% ELSE %]
    - There are no cities defined. Create a new city. + There are no cities defined. Create a new city.
    [% END %] + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt index 9d3b61c4e9..8fc85b48df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -346,12 +346,12 @@ Classification sources › Administration › Koha [% IF op == 'list' %]

    Classification configuration

    -
    +

    Classification sources

    @@ -370,15 +370,15 @@ Classification sources › Administration › Koha [% END %]
    [% class_source.class_sort_rule | html %] [% class_source.class_split_rule | html %] - Edit - Delete + Edit + Delete
    -
    + -
    +

    Classification filing rules

    @@ -393,15 +393,15 @@ Classification sources › Administration › Koha [% END %]
    [% rule.description |html | html %] [% rule.sort_routine | html %] - Edit - Delete + Edit + Delete
    -
    + -
    +

    Classification splitting rules

    @@ -416,13 +416,13 @@ Classification sources › Administration › Koha [% END %]
    [% rule.description | html %] [% rule.split_routine | html %] - Edit - Delete + Edit + Delete
    -
    + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt index 0274eb6377..d133cf46a1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt @@ -53,7 +53,7 @@ [% ELSE %]

    The rules have been cloned.

    [% END %] - Return to circulation and fine rules + Return to circulation and fine rules [% ELSE %]

    Use carefully! If the destination library already has circulation and fine rules, they will be deleted without warning!

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt index 5da34f460e..b42c9f92aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt @@ -30,7 +30,7 @@
    [% IF pagename == 'additem' AND tablename == 'itemst' %] -
    Changes made below will only apply to item subfields that are mapped to the 'items' table. Go to Koha to MARC mapping
    +
    Changes made below will only apply to item subfields that are mapped to the 'items' table. Go to Koha to MARC mapping
    [% END %] [% END %] @@ -361,7 +361,7 @@ Patron attribute types › Administration › Koha [% END %] [% ELSE %]

    There are no saved patron attribute types.

    - + [% END %]
    [% pagination_bar | $raw %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt index ed5d67dbef..96e1a6579c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt @@ -337,9 +337,9 @@ a.add, a.delete { [% IF mapping.search_field_mandatory %] - + [% ELSE %] - + [% END %] [% END %] @@ -396,7 +396,7 @@ a.add, a.delete { - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt index 77de826cc3..f453c59d80 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt @@ -163,12 +163,12 @@ [% IF op == 'list' %]

    Account credit types

    +
    [% IF credit_types.count %] -
    @@ -208,27 +208,27 @@ [% END %]
    Archived [% IF !credit_type.archived %] - Edit + Edit [% END %] [% IF !credit_type.is_system && !credit_type.archived %] - Archive + Archive [% END %] [% IF !credit_type.is_system && credit_type.archived %] - Restore + Restore [% END %]
    -
    [% ELSE %]
    There are no account credit types defined. Create new credit type
    [% END %] +
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt index 83084ac70d..5b652deae7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -73,7 +73,7 @@ [% IF op == 'list' %] [% END %] @@ -220,7 +220,7 @@ You searched for [% searchfield | html %] [% END %] -
    +
    @@ -246,14 +246,14 @@ [% END %]
    [% IF currency.active %]✓[% END %] [% IF currency.archived %]Yes[% END %] - Edit - Delete + Edit + Delete
    -
    +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt index 1ec5cc2aef..8da3a0b809 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -154,12 +154,12 @@ [% IF op == 'list' %]

    Account debit types

    +
    [% IF debit_types.count %] -
    @@ -209,22 +209,22 @@ [% END %]
    Archived [% IF !debit_type.is_system && !debit_type.archived %] - Edit - Archive + Edit + Archive [% ELSIF debit_type.archived %] - Restore + Restore [% END %]
    -
    [% ELSE %]
    - There are no account debit types defined. Create new debit type + There are no account debit types defined. Create new debit type
    [% END %] +
    [% END %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt index 45a9254c25..edf66884a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt @@ -178,7 +178,7 @@ [% IF op == 'list' %]

    Desks

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt index 848c732fd4..6936d8c6b8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -89,7 +89,7 @@ EDI accounts › Administration › Koha [% IF display %] [% END %] @@ -304,10 +304,10 @@ EDI accounts › Administration › Koha [% END %] [% IF display %] +
    [% IF ( ediaccounts ) %]

    Vendor EDI accounts

    -
    @@ -377,17 +377,17 @@ EDI accounts › Administration › Koha [% END %] [% END %]
    No - Edit Delete + Edit Delete
    -
    [% ELSE %]
    There are no EDI accounts.
    [% END %] +
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt index c5ab23cfc5..fa998369f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt @@ -77,7 +77,7 @@ Library EANs › Administration › Koha [% IF display %] [% END %] @@ -163,8 +163,8 @@ Library EANs › Administration › Koha [% END %] [% IF display %] +
    [% IF ( eans ) %] -
    @@ -190,18 +190,18 @@ Library EANs › Administration › Koha [% END %] [% END %]
    Library - Edit - Delete + Edit + Delete
    -
    [% ELSE %]
    There are no library EANs.
    [% END %] +
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt index f1cd92fbab..d4ee24d82f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt @@ -115,7 +115,7 @@ -
    +

    Circulation alerts for [% Branches.GetName( branch ) || 'Default' | html %]

    Click on the grid to toggle the settings.

    @@ -178,7 +178,7 @@
    - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt index ef7512f737..0a55e25d81 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt @@ -42,7 +42,7 @@ [% IF field_added %] @@ -77,7 +77,7 @@

    Item search fields

    -
    +
    @@ -99,14 +99,14 @@ [% END %]
    [% field.tagsubfield | html %] [% field.authorised_values_category | html %] - Edit - Delete + Edit + Delete
    -
    + [% ELSE %]

    Item search fields

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 60010e44c6..5e2b769ed3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -133,7 +133,7 @@ Item types › Administration › Koha [% IF op == 'list' %][% END %] [% FOREACH m IN messages %] @@ -446,8 +446,8 @@ Item types › Administration › Koha [% IF op == 'delete_confirm' %]
    -

    Delete item type '[% itemtype.itemtype | html %]'?

    +
    @@ -465,20 +465,20 @@ Item types › Administration › Koha [% END %]
    Item type
    Rental charge[% itemtype.rentalcharge | $Price %]
    +
    -
    -
    +
    [% END %] [% IF op == 'list' %]

    Item types administration

    +
    [% IF itemtypes %] -
    [% UNLESS Koha.Preference('noItemTypeImages') && Koha.Preference('OpacNoItemTypeImages') %][% END %] @@ -596,16 +596,16 @@ Item types › Administration › Koha [% END %]
    Image [% IF ( itemtype.automatic_checkin ) %]Yes[% ELSE %] [% END %] - Edit - Delete + Edit + Delete
    -
    [% ELSE %]
    There are no itemtypes defined
    [% END %] +
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt index e403278594..d4fe97f9b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt @@ -46,7 +46,7 @@
    Failed to add mapping for [% error_info | html %]
    [% END %] -
    +
    @@ -64,8 +64,8 @@ @@ -73,7 +73,7 @@ [% END %]
    Koha field[% loo.liblibrarian | html %] [% IF !loo.readonly %] - Add - [% IF loo.tagfield %] Remove [% END %] + Add + [% IF loo.tagfield %] Remove [% END %] [% END %]
    -
    + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt index 15bb31ff0a..80d2c32052 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt @@ -74,7 +74,7 @@
    @@ -420,25 +420,25 @@
    [% IF group.branchcode %] - + [% ELSE %]
    - +
    - +
    - Edit - Delete + Edit + Delete
    Delete Delete Delete Delete
    Add Add
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index 7b8d5bf0c8..7eb928b41c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -108,7 +108,7 @@ [% END %]
    -
    +
    @@ -237,8 +237,8 @@ [% END %] [% END %] [% END %] @@ -430,8 +430,8 @@ @@ -534,7 +534,7 @@ [% END %] @@ -591,14 +591,14 @@
    - Edit - Delete + Edit + Delete [% IF note.defined && note != '' %] @@ -391,8 +391,8 @@ [% recall_shelf_time | html %] - Edit - Delete + Edit + Delete
    - - + + - +
    -
    +
    -

    Default checkout, hold and return policy[% IF humanbranch %] for [% Branches.GetName( humanbranch ) | html %][% END %]

    You can set a default maximum number of checkouts, hold policy and return policy that will be used if none is defined below for a particular item type or category.

    +
    @@ -766,18 +766,17 @@ -
    - + [% IF ( default_checkout_hold_and_return_policy ) %] Unset [% END %]
    +
    -
    +
    [% IF ( show_branch_cat_rule_form ) %]
    -

    [% IF humanbranch %]Checkout, hold policy by patron category for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default checkout, hold policy by patron category[% END %]

    For this library, you can specify the maximum number of loans that a patron of a given category can make, regardless of the item type. @@ -786,6 +785,7 @@ no limit applies, except possibly for a limit you define for a specific item type.

    +
    @@ -850,16 +850,15 @@ - + -
    +
    -
    + [% END %] [% IF Koha.Preference('ArticleRequests') %]
    -
    [% IF humanbranch %]

    Daily open article requests limit for [% Branches.GetName( humanbranch ) | html %]

    [% ELSE %] @@ -867,6 +866,7 @@ [% END %]

    Specify the maximum number simultaneous current article requests a patron of a given category can have.

    +
    @@ -909,11 +909,10 @@ -
    +
    -
    +
    -
    [% IF humanbranch %]

    Article request fees for [% Branches.GetName( humanbranch ) | html %]

    [% ELSE %] @@ -921,6 +920,7 @@ [% END %]

    Specify the article request fee for a given patron category.

    +
    @@ -966,16 +966,15 @@ - + -
    +
    -
    + [% END %]
    -
    [% IF current_branch == '*' %]

    Default lost item fee refund on return policy

    [% ELSE %] @@ -984,6 +983,7 @@

    Specify the default policy for lost item fees on return.

    +
    @@ -1071,16 +1071,15 @@ -
    - +
    +
    -
    +
    -

    [% IF humanbranch %]Holds policy by item type for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default holds policy by item type[% END %]

    For this library, you can edit rules for given itemtypes, regardless @@ -1101,6 +1100,7 @@

    +
    @@ -1206,11 +1206,11 @@ - + -
    +
    -
    + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt index 321b400223..976f30bf66 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt @@ -40,7 +40,7 @@

    SMS cellular providers

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt index 3c5063a5f2..cb1b792bbf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt @@ -236,7 +236,7 @@ [% IF op == 'list' %]

    SMTP servers

    @@ -254,7 +254,7 @@ [% IF servers_count > 0 %] -
    +
    @@ -268,7 +268,7 @@
    -
    + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt index 1e37a8c026..c4e79bbcc5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -337,11 +337,11 @@ [% IF ( tab != 'local_use' ) %]

    Please click on one of the tabs at the left side of this form.

    -
    +
    [% ELSE %]

    Local use preferences

    -
    +
    @@ -459,15 +459,15 @@ - + - + [% END %]
    Preference Edit Delete Edit Delete
    -
    + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt index 84ce787e41..7277d70695 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt @@ -79,9 +79,9 @@
    Check all | - Uncheck all + Uncheck all | - Switch to basic editor + Switch to basic editor
    @@ -92,8 +92,8 @@ [% FOREACH to IN branches %] [% END %] @@ -111,8 +111,8 @@ [% FOREACH from IN branches %] [% FOREACH to IN branches %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt index ccaff55fa8..a15493e1c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt @@ -49,7 +49,7 @@ Defining transport costs between libraries [% IF ( WARNING_transport_cost_matrix_off ) %] -
    Because the "UseTransportCostMatrix" system preference is currently not enabled, the transport cost matrix is not being used.
    Go to the UseTransportCostMatrix system preference if you wish to enable this feature.
    +
    Because the "UseTransportCostMatrix" system preference is currently not enabled, the transport cost matrix is not being used.
    Go to the UseTransportCostMatrix system preference if you wish to enable this feature.
    [% END %] [% IF ( errors ) %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt index a1ee95222a..3b3385cf7f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -212,8 +212,8 @@ [% IF op == 'list' %]

    Z39.50/SRU servers administration

    [% IF id %] @@ -221,7 +221,7 @@ [% ELSIF searchfield %] You searched for [% searchfield | html %] [% END %] -
    +
      -

    Check

    -

    Uncheck

    +

    Check

    +

    Uncheck

    -

    Check

    -

    Uncheck

    +

    Check

    +

    Uncheck

    [% from.branchname | html %]
    @@ -240,7 +240,7 @@
    TargetHostname/PortDatabaseUseridPasswordPreselectedRankSyntaxEncodingTimeoutRecord typeAttributesActions[% loo.attributes | html %]
    - + Actions
    - + [% END %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt index 765800fe30..9cff5f5cb6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt @@ -313,12 +313,12 @@
    - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt index 1b4c89f50f..a9e8659049 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -105,7 +105,7 @@ [% IF ( CAN_user_editauthorities ) %]
    - + Actions
    [% IF ( expanded_options ) %] - Fewer options + Fewer options
    [% ELSE %] - More options + More options
    [% END %] [% IF searchid %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 6b38a863a2..30fa0e1aa6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -618,13 +618,13 @@ Note that permanent location is a code, and location may be an authval. [% UNLESS item.cannot_be_edited %] [% IF Koha.Preference('LocalCoverImages') OR Koha.Preference('OPACLocalCoverImages') %] [% ELSE %] - Edit + Edit [% END %] [% END %] @@ -981,7 +981,7 @@ Note that permanent location is a code, and location may be an authval. No images have been uploaded for this bibliographic record yet. [% END %] [% IF ( CAN_user_tools_upload_local_cover_images ) %] -

    Upload an image file: Upload +

    Upload an image file: Upload

    [% END %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt index c45f8e8f59..c173773eb6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt @@ -52,7 +52,7 @@ [% SET show_patron_column = Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %] -
    + [% IF checkouts %]

    Checked out [% checkouts.size | html %] times

    @@ -122,7 +122,7 @@ [% biblio.title | html %][% IF biblio.author %], by [% biblio.author | html %][% END %] has never been checked out.

    [% END %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt index e7e07e41cf..db04386b96 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt @@ -181,9 +181,9 @@
    +

    Item search

    -
    @@ -273,13 +273,15 @@
    -
    +
    +
    +
    @@ -354,10 +356,10 @@ + '
    ' + '
    '; - var advSearchLink = $('') + var advSearchLink = $('') .attr('href', '/cgi-bin/koha/catalogue/search.pl') .html(_("Go to advanced search")); - var editSearchLink = $('') + var editSearchLink = $('') .attr('href', '#') .html(_("Edit search")) .addClass('btn btn-default btn-xs') @@ -390,14 +392,14 @@ } } - var csvExportLink = $('') + var csvExportLink = $('') .attr('href', '#') .html("CSV") .on('click', function(e) { e.preventDefault(); exportItems('csv'); }); - var barcodesExportLink = $('') + var barcodesExportLink = $('') .attr('href', '#') .html(_("Barcodes file")) .on('click', function(e) { @@ -419,7 +421,7 @@ .append($('
  • ').append(csvExportLink)) .append($('
  • ').append(barcodesExportLink))); - var selectVisibleRows = $('') + var selectVisibleRows = $('') .attr('href', '#') .append(' ') .append(_("Select visible rows")) @@ -427,7 +429,7 @@ e.preventDefault(); $('#results input[type="checkbox"]').prop('checked', true).change(); }); - var clearSelection = $('') + var clearSelection = $('') .attr('href', '#') .append(' ') .append(_("Clear selection")) @@ -594,7 +596,7 @@ // Add the "New field" link. var form_field = $('div.form-field-select-text').last() var NEW_FIELD = _("New field"); - var button_field_new = $(' ' + NEW_FIELD + ''); + var button_field_new = $(' ' + NEW_FIELD + ''); button_field_new.click(function(e) { e.preventDefault(); addNewField( $(this) ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 58f95568d8..c00a090025 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -72,7 +72,7 @@
  • Physical details: [% pages | html %] [% illus | html %] [% size | html %] 
  • [% IF ( bnotes ) %]
  • Notes: [% bnotes | html %]
  • [% END %]
  • No. of items: [% count | html %] [% IF ( hiddencount ) %]total ([% showncount | html %] shown / [% hiddencount | html %] hidden) -Show all items[% END %]
  • +Show all items[% END %]
    @@ -82,7 +82,7 @@ [% END %] [% IF ( ONLY_ONE ) %] -
    You are only viewing one item. View all
    +
    You are only viewing one item. View all
    [% END %] [% IF updated_exclude_from_local_holds_priority.defined %] @@ -101,7 +101,7 @@

    Item information [% UNLESS ( ITEM_DAT.nomod ) %] [% IF ( CAN_user_editcatalogue_edit_items ) %] - Edit item + Edit item [% END %] [% END %]

    @@ -319,7 +319,7 @@ [% ITEM_DAT.issues | html %] [% ELSE %] 0 - [% END %] (View item's checkout history) + [% END %] (View item's checkout history)
  • Last seen:[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen | $KohaDates %] [%END %] 
  • Last borrowed:[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %] 
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 41c670ca30..92ef2e0dc7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -76,7 +76,7 @@

    [% total | html %] result(s) found [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF limit_desc %] with limit(s): '[% limit_desc | html %]'[% END %][% IF ( LibraryName ) %] in [% LibraryName | html %] Catalog[% END %].

    - Edit this search + Edit this search
    @@ -97,7 +97,7 @@ [% IF Koha.Preference('virtualshelves') %]
    -
    @@ -143,8 +143,8 @@ [% IF ( CAN_user_reserveforothers_place_holds && DisplayMultiPlaceHold ) %] [% IF ( holdfor or holdforclub ) %]
    - - +
    [% ELSE %] [% END # /IF holfor %] [% END # /IF CAN_user_reserveforothers_place_holds %] [% IF Koha.Preference('BrowseResultSelection') %] [% END %] [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
    [% IF bib_doesnt_exist %] @@ -985,8 +986,8 @@ function PopupMARCFieldDoc(field) { -
    +
      [% FOREACH BIG_LOO IN BIG_LOOP %]
    • [% BIG_LOO.number | html %]
    • @@ -1185,8 +1186,8 @@ function PopupMARCFieldDoc(field) { [% END # /FOREACH BIG_LOO.innerloop %]
    - [% END # /FOREACH BIG_LOOP %] -
    + [% END # /FOREACH BIG_LOOP %] +
    [%# Fields for fast cataloging %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt index 7cb8454101..f701a4fe5f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -58,10 +58,10 @@ [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
    [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %] - Advanced editor + Advanced editor [% END %]
    -
    [% IF servers.count > 0 %]
    - - +