From 6770fe1e0bec2490c6e677a4d0b52d9ec8277c54 Mon Sep 17 00:00:00 2001 From: Solene Desvaux Date: Fri, 15 Jul 2022 12:04:35 +0200 Subject: [PATCH] Bug 30952: Staff interface redesign --- koha-tmpl/intranet-tmpl/js/searchbaruse.js | 26 + .../intranet-tmpl/prog/css/addbiblio.css | 30 +- koha-tmpl/intranet-tmpl/prog/css/login.css | 18 +- koha-tmpl/intranet-tmpl/prog/css/mainpage.css | 6 +- .../prog/css/src/_flatpickr.scss | 12 +- .../intranet-tmpl/prog/css/src/_tables.scss | 143 +- .../intranet-tmpl/prog/css/src/calendar.scss | 25 +- .../prog/css/src/staff-global.scss | 2755 ++++++++++++++--- .../includes/acquisitions-add-to-basket.inc | 20 +- .../prog/en/includes/acquisitions-menu.inc | 26 +- .../prog/en/includes/acquisitions-search.inc | 57 +- .../prog/en/includes/acquisitions-toolbar.inc | 8 +- .../en/includes/additional-fields-entry.inc | 2 +- .../prog/en/includes/admin-menu.inc | 18 +- .../prog/en/includes/adv-search.inc | 88 +- .../prog/en/includes/auth-finder-search.inc | 6 +- .../prog/en/includes/authorities-search.inc | 440 +-- .../prog/en/includes/authorities-toolbar.inc | 10 +- .../en/includes/authority-detail-modal.inc | 2 +- .../prog/en/includes/biblio-view-menu.inc | 4 +- .../prog/en/includes/blocked-fines.inc | 2 +- .../prog/en/includes/borrower_debarments.inc | 2 +- .../prog/en/includes/branch-selector.inc | 2 +- .../prog/en/includes/budgets-admin-search.inc | 66 +- .../en/includes/budgets-admin-toolbar.inc | 8 +- .../prog/en/includes/cat-search.inc | 34 +- .../prog/en/includes/cat-toolbar.inc | 30 +- .../prog/en/includes/cataloging-search.inc | 79 +- .../prog/en/includes/catalogue-search-box.inc | 5 +- .../en/includes/category-out-of-age-limit.inc | 5 +- .../intranet-tmpl/prog/en/includes/chart.inc | 2 +- .../prog/en/includes/checkin-search.inc | 46 +- .../prog/en/includes/checkouts-table.inc | 8 +- .../prog/en/includes/circ-menu.inc | 170 +- .../prog/en/includes/circ-nav.inc | 11 +- .../prog/en/includes/circ-search.inc | 58 +- .../prog/en/includes/cities-admin-search.inc | 27 +- .../en/includes/contracts-admin-search.inc | 21 +- .../en/includes/currencies-admin-search.inc | 26 +- .../prog/en/includes/desks-admin-search.inc | 28 +- .../intranet-tmpl/prog/en/includes/facets.inc | 2 +- .../prog/en/includes/guided-reports-view.inc | 38 +- .../intranet-tmpl/prog/en/includes/header.inc | 305 +- .../prog/en/includes/home-search.inc | 74 +- .../prog/en/includes/html_helpers.inc | 2 +- .../prog/en/includes/ill-toolbar.inc | 12 +- .../prog/en/includes/js_includes.inc | 1 + .../prog/en/includes/labels-toolbar.inc | 4 +- .../prog/en/includes/last-borrower.inc | 7 +- .../prog/en/includes/letters-search.inc | 38 +- .../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 | 16 +- .../prog/en/includes/patron-age.inc | 2 +- .../prog/en/includes/patron-search-box.inc | 39 +- .../prog/en/includes/patron-search-header.inc | 169 +- .../prog/en/includes/patron-search.inc | 10 +- .../prog/en/includes/patron-toolbar.inc | 30 +- .../prog/en/includes/patron_messages.inc | 4 +- .../prog/en/includes/patroncards-toolbar.inc | 4 +- .../prog/en/includes/patronfields.inc | 2 +- .../prog/en/includes/patrons-admin-search.inc | 43 +- .../prog/en/includes/pos-menu.inc | 4 +- .../prog/en/includes/prefs-admin-search.inc | 40 +- .../prog/en/includes/prefs-menu.inc | 6 +- .../prog/en/includes/reports-menu.inc | 62 +- .../prog/en/includes/reports-toolbar.inc | 26 +- .../includes/rotating-collections-toolbar.inc | 8 +- .../prog/en/includes/serials-menu.inc | 34 +- .../prog/en/includes/serials-search.inc | 49 +- .../prog/en/includes/serials-toolbar.inc | 30 +- .../prog/en/includes/shortcut.inc | 11 + .../en/includes/stockrotation-toolbar.inc | 11 +- .../prog/en/includes/subscriptions-search.inc | 6 +- .../prog/en/includes/subtypes_unimarc.inc | 6 +- .../en/includes/suggestions-add-search.inc | 32 +- .../prog/en/includes/tools-menu.inc | 12 +- .../prog/en/includes/vendor-menu.inc | 5 +- .../en/includes/virtualshelves-toolbar.inc | 12 +- .../prog/en/includes/z3950-admin-search.inc | 27 +- .../intranet-tmpl/prog/en/modules/about.tt | 6 + .../prog/en/modules/acqui/acqui-home.tt | 38 +- .../prog/en/modules/acqui/addorderiso2709.tt | 33 +- .../prog/en/modules/acqui/basket.tt | 29 +- .../prog/en/modules/acqui/basketgroup.tt | 41 +- .../prog/en/modules/acqui/basketheader.tt | 15 +- .../prog/en/modules/acqui/booksellers.tt | 9 +- .../prog/en/modules/acqui/cancelorder.tt | 3 +- .../prog/en/modules/acqui/duplicate_orders.tt | 23 +- .../prog/en/modules/acqui/edi_ean.tt | 10 +- .../prog/en/modules/acqui/edifactmsgs.tt | 9 +- .../prog/en/modules/acqui/edimsg.tt | 10 +- .../prog/en/modules/acqui/histsearch.tt | 49 +- .../prog/en/modules/acqui/invoice-files.tt | 9 +- .../prog/en/modules/acqui/invoice.tt | 25 +- .../prog/en/modules/acqui/invoices.tt | 13 +- .../prog/en/modules/acqui/lateorders.tt | 18 +- .../prog/en/modules/acqui/modordernotes.tt | 3 +- .../prog/en/modules/acqui/neworderempty.tt | 33 +- .../modules/acqui/neworderempty_duplicate.tt | 11 +- .../en/modules/acqui/newordersubscription.tt | 11 +- .../en/modules/acqui/newordersuggestion.tt | 9 +- .../prog/en/modules/acqui/ordered.tt | 9 +- .../prog/en/modules/acqui/orderreceive.tt | 9 +- .../prog/en/modules/acqui/parcel.tt | 14 +- .../prog/en/modules/acqui/parcels.tt | 24 +- .../prog/en/modules/acqui/spent.tt | 9 +- .../prog/en/modules/acqui/supplier.tt | 40 +- .../prog/en/modules/acqui/uncertainprice.tt | 15 +- .../prog/en/modules/acqui/z3950_search.tt | 15 +- .../en/modules/admin/additional-fields.tt | 24 +- .../prog/en/modules/admin/admin-home.tt | 30 +- .../en/modules/admin/adveditorshortcuts.tt | 12 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 33 +- .../prog/en/modules/admin/aqbudgets.tt | 29 +- .../prog/en/modules/admin/aqcontract.tt | 34 +- .../prog/en/modules/admin/aqplan.tt | 48 +- .../prog/en/modules/admin/audio_alerts.tt | 28 +- .../modules/admin/auth_subfields_structure.tt | 12 +- .../en/modules/admin/auth_tag_structure.tt | 12 +- .../en/modules/admin/authorised_values.tt | 38 +- .../prog/en/modules/admin/authtypes.tt | 33 +- .../prog/en/modules/admin/background_jobs.tt | 18 +- .../prog/en/modules/admin/biblio_framework.tt | 45 +- .../modules/admin/branch_transfer_limits.tt | 15 +- .../prog/en/modules/admin/branches.tt | 29 +- .../prog/en/modules/admin/cash_registers.tt | 11 +- .../prog/en/modules/admin/categories.tt | 27 +- .../prog/en/modules/admin/checkmarc.tt | 11 +- .../prog/en/modules/admin/cities.tt | 26 +- .../prog/en/modules/admin/classsources.tt | 55 +- .../prog/en/modules/admin/clone-rules.tt | 9 +- .../prog/en/modules/admin/columns_settings.tt | 11 +- .../prog/en/modules/admin/credit_types.tt | 28 +- .../prog/en/modules/admin/currency.tt | 28 +- .../prog/en/modules/admin/debit_types.tt | 28 +- .../prog/en/modules/admin/desks.tt | 11 +- .../prog/en/modules/admin/didyoumean.tt | 3 +- .../prog/en/modules/admin/edi_accounts.tt | 31 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 29 +- .../modules/admin/item_circulation_alerts.tt | 18 +- .../en/modules/admin/items_search_field.tt | 9 +- .../en/modules/admin/items_search_fields.tt | 26 +- .../prog/en/modules/admin/itemtypes.tt | 31 +- .../prog/en/modules/admin/koha2marclinks.tt | 13 +- .../prog/en/modules/admin/library_groups.tt | 25 +- .../en/modules/admin/marc-overlay-rules.tt | 16 +- .../modules/admin/marc_subfields_structure.tt | 39 +- .../prog/en/modules/admin/marctagstructure.tt | 34 +- .../prog/en/modules/admin/matching-rules.tt | 8 +- .../prog/en/modules/admin/oai_set_mappings.tt | 9 +- .../prog/en/modules/admin/oai_sets.tt | 28 +- .../prog/en/modules/admin/overdrive.tt | 9 +- .../en/modules/admin/patron-attr-types.tt | 29 +- .../prog/en/modules/admin/preferences.tt | 13 +- .../searchengine/elasticsearch/mappings.tt | 7 +- .../prog/en/modules/admin/share_content.tt | 17 +- .../prog/en/modules/admin/smart-rules.tt | 37 +- .../prog/en/modules/admin/sms_providers.tt | 11 +- .../prog/en/modules/admin/smtp_servers.tt | 25 +- .../en/modules/admin/systempreferences.tt | 27 +- .../prog/en/modules/admin/transfer_limits.tt | 15 +- .../en/modules/admin/transport-cost-matrix.tt | 17 +- .../prog/en/modules/admin/usage_statistics.tt | 15 +- .../prog/en/modules/admin/z3950servers.tt | 23 +- .../intranet-tmpl/prog/en/modules/auth.tt | 2 +- .../modules/authorities/authorities-home.tt | 11 +- .../en/modules/authorities/authorities.tt | 15 +- .../prog/en/modules/authorities/detail.tt | 16 +- .../prog/en/modules/authorities/merge.tt | 9 +- .../modules/authorities/searchresultlist.tt | 9 +- .../prog/en/modules/basket/basket.tt | 16 +- .../prog/en/modules/catalogue/ISBDdetail.tt | 15 +- .../prog/en/modules/catalogue/MARCdetail.tt | 15 +- .../prog/en/modules/catalogue/advsearch.tt | 49 +- .../prog/en/modules/catalogue/detail.tt | 13 +- .../prog/en/modules/catalogue/imageviewer.tt | 9 +- .../prog/en/modules/catalogue/issuehistory.tt | 15 +- .../prog/en/modules/catalogue/itemsearch.tt | 34 +- .../en/modules/catalogue/labeledMARCdetail.tt | 9 +- .../prog/en/modules/catalogue/moredetail.tt | 27 +- .../prog/en/modules/catalogue/results.tt | 65 +- .../en/modules/catalogue/search-history.tt | 9 +- .../en/modules/catalogue/stockrotation.tt | 9 +- .../prog/en/modules/cataloguing/addbooks.tt | 21 +- .../prog/en/modules/cataloguing/additem.tt | 30 +- .../prog/en/modules/cataloguing/editor.tt | 30 +- .../prog/en/modules/cataloguing/linkitem.tt | 10 +- .../prog/en/modules/cataloguing/merge.tt | 9 +- .../prog/en/modules/cataloguing/moveitem.tt | 9 +- .../modules/cataloguing/z3950_auth_search.tt | 4 +- .../en/modules/cataloguing/z3950_search.tt | 8 +- .../prog/en/modules/circ/article-requests.tt | 9 +- .../prog/en/modules/circ/bookcount.tt | 9 +- .../prog/en/modules/circ/branchoverdues.tt | 11 +- .../prog/en/modules/circ/branchtransfers.tt | 25 +- .../prog/en/modules/circ/checkout-notes.tt | 10 +- .../prog/en/modules/circ/circulation-home.tt | 103 +- .../prog/en/modules/circ/circulation.tt | 32 +- .../circ/circulation_batch_checkouts.tt | 9 +- .../prog/en/modules/circ/offline.tt | 9 +- .../prog/en/modules/circ/on-site_checkouts.tt | 9 +- .../prog/en/modules/circ/overdue.tt | 5 +- .../prog/en/modules/circ/pendingreserves.tt | 61 +- .../prog/en/modules/circ/renew.tt | 45 +- .../prog/en/modules/circ/request-article.tt | 9 +- .../prog/en/modules/circ/reserveratios.tt | 7 +- .../prog/en/modules/circ/returns.tt | 5 +- .../prog/en/modules/circ/set-library.tt | 43 +- .../prog/en/modules/circ/transfers_to_send.tt | 9 +- .../en/modules/circ/transferstoreceive.tt | 11 +- .../prog/en/modules/circ/view_holdsqueue.tt | 38 +- .../prog/en/modules/circ/waitingreserves.tt | 11 +- .../prog/en/modules/clubs/club-enrollments.tt | 11 +- .../prog/en/modules/clubs/clubs-add-modify.tt | 23 +- .../prog/en/modules/clubs/clubs.tt | 64 +- .../prog/en/modules/clubs/patron-enroll.tt | 6 +- .../en/modules/clubs/templates-add-modify.tt | 21 +- .../course_reserves/add_items-step1.tt | 9 +- .../course_reserves/add_items-step2.tt | 9 +- .../course_reserves/batch_add_items.tt | 9 +- .../modules/course_reserves/batch_rm_items.tt | 9 +- .../modules/course_reserves/course-details.tt | 19 +- .../course_reserves/course-reserves.tt | 13 +- .../prog/en/modules/course_reserves/course.tt | 9 +- .../modules/course_reserves/invalid-course.tt | 11 +- .../prog/en/modules/errors/errorpage.tt | 10 +- .../prog/en/modules/ill/ill-requests.tt | 11 +- .../prog/en/modules/intranet-main.tt | 247 +- .../prog/en/modules/labels/barcode-print.tt | 15 +- .../en/modules/labels/label-bib-search.tt | 6 +- .../en/modules/labels/label-edit-batch.tt | 21 +- .../en/modules/labels/label-edit-layout.tt | 12 +- .../en/modules/labels/label-edit-profile.tt | 24 +- .../en/modules/labels/label-edit-range.tt | 16 +- .../en/modules/labels/label-edit-template.tt | 17 +- .../prog/en/modules/labels/label-home.tt | 9 +- .../prog/en/modules/labels/label-manage.tt | 20 +- .../prog/en/modules/labels/label-print.tt | 30 +- .../prog/en/modules/labels/result.tt | 4 +- .../prog/en/modules/labels/search.tt | 8 +- .../prog/en/modules/labels/spinelabel-home.tt | 13 +- .../en/modules/members/accountline-details.tt | 12 +- .../prog/en/modules/members/apikeys.tt | 10 +- .../prog/en/modules/members/boraccount.tt | 30 +- .../prog/en/modules/members/deletemem.tt | 10 +- .../prog/en/modules/members/discharge.tt | 10 +- .../prog/en/modules/members/discharges.tt | 38 +- .../prog/en/modules/members/files.tt | 16 +- .../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 | 16 +- .../prog/en/modules/members/maninvoice.tt | 20 +- .../prog/en/modules/members/member-flags.tt | 20 +- .../en/modules/members/member-password.tt | 16 +- .../prog/en/modules/members/member.tt | 15 +- .../prog/en/modules/members/memberentrygen.tt | 7 +- .../prog/en/modules/members/members-update.tt | 10 +- .../prog/en/modules/members/merge-patrons.tt | 14 +- .../prog/en/modules/members/moremember.tt | 7 +- .../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 | 17 +- .../prog/en/modules/members/readingrec.tt | 12 +- .../prog/en/modules/members/recallshistory.tt | 8 +- .../prog/en/modules/members/routing-lists.tt | 12 +- .../prog/en/modules/members/search.tt | 2 +- .../prog/en/modules/members/statistics.tt | 14 +- .../en/modules/members/two_factor_auth.tt | 9 +- .../en/modules/offline_circ/enqueue_koc.tt | 9 +- .../prog/en/modules/offline_circ/list.tt | 9 +- .../en/modules/offline_circ/process_koc.tt | 15 +- .../en/modules/onboarding/onboardingstep1.tt | 2 +- .../en/modules/onboarding/onboardingstep2.tt | 2 +- .../en/modules/onboarding/onboardingstep3.tt | 2 +- .../en/modules/onboarding/onboardingstep4.tt | 2 +- .../en/modules/onboarding/onboardingstep5.tt | 2 +- .../en/modules/patron_lists/add-modify.tt | 30 +- .../prog/en/modules/patron_lists/list.tt | 37 +- .../prog/en/modules/patron_lists/lists.tt | 19 +- .../prog/en/modules/patroncards/edit-batch.tt | 34 +- .../en/modules/patroncards/edit-layout.tt | 20 +- .../en/modules/patroncards/edit-profile.tt | 20 +- .../en/modules/patroncards/edit-template.tt | 16 +- .../prog/en/modules/patroncards/home.tt | 15 +- .../en/modules/patroncards/image-manage.tt | 43 +- .../prog/en/modules/patroncards/manage.tt | 26 +- .../prog/en/modules/patroncards/print.tt | 33 +- .../en/modules/plugins/plugins-disabled.tt | 12 +- .../prog/en/modules/plugins/plugins-home.tt | 5 +- .../prog/en/modules/plugins/plugins-upload.tt | 19 +- .../intranet-tmpl/prog/en/modules/pos/pay.tt | 9 +- .../prog/en/modules/pos/register.tt | 11 +- .../prog/en/modules/pos/registers.tt | 11 +- .../en/modules/reports/acquisitions_stats.tt | 21 +- .../prog/en/modules/reports/bor_issues_top.tt | 17 +- .../prog/en/modules/reports/borrowers_out.tt | 19 +- .../en/modules/reports/borrowers_stats.tt | 19 +- .../en/modules/reports/cash_register_stats.tt | 7 +- .../prog/en/modules/reports/cat_issues_top.tt | 19 +- .../prog/en/modules/reports/catalogue_out.tt | 18 +- .../en/modules/reports/catalogue_stats.tt | 22 +- .../prog/en/modules/reports/dictionary.tt | 68 +- .../modules/reports/guided_reports_start.tt | 8 +- .../en/modules/reports/issues_avg_stats.tt | 17 +- .../prog/en/modules/reports/issues_stats.tt | 19 +- .../prog/en/modules/reports/itemslost.tt | 13 +- .../prog/en/modules/reports/itemtypes.tt | 13 +- .../en/modules/reports/orders_by_budget.tt | 20 +- .../prog/en/modules/reports/reports-home.tt | 15 +- .../prog/en/modules/reports/reserves_stats.tt | 19 +- .../prog/en/modules/reports/serials_stats.tt | 15 +- .../prog/en/modules/reserve/request.tt | 22 +- .../prog/en/modules/reviews/reviewswaiting.tt | 11 +- .../modules/rotating_collections/addItems.tt | 16 +- .../rotating_collections/editCollections.tt | 18 +- .../rotatingCollections.tt | 13 +- .../transferCollection.tt | 16 +- .../en/modules/serials/checkexpiration.tt | 15 +- .../prog/en/modules/serials/claims.tt | 12 +- .../en/modules/serials/routing-preview.tt | 9 +- .../prog/en/modules/serials/routing.tt | 9 +- .../en/modules/serials/serials-collection.tt | 9 +- .../prog/en/modules/serials/serials-edit.tt | 10 +- .../prog/en/modules/serials/serials-home.tt | 9 +- .../prog/en/modules/serials/serials-search.tt | 26 +- .../en/modules/serials/subscription-add.tt | 42 +- .../modules/serials/subscription-batchedit.tt | 13 +- .../en/modules/serials/subscription-detail.tt | 12 +- .../serials/subscription-frequencies.tt | 24 +- .../modules/serials/subscription-history.tt | 9 +- .../serials/subscription-numberpatterns.tt | 32 +- .../prog/en/modules/serials/viewalerts.tt | 10 +- .../prog/en/modules/suggestion/suggestion.tt | 7 +- .../prog/en/modules/tags/list.tt | 14 +- .../prog/en/modules/tags/review.tt | 42 +- .../prog/en/modules/tools/access_files.tt | 14 +- .../en/modules/tools/additional-contents.tt | 117 +- .../automatic_item_modification_by_age.tt | 8 +- .../prog/en/modules/tools/batchMod-del.tt | 12 +- .../prog/en/modules/tools/batchMod-edit.tt | 46 +- .../prog/en/modules/tools/batchMod.tt | 22 +- .../en/modules/tools/batch_delete_records.tt | 22 +- .../modules/tools/batch_extend_due_dates.tt | 22 +- .../tools/batch_record_modification.tt | 18 +- .../prog/en/modules/tools/cleanborrowers.tt | 28 +- .../prog/en/modules/tools/csv-profiles.tt | 18 +- .../prog/en/modules/tools/export.tt | 18 +- .../prog/en/modules/tools/holidays.tt | 22 +- .../prog/en/modules/tools/import_borrowers.tt | 35 +- .../prog/en/modules/tools/inventory.tt | 44 +- .../prog/en/modules/tools/letter.tt | 44 +- .../en/modules/tools/manage-marc-import.tt | 48 +- .../tools/marc_modification_templates.tt | 36 +- .../prog/en/modules/tools/modborrowers.tt | 42 +- .../prog/en/modules/tools/overduerules.tt | 12 +- .../prog/en/modules/tools/picture-upload.tt | 26 +- .../prog/en/modules/tools/problem-reports.tt | 12 +- .../prog/en/modules/tools/quotes-upload.tt | 16 +- .../prog/en/modules/tools/quotes.tt | 27 +- .../prog/en/modules/tools/scheduler.tt | 19 +- .../prog/en/modules/tools/showdiffmarc.tt | 6 + .../en/modules/tools/stage-marc-import.tt | 32 +- .../prog/en/modules/tools/stockrotation.tt | 12 +- .../prog/en/modules/tools/tools-home.tt | 17 +- .../prog/en/modules/tools/upload-images.tt | 14 +- .../prog/en/modules/tools/upload.tt | 40 +- .../prog/en/modules/tools/viewlog.tt | 20 +- .../virtualshelves/addbybiblionumber.tt | 2 +- .../modules/virtualshelves/sendshelfform.tt | 23 +- .../prog/en/modules/virtualshelves/shelves.tt | 8 +- .../intranet-tmpl/prog/img/UIKit/arrow.svg | 9 + .../intranet-tmpl/prog/img/UIKit/cart.svg | 25 + .../prog/img/UIKit/check-green.svg | 12 + .../prog/img/UIKit/cross-green.svg | 16 + .../intranet-tmpl/prog/img/UIKit/cross.svg | 20 + .../prog/img/UIKit/end-green.svg | 17 + .../prog/img/UIKit/home-green.svg | 12 + .../intranet-tmpl/prog/img/UIKit/home.svg | 12 + .../prog/img/UIKit/next-green.svg | 13 + .../prog/img/UIKit/picto-koha.svg | 19 + .../intranet-tmpl/prog/img/UIKit/setting.svg | 27 + 385 files changed, 7493 insertions(+), 4056 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/js/searchbaruse.js create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/shortcut.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/img/UIKit/arrow.svg create mode 100644 koha-tmpl/intranet-tmpl/prog/img/UIKit/cart.svg create mode 100644 koha-tmpl/intranet-tmpl/prog/img/UIKit/check-green.svg create mode 100644 koha-tmpl/intranet-tmpl/prog/img/UIKit/cross-green.svg create mode 100644 koha-tmpl/intranet-tmpl/prog/img/UIKit/cross.svg create mode 100644 koha-tmpl/intranet-tmpl/prog/img/UIKit/end-green.svg create mode 100644 koha-tmpl/intranet-tmpl/prog/img/UIKit/home-green.svg create mode 100644 koha-tmpl/intranet-tmpl/prog/img/UIKit/home.svg create mode 100644 koha-tmpl/intranet-tmpl/prog/img/UIKit/next-green.svg create mode 100644 koha-tmpl/intranet-tmpl/prog/img/UIKit/picto-koha.svg create mode 100644 koha-tmpl/intranet-tmpl/prog/img/UIKit/setting.svg diff --git a/koha-tmpl/intranet-tmpl/js/searchbaruse.js b/koha-tmpl/intranet-tmpl/js/searchbaruse.js new file mode 100644 index 0000000000..5f57255eb5 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/js/searchbaruse.js @@ -0,0 +1,26 @@ +$(document).ready(function() { + $('.iconsearch').on('click', function () { + var namesearch = document.getElementsByClassName('name-icon'); + var iconssearch = document.getElementsByClassName('iconsearch'); + for (var i = namesearch.length - 1; i >= 0; i--) { + namesearch[i].classList.remove('active'); + if (this == iconssearch[i]){ + namesearch[i].classList.add('active'); + } + } + + $('.head-searchbox').each(function() { + sizeof(this); + }) + }); + + $('.head-searchbox').each(function() { + sizeof(this); + }); + + function sizeof(el){ + var offsetWidth = document.getElementById('btn-space').offsetWidth +5; + var width = 500 - offsetWidth; + el.style = "width:" + width + "px"; + } +}); diff --git a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css index c84f399ab7..4c4ef32b66 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css +++ b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css @@ -6,8 +6,7 @@ div#toolbar { border: 0; } -#addbibliotabs .ui-tabs-nav, -#authoritytabs .ui-tabs-nav { +#addbibliotabs .ui-tabs-nav { display: none; } @@ -223,10 +222,6 @@ a.tagnum { width: 31em; } -#cat_addbiblio .field_marceditor .flatpickr_wrapper { - display: none; -} - .mandatory_marker { color: red; } @@ -277,6 +272,7 @@ tbody tr.active td { .toolbar-tabs-container { margin: 3em -5px -5px -5px; + width: -webkit-fill-available; } .toolbar-tabs { @@ -299,30 +295,34 @@ tbody tr.active td { } .toolbar-tabs li a { - border: 1px solid #EDF4F6; + border: 1px solid #71B443; border-left: 0; - border-right: 1px solid #EDF4F6; - border-bottom-right-radius: 5px; - border-bottom-left-radius: 5px; + background-color: #71B443; + border-right: 1px solid #71B443; + border-radius: 5px; + margin: 5px; + /* border-bottom-left-radius: 5px; */ display: block; + color: #fff; font-weight: bold; padding: .3em 1.5em; width: 100%; } .toolbar-tabs li.selected a { - background-color: #EDF4F6; - border-right: 1px solid #C3D6DB; - border-bottom: 1px solid #C3D6DB; + background-color: #418940; + border-right: 1px solid #418940; + border-bottom: 1px solid #418940; font-weight: bold; } .toolbar-tabs li.selected a:hover { - background-color: #EDF4F6; + background-color: #418940; } .toolbar-tabs li a:hover { - background-color: #F4F8F9; + background-color: #418940; + text-decoration: none; } .toolbar-tabs li:first-child a { diff --git a/koha-tmpl/intranet-tmpl/prog/css/login.css b/koha-tmpl/intranet-tmpl/prog/css/login.css index 1a8c06a3a3..8a5201a430 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/login.css +++ b/koha-tmpl/intranet-tmpl/prog/css/login.css @@ -20,7 +20,7 @@ a:hover { } body { - background: #f5f5f5; + background: #f3f4f4; } form, label input { @@ -42,7 +42,8 @@ label { #login { background: #fff; - border: 1px solid #a2a2a2; + border: none; + box-shadow: 8px 8px 12px rgb(170 170 170); margin: 4em auto; padding: 1.5em; position : relative; @@ -107,6 +108,14 @@ label { #login #submit-button, #login .button { font-size: 1.4em; padding : .3em .6em; + background: rgba(254, 195, 44, 1); + border: none; + color: #000; +} + +#login #submit-button:hover, #login #submit-button:focus, #login #submit-button:active{ + background: rgba(254, 195, 44, 0.7) !important; + border: none; } #login #onerror_actions { @@ -145,7 +154,7 @@ label { } .submit input:active, .button:active { - background: #f4f4f4; + background: #fff; border: 1px solid #999; border-left-color: #999; border-top-color: #999; @@ -155,8 +164,9 @@ label { text-align: right; } + textarea, input, select { - background: #f4f4f4; + background: #fff; border: 1px solid #b2b2b2; color: #000; font: 13px Verdana, Arial, Helvetica, sans-serif; diff --git a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css index a2e6cdc9c1..cc850bb3ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css +++ b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css @@ -13,9 +13,9 @@ #container-main { /* Contains the news + both columns of links + pending box + userblock box */ - background-image:url('../img/background_koha_logo.png'); - background-repeat:no-repeat; - background-position:left top; + /*background-image:url('../img/background_koha_logo.png');*/ + /*background-repeat:no-repeat;*/ + /*background-position:left top;*/ padding: 1em 0; } diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_flatpickr.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_flatpickr.scss index 34d1ce6ffe..8cfbedc426 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; @@ -942,10 +942,16 @@ span.flatpickr-weekday { .flatpickr-input { 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"); + // 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: 3px 3px 3px 20px; + padding: 5px; + font-style: italic; + + font-size: 90%; + vertical-align: middle; + width: 225px; + height: 25px; &:focus { border-radius: 0; diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss index a62600d96f..328e779dc7 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss @@ -1,6 +1,6 @@ table { border-collapse: collapse; - border-right: 1px solid $table-border-color; + border-top: 1px solid $table-border-color; .btn-group { @@ -70,6 +70,10 @@ table { &.dataTable { border-collapse: collapse; + border: none; + margin-top: .5em; + margin-bottom: .5em; + tfoot { td, @@ -79,15 +83,20 @@ table { } thead { + + th, td { - border-bottom: 1px solid $table-border-color; - border-left: 1px solid $table-border-color; - padding: .5em; + border-top: none; + border-left: none; + border-right: none; + border: none; + padding: .5em; } tr { + background-color: #fff; &.columnFilter { th { padding: 0; @@ -96,8 +105,6 @@ table { } .sorting_asc { - background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2bW0iIGhlaWdodD0iMi4zODRtbSIgdmlld0JveD0iMCAwIDYuMDAwMDAwMiAyLjM4NDAzODkiPjxnPjxwYXRoIGZpbGw9IiMwMDZhY2MiIGQ9Ik00LjA1IDEuNzRoLTIuMUwzIC42NHoiLz48L2c+PC9zdmc+") no-repeat scroll right center $table-header-background; - padding-right: 19px; &.fixed_sort { background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2bW0iIGhlaWdodD0iOS4wMSIgdmlld0JveD0iMCAwIDYgMi4zODQiPjxwYXRoIGZpbGw9IiM5NDk0OTQiIGQ9Ik00LjA1IDEuNzRoLTIuMUwzIC42NHoiLz48L3N2Zz4=") no-repeat scroll right center $table-header-background; @@ -107,26 +114,36 @@ table { .sorting_desc { background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2bW0iIGhlaWdodD0iMi4zODRtbSIgdmlld0JveD0iMCAwIDYuMDAwMDAwMiAyLjM4NDAzODkiPjxnPjxwYXRoIGZpbGw9IiMwMDZhY2MiIGQ9Ik00LjA1LjY0aC0yLjFMMyAxLjc0eiIvPjwvZz48L3N2Zz4=") no-repeat scroll right center $table-header-background; - padding-right: 19px; &.fixed_sort { background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2bW0iIGhlaWdodD0iOS4wMSIgdmlld0JveD0iMCAwIDYgMi4zODQiPjxwYXRoIGZpbGw9IiM5NDk0OTQiIGQ9Ik00LjA1LjY0aC0yLjFMMyAxLjc0eiIvPjwvc3ZnPg==") no-repeat scroll right center $table-header-background; cursor: default; } } - - .sorting { - background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2bW0iIGhlaWdodD0iMi41NTFtbSIgdmlld0JveD0iMCAwIDYuMDAwMDAwMyAyLjU1MDY2MTQiPjxwYXRoIGZpbGw9IiNhY2FjYWMiIGQ9Ik00LjA1IDEuNDVoLTIuMUwzIDIuNTV6Ii8+PHBhdGggZmlsbD0iI2FjYWNhYyIgZD0iTTQuMDUgMS4xaC0yLjFMMyAweiIvPjwvc3ZnPg==") no-repeat scroll right center $table-header-background; - padding-right: 19px; - } } tbody { + border-top: 2px solid #A19B9E; + td { padding: .5em; + border: none; } - } + .dropdown-menu{ + background-color: #F3F4F4; + + a{ + color: #000; + + &:hover, + &:focus{ + background-image: none; + background-color: #F3F4F4; + } + } + } + } } /* Row grouping */ @@ -154,9 +171,7 @@ table { td, th { - border-bottom: 1px solid $table-border-color; - border-left: 1px solid $table-border-color; - padding: .2em .3em; + padding: .2em .9em; } td { @@ -167,6 +182,24 @@ td { white-space: nowrap; } + button, a, input[type="button"]{ + &.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; @@ -197,7 +230,6 @@ td { th { - background-color: $table-header-background; font-weight: bold; text-align: center; @@ -354,25 +386,46 @@ caption { tbody { tr { + &:nth-child(odd):not(.dtrg-group) { td { - border-right: 1px solid $table-border-color; + border: none; } } &:nth-child(odd):not(.dtrg-group):not(.active):not(.ok) { td { &:not(.bg-danger):not(.bg-warning):not(.bg-info):not(.bg-success):not(.bg-primary) { background-color: $table-odd-row; + margin: 1em; } } } } + .dropdown-menu{ + + background-color: #fff; + color: #000; + top: 100%; + + a{ + color: #000; + + &:hover, + &:focus{ + background-image: none; + background-color: #fff; + color: #000; + padding: 3px 20px; + text-decoration: underline; + } + } + } } .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; @@ -419,43 +472,29 @@ tbody { } .paginate_button { - color: #004D99 !important; padding-bottom: 0; padding-top: 0; + + &.current, &:hover, &:active { - background: #FFC none; - border: 1px solid transparent; - box-shadow: none; - color: #222BAC !important; - } - - &.current { - background: #E6FCB7 none; - border: 0; - color: #666; + border-radius: 4px; + color: #666 !important; font-weight: bold; - - &:hover, - &:active { - background: #E6FCB7 none; - border: 0; - box-shadow: none; - color: #666; - cursor: default; - } + background: #fff; } &.first, &.previous, &.next, &.last { + padding: 0; + &::before, &::after { display: inline-block; font-family: FontAwesome; - width: 1em; } } @@ -464,21 +503,18 @@ tbody { &::before { content: "\f100"; - padding-right: .5em; } } &.previous { &::before { content: "\f104"; - padding-right: .5em; } } &.next { &::after { content: "\f105"; - padding-left: .5em; } } @@ -487,7 +523,6 @@ tbody { &::after { content: "\f101"; - padding-left: .5em; } } } @@ -498,13 +533,21 @@ tbody { font-size: 90%; &.top { - border-top: 1px solid $table-border-color; - padding-top: 1em; + padding: 1em 0; + margin-top: 1em; + margin-bottom: 17px; } &.bottom { - border-bottom: 1px solid $table-border-color; padding-bottom: 1em; + display: none; + } + + div{ + &.dt-buttons { + position: relative; + float: right; + } } button, @@ -513,11 +556,13 @@ tbody { &.dt-button { background: transparent none; border: 0; - color: #000; + color: #696969; font-size: 1em; line-height: 1.7em; margin: 3px 3px 0; padding: 0 .5em; + position: relative; + float: right; &::before { content: ''; @@ -567,7 +612,7 @@ tbody { border: 0; padding: 0; } -} /* /.pager */ +} .toptabs { .pager { diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss b/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss index fdf972ea51..2f160e06ec 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 { @@ -140,7 +153,7 @@ fieldset.brief li.radio { .flatpickr-calendar { border-radius: 0; - border: 1px solid #B9D8D9; + border: 1px solid #71B344; box-shadow: none; } diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index cb6d2c52a6..65fd54841d 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -3,56 +3,96 @@ @import "flatpickr"; ::selection { - background: #538200; - color: #FFFFFF; + background: #418940; + color: #fff; } a { &:link, &:visited { - color: #004D99; - text-decoration: none; + color: #71B443; + padding: .3em; + border: none; + background-color: transparent; + box-shadow: none; + font-size: 100%; } &:hover, - &:active { - color: #538200; - text-decoration: none; + &:active, &:focus { + text-decoration: underline; + color: #71B443; + padding: .3em; + border: none; + background-color: transparent; + box-shadow: none; + font-size: 100%; } &:hover { .term { - color: #FF9090; + color: #000; + text-decoration: underline; } } &.authlink { - background-color: #e6f0f2; + background-color: #e3f1df; border-radius: 5px; display: inline-block; padding: 2px 4px; } &.btn { - &:link, - &:visited { - color: #333333; - } - &.btn-link { &:link, &:visited { - color: #004D99; + color: #71B443; } &:hover { - color: #538200; + text-decoration: underline; + font-weight: bold; } } + + } + + &.edit-patronimage{ + color: #333; + background-color: #e6e6e6; + border-color: #adadad; } &.cancel { - padding-left: 1em; + + 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; + } } &.cartRemove { @@ -63,17 +103,54 @@ a { } &.clear_date { - color: #C33; + color: #418940; font-size: 130%; + vertical-align: middle; &:hover { - color: #FF9090; + color: #71B443; + text-decoration: none; } } - &.close { - &:hover { - color: #538200; + &.settings{ + i, img{ + text-align: center; + 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; + background-color: transparent; + color: #418940; + } + + } + + img{ + max-width: 30px; + height: auto; + padding: 10px; } } @@ -89,6 +166,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; } @@ -138,21 +233,335 @@ a { background-image: url("../img/famfamfam/silk/page_white_code.png"); } + &.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; + } + } + } + + &.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; + } + } +} + + +#resetZ3950Search{ + font-size: 110%; + color: #71B443; } + a.ctrl_link { display: inline-block; padding-right: 1rem; } + aside { - h5 { - font-size: 100%; - margin: .5em 0; + position: absolute; + left: 0px; + width: 100%; + + fieldset{ + &.sidebar{ + box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); + padding: 0.9em; + 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; + } + + 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 { + 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; + } + } + } + } + } } - fieldset { - &.brief { - padding: .4em .7em; + + /* + + + + + ol { + margin: 0; + padding: 0; + } + + button + button, input + input { @@ -168,6 +577,7 @@ aside { legend { font-size: 95%; margin: 0; + border-bottom: none; } &.action { @@ -182,6 +592,7 @@ aside { label { margin: .5em 0 0 0; + border-top : 1px inset #999999; } li { @@ -193,11 +604,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; } @@ -205,7 +729,7 @@ aside { } &.radio { - padding: .7em 0; + padding: .3em 0; input { padding: .3em 0; @@ -242,6 +766,197 @@ aside { margin-left: 0; padding: 0; } + } +*/ +} + +#navmenulist{ + background-color: #e6e6e6; + width: 100%; + overflow: auto; + display: block; + 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; + + &.mainmenu{ + display: inline; + } + + + &.koha-mainpage{ + display: flex; + align-items: center; + justify-content: center; + } + + &.settings-links{ + display: inline; + + ul{ + float: right; + + li{ + list-style-type: none; + margin-bottom: 0; + height: auto; + width: 150px; + padding: 5px 10px; + + a, a:visited, a:link{ + color: #000; + } + } + } + } + + &.koha-bottom{ + background: transparent url(../img/koha-logo-medium.png) no-repeat center; + width: 150px; + background-size: 70%; + height: 50px; + margin: 25px; + bottom: 0px; + text-align: center; + display: flex; + align-items: center; + justify-content: center; + z-index: 1030; + + a{ + width: 100%; + height: 100%; + } + } +} + +.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, &:focus, &:active{ + text-decoration: none; + + i{ + background-color: #418940; + border-color: #418940; + } + + h1{ + color: #418940; } } } @@ -249,7 +964,7 @@ aside { button { @include default-button; - &:active { + &:active, &:hover { border: 1px inset #999999; } @@ -265,6 +980,14 @@ button { } } +#add_to_patron_list_submit{ + color: #71B443; + + &:hover{ + border: none; + } +} + main { &::after { clear: both; @@ -274,11 +997,13 @@ main { } body { - font-family: $font-main; + //font-family: $font-main; + font-family: 'Poppins', sans-serif; font-size: 13px; line-height: 1.22; padding: 0 0 4em; text-align: left; + background-color: #F3F4F4; &.nobackdrop { .modal-backdrop { @@ -335,34 +1060,16 @@ 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: 146.5%; + font-size: 150%; font-weight: bold; + color: #696969; } h3 { font-size: 131%; font-weight: bold; + color: #696969; } h4 { @@ -372,7 +1079,6 @@ h4 { h5 { font-size: 100%; - font-weight: bold; } h6 { @@ -380,13 +1086,19 @@ h6 { font-weight: bold; } + + h1, h2, h3, h4, h5, h6 { - margin: .3em 0; + margin: .5em 0; + + a, a:link, a:visited{ + color: #000; + } } hr { @@ -395,7 +1107,89 @@ hr { } p { - margin: .5em 0; + margin: .7em 0; + + &.more{ + height: 100% !important; + top: 30px; + 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; + outline: 1px black; + float: right; + height: 30px; + border-radius: 17px; + padding-left: 2em; + padding-right: 1.5em; + border: none; + margin-left: 0px; + position: absolute; + top: -5px; + right: 30px; + z-index: 100; + display: inline !important; + letter-spacing: normal; + word-spacing: normal; + text-transform: none; + text-indent: 0px; + text-shadow: none; + text-align: start; + cursor: text; + font: 400 13.3333px Arial; + } + } + + &.more_bottom{ + background-color: #352C2E; + height: auto !important; + padding: 0 5px 10px 5px; + top: 30px; + border-bottom-left-radius: 17px; + border-bottom-right-radius: 17px; + + label{ + color: #fff; + } + + input{ + outline-offset: 0px; + outline: 1px black; + height: 20px; + border-radius: 17px; + padding-left: 2em; + padding-right: 1.5em; + border: none; + margin-top: 5px; + margin-left: 0px; + width: 100%; + z-index: 100; + display: inline-block !important; + letter-spacing: normal; + word-spacing: normal; + text-transform: none; + text-indent: 0px; + text-shadow: none; + text-align: start; + cursor: text; + font: 400 13.3333px Arial; + } + } +} + +#patron_search { + .address { + font-size: 100%; + } } strong { @@ -420,7 +1214,7 @@ cite { input, textarea { &:focus { - border-color: #538200; + border-color: #418940; border-radius: 4px; } } @@ -434,15 +1228,44 @@ input { &[type="submit"], &[type="button"] { - &:active { - border: 1px inset #999999; - } + border: none; + background-color: #FEC32C; + color: #000; + //font-family: $font-main; + font-family: 'Poppins', sans-serif; + text-shadow: 0 1px 0 #fff; + display: inline-block; + margin-bottom: 0; + font-weight: normal; + text-align: center; + white-space: nowrap; + vertical-align: middle; + touch-action: manipulation; + min-width: 90px; + width: auto; + cursor: pointer; + background-image: none; + padding: 6px 12px; + font-size: 12px; + line-height: 1.42857143; + border-radius: 4px; + user-select: none; } &[type="submit"], &[type="reset"], &[type="button"] { - @include default-button; + border-radius: 4px; + border-width: 1px; + color: #333333; + display: inline-block; + font-size: inherit; + line-height: 1.42857143; + margin: 5px; + text-align: center; + text-shadow: 0 1px 0 #fff; + vertical-align: middle; + white-space: nowrap; &:active { border: 1px inset #999999; @@ -464,6 +1287,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 { @@ -471,6 +1312,7 @@ input { border-color: #900; } + label, .label { color: #000; @@ -517,19 +1359,40 @@ label, padding-top: 10px; } -#navmenulist { - li { - border-bottom: 1px solid #EEE; - list-style: $nav-menu-bullet; - padding: .2em 0; +#area-news, #area-userblock{ + background-color: #FFF; + border: none; + color: #696969; + margin: 0em 0em 1em 0em; + box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); + display: block; + padding: 1em; - a { - text-decoration: none; + h3{ + background-color: #fff; + } +} - &.current { - font-weight: bold; - } - } +.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; + align-items: center; + justify-content: center; + flex-wrap: wrap; + width: 200px; + height: 150px; + margin-right: auto; + margin-left: auto; } } @@ -548,7 +1411,7 @@ ul { padding-left: 1.1em; li { - list-style-type: disc; + list-style-type: none; input { &.submit { @@ -566,7 +1429,7 @@ ul { padding-left: 0; button { - font-family: $font-main; + font-family: 'Poppins', sans-serif; padding-bottom: 2px; } @@ -576,6 +1439,11 @@ ul { } } + &.nav-tabs { + border-bottom: 1px solid transparent; + padding: .2em 1.4em 0 1.4em; + } + &.budget_hierarchy { margin-left: 0; padding-left: 0; @@ -601,7 +1469,6 @@ ul { } } - // For Font Awesome icon bullets &.fa-ul { li { list-style-type: none; @@ -628,13 +1495,6 @@ ol { } } - -.gradient { - background-image: linear-gradient(to bottom, rgb(230, 240, 242) 1%, rgb(255, 255, 255) 99%); - align-items: flex-start; - display: flex; -} - .cart-controls { border-top: 1px solid #E8E8E8; padding: 7px 0; @@ -663,10 +1523,15 @@ ol { } fieldset { - background-color: #F4F8F9; - border: 2px solid #B9D8D9; - border-radius: 5px; - margin: 1em 1em 1em 0; + width: 100%; + color: #71B443; + background-color: #FFF; + position: relative; + color: #696969; + left: 0px; + top: 0px; + margin: 0em 1em 1em 0em; + box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); padding: 1em; + fieldset { @@ -675,6 +1540,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; @@ -683,11 +1558,11 @@ fieldset { margin-right: 0; } - .standard { - background-color:#f4f8f9 !important; + &.standard { + background-color:#F4F8F9 !important; } - .contrast { + &.contrast { background-color:#F3F3F3 !important; } @@ -695,14 +1570,17 @@ fieldset { background-color: transparent; border: 0; clear: both; + box-shadow: none; float: none; margin: .9em 0 0; padding: .4em; width: auto; } + &.brief { - border: 2px solid #B9D8D9; + width: 50%; + overflow: visible; div { &.hint { @@ -711,7 +1589,6 @@ fieldset { } label { - display: block; font-weight: bold; padding: .3em 0; @@ -768,14 +1645,18 @@ fieldset { } } + ol{ + li{ + list-style-type: none; + padding: .3em 0; + } + } + &.rows { - border: 2px solid #B9D8D9; - border-width: 1px; + border: none; clear: left; float: left; font-size: 90%; - margin: .9em 0 0; - padding: 0; width: 100%; fieldset { @@ -849,7 +1730,8 @@ fieldset { font-weight: bold; margin-right: 1rem; text-align: right; - width: 9rem; + width: auto; + min-width: 9rem; &.error { float: none; @@ -876,11 +1758,11 @@ fieldset { } } - legend { + /*legend { font-size: 110%; font-weight: bold; margin-left: 1em; - } + }*/ li { clear: left; @@ -916,8 +1798,6 @@ fieldset { } fieldset { - margin-left: 10em; - label { width: 6em; } @@ -1033,6 +1913,10 @@ fieldset { margin: 1em; } } + + fieldset{ + box-shadow: none; + } } #multi_receiving { @@ -1042,18 +1926,7 @@ fieldset { width: 50%; } } - } -} - -legend { - background-color: #FFFFFF; - border: 2px solid #B9D8D9; - border-radius: 3px; - font-size: 123.1%; - font-weight: bold; - margin-bottom: 0; - padding: .2em .5em; - width: auto; + } } details { @@ -1093,7 +1966,7 @@ details[open] { } #breadcrumbs { - background-color: #E6F0F2; + background-color: transparent; clear: both; margin: 0; padding: .8em .5em .8em 10px; @@ -1105,6 +1978,32 @@ details[open] { } } +#shortcut{ + position: relative; + top: -35px; + padding: .8em .5em .8em 10px; + + ol{ + float: right; + margin: 0; + padding: 0; + + li{ + list-style-type: none; + display: inline; + + a.toplinks{ + padding: 0; + } + + div{ + margin: 0; + + } + } + } +} + #header { + #breadcrumbs { margin-top: 1em; @@ -1154,7 +2053,7 @@ div { } &.note { - background: linear-gradient(to bottom, #F4F6FA 0%, #E8EDF6 100%); // W3C + background: linear-gradient(to bottom, #F4F6FA 0%, #E8EDF6 100%); border: 1px solid #BCBCBC; margin: .5em 0; padding: .5em; @@ -1168,7 +2067,6 @@ div { } } - // Tools > automatic_item_modification_by_age &.rules { display: block; } @@ -1183,7 +2081,7 @@ div { &.rule { background-color: #F4F8F9; - border: 2px solid #B9D8D9; + border: 2px solid #bfd9b9; border-radius: 5px; margin: .3em; padding: .3em; @@ -1316,91 +2214,23 @@ div { } .browse { - margin: .5em 0; - } -} - -#header_search { - background-position: .5em .5em; - background-repeat: no-repeat; - float: left; - margin: .3em 0 .5em; - - input { - &[type="submit"] { - border-radius: 3px; - padding: .2em .8em; - } - } - - 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; - - 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; + margin: .5em 50px; + font-weight: bold; - > li { - display: none; + a{ + color: #71B443; + font-weight: normal; - &:first-of-type { - display: block; + &:hover, &:active{ + font-weight: bold; + color: #418940; } } - - &:first-of-type { - display: block; - } - } - - .head-searchbox { - font-size: 1.3em; - width: 30em; } } #reserves, #checkouts { - border: 1px solid #B9D8D9; padding: 1em; } @@ -1433,21 +2263,133 @@ dd { #toolbar, .btn-toolbar { - background-color: #EDF4F6; - border: 1px solid #E6F0F2; + background-color: #f3F4F4; + border: none; border-radius: 5px 5px 0 0; margin: 0; padding: 5px; + display: block; - .dropdown-menu { - border-top-width: 1px; - font-size: 13px; + div{ + position: relative; + height: 100%; + float: right; + + 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; + width: auto; + font-size: 12px; + line-height: 1.42857143; + border-radius: 0px; + border: 0.5px solid lightgray; + font-size: 100%; + background-color: #fff; + margin: 5px 0 0 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: #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; + font-weight: bold; + background-color: #fff; + background-image: none; + + } + } + } + + #up{ + display: table; + } + + #down{ + display: table; + } + + #patdrop{ + 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: -20px; + right: auto; + + a{ + 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; + } + } + + } } &.floating { border-radius: 0; margin-top: 0; z-index: 300; + width: 851px; } a.addtocart { @@ -1487,31 +2429,42 @@ dd { .patroninfo { - margin-top: -.5em; + margin-right: .5em; + padding-top: 1em; + background-color: #e6e6e6; + left: -10px; + width: 100%; + padding-bottom: 25px; h5 { - 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; + 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; + } } @@ -1520,15 +2473,8 @@ dd { } > div { - border-right: 1px solid #B9D8D9; width: 100%; } - - &.is-staff { - h5 { - background-color: #EEE; - } - } } .patroninfo-section { @@ -1541,7 +2487,6 @@ dd { } .patroninfo-heading { - background-color: rgba(237, 244, 246, .4); padding: .5em; margin-bottom: .3em; clear: both; @@ -1555,8 +2500,6 @@ dd { } } -/* Patron image */ - .patronimage-container { padding: .2em; position: relative; @@ -1623,15 +2566,32 @@ dd { } .dropdown-menu { + position: absolute; + top: 50px; + background-color: #F3F4F4; li { list-style-type: none; + display: flex; + + a{ + color: #000; + + &:hover{ + background-color: #F3F4F4; + color: #000; + text-decoration: underline; + background-image: none; + } + } } + } .btn-toolbar { fieldset { &.action { margin-top: 0; + float: right; } } @@ -1676,13 +2636,12 @@ input[type='text']:read-only:focus { .content_hidden { display: none; - visibility: hidden; // you propably don't need to change this one + visibility: hidden; } -// the property for the displayed tab .content_visible { display: block; - visibility: visible; // you propably don't need to change this one + visibility: visible; } #z3950searcht { @@ -1717,7 +2676,7 @@ i { } &.success { - color: #008000; + color: #418940; } &.warn { @@ -1727,7 +2686,8 @@ i { .circ-setting { font-size: 85%; - padding-top: .3em; + padding-top: .9em; + padding-bottom: .9em; input { vertical-align: middle; @@ -1740,9 +2700,7 @@ i { } .circ-settings { - background-color: #F4F8F9; border-radius: 0; - border-top: 2px solid #B9D8D9; display: none; margin-left: -1em; margin-right: -1em; @@ -1752,6 +2710,26 @@ i { #show-circ-settings { margin-top: .5em; + display: inline; + background: transparent url("../img/UIKit/setting.svg") no-repeat scroll 0%; + background-size: 70%; + position: relative; + margin: 3px; + align-items: center; + right: 35px; + opacity: 0.3; + + &:hover{ + opacity: 1; + } + + a{ + width: 100%; + + &:hover{ + text-decoration: none; + } + } } .checkin-active-setting { @@ -1759,6 +2737,7 @@ i { border-radius: 3px; box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5); margin: .5em; + width: fit-content; padding: .5em; } @@ -1796,11 +2775,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; @@ -1838,9 +2817,8 @@ i { input { background-color: #FFFFFF; - border: 1px solid #BCBCBC; margin: .4em; - padding: .4em .4em .4em 25px; + padding: .4em; &:hover { background-color: #FFC; @@ -1848,6 +2826,52 @@ i { &[type="submit"] { background: #FFF none; + + &.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: 'Poppins', sans-serif; + display: inline-block; + margin-bottom: 0; + font-weight: normal; + text-align: center; + white-space: nowrap; + vertical-align: middle; + touch-action: manipulation; + 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 { @@ -1879,9 +2903,10 @@ 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; + ul, h5 { @@ -1896,9 +2921,8 @@ 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; text-shadow: none; @@ -1922,9 +2946,10 @@ i { .approve, .success { + background-color: #FEC32C; i { &.fa { - color: #008000; + color: #418940; } } } @@ -1980,7 +3005,7 @@ i { } #menu { - border-right: 1px solid #B9D8D9; + border-right: 1px solid #bfd9b9; margin-right: .5em; padding-bottom: 2em; padding-top: 1em; @@ -1988,7 +3013,7 @@ i { li { a { background: linear-gradient(to bottom, #E8F0F6 0%, #E8F0F6 96%, #C1C1C1 100%); - border: 1px solid #B9D8D9; + border: 1px solid #bfd9b9; border-bottom-left-radius: 5px; border-top-left-radius: 5px; display: block; @@ -2019,7 +3044,7 @@ i { &:hover { background-color: #FFFFFF; - color: #538200; + color: #418940; } } } @@ -2031,6 +3056,59 @@ i { } } } +/* +#menu-side { + margin-right: .5em; + padding-bottom: 2em; + padding-top: 1em; + background-color: #e6e6e6; + position: absolute; + left: 0px; + + li { + a { + display: block; + font-size: 111%; + margin: .5em 0; + margin-right: -1px; + padding: .4em .3em; + text-decoration: none; + + left: 0px; + color: #000; + display: block; + + &:hover { + background-color: #F3F4F4; + color: #418940; + border-left: solid 5px #418940; + font-weight: bold; + } + } + + &.active { + a { + background-color: #F3F4F4; + color: #418940; + border-left: solid 5px #418940; + font-weight: bold; + + &:hover { + background-color: #F3F4F4; + color: #418940; + border-left: solid 5px #418940; + font-weight: bold; + } + } + } + } + + ul { + li { + list-style-type: none; + } + } +}*/ #closewindow { margin-top: 2em; @@ -2042,8 +3120,14 @@ i { } .barcode { - font-size: 200%; + font-size: 100%; vertical-align: middle; + font-style: italic; + width: 250px; + height: 30px; + padding-left: 5px; + padding-right: 30px; + border-radius: 0; } li { @@ -2114,14 +3198,60 @@ li { } } -#searchresults { - td { +#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; + min-width: 100%; + width: fit-content; + padding: 20px; + + fieldset{ + box-shadow: none; + } + + h3{ + padding-bottom: .7em; + margin: 0; + color: #696969; + } + + 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; font-size: 90%; list-style: url("../img/item-bullet.svg"); padding: .2em 0; + color: #000; + top: 100%; &.result_itype_image { list-style: none; @@ -2153,6 +3283,7 @@ li { table { td { vertical-align: top; + text-align: center; } } @@ -2178,15 +3309,37 @@ li { } } } + + .dropdown-menu { + background-color: #fff; + color: #000; + height: fit-content; + top: 100%; + + a{ + color: #000; + + &:hover{ + background-image: none; + color: #000; + text-decoration: underline; + background-color: #fff; + } + } + } } .searchheader { - background-color: #E6F0F2; - border: 1px solid #B9D8D9; - border-radius: 5px 5px 0 0; + background-color: transparent; + border: 1px solid #696969; + border-radius: 5px 5px 5px 5px; font-size: 80%; - margin: 0 0 .5em -1px; - padding: .4em 0 .4em 1em; + margin-top: .5em; + margin-bottom: .5em; + padding: 5px; + width: 100%; + color: #696969; + display: block; &.floating { border-radius: 0; @@ -2219,15 +3372,20 @@ li { } } -#search-facets { - border: 1px solid #B9D8D9; - border-radius: 5px 5px 0 0; +.mini-inp{ + height: 12px; + width: 30px; +} + + +#search-facets { 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; @@ -2237,6 +3395,10 @@ li { margin: 0; padding: .3em; + &.cadre{ + border: 3px solid #71B443; + } + li { font-weight: bold; list-style-type: none; @@ -2273,7 +3435,7 @@ li { } #biblio-cover-slider { - border: 1px solid #b9d8d9; + border: 1px solid #bfd9b9; border-radius: 3px; margin: 5px; padding: 10px 5px 5px 5px; @@ -2324,6 +3486,21 @@ td { } } +.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; @@ -2352,6 +3529,7 @@ td { #CheckPending { font-weight: normal; margin: 0 .5em 0 0; + color: #71B443; } .lost, @@ -2475,10 +3653,9 @@ td.bundle { } #cartDetails { - background-color: #FFFFFF; - border: 1px solid #739ACF; + background-color: #352C2E; box-shadow: 1px 1px 3px 0 #666; - color: #000; + color: #fff; display: none; margin: 0; padding: 10px; @@ -2488,11 +3665,9 @@ td.bundle { } #cartmenulink { - padding-left: 15px; - - i.fa.fa-shopping-cart { - padding-right: 7px; - } + position: relative; + left: 0px; + top: 0px; } #basketcount { @@ -2551,7 +3726,6 @@ td.bundle { } .container { - border: 1px solid #EEE; margin: 1em 0; padding: 1em; } @@ -2643,7 +3817,7 @@ td.bundle { } .advsearch { - margin: 0; + margin: 0em 1em 1em 0em; table { border-collapse: separate; @@ -2762,13 +3936,14 @@ td.bundle { // Override core jQueryUI widgets .ui-widget-content { background: #FFFFFF none; - border: 1px solid #B9D8D9; + border-radius: 4px; + border: 3px solid #418940; color: #222222; } .ui-widget-header { - background: #E6F0F2 none; - border: 1px solid #B9D8D9; + background: #b5dbad none; + border: 1px solid #bfd9b9; color: #222222; font-weight: bold; } @@ -2776,8 +3951,7 @@ td.bundle { .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - background: #F4F8F9 none; - border: 1px solid #B9D8D9; + border: 1px solid #bfd9b9; color: #555555; font-weight: normal; } @@ -2788,21 +3962,12 @@ td.bundle { .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { - background: #E6F0F2 none; - border: 1px solid #B9D8D9; + background: #cad8c6 none; + border: 1px solid #bfd9b9; color: #212121; 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 { @@ -2831,7 +3996,7 @@ td.bundle { padding: 3px 1em 3px .4em; &:hover { - background: #E6F0F2 none; + background: #e3f1df none; color: #212121; font-weight: normal; } @@ -2866,6 +4031,7 @@ td.bundle { } .ui-tabs-nav { + .ui-tabs-active a, a:hover, a:focus, @@ -2878,44 +4044,43 @@ td.bundle { &.ui-widget-header { background: none; border: 0; + padding: .2em .9em 0 .9em; } } .ui-tabs { + .ui-tabs-panel { + background: #FFF none; + border-radius: 4px; + border: 3px solid #418940; + + fieldset{ + box-shadow: none; + } + } .ui-tabs-nav { li { - background: #E6F0F2 none; - border: 1px solid #B9D8D9; + background: #71B443; + border: none; margin-right: .4em; - top: 1px; + border-radius: 4px 4px 0 0; - &.ui-tabs-active { - background-color: #FFFFFF; - border: 1px solid #B9D8D9; + &.ui-tabs-active, &.ui-state-hover { + background-color: #418940; + border-radius: 4px 4px 0 0; + border: none; border-bottom-width: 0; + padding-bottom: 0; a { - color: #000; - font-weight: bold; + color: #FFF; } - &.ui-state-hover { - background: #FFF none; - } - } - &.ui-state-default { - &.ui-state-hover { - background: #EDF4F5 none; - } } } } - .ui-tabs-panel { - border: 1px solid #B9D8D9; - } - &.ui-widget-content { background: transparent none; border: 0; @@ -2923,22 +4088,22 @@ td.bundle { .ui-state-default { a { - color: #004D99; + color: #fff; &:link, &:visited { - color: #004D99; + color: #fff; } } } .ui-state-hover { a { - color: #538200; + color: #418940; &:link, &:visited { - color: #538200; + color: #418940; } } } @@ -2959,13 +4124,59 @@ td.bundle { } .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; color: #222222; font-size: 100%; font-weight: bold; @@ -2987,12 +4198,10 @@ td.bundle { } li { - 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; float: left; font-weight: normal; list-style: none outside none; @@ -3002,35 +4211,34 @@ td.bundle { position: relative; top: 1px; white-space: nowrap; + background: #71B443; - &.active { - background-color: #FFFFFF; - color: #212121; + &.active, &:hover { font-weight: normal; padding-bottom: 1px; + background-color: #418940; + border: none; + border-bottom-width: 0; + a { background: none repeat scroll 0 0 transparent; - color: #000000; - cursor: text; - font-weight: bold; + color: #fff; outline: 0 none; top: 1px; } } a { - color: #004D99; + color: #fff; cursor: pointer; float: left; padding: .5em 1em; text-decoration: none; &:hover { - background-color: #EDF4F5; border-top-left-radius: 4px; border-top-right-radius: 4px; - color: #538200; } } } @@ -3038,9 +4246,8 @@ td.bundle { .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 #418940; + border-radius: 4px; color: #222222; display: block; padding: 1em 1.4em; @@ -3051,6 +4258,12 @@ td.bundle { margin-top: 5px; .ui-tabs-panel { background: #FFF none; + border-radius: 4px; + border: 3px solid #418940; + + fieldset{ + box-shadow: none; + } } } @@ -3153,7 +4366,7 @@ td.bundle { } .pluginname { - background-color: #E6F0F2; + background-color: #e3f1df; cursor: move; margin: .3em; padding-bottom: 4px; @@ -3189,84 +4402,467 @@ video { width: 480px; } -// Bootstrap overrides +// Bootstrap overrides + +.dropdown-header { + border-top: 1px solid #EEE; + color: #000; + font-weight: bold; + margin-top: 5px; + padding-left: 10px; + + &:first-child { + border-top: 0; + } +} + +nav { + border: 0; + display: block; + + &.breadcrumb { + background-color: transparent; + clear: both; + margin: 0; + position: absolute; + top: 0px; + left: 0px; + + ol { + margin: 0; + padding-left: 0; + list-style: none; + + li { + display: inline; + color : #418940; + font-style: italic; + + &+li::before { + content: '/'; + display: inline-block; + height: .8em; + width: .8em; + } + + a:link, a:active, a:hover, a:focus{ + padding: .6em .3em; + } + } + } + + [aria-current="page"] { + color: #696969; + text-decoration: none; + } + } +} + +.navbar{ + background-color: #352C2E; + width: 100%; +} + +.navbar-header, .collapse{ + padding-left: 10px; + padding-right: 10px; + float: left; + + a{ + color: #fff; + line-height: 40px; + } +} + +.navbar-head{ + display: block !important; + height: auto !important; +} + +#logo { + background: transparent url("../img/UIKit/picto-koha.svg") no-repeat scroll 0%; + margin: .75em 0em .75em 0em; + background-size: 85%; + width: 20px; + height: 30px; + float: left; + position: relative; + top: 0px; + left: 0px; + + a { + border: 0; + cursor: pointer; + width: 100%; + height: 100%; + padding: 50px 0 0; + text-decoration: none; + position: absolute; + top: -10px; + left: 0px; + } +} + +#toplevelmenu{ + background-color: transparent; + box-shadow: none; + position: relative; + left: 0px; + top: 0px; +} + +.navbar-nav { + li { + list-style: none; + + .upper{ + position: relative; + bottom: 3px; + left: 300px; + } + + .filteraction{ + position: absolute; + right: 35px; + top: -5px; + width: 25px; + height: 30px; + border: none; + padding-left: 5px; + padding-right: 5px; + margin: 0; + display: inline; + + a{ + color: #71B443; + vertical-align: middle; + + &:hover, &:active{ + background-color: transparent; + text-decoration: none; + color: #71B443; + } + } + + } + + .residentsearch { + border: 0; + cursor: text; + padding: 0 0 .2em; + background-color: transparent; + } + + .inactive{ + display: none; + } + + #buttonssearch,#header_search{ + padding: 10px; + border-radius: 28px; + height: 30px; + background-image: linear-gradient(to right, #418940, #71B443); + z-index: 1; + } + + #header_search{ + position: relative; + left: 0px; + top: 0px; + width: 500px; + display: block; + margin: 10px 0; + } + + #submit, #autocsubmit{ + background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%; + position: absolute; + min-width: 7px; + right: 0; + top: 0px; + width: 25px; + height: 30px; + border: none; + padding-left: 5px; + padding-right: 5px; + margin: 0; + display: inline; + } + + #header_search{ + width: 500px; + } + + .ui-tabs-nav { + background-image: linear-gradient(to right, #418940, #71B443); + background-color: transparent; + 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; + 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; + cursor: pointer; + padding: 3px; + font-size: .9em; + } + } + } + + span{ + &.name-icon{ + display: none; + } + + &.name-icon:hover, &.name-icon.active{ + margin-right: 0; + font-size: 0.85em; + cursor: text; + padding: 0.25em; + margin: 0; + display: inline-block; + overflow: hidden; + opacity: 1; + } + } + } + + &.ui-widget-content { + background: transparent none; + border: 0; + } -.dropdown-header { - border-top: 1px solid #EEE; - color: #000; - font-weight: bold; - margin-top: 5px; - padding-left: 10px; + .ui-state-default { + a { + color: #fff; + cursor: pointer; + padding: 3px; + font-size: .9em; + + &:link, + &:visited { + color: #fff; + padding: 3px; + background-color: transparent; + } + } + } - &:first-child { - border-top: 0; - } -} + .ui-state-hover, .ui-state-active { + a { + font-size: 1em; + cursor: pointer; + padding: 3px; + font-size: .9em; + background-color: transparent; -nav { - background: #E6F0F2 none; - border: 0; + i{ + border-bottom: 2px solid #fff; + padding-bottom: 2px; + } + } + } - &.breadcrumb { - background-color: #E6F0F2; - clear: both; - margin: 0; - padding: .8em .5em .8em 10px; - position: relative; + .ui-widget { + font-family: inherit; + font-size: inherit; - ol { - margin: 0; - padding-left: 0; - list-style: none; + input, + select, + textarea, + button { + font-family: inherit; + font-size: inherit; + } } - li { - display: inline; + input{ + display: none; - &+li::before { - background: transparent url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgZmlsbD0iY3VycmVudENvbG9yIiBjbGFzcz0iYmkgYmktY2hldnJvbi1yaWdodCI+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNNy4zNyAwbDUuMzUgNy4zYy4yLjIuMi41MSAwIC43bC01LjM4IDhoLTQuMmw1LjY0LTguMzVMMy4xMy4wMXoiLz48L3N2Zz4=") 50% 50% no-repeat; - background-size: 8px; - content: ''; - display: inline-block; - height: .8em; - width: .8em; + &.head-searchbox{ + outline-offset: 0px; + outline: 1px black; + float: right; + height: 30px; + border-radius: 17px; + padding-left: 2em; + padding-right: 1.5em; + border: none ; + margin-left: 0px; + position:absolute; + top: 0px; + right: 30px; + z-index : -2; + display: inline; + 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%; + } + } + + &.multi-input{ + outline-offset: 0px; + outline: 1px black; + float: right; + height: 30px; + border-radius: 17px; + padding-left: 2em; + padding-right: 1.5em; + border: none ; + margin-left: 0px; + position:absolute; + top: 0px; + right: 30px; + z-index : -2; + display: inline; + 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; + } } - [aria-current="page"] { - color: #000; - font-weight: 700; - text-decoration: none; + #header_search.fold{ + width: 0px; + opacity: 0; + margin: 0; + padding: 0; } - } + #backsearch{ + display: none; + font-size: 1em; -} + } -.navbar-collapse { - background: #E6F0F2 none; - box-shadow: none; -} + #header_search.fold #backsearch{ + display: inline-block; + cursor: pointer; + } -.navbar-nav { - li { - list-style: none; + .description{ + opacity: 0.6; + max-width: 50em; + display: block; + width: 100%; + } + .description.hidden{ + opacity: 0; + } &.open { li { + background-color: #352C2E; + a { font-weight: normal; + padding: 0 15px; + font-size: 13px; + + &:hover, + &:focus{ + background-color: #352C2E; + background-image: none; + text-decoration: underline; + } } } } a { - font-weight: bold; - padding-bottom: .4em; - padding-top: .4em; + line-height: 40px; + overflow: hidden; + color: #fff; + + &:hover, &:active{ + background-color: #352C2E; + border-bottom: 1px 5px #fff; + color: #fff; + } } } + + ul{ + background-color: #352C2E; + } +} + + + +#logged-in-menu{ + position: relative; + left: 0px; + top: 0px; + height: 50px; + + &:hover{ + text-decoration: none; + } +} + +.loggedinusername{ + bottom: 5px; + text-decoration: none; + position: relative; + float: right; + right: 0px; + height: 20px; + width: 100%; +} + +.logged-in-branch-name{ + position: relative; + right: 0px; + height: 20px; + top: 10px; + width: 100%; + + &:hover{ + text-decoration: underline; + } } .nav .open > a, @@ -3279,7 +4875,6 @@ nav { .nav > li > a:hover, .nav > li > a:focus { background-color: transparent; - text-decoration: none; } .pagination { @@ -3287,24 +4882,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; } } } @@ -3312,12 +4907,134 @@ nav { button, .btn { - border-color: #ADADAD #ADADAD #949494; - font-family: $font-main; + font-family: 'Poppins', sans-serif; + display: inline-block; + margin-bottom: 0; + font-weight: normal; + text-align: center; + white-space: nowrap; + vertical-align: middle; + touch-action: manipulation; + cursor: pointer; + background-image: none; + padding: 6px 25px; + font-size: 12px; + line-height: 1.42857143; + 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: 'Poppins', sans-serif; + display: inline-block; + margin-bottom: 0; + font-weight: normal; + text-align: center; + white-space: nowrap; + vertical-align: middle; + touch-action: manipulation; + min-width: 90px; + width: fit-content; + 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; +} + +#patronlist-menu{ + padding: 0 25px; +} + +.principal{ + background-color: #FEC32C; + color: #000; + text-shadow: 0 1px 0 #fff; + border: none; + padding: 6px 25px; + background-image: none; + margin: 5px; + + &:hover, + &:active, + &:focus{ + background-color: #fec22c9f; + color: #000; + border: none; + } } .btn-xs, @@ -3331,6 +5048,10 @@ button, .panel { background: #F4F8F9 none; box-shadow: none; + + &:hover{ + background: #e3f1df none; + } } .panel-collapse { @@ -3353,7 +5074,7 @@ button, } &:hover { - background: #e6f0f2 none; + background: #e3f1df none; border-bottom-left-radius: 0; border-bottom-right-radius: 0; } @@ -3367,7 +5088,7 @@ button, } &:hover { - background: #e6f0f2 none; + background: #e3f1df none; border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; } @@ -3376,14 +5097,14 @@ button, } .panel-default { - border: 1px solid #B9D8D9; + border: 1px solid #bfd9b9; > .panel-heading { background: transparent none; padding: 0; + .panel-collapse { > .panel-body { - border-top-color: #B9D8D9; + border-top-color: #bfd9b9; } } } @@ -3582,7 +5303,7 @@ label { fieldset, ol { - background-color: transparent; + background-color: #FFF; border: 0; margin: 0; padding: 0; @@ -3590,7 +5311,11 @@ label { } .modal-content { - background-color: #EDF4F6; + background-color: rgb(211, 223, 204); + + fieldset{ + box-shadow: none; + } } .btn-group { @@ -3632,25 +5357,27 @@ code { } .tab-content { - background-color: #FFF; - border: 1px solid #B9D8D9; - border-top-width: 0; + border: 3px solid #418940; + border-radius: 4px; + overflow: auto; padding: 1em; } .nav-tabs { > li { > a { - background-color: #e6f0f2; - border: 1px solid #b9d8d9; - border-radius: 4px 4px 0 0; + background-color: #71B443; + color: #fff; line-height: 1.42857143; margin-right: .4em; padding: .5em 1em; &:hover { - background-color: #EEF4F5; - border-color: #b9d8d9; + background-color: #418940; + border-radius: 4px 4px 0 0; + border: 1px solid #418940; + text-decoration: none; + color: #fff; } } @@ -3658,10 +5385,9 @@ code { a, a:hover, a:focus { - background-color: #fff; - border: 1px solid #b9d8d9; - border-bottom-color: transparent; - color: #000; + background-color: #418940; + border-radius: 4px 4px 0 0; + color: #fff; cursor: default; font-weight: bold; } @@ -3670,7 +5396,6 @@ code { } // End Bootstrap overrides - .waiting { cursor: wait; } @@ -3716,7 +5441,7 @@ progress { } span { - background-color: #EBF3FF; + background-color: #ecffeb; border-radius: 5px; display: inline-block; font-size: 75%; @@ -3725,7 +5450,7 @@ progress { white-space: nowrap; &.selected { - background-color: #CCE0FC; + background-color: #d2fad0; } } } @@ -3742,7 +5467,6 @@ progress { } // Class to be added to toolbar when it starts being fixed at the top of the screen - .floating { box-shadow: 0 3px 2px 0 rgba(0, 0, 0, .5); z-index: 100; @@ -3786,7 +5510,7 @@ progress { #browse-return-to-results { background-color: #E8F0F6; - border: 1px solid #B9D8D9; + border: 1px solid #bfd9b9; border-bottom-width: 0; border-top-left-radius: 5px; border-top-right-radius: 5px; @@ -3797,7 +5521,7 @@ progress { .browse-button { background-color: #FFF; - border: 1px solid #B9D8D9; + border: 1px solid #bfd9b9; color: #004D99; display: block; overflow: hidden; @@ -3929,7 +5653,6 @@ input.renew { .date-select { label { - display: inline-block; width: 40%; } } @@ -3985,7 +5708,7 @@ input.renew { .branchgriditem { background-color: #FFFFFF; - border: 1px solid #B9D8D9; + border: 1px solid #bfd9b9; border-radius: 3px; display: table-cell; float: left; @@ -4012,7 +5735,7 @@ input.renew { #new_rule { background-color: #F4F8F9; - border: 2px solid #B9D8D9; + border: 2px solid #bfd9b9; border-radius: 5px; display: none; margin: .3em; @@ -4053,7 +5776,6 @@ input.renew { } } - .form-message { background-color: #FFF; border: 1px solid #A4BEDD; @@ -4072,18 +5794,8 @@ input.renew { } } -#patron_search { - #filters { - display: none; - } - - .address { - font-size: 100%; - } -} - #fixedlengthbuilderaction { - border: 3px solid #E6F0F2; + border: 3px solid #e3f1df; left: 80%; padding: 5px; position: relative; @@ -4340,6 +6052,14 @@ input.renew { #helper { span { display: none; + font-style: normal; + // position: absolute; + //top: 10px; + //right: 20px; + + &:hover{ + text-decoration: underline; + } } } @@ -4348,15 +6068,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 { @@ -4365,64 +6087,138 @@ input.renew { } .lastborrower { - background-color: #E6F0F2; - border: 1px solid #95C6D0; + background-image: linear-gradient(to left, #418940, #71B443); box-shadow: 1px 1px 1px 0 #999; - color: #CC0000; + color: #fff; margin: .4em 0; - padding: .3em .5em .3em .5em; + border-radius: 5px 5px 5px 5px; + // position: absolute; + // right: 50px; } + + #lastborrower-ref { - border-radius: 5px 0px 0px 5px; float: left; + padding: .1em .4em .1em .5em; +} + +#lastborrower-bar { + float: right; + float: left; + padding: .1em .0em .1em .0em; } #lastborrower-remove { - border-radius: 0px 5px 5px 0px; cursor: pointer; float: right; + margin: .0em .4em .0em .4em; + padding: .1em .5em .1em .5em; } #lastborrower-window { - display: none; position: absolute; - right: 5px; - top: 0px; + right: 50px; + top: 9px; +} + +#lastborrowerlink { + background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%; + color: #fff; + padding: .0em .0em .0em 1.3em; + + &:hover{ + text-decoration: underline; + } } /* ==== 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; + display: table; + margin-bottom: 15px; a { - &.circ-button { - // Class used for each module link - background-color: #F4F8F9; - background-position: 5px 3px; - background-repeat: no-repeat; - border: 2px solid #B9D8D9; - border-radius: 6px; - box-sizing: content-box; - color: #000000; + &.menucirc{ display: block; - font-size: 110%; - font-weight: bold; - margin: .5em 0; - max-width: 260px; - padding: 8px; - text-decoration: none; + height: 60px; + margin: 5px; + + i{ + + &.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; + } - &:hover { - // Class used for each module link hover state - border-color: #538200; - color: #538200; + &.fond{ + opacity: 70%; + position: relative; + top: 5px; + border: none; + right: 20px; + border-radius: 0; + background-color: transparent; + width: auto; + height: auto; + margin: 0; + padding: 0; + } + + } + + h1 { + font-size: 150%; + font-weight: normal; + display: inline; + color: #000; + } + + &:hover, &:active, &:focus{ + text-decoration: none; + + h1{ + color: #418940; + } + + i{ + &.fa{ + background-color: #418940; + border: solid 3px #418940; + } + &.fond{ + opacity: 70%; + position: relative; + top: 5px; + border: none; + right: 20px; + border-radius: 0; + background-color: transparent; + width: auto; + height: auto; + margin: 0; + padding: 0; + } + } } } } @@ -4430,7 +6226,7 @@ input.renew { } .about h2 { - border-bottom: 1px solid #B9D8D9; + border-bottom: 1px solid #bfd9b9; padding: .5em .2em; margin: .5em 0; } @@ -4452,27 +6248,6 @@ input.renew { // ==== MODULE LINKS - End ==== -#catalog-search-link { - border-right: 1px solid lighten( #E6F0F2, 15% ); - padding-right: .3em; -} - -#catalog-search-dropdown { - padding: 0; - - & > a { - border-left: 1px solid darken( #B4D2D8, 5% ); - margin-right: .6em; - padding: .4em .6em; - - &:hover, - &.catalog-search-dropdown-hover { - background-color: darken( #E6F0F2, 5% ); - border-left: 1px solid darken( #B4D2D8, 15% ); - } - } -} - #tools_holidays { .radio, .checkbox { @@ -4573,14 +6348,13 @@ input.renew { .header-menu-link { display: none; - font-weight: bold; padding: .4em .6em; } #user-menu { + top: 0px; position: absolute; right: 5px; - top: 0; } div#makechart ol li { @@ -4616,7 +6390,6 @@ div .suggestion_note { } .currentlibrary { - background-color: #E6FCB7; display: inline-block; padding: 2px 4px; } @@ -4712,7 +6485,7 @@ div .suggestion_note { .open { .dropdown-menu { - background-color: #FFF; + background-color: #352C2E; border: 1px solid #ccc; position: absolute; } @@ -4720,8 +6493,7 @@ div .suggestion_note { } #header { - background-color: #FFF; - border: 1px solid #CCC; + background-color: #352C2E; margin-bottom: 1em; a { @@ -4729,8 +6501,10 @@ div .suggestion_note { padding-left: 1.5em; &:hover { - background-color: #0070A9; + text-decoration: underline; color: #FFF; + background-color: #352C2E; + background-image: none; } } @@ -4739,7 +6513,7 @@ div .suggestion_note { box-shadow: unset; float: none; left: auto; - position: relative; + position: initial; right: auto; &.dropdown-menu { @@ -4747,13 +6521,13 @@ div .suggestion_note { } } - .dropdown-menu { + .dropdown-menu-brown { li { - a { - color: #004D99; + a { &:hover { color: #FFF; + text-decoration: underline; } } } @@ -4785,8 +6559,7 @@ div .suggestion_note { #user-menu { .open { .dropdown-menu { - background-color: #FFF; - border: 1px solid #ccc; + background-color: #352c35; position: absolute; } } @@ -4835,7 +6608,13 @@ div .suggestion_note { #helper { - i { + i {background-color: #352C2E; + box-shadow: none; + height: 50px; + padding-left: 10px; + padding-right: 10px; + display: inline; + float: left; display: none; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc index f330237f37..d021c6e6b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc @@ -7,21 +7,21 @@ - + -
  • From a suggestion
  • -
  • From a subscription
  • -
  • From a new (empty) record
  • -
  • From existing orders (copy)
  • -
  • From an external source
  • -
  • From a new file
  • -
  • From a staged file
  • - [% IF ( CAN_user_circulate ) %]
  • From titles with highest hold ratios
  • [% END %] +
  • From a suggestion
  • +
  • From a subscription
  • +
  • From a new (empty) record
  • +
  • From existing orders (copy)
  • +
  • From an external source
  • +
  • From a new file
  • +
  • From a staged file
  • + [% IF ( CAN_user_circulate ) %]
  • From titles with highest hold ratios
  • [% END %] [% ELSE %]
    -

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

    +

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

    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc index 066f203482..51d77de107 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc @@ -1,7 +1,8 @@ [% USE Koha %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc index c3ae4e2a23..17b6c47aa8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -53,8 +53,8 @@ [% END %] - - + + [% END %] @@ -81,7 +81,7 @@ - + [% END %] @@ -121,7 +121,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 926008ed94..eb147c34cf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -10,29 +10,40 @@ [% ELSIF ( patron_is_staff ) %] [% patron_type_class = 'is-staff' %] [% END %] -
    -[% IF ( patronimages ) %] +
    +
    + [% IF ( patronimages ) %]
    -[% ELSE %] + [% ELSE %]
    -[% END %] + [% END %] + [% IF ( patron_is_staff ) %] - + [% END %] + [% IF ( patron_is_superlibrarian ) %] - + [% END %] + [% INCLUDE 'patron-title.inc' %] + + [% IF ( patron.dateofbirth ) %] +
  • + [% INCLUDE 'patron-age.inc' %] +
  • + [% END %] +
    -[% IF Koha.Preference('showLastPatron') %] + [% IF Koha.Preference('showLastPatron') %] -[% END %] + [% END %] -[% IF ( patronimages ) %] + [% IF ( patronimages ) %]
    [% IF ( patron.image ) %] @@ -48,57 +59,57 @@ [% END %]
    -[% END %] + [% END %] -
      - [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %] +
        + [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %] [% PROCESS 'display-address-style' %] [% IF ( patron.phone || patron.mobile || patron.phonepro ) %]
      • + [% IF ( patron.phone ) %] - [% patron.phone | html %] + [% patron.phone | html %] [% ELSE %] [% IF ( patron.mobile ) %] - [% patron.mobile | html %] + [% patron.mobile | html %] [% ELSE %] [% IF ( patron.phonepro ) %] - [% patron.phonepro | html %] + [% patron.phonepro | html %] [% END %] [% END %] [% END %]
      • [% END %] + [% IF ( patron.email ) %] - + [% ELSE %] [% IF ( patron.emailpro ) %] - + [% END %] [% END %] - [% IF ( patron.dateofbirth ) %] -
      • - Born: - [% INCLUDE 'patron-age.inc' %] -
      • - [% END %] + + [% UNLESS ( patron.address or patron.address2 ) %] -
      • No address stored.
      • +
      • No address stored.
      • [% END %] [% UNLESS ( patron.city ) %] -
      • No city stored.
      • +
      • No city stored.
      • [% END %] + [% UNLESS ( patron.phone or patron.mobile or patron.phonepro) %] -
      • No phone stored.
      • +
      • No phone stored.
      • [% END %] + [% UNLESS ( patron.email or patron.emailpro) %] -
      • No email stored.
      • +
      • No email stored.
      • [% END %] + [% UNLESS ( patron.dateofbirth ) %] -
      • No date of birth stored.
      • +
      • No date of birth stored.
      • + [% END %] [% END %] - [% END %] - - [% IF Koha.Preference('ExtendedPatronAttributes') %] + [% IF Koha.Preference('ExtendedPatronAttributes') %] [% FOREACH extendedattribute IN patron.extended_attributes %] [% IF ( extendedattribute.type.display_checkout ) %] [%# FIXME We should filter in the line above %] [% IF ( extendedattribute.attribute ) %] [%# FIXME Why that? why not if == 0? %] @@ -108,60 +119,64 @@ [% END %] [% END %] [% END %] - [% END %] -
      • Category: [% patron.category.description | html %] ([% patron.categorycode | html %])
      • -
      • Home library: [% Branches.GetName( patron.branchcode ) | html %]
      • -
      • Borrowernumber: [% patron.borrowernumber | html %]
      • -
      • Updated on [% patron.updated_on | $KohaDates with_hours => 1 %]
      • - [% IF patron.account_locked %] + [% END %] + +
      • Category: [% patron.category.description | html %] ([% patron.categorycode | html %])
      • +
      • Home library: [% Branches.GetName( patron.branchcode ) | html %]
      • +
      • Borrowernumber: [% patron.borrowernumber | html %]
      • +
      • Updated on [% patron.updated_on | $KohaDates with_hours => 1 %]
      • + + [% IF patron.account_locked %] [% IF patron.login_attempts < 0 %] [% ELSE %] [% END %] - [% END %] -
    - + + +
    [% IF patronimages && CAN_user_tools_batch_upload_patron_images %] @@ -212,7 +228,7 @@ - + [% IF ( patron.image ) %] + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc index 38ba890300..664e91e1ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc @@ -1,23 +1,24 @@ [% USE Koha %] -
    - +
      +
    • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
    • [% END %] + [% IF ( CAN_user_catalogue ) %]
    • [% END %] + + Search cities + Check out + Search the catalog +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc index 0b8eae4285..bcd79bc01b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc @@ -1,24 +1,25 @@ [% USE Koha %] -
    - -
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc index 6fd0aad660..dd0119fbda 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc @@ -1,21 +1,25 @@ [% USE Koha %] -
    - + -
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc index 1ccecacdc9..0cc92f5784 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc @@ -1,23 +1,25 @@ [% USE Koha %] -
    - +
      +
    • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
    • [% END %] + [% IF ( CAN_user_catalogue ) %]
    • [% END %] + + Search desks + Check out + Search catalog +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index d31ade3d23..641f6c3a2c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -5,7 +5,7 @@ [% IF ( facets_loop ) %]

    Refine your search

    -
      +
      • Availability [% IF ( related ) %]
      • (related searches: [% FOREACH relate IN related %][% relate.related_search | html %][% END %])
      • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc index 94b73fd44e..1cae6d331b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc @@ -1,24 +1,22 @@ [% USE Koha %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 754ac0d294..cdb43efa1a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -3,32 +3,32 @@ [% USE Desks %] [% USE Registers %] [% USE Koha %] + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc index 3a3aa32722..67696c2022 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc @@ -1,44 +1,50 @@ [% USE Koha %] -
        - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc index 6ec8a50c8f..e195d7f556 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc @@ -213,7 +213,7 @@ [% IF display_columns_selection %][%# Needs js/pages/batchMod.js %] [% IF checkboxes_edit OR checkboxes_delete %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc index 03fec59ce1..0b4b5ef6e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc @@ -4,31 +4,31 @@ [% IF backends_available %] [% IF backends.size > 1 %] [% ELSE %] - + New ILL request [% END %] [% ELSE %] - + New ILL request [% END %] [% IF query_type == 'illlist' %] - + Refresh [% ELSE %] - + List requests [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc index cc3cbb713a..c9612c3adf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc @@ -26,6 +26,7 @@ [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %] [% Asset.js("js/staff-global.js") | $raw %] +[% Asset.js("js/searchbaruse.js") | $raw %] [% INCLUDE 'validator-strings.inc' %] [% IF ( IntranetUserJS ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc index 801ab9cb2e..b7bb362895 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc @@ -1,7 +1,7 @@ [% INCLUDE 'blocking_errors.inc' %]
        - +
        - +
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc index 179f40e2c7..cb58a57dda 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc @@ -1,18 +1,18 @@ [% INCLUDE 'blocking_errors.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc index 1f3d48333a..699c3975c8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc @@ -1,19 +1,19 @@
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/shortcut.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/shortcut.inc new file mode 100644 index 0000000000..d63d704209 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/shortcut.inc @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc index a75408f0cf..1e8cbac316 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc @@ -1,14 +1,15 @@ [% USE Koha %]
        +
        [% IF no_op_set %] - New rota + New rota [% END %] [% IF op == 'manage_stages' %] - Edit rota - Add stage + Edit rota + Add stage [% END %] [% IF op == 'manage_items' %] Edit rota - Add items + Add items [% END %] -
        +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc index 7fdea9c933..24b0a4d50d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc @@ -1,7 +1,7 @@ [% PROCESS 'html_helpers.inc' %]
    -
    + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc index d564f7803f..35e3d47105 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc @@ -5,7 +5,7 @@ [% INCLUDE 'patron-search-box.inc' %] + [% INCLUDE 'catalogue-search-box.inc' %] - +
      +
    • + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
    • [% END %] + [% IF ( CAN_user_catalogue ) %]
    • [% END %] + + Search suggestions + Check out + Search catalog +
    -
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc index a31ef9a51d..d5dcdd2ad2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc @@ -2,11 +2,11 @@