From 125b5de8aefe7a78eb1669cdf61362b019bc8932 Mon Sep 17 00:00:00 2001 From: Solene Desvaux Date: Mon, 13 Jun 2022 14:06:38 +0200 Subject: [PATCH] Bug 30952: Search bar --- .../intranet-tmpl/prog/css/src/_tables.scss | 23 +- .../intranet-tmpl/prog/css/src/calendar.scss | 23 +- .../prog/css/src/staff-global.scss | 1307 ++++++++++++++--- .../prog/en/includes/acquisitions-search.inc | 81 +- .../prog/en/includes/adv-search.inc | 142 +- .../prog/en/includes/authorities-search.inc | 5 +- .../prog/en/includes/authorities-toolbar.inc | 8 +- .../prog/en/includes/biblio-view-menu.inc | 6 +- .../prog/en/includes/borrower_debarments.inc | 4 +- .../prog/en/includes/branch-selector.inc | 2 +- .../prog/en/includes/budgets-admin-search.inc | 63 +- .../en/includes/budgets-admin-toolbar.inc | 8 +- .../prog/en/includes/cat-toolbar.inc | 28 +- .../prog/en/includes/cataloging-search.inc | 34 +- .../prog/en/includes/catalogue-search-box.inc | 6 +- .../prog/en/includes/checkin-search.inc | 93 +- .../prog/en/includes/checkouts-table.inc | 6 +- .../prog/en/includes/circ-menu.inc | 21 +- .../prog/en/includes/circ-nav.inc | 6 +- .../prog/en/includes/circ-search.inc | 106 +- .../prog/en/includes/cities-admin-search.inc | 28 +- .../en/includes/contracts-admin-search.inc | 21 +- .../en/includes/currencies-admin-search.inc | 27 +- .../intranet-tmpl/prog/en/includes/facets.inc | 2 +- .../prog/en/includes/guided-reports-view.inc | 40 +- .../intranet-tmpl/prog/en/includes/header.inc | 285 ++-- .../prog/en/includes/home-search.inc | 114 +- .../prog/en/includes/labels-toolbar.inc | 4 +- .../prog/en/includes/letters-search.inc | 40 +- .../prog/en/includes/lis-search.inc | 140 ++ .../en/includes/member-alt-address-style.inc | 2 +- .../en/includes/member-alt-contact-style.inc | 2 +- .../en/includes/member-main-address-style.inc | 2 +- .../prog/en/includes/members-toolbar.inc | 2 +- .../prog/en/includes/patron-age.inc | 2 +- .../prog/en/includes/patron-search-box.inc | 26 +- .../prog/en/includes/patron-search.inc | 122 ++ .../prog/en/includes/patron-toolbar.inc | 10 +- .../prog/en/includes/patron_messages.inc | 12 +- .../prog/en/includes/patroncards-toolbar.inc | 4 +- .../prog/en/includes/patrons-admin-search.inc | 31 +- .../prog/en/includes/prefs-admin-search.inc | 22 +- .../prog/en/includes/prefs-menu.inc | 6 +- .../prog/en/includes/reports-toolbar.inc | 20 +- .../prog/en/includes/serials-search.inc | 50 +- .../prog/en/includes/tools-menu.inc | 271 ++-- .../prog/en/includes/z3950-admin-search.inc | 27 +- .../intranet-tmpl/prog/en/modules/about.tt | 6 + .../prog/en/modules/acqui/acqui-home.tt | 10 +- .../prog/en/modules/acqui/addorderiso2709.tt | 12 +- .../prog/en/modules/acqui/basket.tt | 12 +- .../prog/en/modules/acqui/basketgroup.tt | 15 +- .../prog/en/modules/acqui/basketheader.tt | 12 +- .../prog/en/modules/acqui/booksellers.tt | 12 +- .../prog/en/modules/acqui/cancelorder.tt | 6 + .../prog/en/modules/acqui/duplicate_orders.tt | 12 +- .../prog/en/modules/acqui/edi_ean.tt | 13 +- .../prog/en/modules/acqui/edimsg.tt | 13 +- .../prog/en/modules/acqui/histsearch.tt | 44 +- .../prog/en/modules/acqui/invoice-files.tt | 12 +- .../prog/en/modules/acqui/invoice.tt | 6 + .../prog/en/modules/acqui/invoices.tt | 173 ++- .../prog/en/modules/acqui/lateorders.tt | 27 +- .../prog/en/modules/acqui/modordernotes.tt | 6 + .../prog/en/modules/acqui/neworderempty.tt | 12 +- .../modules/acqui/neworderempty_duplicate.tt | 14 +- .../en/modules/acqui/newordersubscription.tt | 12 +- .../en/modules/acqui/newordersuggestion.tt | 12 +- .../prog/en/modules/acqui/ordered.tt | 12 +- .../prog/en/modules/acqui/orderreceive.tt | 12 +- .../prog/en/modules/acqui/parcel.tt | 12 +- .../prog/en/modules/acqui/parcels.tt | 12 +- .../prog/en/modules/acqui/spent.tt | 12 +- .../prog/en/modules/acqui/supplier.tt | 12 +- .../prog/en/modules/acqui/uncertainprice.tt | 12 +- .../prog/en/modules/acqui/z3950_search.tt | 12 +- .../en/modules/admin/additional-fields.tt | 21 +- .../prog/en/modules/admin/admin-home.tt | 7 +- .../en/modules/admin/adveditorshortcuts.tt | 12 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 134 +- .../prog/en/modules/admin/aqbudgets.tt | 134 +- .../prog/en/modules/admin/aqcontract.tt | 12 +- .../prog/en/modules/admin/aqplan.tt | 44 +- .../prog/en/modules/admin/audio_alerts.tt | 33 +- .../modules/admin/auth_subfields_structure.tt | 12 +- .../en/modules/admin/auth_tag_structure.tt | 12 +- .../en/modules/admin/authorised_values.tt | 45 +- .../prog/en/modules/admin/authtypes.tt | 31 +- .../prog/en/modules/admin/background_jobs.tt | 20 +- .../prog/en/modules/admin/biblio_framework.tt | 31 +- .../modules/admin/branch_transfer_limits.tt | 21 +- .../prog/en/modules/admin/branches.tt | 29 +- .../prog/en/modules/admin/cash_registers.tt | 12 +- .../prog/en/modules/admin/categories.tt | 36 +- .../prog/en/modules/admin/checkmarc.tt | 14 +- .../prog/en/modules/admin/cities.tt | 31 +- .../prog/en/modules/admin/classsources.tt | 61 +- .../prog/en/modules/admin/clone-rules.tt | 14 +- .../prog/en/modules/admin/columns_settings.tt | 14 +- .../prog/en/modules/admin/credit_types.tt | 31 +- .../prog/en/modules/admin/currency.tt | 50 +- .../prog/en/modules/admin/debit_types.tt | 31 +- .../prog/en/modules/admin/desks.tt | 12 +- .../prog/en/modules/admin/didyoumean.tt | 12 +- .../prog/en/modules/admin/edi_accounts.tt | 50 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 50 +- .../modules/admin/item_circulation_alerts.tt | 19 +- .../en/modules/admin/items_search_field.tt | 12 +- .../en/modules/admin/items_search_fields.tt | 30 +- .../prog/en/modules/admin/itemtypes.tt | 42 +- .../prog/en/modules/admin/koha2marclinks.tt | 20 +- .../prog/en/modules/admin/library_groups.tt | 12 +- .../en/modules/admin/marc-overlay-rules.tt | 12 +- .../modules/admin/marc_subfields_structure.tt | 12 +- .../prog/en/modules/admin/marctagstructure.tt | 28 +- .../prog/en/modules/admin/matching-rules.tt | 113 +- .../prog/en/modules/admin/oai_set_mappings.tt | 12 +- .../prog/en/modules/admin/oai_sets.tt | 29 +- .../prog/en/modules/admin/overdrive.tt | 12 +- .../en/modules/admin/patron-attr-types.tt | 28 +- .../prog/en/modules/admin/preferences.tt | 16 +- .../searchengine/elasticsearch/mappings.tt | 61 +- .../prog/en/modules/admin/share_content.tt | 12 +- .../prog/en/modules/admin/smart-rules.tt | 62 +- .../prog/en/modules/admin/sms_providers.tt | 12 +- .../prog/en/modules/admin/smtp_servers.tt | 28 +- .../en/modules/admin/systempreferences.tt | 41 +- .../prog/en/modules/admin/transfer_limits.tt | 22 +- .../en/modules/admin/transport-cost-matrix.tt | 22 +- .../prog/en/modules/admin/usage_statistics.tt | 12 +- .../prog/en/modules/admin/z3950servers.tt | 31 +- .../modules/authorities/authorities-home.tt | 11 +- .../en/modules/authorities/authorities.tt | 612 ++++---- .../prog/en/modules/authorities/detail.tt | 12 +- .../prog/en/modules/authorities/merge.tt | 12 +- .../modules/authorities/searchresultlist.tt | 12 +- .../prog/en/modules/basket/basket.tt | 16 +- .../prog/en/modules/catalogue/ISBDdetail.tt | 11 +- .../prog/en/modules/catalogue/MARCdetail.tt | 11 +- .../prog/en/modules/catalogue/detail.tt | 17 +- .../prog/en/modules/catalogue/imageviewer.tt | 11 +- .../prog/en/modules/catalogue/issuehistory.tt | 11 +- .../en/modules/catalogue/labeledMARCdetail.tt | 11 +- .../prog/en/modules/catalogue/moredetail.tt | 33 +- .../prog/en/modules/catalogue/results.tt | 31 +- .../en/modules/catalogue/search-history.tt | 11 +- .../en/modules/catalogue/stockrotation.tt | 11 +- .../prog/en/modules/cataloguing/addbiblio.tt | 31 +- .../prog/en/modules/cataloguing/addbooks.tt | 9 +- .../prog/en/modules/cataloguing/additem.tt | 11 +- .../prog/en/modules/cataloguing/editor.tt | 8 +- .../prog/en/modules/cataloguing/linkitem.tt | 12 +- .../prog/en/modules/cataloguing/merge.tt | 11 +- .../prog/en/modules/cataloguing/moveitem.tt | 11 +- .../modules/cataloguing/z3950_auth_search.tt | 6 +- .../en/modules/cataloguing/z3950_search.tt | 6 +- .../prog/en/modules/circ/article-requests.tt | 11 +- .../prog/en/modules/circ/bookcount.tt | 11 +- .../prog/en/modules/circ/checkout-notes.tt | 11 +- .../prog/en/modules/circ/circulation-home.tt | 51 +- .../prog/en/modules/circ/circulation.tt | 29 +- .../circ/circulation_batch_checkouts.tt | 11 +- .../prog/en/modules/circ/offline.tt | 11 +- .../prog/en/modules/circ/on-site_checkouts.tt | 11 +- .../prog/en/modules/circ/overdue.tt | 2 +- .../prog/en/modules/circ/request-article.tt | 11 +- .../prog/en/modules/clubs/club-enrollments.tt | 12 +- .../prog/en/modules/clubs/clubs-add-modify.tt | 12 +- .../prog/en/modules/clubs/clubs.tt | 12 +- .../en/modules/clubs/templates-add-modify.tt | 12 +- .../prog/en/modules/common/patron_search.tt | 312 ++++ .../course_reserves/add_items-step1.tt | 12 +- .../course_reserves/add_items-step2.tt | 12 +- .../course_reserves/batch_add_items.tt | 12 +- .../modules/course_reserves/batch_rm_items.tt | 12 +- .../modules/course_reserves/course-details.tt | 12 +- .../course_reserves/course-reserves.tt | 12 +- .../prog/en/modules/course_reserves/course.tt | 12 +- .../modules/course_reserves/invalid-course.tt | 14 +- .../prog/en/modules/errors/errorpage.tt | 13 +- .../prog/en/modules/ill/ill-requests.tt | 12 +- .../prog/en/modules/intranet-main.tt | 72 +- .../en/modules/labels/label-edit-batch.tt | 11 +- .../en/modules/labels/label-edit-layout.tt | 11 +- .../en/modules/labels/label-edit-profile.tt | 11 +- .../en/modules/labels/label-edit-range.tt | 11 +- .../en/modules/labels/label-edit-template.tt | 11 +- .../prog/en/modules/labels/label-home.tt | 11 +- .../prog/en/modules/labels/label-manage.tt | 15 +- .../prog/en/modules/labels/spinelabel-home.tt | 13 +- .../en/modules/members/accountline-details.tt | 10 +- .../prog/en/modules/members/apikeys.tt | 8 +- .../prog/en/modules/members/boraccount.tt | 30 +- .../prog/en/modules/members/deletemem.tt | 8 +- .../prog/en/modules/members/discharge.tt | 8 +- .../prog/en/modules/members/discharges.tt | 13 + .../prog/en/modules/members/files.tt | 18 +- .../prog/en/modules/members/holdshistory.tt | 14 +- .../prog/en/modules/members/housebound.tt | 10 +- .../prog/en/modules/members/ill-requests.tt | 10 +- .../prog/en/modules/members/mancredit.tt | 18 +- .../prog/en/modules/members/maninvoice.tt | 22 +- .../prog/en/modules/members/member-flags.tt | 18 +- .../en/modules/members/member-password.tt | 20 +- .../prog/en/modules/members/member.tt | 6 - .../prog/en/modules/members/memberentrygen.tt | 81 +- .../prog/en/modules/members/members-update.tt | 8 +- .../prog/en/modules/members/merge-patrons.tt | 18 +- .../prog/en/modules/members/moremember.tt | 111 +- .../prog/en/modules/members/notices.tt | 14 +- .../prog/en/modules/members/pay.tt | 10 +- .../prog/en/modules/members/paycollect.tt | 10 +- .../modules/members/purchase-suggestions.tt | 15 +- .../prog/en/modules/members/readingrec.tt | 12 +- .../prog/en/modules/members/routing-lists.tt | 12 +- .../prog/en/modules/members/statistics.tt | 14 +- .../en/modules/offline_circ/enqueue_koc.tt | 12 +- .../prog/en/modules/offline_circ/list.tt | 12 +- .../en/modules/offline_circ/process_koc.tt | 18 +- .../en/modules/patron_lists/add-modify.tt | 32 +- .../prog/en/modules/patron_lists/list.tt | 39 +- .../prog/en/modules/patron_lists/lists.tt | 23 +- .../prog/en/modules/patroncards/edit-batch.tt | 25 +- .../en/modules/patroncards/edit-layout.tt | 19 +- .../en/modules/patroncards/edit-profile.tt | 21 +- .../en/modules/patroncards/edit-template.tt | 14 +- .../prog/en/modules/patroncards/home.tt | 12 +- .../en/modules/patroncards/image-manage.tt | 13 +- .../prog/en/modules/patroncards/manage.tt | 15 +- .../en/modules/plugins/plugins-disabled.tt | 13 +- .../prog/en/modules/plugins/plugins-upload.tt | 17 +- .../intranet-tmpl/prog/en/modules/pos/pay.tt | 12 +- .../prog/en/modules/pos/register.tt | 12 +- .../prog/en/modules/pos/registers.tt | 12 +- .../en/modules/reports/acquisitions_stats.tt | 9 +- .../prog/en/modules/reports/bor_issues_top.tt | 8 +- .../prog/en/modules/reports/borrowers_out.tt | 15 +- .../en/modules/reports/borrowers_stats.tt | 7 +- .../en/modules/reports/cash_register_stats.tt | 8 +- .../prog/en/modules/reports/cat_issues_top.tt | 10 +- .../prog/en/modules/reports/catalogue_out.tt | 14 +- .../en/modules/reports/catalogue_stats.tt | 9 +- .../prog/en/modules/reports/dictionary.tt | 51 +- .../modules/reports/guided_reports_start.tt | 155 +- .../en/modules/reports/issues_avg_stats.tt | 12 +- .../prog/en/modules/reports/issues_stats.tt | 9 +- .../prog/en/modules/reports/itemslost.tt | 9 +- .../prog/en/modules/reports/itemtypes.tt | 11 +- .../en/modules/reports/orders_by_budget.tt | 16 +- .../prog/en/modules/reports/reports-home.tt | 15 +- .../prog/en/modules/reports/reserves_stats.tt | 9 +- .../prog/en/modules/reports/serials_stats.tt | 6 +- .../prog/en/modules/reserve/request.tt | 73 +- .../prog/en/modules/reviews/reviewswaiting.tt | 12 +- .../modules/rotating_collections/addItems.tt | 12 +- .../rotating_collections/editCollections.tt | 12 +- .../rotatingCollections.tt | 12 +- .../transferCollection.tt | 12 +- .../en/modules/serials/checkexpiration.tt | 11 +- .../prog/en/modules/serials/claims.tt | 7 +- .../en/modules/serials/routing-preview.tt | 12 +- .../prog/en/modules/serials/routing.tt | 12 +- .../en/modules/serials/serials-collection.tt | 12 +- .../prog/en/modules/serials/serials-edit.tt | 13 +- .../prog/en/modules/serials/serials-home.tt | 5 +- .../prog/en/modules/serials/serials-search.tt | 52 +- .../en/modules/serials/subscription-add.tt | 12 +- .../modules/serials/subscription-batchedit.tt | 13 +- .../en/modules/serials/subscription-detail.tt | 12 +- .../serials/subscription-frequencies.tt | 15 +- .../modules/serials/subscription-history.tt | 12 +- .../serials/subscription-numberpatterns.tt | 28 +- .../prog/en/modules/serials/viewalerts.tt | 13 +- .../prog/en/modules/suggestion/suggestion.tt | 339 +++-- .../prog/en/modules/tags/list.tt | 14 +- .../prog/en/modules/tags/review.tt | 12 +- .../prog/en/modules/tools/access_files.tt | 13 +- .../en/modules/tools/additional-contents.tt | 105 +- .../automatic_item_modification_by_age.tt | 37 +- .../prog/en/modules/tools/batchMod-del.tt | 13 +- .../prog/en/modules/tools/batchMod-edit.tt | 11 +- .../prog/en/modules/tools/batchMod.tt | 21 +- .../en/modules/tools/batch_delete_records.tt | 26 +- .../modules/tools/batch_extend_due_dates.tt | 21 +- .../tools/batch_record_modification.tt | 43 +- .../prog/en/modules/tools/cleanborrowers.tt | 27 +- .../prog/en/modules/tools/csv-profiles.tt | 21 +- .../prog/en/modules/tools/export.tt | 370 +++-- .../prog/en/modules/tools/holidays.tt | 23 +- .../prog/en/modules/tools/import_borrowers.tt | 28 +- .../prog/en/modules/tools/inventory.tt | 45 +- .../prog/en/modules/tools/letter.tt | 50 +- .../en/modules/tools/manage-marc-import.tt | 26 +- .../tools/marc_modification_templates.tt | 43 +- .../prog/en/modules/tools/modborrowers.tt | 18 +- .../prog/en/modules/tools/overduerules.tt | 11 +- .../prog/en/modules/tools/picture-upload.tt | 10 +- .../prog/en/modules/tools/problem-reports.tt | 11 +- .../prog/en/modules/tools/quotes-upload.tt | 15 +- .../prog/en/modules/tools/quotes.tt | 25 +- .../prog/en/modules/tools/scheduler.tt | 18 +- .../prog/en/modules/tools/showdiffmarc.tt | 6 + .../en/modules/tools/stage-marc-import.tt | 30 +- .../prog/en/modules/tools/stockrotation.tt | 11 +- .../prog/en/modules/tools/upload-images.tt | 19 +- .../prog/en/modules/tools/upload.tt | 27 +- .../prog/en/modules/tools/viewlog.tt | 19 +- .../prog/en/modules/virtualshelves/shelves.tt | 4 +- 308 files changed, 7199 insertions(+), 3170 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss index c3b2df4a41..5741c60254 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss @@ -132,7 +132,6 @@ table { } tbody { - border-top: 2px solid #A19B9E; td { @@ -144,8 +143,21 @@ table { display: none; } } - } + .dropdown-menu{ + background-color: #F3F4F4; + + a{ + color: #000; + + &:hover, + &:focus{ + background-image: none; + background-color: #F3F4F4; + } + } + } + } } /* Row grouping */ @@ -174,13 +186,14 @@ table { td, th { //border-bottom: 1px solid $table-border-color; - border-left: 1px solid $table-border-color; - padding: .2em .3em; + //border-left: 1px solid $table-border-color; + padding: .2em .9em; } td { background-color: #FFFFFF; vertical-align: top; + text-align: center; &.actions { white-space: nowrap; @@ -393,7 +406,7 @@ tbody { .dataTables_wrapper { .dataTables_processing { background-color: #F4F8F9; - border: 2px solid #82B4BE; + border: 2px solid #538200; border-radius: 3px; box-shadow: 2px 2px 3px 1px rgba(0, 0, 0, .2); color: #333; diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss b/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss index fdf972ea51..e53a1b9bd8 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss @@ -94,13 +94,26 @@ $selected: #B9DB88; } .panel { - border: 1px solid #B9D8D9; - border-radius: 4px; - box-shadow: none; - padding: 0; + //border: 1px solid #B9D8D9; + //border-radius: 4px; + //box-shadow: none; + //padding: 0; display: none; - margin: 1em 0; + //margin: 1em 0; z-index: 1; + + + height: 100%; + width: 100%; + background-color: #FFF; + position: relative; + color: #696969; + left: 0px; + top: 0px; + margin: 0em 1em 1em 0em; + padding: 1em; + box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); + //display: inline-block; } fieldset.brief { 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 3e8aa18aa4..ff54a155e8 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -17,7 +17,7 @@ a { &:hover, &:active { color: #000; - text-decoration: underline; //marche pour le menu raccourci mais pas le reste ? + text-decoration: underline; } &:hover { @@ -38,7 +38,7 @@ a { &:link, &:visited { color: #71B443; - padding: 0 25px; + padding: 6px 25px; } &.btn-link { @@ -60,12 +60,12 @@ a { background-color: transparent; color: #696969; 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; - margin-bottom: 0; font-weight: normal; text-align: center; white-space: nowrap; @@ -98,6 +98,7 @@ a { &.clear_date { color: #418940; font-size: 130%; + vertical-align: middle; &:hover { color: #71B443; @@ -184,7 +185,7 @@ a { background-image: none; padding: 6px 12px; font-size: 12px; - line-height: 1.42857143; + //line-height: 1.42857143; border-radius: 4px; -webkit-user-select: none; -moz-user-select: none; @@ -194,19 +195,22 @@ a { background-color: transparent; border: none; display: inline-block; - margin: 0 10px; + margin: 5px 10px; color: #696969; &:hover{ - text-decoration: underline; + text-decoration: none; } &:active{ border: none; } } +} - +#addauth{ + color: #fff; + background-color: #71B443; } #resetZ3950Search{ @@ -242,13 +246,44 @@ aside { margin: .5em 0; } + .radio, .checkbox { + margin: 0; + } + + p{ + margin: 0; + } + fieldset { &.brief { padding: 1.4em 1.7em; - height: 100%; + //height: auto; width: 100%; left: 0px; + overflow: auto; + //white-space: nowrap; + height: auto; + max-height: 500px; + + + &::-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; + } + button + button, input + input { margin-left: 5px; @@ -263,6 +298,7 @@ aside { legend { font-size: 95%; margin: 0; + border-bottom: none; } &.action { @@ -277,6 +313,7 @@ aside { label { margin: .5em 0 0 0; + border-top : 1px inset #999999; } li { @@ -300,7 +337,7 @@ aside { } &.radio { - padding: .7em 0; + padding: .3em 0; input { padding: .3em 0; @@ -344,6 +381,64 @@ aside { div { display: block; + &.menuspe{ + display: inline; + //align-items: center; + //justify-content: center; + } + + + &.menuspebas{ + ///display: inline; + 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{ + display: block; + float: right; + top: 0px; + right: 0; + position: absolute; + width: 160px; + margin-right: 100px; + + li{ + list-style-type: none; + height: 150px; + margin-right: auto; + margin-left: auto; + } + } + + &.bas{ + 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{ + width: 100%; + height: 100%; + } + } + /* &.plus{ display: block; background-color: #352C2E; @@ -509,7 +604,7 @@ h4 { h5 { font-size: 100%; - font-weight: bold; + //font-weight: bold; } h6 { @@ -521,7 +616,7 @@ h7 { font-size: 93%; font-weight: bold; text-align: center; - padding: 5px; + //padding: 5px; position: relative; left: 0px; bottom: 0px; @@ -544,7 +639,7 @@ hr { } p { - margin: .5em 0; + margin: .7em 0; } strong { @@ -597,7 +692,8 @@ input { white-space: nowrap; vertical-align: middle; touch-action: manipulation; - width: 90px; + min-width: 90px; + width: auto; cursor: pointer; background-image: none; padding: 6px 12px; @@ -616,7 +712,8 @@ input { display: inline-block; font-size: inherit; line-height: 1.42857143; - padding: .3em .8em; + //padding: .3em .8em; + margin: 5px; text-align: center; text-shadow: 0 1px 0 #fff; vertical-align: middle; @@ -698,7 +795,7 @@ label, } .col-sm-3 { - width: 20%; + width: 25%; } #area-news{ @@ -714,94 +811,202 @@ label, } .col-sm-9 { - width: 80%; + width: 75%; } .biglinks-list{ padding: 0px; - margin: 10px; + margin: 10px 30px; align-items: center; + height: 150px; li{ list-style-type: none; - display: table; + display: flex; float: left; text-align: center; - margin: 10px; - padding: 5px; + margin-bottom: 5px; + padding: 10px; //display: flex; align-items: center; justify-content: center; flex-wrap: wrap; + width: 150px; + height: 150px; + margin-right: auto; + margin-left: auto; } } .accueil{ text-align: center; //display: block; - display: table; - -webkit-box-sizing: content-box; - box-sizing: content-box; - width: 25px; - height: 25px; - margin: 0 1em 5px 1em; - padding: 5px; - border: solid 3px #71B443; - border-radius: 50%; text-decoration: none; font-family: verdana, arial; - font-weight: bold; - font-size: large; - background-color: #F3f4F4; - align-items: center; - justify-content: center; + + h1 { + font-size: 150%; + font-weight: normal; + } i{ text-align: center; - max-height: 100%; - max-width: 100%; + //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; + //border-color: #418940; + text-decoration: none; + //font-weight: bold; + + i{ + background-color: #418940; + border-color: #418940; + } + + h1{ + font-weight: bold; + } } } +#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: 20.1em; + width: 100%; + overflow: auto; + //white-space: nowrap; display: block; position: absolute; left: 0px; - height: 500px; + 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; + // position: relative; + // top: 30px; h5{ padding-left: 0.5em; - font-size: 110%; + padding-bottom: 0.5em; + font-size: 120%; margin-top: 15px; margin-left: 0; margin-right: 0; margin-bottom: 5px; + color: #696969; + + 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; + + li{ + a{ + font-size: 75%; + } + } + } + li { //border-bottom: 1px solid #352C2E; list-style: $nav-menu-bullet; @@ -813,10 +1018,11 @@ label, left: 0px; flex-direction: row; width: 100%; - height: 2.1em; + //height: 2.1em; + height: auto; a { //text-decoration: none; @@ -828,36 +1034,37 @@ label, text-decoration: none; padding: 0.5em 0.3em 0.5em 1.2em; - - - &.current, &.hover { + &.current, &:hover { background-color: #F3F4F4; color: #418940; border-left: solid 5px #418940; font-weight: bold; } + + &.titre{ + width: 100%; + font-size: 146.5%; + font-weight: bold; + text-align: center; + color: #000; + + &:hover, &.current{ + background-color: #e6e6e6; + color: #000; + border-left: none; + font-weight: bold; + } + } } } } } -#titre{ - width: 100%; - font-size: 146.5%; - font-weight: bold; - margin-top: 0; - margin-bottom: 0; - padding: 0.5em 2.6em 0.5em 2.6em; - color: #000; - position: absolute; - top: 0px; - left: 0px; -} .main { margin-bottom: $language-footer-min-height * 1.5; - display: block; - //margin-top: 1em; + //display: block; + margin-top: 1em; } #login_controls { @@ -900,6 +1107,13 @@ ul { } } + &.nav-tabs { + border-bottom: 1px solid transparent; + padding: .2em 1.4em 0 1.4em; + } + + + &.budget_hierarchy { margin-left: 0; padding-left: 0; @@ -977,6 +1191,9 @@ ol { font-weight: bold; } + + + .strong { font-weight: bold; } @@ -1089,7 +1306,7 @@ fieldset { ol, li { list-style-type: none; - margin-bottom: 1.9em; + //margin-bottom: 1.9em; } span { @@ -1106,14 +1323,19 @@ fieldset { } } + ol{ + li{ + list-style-type: none; + padding: .3em 0; + } + } + &.rows { border: none; box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); clear: left; float: left; font-size: 90%; - margin: .9em 0 0; - padding: 0; width: 100%; fieldset { @@ -1187,7 +1409,8 @@ fieldset { font-weight: bold; margin-right: 1rem; text-align: right; - width: 9rem; + width: auto; + min-width: 9rem; &.error { float: none; @@ -1254,7 +1477,7 @@ fieldset { } fieldset { - margin-left: 10em; + //margin-left: 10em; label { width: 6em; @@ -1477,6 +1700,7 @@ div { .renew_formfield { margin-bottom: 1em; + //itemtype } .circmessage { @@ -1680,6 +1904,8 @@ div { } } + +/* #header_search { //position : relative; //right : - 500px; @@ -1727,7 +1953,7 @@ div { //top: 0; //position: absolute; - line-height: 40px; + // line-height: 40px; top: 0; left: 0; display: flex; @@ -1812,9 +2038,11 @@ div { } } +*/ + #reserves, #checkouts { - border: 1px solid #B9D8D9; + //border-top: 3px solid #418910; padding: 1em; } @@ -1847,7 +2075,7 @@ dd { #toolbar, .btn-toolbar { - background-color: transparent; + background-color: #f3F4F4; border: none; border-radius: 5px 5px 0 0; margin: 0; @@ -1862,27 +2090,104 @@ dd { height: 100%; .dropdown-menu { - border-top-width: 1px; + /*border-top-width: 1px; font-size: 13px; + background-color: #F3F4F4; + border: none; + box-shadow: none; + position: absolute;*/ + //right: 10px; + //top: 30px; + + border-top-width: 1px; + text-align: center; + padding: 0; + width: auto; + font-size: 12px; + line-height: 1.42857143; + border-radius: 0px; + border: 0.5px solid lightgray; + font-size: 100%; + background-color: #fff; + margin: 0; + box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5); + position: absolute; + text-decoration: none; + top: 30px; + + + left: auto; + right: 0; + + a{ + //color: #696969; + //float: right; + //padding: .2em .5em; + //border-bottom: 1px solid #000; + color: #000; + display: block; + padding: 3px 20px; + clear: both; + 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; + + + + text-decoration: none; + font-weight: bold; + background-color: #fff; + background-image: none; + + } + } } #patdrop{ + border-top-width: 1px; text-align: center; padding: 0; + width: auto; font-size: 12px; line-height: 1.42857143; - border-radius: 4px; - border: 1px solid #000; - font-size: 105%; - background-color: transparent; + border-radius: 0px; + border: 0.5px solid lightgray; + font-size: 100%; + background-color: #fff; margin: 0; - box-shadow: none; + box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5); position: absolute; + text-decoration: none; top: 30px; + left: -20px; + right: auto; a{ - color: #696969; - padding: 0; + color: #000; + display: block; + padding: 3px 20px; + clear: both; + font-weight: normal; + line-height: 1.42857143; + white-space: nowrap; + border-bottom: none; + float: left; + + &:hover{ + font-weight: bold; + background-color: #fff; + } } } @@ -1942,35 +2247,45 @@ dd { .patroninfo { //margin-top: -.5em; margin-right: .5em; - padding-bottom: 2em; + //padding-bottom: 2em; padding-top: 1em; background-color: #e6e6e6; //position: absolute; left: -10px; + width: 100%; + padding-bottom: 25px; h5 { - border-right: 1px solid #B9D8D9; + //border-right: 1px solid #B9D8D9; margin-bottom: 0; - padding-bottom: .5em; - padding-left: 0em; - padding-top: .5em; + padding: .5em .9em; + font-weight: bold; + color: #000; &:empty { border-right: 0; } + + li{ + &.patrondateofbirth{ + font-size: 75%; + font-weight: normal; + list-style-type: none; + //display: table; + text-align: center; + } + } } ul { border: 0; - border-bottom: 0; - border-right: 1px solid #B9D8D9; - border-top: 0; margin: 0; - padding: 0; + padding: 0 .9em; li { list-style-type: none; margin: 0; + } } @@ -1979,13 +2294,13 @@ dd { } > div { - border-right: 1px solid #B9D8D9; + //border-right: 1px solid #B9D8D9; width: 100%; } &.is-staff { h5 { - background-color: #EEE; + //background-color: #EEE; } } } @@ -2000,7 +2315,7 @@ dd { } .patroninfo-heading { - background-color: rgba(237, 244, 246, .4); + // background-color: rgba(237, 244, 246, .4); padding: .5em; margin-bottom: .3em; clear: both; @@ -2087,6 +2402,7 @@ dd { li { list-style-type: none; } + } .btn-toolbar { @@ -2217,7 +2533,9 @@ i { margin-top: .5em; display: inline; background: transparent url("../img/UIKit/setting.svg") no-repeat scroll 0%; + background-size: 100%; position: relative; + margin: 3px; align-items: center; right: 25px; opacity: 0.3; @@ -2225,6 +2543,14 @@ i { &:hover{ opacity: 1; } + + a{ + width: 100%; + + &:hover{ + text-decoration: none; + } + } } .checkin-active-setting { @@ -2313,7 +2639,7 @@ i { background-color: #FFFFFF; //border: 1px solid #BCBCBC; margin: .4em; - padding: .4em .4em .4em 25px; + padding: .4em; &:hover { background-color: #FFC; @@ -2321,16 +2647,65 @@ i { &[type="submit"] { background: #FFF none; - } - - &.flatpickr-input { - padding: 3px 3px 3px 20px; - } - } - li { - list-style-position: inside; - } + &.approve{ + background-color: #FEC32C; + color: #000; + text-shadow: 0 1px 0 #fff; + border: none; + background-image: none; + margin-top: 5px; + + &:hover, + &:active, + &:focus{ + background-color: #fec22c9f; + } + } + + &.deny{ + 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; + 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; + } + } + } + + &.flatpickr-input { + padding: 3px 3px 3px 20px; + } + } + + li { + list-style-position: inside; + } p { margin-top: 0; @@ -2397,6 +2772,7 @@ i { .approve, .success { + background-color: #FEC32C; i { &.fa { color: #418940; @@ -2524,6 +2900,7 @@ i { //border: none; padding-left: 5px; padding-right: 30px; + border-radius: 0; } .petit-barcode{ @@ -2534,6 +2911,7 @@ i { border-width: 1px; padding: 5px; font-style: italic; + border-radius: 0; font-size: 90%; vertical-align: middle; @@ -2609,15 +2987,20 @@ li { } } +#catalogue_stats_wrapper, #tbl_cash_register_stats_wrapper, #resulttable_wrapper, #numberpatternst_wrapper{ + background-color: #fff; + margin-top: 20px; + box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); + padding: 20px; +} + #searchresults { background-color: #fff; margin-top: 20px; box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); - padding-left: 20px; - padding-right: 20px; + padding: 20px; h3{ - padding-top: 2.0em; padding-bottom: .7em; margin: 0; color: #696969; @@ -2632,6 +3015,10 @@ li { font-size: 90%; list-style: url("../img/item-bullet.svg"); padding: .2em 0; + background-color: #fff; + box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); + color: #000; + top: 100%; &.result_itype_image { list-style: none; @@ -2689,6 +3076,25 @@ li { } } } + + .dropdown-menu { + //position: absolute; + //top: 50px; + background-color: #fff; + color: #000; + top: 100%; + + a{ + color: #000; + + &:hover{ + background-image: none; + color: #000; + text-decoration: underline; + background-color: #fff; + } + } + } } .searchheader { @@ -2698,6 +3104,7 @@ li { font-size: 80%; margin-top: .5em; margin-bottom: .5em; + padding: 5px; width: 100%; //padding: .4em 1em .4em 1em; color: #696969; @@ -2706,7 +3113,6 @@ li { &.floating { border-radius: 0; margin-top: 0; - } .btn-group { @@ -2743,14 +3149,15 @@ li { #search-facets { - border: 1px solid #B9D8D9; - border-radius: 5px 5px 0 0; + //border: 3px solid #71B443; + //border-radius: 4px; h4 { - background-color: #E6F0F2; - border-bottom: 1px solid #B9D8D9; - border-radius: 5px 5px 0 0; + background-color: #71B443; + border-bottom: 1px solid #71B443; + border-radius: 4px 4px 0 0; font-size: 90%; + color: #fff; margin: 0; padding: .4em .2em; text-align: center; @@ -2760,6 +3167,10 @@ li { margin: 0; padding: .3em; + &.cadre{ + border: 3px solid #71B443; + } + li { font-weight: bold; list-style-type: none; @@ -2847,17 +3258,35 @@ td { } } -#lientype{ +#lientype, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #addauth, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #z3950submit, #add_manual_restriction{ + color: #71B443; + padding: .3em; + border: none; + background-color: transparent; + border: none; + box-shadow: none; + font-size: 100%; + + &:hover{ + text-decoration: underline; + } +} + +.highlight_toggle{ color: #71B443; padding: .3em; border: none; background-color: transparent; + border: none; + box-shadow: none; + font-size: 100%; &:hover{ text-decoration: underline; } } + .cover-image { display: none; @@ -3175,7 +3604,7 @@ td { .advsearch { //margin: 0; //box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); - margin: 0em 1em 1em 0em + margin: 0em 1em 1em 0em; table { border-collapse: separate; @@ -3294,7 +3723,8 @@ td { // Override core jQueryUI widgets .ui-widget-content { background: #FFFFFF none; - border: 1px solid #B9D8D9; + border-radius: 4px; + border: 3px solid #538200; color: #222222; } @@ -3308,7 +3738,7 @@ td { .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - background: #F4F8F9 none; + // background: #F4F8F9 none; border: 1px solid #B9D8D9; color: #555555; font-weight: normal; @@ -3412,21 +3842,31 @@ td { &.ui-widget-header { background: none; border: 0; - padding: .2em 1.4em; + padding: .2em .9em 0 .9em; } } .ui-tabs { + .ui-tabs-panel { + background: #FFF none; + border-radius: 4px; + border: 3px solid #538200; + + fieldset{ + box-shadow: none; + } + } .ui-tabs-nav { li { - background: #71B443 none; + background: #71B443; border: none; margin-right: .4em; - top: 1px; - border-radius: 4px; + //top: 1px; + border-radius: 4px 4px 0 0; &.ui-tabs-active, &.ui-state-hover { background-color: #418910; + border-radius: 4px 4px 0 0; border: none; border-bottom-width: 0; padding-bottom: 0; @@ -3438,11 +3878,9 @@ td { } - } } - &.ui-widget-content { background: transparent none; border: 0; @@ -3486,13 +3924,63 @@ td { } .statictabs { + + background-color: #fff; + margin-top: 20px; + box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); + padding: 20px; + + h3{ + padding-bottom: .7em; + margin: 0; + color: #696969; + } + + td { + border: none; + + ul { + li { + clear: left; + font-size: 90%; + list-style: url("../img/item-bullet.svg"); + padding: .2em 0; + + &.result_itype_image { + list-style: none; + list-style-type: none; + } + + img { + float: left; + margin: 3px 5px 3px -5px; + max-width: 25px; + } + } + } + } + + span { + &.status { + clear: left; + color: #900; + display: block; + } + + &.unavailable { + clear: left; + display: block; + } + } + + > 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; + // 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; @@ -3514,12 +4002,15 @@ td { } li { - background: none repeat scroll 0 0 #E6F0F2; - border: 1px solid #B9D8D9; - border-bottom: 0 none; + //background: none repeat scroll 0 0 #E6F0F2; + //border: 1px solid #B9D8D9; + // border-bottom: 0 none; border-top-left-radius: 4px; border-top-right-radius: 4px; - color: #555555; + 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; @@ -3530,34 +4021,45 @@ td { top: 1px; white-space: nowrap; - &.active { - background-color: #FFFFFF; - color: #212121; + 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: #418910; + border: none; + border-bottom-width: 0; + //padding-bottom: 0; + a { background: none repeat scroll 0 0 transparent; - color: #000000; + color: #fff; cursor: text; - font-weight: bold; + //font-weight: bold; outline: 0 none; top: 1px; } } a { - color: #004D99; + color: #fff; cursor: pointer; float: left; padding: .5em 1em; text-decoration: none; &:hover { - background-color: #EDF4F5; + //background-color: #EDF4F5; border-top-left-radius: 4px; border-top-right-radius: 4px; - color: #538200; + //color: #538200; } } } @@ -3565,9 +4067,8 @@ td { .tabs-container { background: none repeat scroll 0 0 transparent; - border: 1px solid #B9D8D9; - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; + border: 3px solid #418910; + border-radius: 4px; color: #222222; display: block; padding: 1em 1.4em; @@ -3578,6 +4079,12 @@ td { margin-top: 5px; .ui-tabs-panel { background: #FFF none; + border-radius: 4px; + border: 3px solid #538200; + + fieldset{ + box-shadow: none; + } } } @@ -3775,21 +4282,41 @@ nav { } } -.navbar-header{ - //background-image: linear-gradient(to right, #352C2E , #3A4F2A); +.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%; + // width: 100%;*/ padding-left: 10px; padding-right: 10px; + /*display: inline-block;*/ + float: left; - span{ - display: inline; - //float: left; + a{ + color: #fff; + // display: inline-block; + line-height: 40px; } } +.navbar-head{ + // top: 0px; + //position: absolute; + //right: 5px; + overflow-x: hidden; + display: block !important; + height: auto !important; +} + #logo { background: transparent url("../img/UIKit/picto-koha.svg") no-repeat scroll 0%; margin: .75em 0em .75em 0em; @@ -3830,11 +4357,17 @@ nav { .residentsearch { border: 0; //border-bottom: 1px solid #85CA11; + cursor: text; padding: 0 0 .2em; + background-color: transparent; } - #buttonssearch,#containersearch{ - padding: 10px 20px; + .inactive{ + display: none; + } + + #buttonssearch,#header_search{ + padding: 10px; border-radius: 28px; //height: 2.2em; height: 30px; @@ -3842,52 +4375,165 @@ nav { z-index: 1; } - #containersearch{ + /* #containersearch{ position: relative; top : 10px; + left: 0px;*/ + + #header_search{ + //position: relative; + //top : 10px; + //left: 0px; + + position: relative; left: 0px; + top: 0px; + //line-height: 40px; + overflow: hidden; + display: block; + margin: 10px 0; } - #submitsearch{ + #submit, #autocsubmit{ background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%; position: absolute; - right : 0px; + // right : 0px; + right : -65px; top: 0px; width: 25px; height: 30px; border: none; padding-left: 5px; padding-right: 5px; + margin: 0; + display: inline; } #containersearch, #containersearch:not(.fold) #buttonssearch{ width: 500px; - } - #buttonssearch{ + + .ui-tabs-nav { + background-image: linear-gradient(to right, #418940, #71B443); + border-radius: 28px; position: absolute; top: 0; left: 0; + height: 100%; display: flex; justify-content: space-around; align-items: center; color: white; box-shadow: 0px 0px 3px 0px #0000004d; + + li { + background: transparent; + border: none; + // margin-right: .4em; + //top: 1px; + border-radius: 0; + + &.ui-tabs-active, &.ui-state-hover { + background-color: transparent; + border-radius: 4px 4px 0 0; + border: none; + border-bottom-width: 0; + padding-bottom: 0; + + a { + color: #FFF; + //font-weight: bold; + cursor: pointer; + padding: 3px; + font-size: .9em; + } + + + } + } + } + + &.ui-widget-content { + background: transparent none; + border: 0; + } + + .ui-state-default {//le menu de la barre de recherche du haut + a { + color: #fff; + cursor: pointer; + padding: 3px; + font-size: .9em; + + &:link, + &:visited { + color: #fff; + padding: 3px; + background-color: transparent; + } + } + } + + .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; + background-color: transparent; + + i{ + border-bottom: 2px solid #fff; + padding-bottom: 2px; + } + } + } + + + .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: pointer; + cursor: text; padding: 0.25em; //border-bottom: 2px solid transparent; - margin: 0 1em; - transition: 0.25s; + margin: 0; + // transition: 0.25s; + display: inline-block; overflow: hidden; opacity: 1; } - +/* .buttonsearch:hover, .buttonsearch.active{ border-bottom: 2px solid white; @@ -3925,7 +4571,63 @@ nav { //width: 1000px; } - #containersearch.fold .buttonsearch:not(.active){ + #containersearch.fold .buttonsearch:not(.active){*/ + + 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; + + letter-spacing: normal; + word-spacing: normal; + text-transform: none; + text-indent: 0px; + text-shadow: none; + text-align: start; + cursor: text; + font: 400 13.3333px Arial; + + &::placeholder{ + font-size: 85%; + } + } + + &.titre{ + float: none; + position: relative; + width: 170px; + bottom: 15px; + right: -115px; + } + + } + + + #header_search.fold .buttonsearch:not(.active){ width: 0px; opacity: 0; margin: 0; @@ -3935,12 +4637,34 @@ nav { #backsearch{ display: none; font-size: 1em; + } - #containersearch.fold #backsearch{ + /* .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; @@ -3954,13 +4678,17 @@ nav { &.open { li { background-color: #352C2E; - padding: 2px; + //padding: 2px; a { font-weight: normal; + padding: 0 15px; + font-size: 13px; - &:hover{ + &:hover, + &:focus{ background-color: #352C2E; + background-image: none; text-decoration: underline; } } @@ -3968,7 +4696,7 @@ nav { } a { - font-weight: bold; + //font-weight: bold; //padding-bottom: .4em; //padding-top: .4em; line-height: 40px; @@ -3992,7 +4720,7 @@ nav { left: 0px; top: 0px; //white-space: pre; - //§§flex-direction: column; + //flex-direction: column; height: 50px; //display: block; @@ -4100,6 +4828,41 @@ button, &.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; + 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; + } + } } #merge-patrons{ padding: 0 25px; @@ -4111,7 +4874,7 @@ button, } .pat{ - background-color: transparent; + /* background-color: transparent; border: none; display: inline-block; margin: 0 10px; @@ -4120,7 +4883,48 @@ button, font-size: 105%; &:hover{ - text-decoration: underline; + //text-decoration: underline; + background-color: #d8d8d8; + } + + &:active{ + border: none; + } + + + &:focus{ + background-color: #d8d8d8; + }*/ + + + + 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; + box-shadow: none; + background-image: none; + padding: 6px 12px; + font-size: 12px; + //line-height: 1.42857143; + 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{ + background-color: #d8d8d8; } &:active{ @@ -4130,12 +4934,12 @@ button, .mot{ margin-right: 0; - padding-right: 0; + //padding-right: 0; } .fleche{ margin-left: 0; - border: 1px solid #000; + //border: 1px solid #000; border-radius: 4px; padding: 0 5px 0 3px; @@ -4152,6 +4956,8 @@ button, color: #000; text-shadow: 0 1px 0 #fff; border: none; + background-image: none; + margin: 5px; &:hover, &:active, @@ -4165,6 +4971,8 @@ button, color: #000; text-shadow: 0 1px 0 #fff; border: none; + background-image: none; + margin: 5px; &:hover, &:active, @@ -4485,25 +5293,32 @@ code { } .tab-content { - background-color: #FFF; + /* background-color: #FFF; border: 1px solid #B9D8D9; - border-top-width: 0; + border-top-width: 0;*/ + border: 3px solid #538200; + border-radius: 4px; + //border-top-width: 0; padding: 1em; } .nav-tabs { > li { > a { - background-color: #e6f0f2; - border: 1px solid #b9d8d9; - border-radius: 4px 4px 0 0; + background-color: #71B443; + //border: none; + // border-radius: 4px; + color: #fff; line-height: 1.42857143; margin-right: .4em; padding: .5em 1em; &:hover { - background-color: #EEF4F5; - border-color: #b9d8d9; + background-color: #538200; + border-radius: 4px 4px 0 0; + border: 1px solid #538200; + text-decoration: none; + color: #fff; } } @@ -4511,10 +5326,12 @@ code { a, a:hover, a:focus { - background-color: #fff; - border: 1px solid #b9d8d9; - border-bottom-color: transparent; - color: #000; + background-color: #538200; + border-radius: 4px 4px 0 0; + color: #fff; + //border: none; + //border-bottom-color: transparent; + //color: #000; cursor: default; font-weight: bold; } @@ -4942,7 +5759,6 @@ input.renew { label{ color: #fff; - font-weight: bold; } } @@ -5225,15 +6041,17 @@ input.renew { } .loggedin-menu-label { - color: #777; + color: #fff; font-size: 12px; line-height: 1.42857143; padding: 4px 12px; white-space: nowrap; span { - color: #000; + color: #fff; font-weight: bold; + left: 15px; + top: 0; } &.divider { @@ -5271,7 +6089,7 @@ input.renew { cursor: pointer; float: right; margin: .0em .4em .0em .4em; - padding: .1em .5em .1em .5em;; + padding: .1em .5em .1em .5em; } #lastborrower-window { @@ -5294,67 +6112,63 @@ input.renew { /* ==== MODULE LINKS - Start ==== */ .buttons-list { // List containing the module links - margin-bottom: 30px; + margin: 30px 0; padding: 0; + margin-left: 15px; li { // Standard attributes for the list elements + height: 60px; list-style-type: none; - height: 50px; + display: table; + margin-bottom: 15px; a { - &.circ-button { - text-align: center; - display: inline; - -webkit-box-sizing: content-box; - box-sizing: content-box; - width: 30px; - height: 30px; - margin: 0 5px 14px 1em; - padding: 5px; - border: solid 3px #71B443; - border-radius: 50%; - text-decoration: none; - font-family: verdana, arial; - font-weight: bold; - font-size: large; - color: #000000; - background-color: #F3f4F4; - align-items: center; - justify-content: center; + &.menucirc{ + display: block; + height: 60px; + margin: 5px; + //font-size: 150%; i{ - text-align: center; - max-height: 100%; - max-width: 100%; + &.fa{ + color: #fff; + border-radius: 50%; + background-color: #71B443; + width: 40px; + height: 40px; + margin: 5px; + padding: 10px; + -webkit-box-sizing: content-box; + box-sizing: content-box; + align-items: center; + justify-content: center; + display: inline; + border: solid 3px #71B443; + } + + } + + h1 { + font-size: 150%; + font-weight: normal; + display: inline; } &:hover{ color: #418940; - border-color: #418940; - + text-decoration: none; -/* - // Class used for each module link - background-color: #F4F8F9; - background-position: 5px 3px; - background-repeat: no-repeat; - border: 2px solid #B9D8D9; - border-radius: 6px; - box-sizing: content-box; - color: #000000; - display: block; - font-size: 110%; - font-weight: bold; - margin: .5em 0; - max-width: 260px; - padding: 8px; - text-decoration: none; + i{ + &.fa{ + background-color: #418940; + border: solid 3px #418940; + } + } - &:hover { - // Class used for each module link hover state - border-color: #538200; - color: #538200;*/ + h1{ + font-weight: bold; + } } } } @@ -5490,9 +6304,9 @@ input.renew { } .header-menu-link { - background-color: #352C2E; + // background-color: #352C2E; display: none; - font-weight: bold; + // font-weight: bold; padding: .4em .6em; } @@ -5500,9 +6314,20 @@ input.renew { //position: absolute; //right: 5px; //top: 0; - position: relative; - left: 0px; + // 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 { @@ -5643,7 +6468,7 @@ div .suggestion_note { #header { background-color: #352C2E; - border: 1px solid #352C2E; + // border: 1px solid #352C2E; margin-bottom: 1em; a { @@ -5653,6 +6478,8 @@ div .suggestion_note { &:hover { text-decoration: underline; color: #FFF; + background-color: #352C2E; + background-image: none; } } @@ -5661,25 +6488,24 @@ div .suggestion_note { box-shadow: unset; float: none; left: auto; - position: relative; + position: initial; right: auto; &.dropdown-menu { display: block; - background-color : #352C2E; + // background-color : #352C2E; } } - .dropdown-menu { + .dropdown-menu-brown { li { - background-color: #352C2E; + // background-color: #352C2E; a { //color: #fff; &:hover { color: #FFF; text-decoration: underline; - } } } @@ -5711,8 +6537,8 @@ div .suggestion_note { #user-menu { .open { .dropdown-menu { - background-color: #FFF; - border: 1px solid #ccc; + background-color: #352c35; + // border: 1px solid #ccc; position: absolute; } } @@ -5761,7 +6587,14 @@ div .suggestion_note { #helper { - i { + i {background-color: #352C2E; + box-shadow: none; + height: 50px; + // width: 100%; + padding-left: 10px; + padding-right: 10px; + display: inline-block; + float: left; display: none; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index ce47d80f8e..f1667cd0ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -3,45 +3,47 @@ [% PROCESS 'patronfields.inc' %] -
+ + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc index 4d1d3f2391..292f69071c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc @@ -2,46 +2,122 @@ + + + + +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc index 1611429e61..4bb44b205a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -1,7 +1,6 @@ -
- - [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt index bbc1cc892b..315fd5afa4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt @@ -1,6 +1,9 @@ [% USE raw %] [% USE Asset %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'authorities-search.inc' %] +[% END %] [% PROCESS 'authorities.inc' %] [% INCLUDE 'doc-head-open.inc' %] @@ -18,8 +21,7 @@ </head> <body id="auth_detail" class="auth"> -[% INCLUDE 'header.inc' %] -[% INCLUDE 'authorities-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %] <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> <ol> @@ -40,6 +42,12 @@ </a> </li> </ol> + <ol> + [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] + </ol> + <ol> + <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> + </ol> </nav> <div class="main container-fluid"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt index 80e0e71562..c5869fca4e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt @@ -2,6 +2,9 @@ [% USE Asset %] [% PROCESS 'merge-record.inc' %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'authorities-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] <title>Merging records › Cataloging › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -13,8 +16,7 @@ div#result { margin-top: 1em; } -[% INCLUDE 'header.inc' %] -[% INCLUDE 'authorities-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
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 c61235dde1..a9e8659049 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -2,6 +2,9 @@ [% USE Asset %] [% USE Koha %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'authorities-search.inc' %] +[% END %] [% PROCESS 'authorities-search-results.inc' %] [% INCLUDE 'doc-head-open.inc' %] Authority search results › Authorities › Koha @@ -19,8 +22,7 @@ -[% INCLUDE 'header.inc' %] -[% INCLUDE 'authorities-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index 5c62dad4f1..b31d736acd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -40,15 +40,16 @@

Your cart

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt index 4f8fd1070f..4d1ab0fb48 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt @@ -2,6 +2,9 @@ [% USE Koha %] [% USE Asset %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'cat-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( unknownbiblionumber ) %] @@ -14,7 +17,7 @@ </head> <body id="catalog_ISBDdetail" class="catalog"> -[% INCLUDE 'header.inc' %] +[% INCLUDE 'header.inc' form=formulaire %] <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> <ol> @@ -42,6 +45,12 @@ </li> [% END %] </ol> + <ol> + [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] + </ol> + <ol> + <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> + </ol> </nav> <div class="main container-fluid"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt index b07e646029..765fbd20de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt @@ -2,6 +2,9 @@ [% USE Koha %] [% USE Asset %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'cat-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] <title> [% IF ( unknownbiblionumber ) %] @@ -15,7 +18,7 @@ <body id="catalog_MARCdetail" class="catalog"> -[% INCLUDE 'header.inc' %] +[% INCLUDE 'header.inc' form=formulaire %] <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> <ol> @@ -43,6 +46,12 @@ </li> [% END %] </ol> + <ol> + [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] + </ol> + <ol> + <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> + </ol> </nav> <div class="main container-fluid"> 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 1f26e9dd63..3053b96bc3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -32,6 +32,9 @@ [% SET plugins_intranet_catalog_biblio_tabs = KohaPlugins.get_plugins_intranet_catalog_biblio_tab({ biblio => biblio, biblio_id => biblionumber }) %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'cat-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] <title> [% IF ( unknownbiblionumber ) %] @@ -46,7 +49,7 @@ <body id="catalog_detail" class="catalog"> -[% INCLUDE 'header.inc' %] +[% INCLUDE 'header.inc' form=formulaire %] <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> <ol> @@ -74,6 +77,12 @@ </li> [% END %] </ol> + <ol> + [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] + </ol> + <ol> + <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> + </ol> </nav> <div class="main container-fluid"> @@ -608,13 +617,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') %] <div class="btn-group"> - <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]#edititem"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a> + <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]#edititem" id="lientype"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="lientype"><span class="caret"></span></a> <ul class="dropdown-menu pull-right"> <li><a href="/cgi-bin/koha/tools/upload-cover-image.pl?itemnumber=[% item.itemnumber | uri %]&filetype=image"><i class="fa fa-upload"></i> Upload image</a></li> </ul> </div> [% ELSE %] - <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]#edititem"><i class="fa fa-pencil"></i> Edit</a> + <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]#edititem" id="lientype"><i class="fa fa-pencil"></i> Edit</a> [% END %] [% END %] </td> @@ -971,7 +980,7 @@ Note that permanent location is a code, and location may be an authval. <span class="noimagesuploaded">No images have been uploaded for this bibliographic record yet.</span> [% END %] [% IF ( CAN_user_tools_upload_local_cover_images ) %] - <p>Upload an image file: <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber | uri %]&filetype=image"><i class="fa fa-upload" aria-hidden="true"></i> Upload</a> + <p>Upload an image file: <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber | uri %]&filetype=image" id="lientype"><i class="fa fa-upload" aria-hidden="true"></i> Upload</a> </p> [% END %] </div> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt index 6fde26b1ef..d0a029836e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt @@ -1,6 +1,9 @@ [% USE raw %] [% USE Asset %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'cat-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] <title>Images › [% INCLUDE 'biblio-title-head.inc' %] › Catalog › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -24,7 +27,7 @@ -[% INCLUDE 'header.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
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 685e0824fc..4b13c5df62 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt @@ -5,6 +5,9 @@ [% USE Branches %] [% USE TablesSettings %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'cat-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] Checkout history for [% INCLUDE 'biblio-title-head.inc' %] › Catalog › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -12,7 +15,7 @@ -[% INCLUDE 'header.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt index 7b03e227e6..4ad723cda5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt @@ -2,6 +2,9 @@ [% USE Koha %] [% USE Asset %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'cat-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] @@ -16,7 +19,7 @@ </head> <body id="catlaog_labeledMARCdetail" class="catalog"> - [% INCLUDE 'header.inc' %] + [% INCLUDE 'header.inc' form=formulaire %] <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> <ol> @@ -36,6 +39,12 @@ </a> </li> </ol> + <ol> + [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] + </ol> + <ol> + <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> + </ol> </nav> <div class="main container-fluid"> 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 26c9a7c676..2983cf6023 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -5,6 +5,9 @@ [% USE Branches %] [% USE Price %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'cat-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] <title>Item details for [% INCLUDE 'biblio-title-head.inc' %] › Catalog › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -12,7 +15,7 @@ [% USE KohaDates %] -[% INCLUDE 'header.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
@@ -63,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 %]
    @@ -73,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 %] @@ -92,7 +101,7 @@

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

    @@ -160,11 +169,11 @@ [% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %] - +

    Item has been claimed as returned.

    [% ELSE %] - + [% END %] [% ELSE %] @@ -198,7 +207,7 @@ [% END %] - + [% ELSE %] [% FOREACH itemdamagedloo IN itemdamagedloop %] [% IF ( itemdamagedloo.selected ) %] @@ -231,7 +240,7 @@ [% END %] - + [% ELSE %] [% FOREACH itemwithdrawn IN itemwithdrawnloop %] [% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %] @@ -267,7 +276,7 @@ [% END %] - +
    @@ -310,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 %] 
    • @@ -330,7 +339,7 @@
    - +
    [% ELSE %] [% ITEM_DAT.itemnotes | html %] @@ -344,7 +353,7 @@
    - +
    [% ELSE %] [% ITEM_DAT.itemnotes_nonpublic | html %] 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 80cf4917ef..823ea43819 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -6,6 +6,9 @@ [% USE KohaDates %] [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'cat-search.inc' %] +[% END %] [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] @@ -14,7 +17,7 @@ -[% INCLUDE 'header.inc' %] +[% INCLUDE 'header.inc' form=formulaire %] [% IntranetCoce = Koha.Preference('IntranetCoce') %] [% CoceProviders = Koha.Preference('CoceProviders') %] @@ -36,6 +39,12 @@ +
      + [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] +
    +
      + Help +
    @@ -62,8 +71,8 @@
    [% END %] +
    [% IF ( total ) %] -

    [% 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 %].

    @@ -71,9 +80,8 @@
    - Select all - | - Clear all + Select all + Clear all | [% IF Koha.Preference("StaffHighlightedWords") == 1 %] Unhighlight @@ -89,7 +97,7 @@ [% IF Koha.Preference('virtualshelves') %]
    -
      @@ -135,7 +143,7 @@ [% IF ( CAN_user_reserveforothers_place_holds && DisplayMultiPlaceHold ) %] [% IF ( holdfor or holdforclub ) %]
      - + @@ -155,14 +163,14 @@
      [% ELSE %] [% END # /IF holfor %] [% END # /IF CAN_user_reserveforothers_place_holds %] [% IF Koha.Preference('BrowseResultSelection') %] [% END %] @@ -200,7 +208,7 @@ [% END %]
      -
        @@ -336,6 +344,7 @@
      [% END # /IF total %] + [% IF ( query_error ) %]

      Error: [% query_error | html %]

      [% END %] @@ -410,7 +419,7 @@ [% ELSE # /IF scan %] -
      + [% INCLUDE 'page-numbers.inc' %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt index 37fffc407e..e91665c797 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt @@ -1,6 +1,9 @@ [% USE raw %] [% USE Asset %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'cat-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] [% USE Koha %] [% USE KohaDates %] @@ -10,7 +13,7 @@ -[% INCLUDE 'header.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt index 25e9be9c46..0f05a48c92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt @@ -3,13 +3,16 @@ [% USE Asset %] [% USE Branches %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'cat-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] Stock rotation details for [% INCLUDE 'biblio-title-head.inc' %] › Catalog › Koha [% INCLUDE 'doc-head-close.inc' %] [% USE KohaDates %] -[% INCLUDE 'header.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index cb6a16f905..709b98aebb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -806,6 +806,12 @@ function PopupMARCFieldDoc(field) { +
        + [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] +
      +
        + Help +
      @@ -814,13 +820,13 @@ function PopupMARCFieldDoc(field) {
      -

      +

      [% IF ( biblionumber ) %] Editing [% title | html %] (Record number [% biblionumber | html %]) [% ELSE %] Add MARC record [% IF (circborrowernumber) %](fast cataloging)[% END %] [% END %] -

      + [% UNLESS ( number ) %] @@ -864,15 +870,16 @@ function PopupMARCFieldDoc(field) { [% END %]
      +
      [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] [% IF (circborrowernumber) %][%# fast cataloging must lead to items %] -
      Save
      +
      Save
      [% ELSE %]
      - - +
      -
      +
      [% IF bib_doesnt_exist %]
      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 f425b404e7..1480e37f01 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -3,16 +3,13 @@ [% USE KohaDates %] [% USE TablesSettings %] [% SET footerjs = 1 %] -[% formulaire = BLOCK %] - [% INCLUDE 'cataloging-search.inc' %] -[% END %] [% INCLUDE 'doc-head-open.inc' %] Cataloging [% IF ( total || breeding_loop ) %] › Search results [% ELSIF ( query ) %] › No results found [% END %] › Koha [% INCLUDE 'doc-head-close.inc' %] - [% INCLUDE 'header.inc' form=formulaire %] + [% INCLUDE 'header.inc' %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt index 9bf940cf38..0b640072de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt @@ -1,9 +1,13 @@ + +[% formulaire = BLOCK %] + [% INCLUDE 'cat-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] Link to host record › Cataloging › Koha [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'header.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt index 7d682f78f5..2fbc65fbb1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt @@ -1,6 +1,9 @@ [% USE raw %] [% USE Asset %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'cataloging-search.inc' %] +[% END %] [% PROCESS 'merge-record.inc' %] [% INCLUDE 'doc-head-open.inc' %] @@ -15,7 +18,7 @@ div#result { margin-top: 1em; } -[% INCLUDE 'header.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt index 742fb77fa9..07fa7b79dc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt @@ -1,10 +1,13 @@ [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'cat-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] Attach an item to [% INCLUDE 'biblio-title-head.inc' %] › Cataloging › Koha [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'header.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt index 8c039990af..a9232e202e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt @@ -43,7 +43,7 @@
      • -
    • Clear search form
      • +
    • Clear search form
      • @@ -68,7 +68,7 @@
      @@ -90,7 +90,7 @@ [% breeding_loo.heading_code | html %]
      - MARC + MARC