Bugzilla – Attachment 137744 Details for
Bug 30952
New design for staff interface
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30952: Staff interface redesign
Bug-30952-Staff-interface-redesign.patch (text/plain), 1.18 MB, created by
Solene D
on 2022-07-15 10:06:50 UTC
(
hide
)
Description:
Bug 30952: Staff interface redesign
Filename:
MIME Type:
Creator:
Solene D
Created:
2022-07-15 10:06:50 UTC
Size:
1.18 MB
patch
obsolete
>From 6770fe1e0bec2490c6e677a4d0b52d9ec8277c54 Mon Sep 17 00:00:00 2001 >From: Solene Desvaux <sdesvaux@biblibre.com> >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 @@ > <label>From an existing record: > <input type="text" name="q" size="25" /> > </label> >- <input type="submit" class="submit" id="searchtoorder" data-booksellerid="[% booksellerid | html %]" data-basketno="[% basketno | html %]" value="Submit" /> >+ <input type="submit" class="principal" id="searchtoorder" data-booksellerid="[% booksellerid | html %]" data-basketno="[% basketno | html %]" value="Submit" /> > </form> > </li> >- <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From a suggestion</a></li> >- <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From a subscription</a></li> >- <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From a new (empty) record</a></li> >- <li><a href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basketno | uri %]">From existing orders (copy)</a></li> >- <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From an external source</a></li> >- <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]"> From a new file</a></li> >- <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]"> From a staged file</a></li> >- [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From titles with highest hold ratios</a></li>[% END %] >+ <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From a suggestion</a></li> >+ <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From a subscription</a></li> >+ <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From a new (empty) record</a></li> >+ <li><a href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basketno | uri %]">From existing orders (copy)</a></li> >+ <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From an external source</a></li> >+ <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]"> From a new file</a></li> >+ <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]"> From a staged file</a></li> >+ [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From titles with highest hold ratios</a></li>[% END %] > </ul> > [% ELSE %] > <div class="dialog alert"> >- <p>You can't create any orders unless you first <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget and a fund</a>.</p> >+ <p>You can't create any orders unless you first <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget and a fund</a>.</p> > </div> > [% END %] > </fieldset> >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 %] > <div id="navmenu"> > <div id="navmenulist"> >- <h5>Acquisitions</h5> >+ >+ <h4>Acquisitions</h4> > <ul> > <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions home</a></li> > [% IF ( CAN_user_acquisition_order_receive ) %]<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>[% END %] >@@ -11,20 +12,21 @@ > <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li> > [% END %] > </ul> >+ > [% IF ( CAN_user_reports || CAN_user_circulate_circulate_remaining_permissions ) %] >- <h5>Reports</h5> >- <ul> >- [% IF ( CAN_user_reports ) %] >- <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions statistics wizard</a></li> >- <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a></li> >- [% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li><a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a></li> >- [% END %] >- </ul> >+ <h4>Reports</h4> >+ <ul> >+ [% IF ( CAN_user_reports ) %] >+ <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions statistics wizard</a></li> >+ <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a></li> >+ [% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >+ <li><a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a></li> >+ [% END %] >+ </ul> > [% END %] > [% IF ( CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_acquisition_currencies_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) || CAN_user_parameters_manage_additional_fields ) %] >- <h5>Administration</h5> >+ <h4>Administration</h4> > <ul> > [% IF ( CAN_user_acquisition_period_manage ) %] > <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >index a68f429195..9a1b0d71d5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >@@ -1,32 +1,37 @@ >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Acquisitions Resident Search Box --> >+<!-- Begin Acquisitions Resident Search Box --> >+ > <div id="header_search"> >-<div id="supplier_search" class="residentsearch"> >- <label class="tip" for="supplier">Search vendors:</label> >+ <div id="supplier_search" class="residentsearch"> > <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post"> >- <input type="text" size="25" name="supplier" id="supplier" class="focus" /> >- <input type="submit" class="submit" value="Submit" /></form> >-</div> >- <div id="orders_search" class="residentsearch"> >- <p class="tip">Search orders:</p> >+ <input type="text" name="supplier" id="supplier" class="head-searchbox" placeholder="Search vendors" /> >+ <input type="submit" id="submit" value="" /> >+ </form> >+ </div> > >+ <div id="orders_search" class="residentsearch"> > <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"> >- <label for="title">Title: </label> <input type="text" id="title" name="title" size="15" value="[% title | html %]" /> >- <label for="searchsupplier">Vendor:</label> <input type="text" id="searchsupplier" name="name" size="15" value="[% name | html %]" /> >- <input type="hidden" id="do_search" name="do_search" value="do" /> >- <span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span> >- <span class="filteraction" id="filteraction_on"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span> >- <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a> >- <p id="filters" style="display:none"> >- <label for="basket">Basket: </label><input type="text" name="basket" id="basket" /> >- <label for="booksellerinvoicenumber">Invoice number: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" /> >- </p> >- </form> >+ <input type="text" id="title" style="display:inline;left: 125px;" class="multi-input" placeholder="Title" name="title" size="13" value="[% title | html %]" /> >+ <input type="text" id="searchsupplier" style="display:inline" class="multi-input" placeholder="Vendor" name="name" size="13" value="[% name | html %]" /> >+ <input type="hidden" id="do_search" name="do_search" value="do" /> >+ <span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" class="toggle_element" data-element="#open,.filteraction">[-]</a></span> >+ <span class="filteraction" id="filteraction_on"> <a href="#" class="toggle_element" data-element="#open,.filteraction">[+]</a></span> >+ <input value="" class="submit" id="submit" type="submit" /> >+ >+ <p class="more" id="open" style="display:none"> >+ <input type="text" style="right: 260px" placeholder="Basket" name="basket" id="basket" /> >+ <input type="text" placeholder="Invoice number" name="booksellerinvoicenumber" id="booksellerinvoicenumber" /> >+ </p> >+ </form> > </div> >- <ul id="tabtriggers"> >- <li><a href="#supplier_search">Vendor search</a></li> >- <li><a href="#orders_search">Orders search</a></li> >- </ul> >+ >+ >+ <ul id="btn-space"> >+ <li><a title="Vendor search" class="iconsearch" href="#supplier_search"><i class="fa fa-upload"></i></a></li> >+ <li><a title="Orders search" class="iconsearch" href="#orders_search"><i class="fa fa-download"></i></a></li> >+ >+ <span class="name-icon active">Vendor search</span> >+ <span class="name-icon">Orders search</span> >+ </ul> > </div><!-- /header_search --> >-</div><!-- /gradient --> >-<!-- End Acquisitions Resident Search Box --> >+ >+<!-- End Main page Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >index 294a777629..4ee5cc447d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >@@ -3,7 +3,7 @@ > <div id="toolbar" class="btn-toolbar"> > [% IF ( booksellerid ) %] > <div class="btn-group"> >- <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New >+ <a class="btn btn-default toolbar-btn dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New > <span class="caret"></span> > </a> > <ul class="dropdown-menu"> >@@ -20,7 +20,7 @@ > </div> > [% IF ( CAN_user_acquisition_vendors_manage ) %] > <div class="btn-group"> >- <a class="btn btn-default" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]&op=enter"><i class="fa fa-pencil"></i> Edit vendor</a> >+ <a class="btn btn-default toolbar-btn" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]&op=enter"><i class="fa fa-pencil"></i> Edit vendor</a> > </div> > [% UNLESS ( basketcount OR subscriptioncount ) %] > <div class="btn-group"> >@@ -33,10 +33,10 @@ > [% END %] > [% END %] > [% IF CAN_user_acquisition_order_receive && basketcount && active %] >- <div class="btn-group"><a class="btn btn-default" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | html %]"><i class="fa fa-inbox"></i> Receive shipments</a></div> >+ <div class="btn-group"><a class="btn btn-default toolbar-btn" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | html %]"><i class="fa fa-inbox"></i> Receive shipments</a></div> > [% END %] > [% ELSE %] >- <div class="btn-group"><a class="btn btn-default" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="fa fa-plus"></i> New vendor</a></div> >+ <div class="btn-group"><a class="btn btn-default toolbar-btn" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="fa fa-plus"></i> New vendor</a></div> > [% END %] > </div> > <!-- / acquisitions-toolbar.inc --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc >index 775c04d167..8f9c83acaa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc >@@ -1,7 +1,7 @@ > [% USE AuthorisedValues %] > [% IF wrap_fieldset != 0 %] > <fieldset class="rows"> >- <legend>Additional fields</legend> >+ <h3>Additional fields</h3> > <ol> > [% END %] > [% FOR field IN available %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc >index 03ac6e69db..88cf6ec54f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc >@@ -4,14 +4,14 @@ > <div id="navmenulist"> > > [% IF ( CAN_user_parameters_manage_sysprefs ) %] >- <h5>System preferences</h5> >+ <h4>System preferences</h4> > <ul> > <li><a href="/cgi-bin/koha/admin/preferences.pl">System preferences</a></li> > </ul> > [% END %] > > [% IF ( CAN_user_parameters_manage_libraries || CAN_user_parameters_manage_itemtypes || CAN_user_parameters_manage_auth_values ) %] >- <h5>Basic parameters</h5> >+ <h4>Basic parameters</h4> > <ul> > [% IF ( CAN_user_parameters_manage_libraries ) %] > <li><a href="/cgi-bin/koha/admin/branches.pl">Libraries</a></li> >@@ -27,7 +27,7 @@ > [% END %] > > [% IF ( CAN_user_parameters_manage_patron_categories || CAN_user_parameters_manage_circ_rules || CAN_user_parameters_manage_patron_attributes || CAN_user_parameters_manage_transfers || CAN_user_parameters_manage_item_circ_alerts || CAN_user_parameters_manage_cities ) %] >- <h5>Patrons and circulation</h5> >+ <h4>Patrons and circulation</h4> > <ul> > [% IF ( CAN_user_parameters_manage_patron_categories ) %] > <li><a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a></li> >@@ -55,7 +55,7 @@ > [% END %] > > [% IF ( CAN_user_parameters_manage_accounts || ( Koha.Preference('UseCashRegisters') && CAN_user_parameters_manage_cash_registers ) ) %] >- <h5>Accounting</h5> >+ <h4>Accounting</h4> > <ul> > [% IF ( CAN_user_parameters_manage_accounts ) %] > <li><a href="/cgi-bin/koha/admin/debit_types.pl">Debit types</a></li> >@@ -68,14 +68,14 @@ > [% END %] > > [% IF CAN_user_parameters_manage_background_jobs %] >- <h5>Background jobs</h5> >+ <h4>Background jobs</h4> > <ul> > <li><a href="/cgi-bin/koha/admin/background_jobs.pl">Background jobs</a></li> > </ul> > [% END %] > > [% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || CAN_user_parameters_manage_search_engine_config || CAN_user_parameters_manage_marc_overlay_rules ) %] >- <h5>Catalog</h5> >+ <h4>Catalog</h4> > <ul> > [% IF ( CAN_user_parameters_manage_marc_frameworks ) %] > <li><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></li> >@@ -107,7 +107,7 @@ > [% END %] > > [% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) ) %] >- <h5>Acquisition parameters</h5> >+ <h4>Acquisition parameters</h4> > > <ul> > [% IF ( CAN_user_acquisition_currencies_manage ) %] >@@ -127,14 +127,14 @@ > [% END %] > > [% IF CAN_user_plugins && plugins_enabled %] >- <h5>Plugins</h5> >+ <h4>Plugins</h4> > <ul> > <li><a href="/cgi-bin/koha/plugins/plugins-home.pl">Manage plugins</a></li> > </ul> > [% END %] > > [% IF ( CAN_user_parameters_manage_smtp_servers || CAN_user_parameters_manage_search_targets || CAN_user_parameters_manage_didyoumean || CAN_user_parameters_manage_column_config || CAN_user_parameters_manage_audio_alerts || ( CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) || CAN_user_parameters_manage_usage_stats || CAN_user_parameters_manage_additional_fields || ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) ) %] >- <h5>Additional parameters</h5> >+ <h4>Additional parameters</h4> > <ul> > [% IF ( CAN_user_parameters_manage_search_targets ) %] > <li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc >index 6e48161e3a..b730e82a32 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc >@@ -1,53 +1,45 @@ >-<div class="gradient"> >- <div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div> >+<!-- Begin main page resident search box --> >+<div id="header_search"> > >- <!-- Begin main page resident search box --> >- <div id="header_search"> >- [% INCLUDE 'patron-search-box.inc' %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <div id="checkin_search" class="residentsearch"> >- <label class="tip" for="ret_barcode">Scan a barcode to check in:</label> >- <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <input type="text" name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >- </div> >- <div id="renew_search" class="residentsearch"> >- <label class="tip" for="ren_barcode">Scan a barcode to renew:</label> >- <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <input type="text" class="head-searchbox" name="barcode" id="ren_barcode" size="40" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >- </div> >- [% END %] >+ [% INCLUDE 'patron-search-box.inc' %] > >- [% IF CAN_user_borrowers_edit_borrowers %] >- <div id="patron_search" class="residentsearch"> >- <label class="tip" for="searchmember">Enter patron card number or partial name:</label> >- <form action="/cgi-bin/koha/members/member.pl" method="post"> >- <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text" /> >- <input type="hidden" name="quicksearch" value="1" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >- </div> >- [% END %] >+ [% IF (CAN_user_circulate_circulate_remaining_permissions) %] >+ <div id="checkin_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >+ <input name="barcode" id="ret_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to check in" size="40" /> >+ <input value="" class="submit" type="submit" id="submit" /> >+ </form> >+ </div> > >- <ul> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li><a class="keep_text" href="#circ_search">Check out</a></li> >- [% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li><a class="keep_text" href="#checkin_search">Check in</a></li> >- [% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li><a class="keep_text" href="#renew_search">Renew</a></li> >- [% END %] >- [% IF CAN_user_borrowers_edit_borrowers %] >- <li><a class="keep_text" href="#patron_search">Search patrons</a></li> >- [% END %] >- </ul> >+ <div id="renew_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >+ <input name="barcode" id="ren_barcode" class="head-searchbox" type="text" placeholder="Scan a barcode to renew" size="40" /> >+ <input value="" class="submit" type="submit" id="submit" /> >+ </form> >+ </div> >+ [% END %] > >- </div><!-- /#header_search --> >- <!-- End advanced search page resident search box --> >+ [% IF CAN_user_borrowers_edit_borrowers %] >+ <div id="patron_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/members/member.pl" method="post"> >+ <input name="searchmember" class="head-searchbox" placeholder="Enter patron card number or partial name" id="searchmember" size="40" type="text" /> >+ <input type="hidden" name="quicksearch" value="1" /> >+ <input value="" class="submit" id="submit" type="submit" /> >+ </form> >+ </div> >+ [% END %] > >-</div><!-- /.gradient --> >+ <ul id="btn-space"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a title="Search patrons" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %] >+ >+ <span class="name-icon active">Check out</span> >+ <span class="name-icon">Check in</span> >+ <span class="name-icon">Renew</span> >+ <span class="name-icon">Search patrons</span> >+ </ul> >+</div><!-- /#header_search --> >+ >+<!-- End advanced search page resident search box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >index 9453e3f40b..19957080c9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >@@ -1,8 +1,8 @@ > [% PROCESS 'form-blocks.inc' %] > > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="#" id="clear" class="btn btn-default btn-sm"><i class="fa fa-trash"></i> Clear field</a></div> >- <div class="btn-group"><a href="#" id="createnew" class="btn btn-default btn-sm"><i class="fa fa-plus"></i> Create new authority</a></div> >+ <div class="btn-group"><a href="#" id="clear" class="btn btn-default toolbar-btn btn-sm"><i class="fa fa-trash"></i> Clear field</a></div> >+ <div class="btn-group"><a href="#" id="createnew" class="btn btn-default toolbar-btn btn-sm"><i class="fa fa-plus"></i> Create new authority</a></div> > </div> > <form name="f" method="get" action="auth_finder.pl"> > <input type="hidden" name="source" value="[% source | html %]" /> >@@ -158,6 +158,6 @@ > </ol> > </fieldset> > [% END %] >- <fieldset class="action"> <input type="submit" value="Search" class="submit" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a> >+ <fieldset class="action"> <input type="submit" value="Search" class="principal" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >index 1611429e61..bb1869fd21 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >@@ -1,210 +1,197 @@ >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div> > <!-- Begin Authorities Resident Search Box --> >-<div id="header_search" class="residentsearch"> >+ >+<div id="header_search"> > <div id="mainmain_heading" class="residentsearch"> >- <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> >- <label class="tip" for="value_mainentry">Enter main heading ($a only):</label> >- <input type="hidden" name="op" value="do_search" /> >- <input type="hidden" name="type" value="intranet" /> >- <select name="authtypecode" id="authtype_main_heading_a"> >- [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >- [% FOREACH authority_type IN authority_types %] >- [% IF authority_type.authtypecode == authtypecode %] >- <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >- [% ELSE %] >- <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >- [% END %] >- [% END %] >- </select> >- <input type="hidden" name="marclist" value="mainmainentry" /> >- <input type="hidden" name="and_or" value="and" /> >- <input type="hidden" name="excluding" value="" /> >- <select name="operator"> >- [% IF ( operator == 'contains' ) %] >- <option value="contains" selected="selected">contains</option> >- [% ELSE %] >- <option value="contains">contains</option> >- [% END %] >- [% IF ( operator == 'start' ) %] >- <option value="start" selected="selected">starts with</option> >- [% ELSE %] >- <option value="start">starts with</option> >- [% END %] >- [% IF ( operator == 'exact' ) %] >- <option value="exact" selected="selected">is exactly</option> >- [% ELSE %] >- <option value="exact">is exactly</option> >- [% END %] >- </select> >- <input id="value_mainentry" type="text" name="value" value="[% value | html %]" class="head-searchbox" /> >- <select name="orderby"> >- [% IF ( orderby == 'HeadingAsc' ) %] >- <option value="HeadingAsc" selected="selected">Heading A-Z</option> >- [% ELSE %] >- <option value="HeadingAsc">Heading A-Z</option> >- [% END %] >- [% IF ( orderby == 'HeadingDsc' ) %] >- <option value="HeadingDsc" selected="selected">Heading Z-A</option> >- [% ELSE %] >- <option value="HeadingDsc">Heading Z-A</option> >- [% END %] >- [% IF ( orderby == '' && op ) %] >- <option value="" selected="selected">None</option> >- [% ELSE %] >- <option value="">None</option> >- [% END %] >- </select> >- <input type="submit" class="submit" value="Submit" /> >- </form> >+ <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> >+ >+ <select name="orderby" class="upper"> >+ [% IF ( orderby == 'HeadingAsc' ) %] >+ <option value="HeadingAsc" selected="selected">Heading A-Z</option> >+ [% ELSE %] >+ <option value="HeadingAsc">Heading A-Z</option> >+ [% END %] >+ [% IF ( orderby == 'HeadingDsc' ) %] >+ <option value="HeadingDsc" selected="selected">Heading Z-A</option> >+ [% ELSE %] >+ <option value="HeadingDsc">Heading Z-A</option> >+ [% END %] >+ [% IF ( orderby == '' && op ) %] >+ <option value="" selected="selected">None</option> >+ [% ELSE %] >+ <option value="">None</option> >+ [% END %] >+ </select> >+ >+ <p class="more_bottom"> >+ <input type="hidden" name="op" value="do_search" /> >+ <input type="hidden" name="type" value="intranet" /> >+ <select name="authtypecode" id="authtype_main_heading_a"> >+ [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >+ [% FOREACH authority_type IN authority_types %] >+ [% IF authority_type.authtypecode == authtypecode %] >+ <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >+ [% ELSE %] >+ <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ >+ <input type="hidden" name="marclist" value="mainmainentry" /> >+ <input type="hidden" name="and_or" value="and" /> >+ <input type="hidden" name="excluding" value="" /> >+ <select name="operator"> >+ [% IF ( operator == 'contains' ) %] >+ <option value="contains" selected="selected">contains</option> >+ [% ELSE %] >+ <option value="contains">contains</option> >+ [% END %] >+ [% IF ( operator == 'start' ) %] >+ <option value="start" selected="selected">starts with</option> >+ [% ELSE %] >+ <option value="start">starts with</option> >+ [% END %] >+ [% IF ( operator == 'exact' ) %] >+ <option value="exact" selected="selected">is exactly</option> >+ [% ELSE %] >+ <option value="exact">is exactly</option> >+ [% END %] >+ </select> >+ >+ <input id="value_mainentry" type="text" name="value" value="[% value | html %]" placeholder="Enter main heading ($a only)" /> >+ </p> >+ >+ <input type="submit" class="submit" id="submit" value="" /> >+ </form> > </div> >+ >+ > <div id="main_heading" class="residentsearch"> >- <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> >- <label class="tip" for="value_mainheading">Enter main heading:</label> >- <input type="hidden" name="op" value="do_search" /> >- <input type="hidden" name="type" value="intranet" /> >- <select name="authtypecode" id="authtype_main_heading"> >- [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >- [% FOREACH authority_type IN authority_types %] >- [% IF authority_type.authtypecode == authtypecode %] >- <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >- [% ELSE %] >- <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >- [% END %] >- [% END %] >- </select> >- <input type="hidden" name="marclist" value="mainentry" /> >- <input type="hidden" name="and_or" value="and" /> >- <input type="hidden" name="excluding" value="" /> >- <select name="operator"> >- [% IF ( operator == 'contains' ) %] >- <option value="contains" selected="selected">contains</option> >- [% ELSE %] >- <option value="contains">contains</option> >- [% END %] >- [% IF ( operator == 'start' ) %] >- <option value="start" selected="selected">starts with</option> >- [% ELSE %] >- <option value="start">starts with</option> >- [% END %] >- [% IF ( operator == 'exact' ) %] >- <option value="exact" selected="selected">is exactly</option> >- [% ELSE %] >- <option value="exact">is exactly</option> >- [% END %] >- </select> >- <input id="value_mainheading" type="text" name="value" value="[% value | html %]" class="head-searchbox" /> >- <select name="orderby"> >- [% IF ( orderby == 'HeadingAsc' ) %] >- <option value="HeadingAsc" selected="selected">Heading A-Z</option> >- [% ELSE %] >- <option value="HeadingAsc">Heading A-Z</option> >- [% END %] >- [% IF ( orderby == 'HeadingDsc' ) %] >- <option value="HeadingDsc" selected="selected">Heading Z-A</option> >- [% ELSE %] >- <option value="HeadingDsc">Heading Z-A</option> >- [% END %] >- [% IF ( orderby == '' && op ) %] >- <option value="" selected="selected">None</option> >- [% ELSE %] >- <option value="">None</option> >- [% END %] >- </select> >- <input type="submit" class="submit" value="Submit" /> >- </form> >+ <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> >+ <select name="orderby" class="upper"> >+ [% IF ( orderby == 'HeadingAsc' ) %] >+ <option value="HeadingAsc" selected="selected">Heading A-Z</option> >+ [% ELSE %] >+ <option value="HeadingAsc">Heading A-Z</option> >+ [% END %] >+ [% IF ( orderby == 'HeadingDsc' ) %] >+ <option value="HeadingDsc" selected="selected">Heading Z-A</option> >+ [% ELSE %] >+ <option value="HeadingDsc">Heading Z-A</option> >+ [% END %] >+ [% IF ( orderby == '' && op ) %] >+ <option value="" selected="selected">None</option> >+ [% ELSE %] >+ <option value="">None</option> >+ [% END %] >+ </select> >+ >+ <p class="more_bottom"> >+ <input type="hidden" name="op" value="do_search" /> >+ <input type="hidden" name="type" value="intranet" /> >+ <select name="authtypecode" id="authtype_main_heading"> >+ [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >+ [% FOREACH authority_type IN authority_types %] >+ [% IF authority_type.authtypecode == authtypecode %] >+ <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >+ [% ELSE %] >+ <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ >+ <input type="hidden" name="marclist" value="mainentry" /> >+ <input type="hidden" name="and_or" value="and" /> >+ <input type="hidden" name="excluding" value="" /> >+ <select name="operator"> >+ [% IF ( operator == 'contains' ) %] >+ <option value="contains" selected="selected">contains</option> >+ [% ELSE %] >+ <option value="contains">contains</option> >+ [% END %] >+ [% IF ( operator == 'start' ) %] >+ <option value="start" selected="selected">starts with</option> >+ [% ELSE %] >+ <option value="start">starts with</option> >+ [% END %] >+ [% IF ( operator == 'exact' ) %] >+ <option value="exact" selected="selected">is exactly</option> >+ [% ELSE %] >+ <option value="exact">is exactly</option> >+ [% END %] >+ </select> >+ >+ <input id="value_mainheading" type="text" name="value" value="[% value | html %]" placeholder="Enter main heading" /> >+ </p> >+ >+ <input type="submit" class="submit" id="submit" value="" /> >+ </form> > </div> >+ > <div id="matchheading_search" class="residentsearch"> >- <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> >- <label class="tip" for="value_matchheading">Enter any heading:</label> >- <input type="hidden" name="op" value="do_search" /> >- <input type="hidden" name="type" value="intranet" /> >- <select name="authtypecode" id="authtype_all_headings"> >- [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >- [% FOREACH authority_type IN authority_types %] >- [% IF authority_type.authtypecode == authtypecode %] >- <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >- [% ELSE %] >- <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >- [% END %] >- [% END %] >- </select> >- <input type="hidden" name="marclist" value="match" /> >- <select name="operator"> >- [% IF ( operator == 'contains' ) %] >- <option value="contains" selected="selected">contains</option> >- [% ELSE %] >- <option value="contains">contains</option> >- [% END %] >- [% IF ( operator == 'start' ) %] >- <option value="start" selected="selected">starts with</option> >- [% ELSE %] >- <option value="start">starts with</option> >- [% END %] >- [% IF ( operator == 'exact' ) %] >- <option value="exact" selected="selected">is exactly</option> >- [% ELSE %] >- <option value="exact">is exactly</option> >- [% END %] >- </select> >- <input id="value_matchheading" type="text" name="value" value="[% value | html %]" class="head-searchbox" /> >- <select name="orderby"> >- [% IF ( orderby == 'HeadingAsc' ) %] >- <option value="HeadingAsc" selected="selected">Heading A-Z</option> >- [% ELSE %] >- <option value="HeadingAsc">Heading A-Z</option> >- [% END %] >- [% IF ( orderby == 'HeadingDsc' ) %] >- <option value="HeadingDsc" selected="selected">Heading Z-A</option> >- [% ELSE %] >- <option value="HeadingDsc">Heading Z-A</option> >- [% END %] >- [% IF ( orderby == '' && op ) %] >- <option value="" selected="selected">None</option> >- [% ELSE %] >- <option value="">None</option> >- [% END %] >- </select> >- <input type="submit" class="submit" value="Submit" /> >- </form> >+ <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> >+ >+ <select name="orderby" class="upper"> >+ [% IF ( orderby == 'HeadingAsc' ) %] >+ <option value="HeadingAsc" selected="selected">Heading A-Z</option> >+ [% ELSE %] >+ <option value="HeadingAsc">Heading A-Z</option> >+ [% END %] >+ [% IF ( orderby == 'HeadingDsc' ) %] >+ <option value="HeadingDsc" selected="selected">Heading Z-A</option> >+ [% ELSE %] >+ <option value="HeadingDsc">Heading Z-A</option> >+ [% END %] >+ [% IF ( orderby == '' && op ) %] >+ <option value="" selected="selected">None</option> >+ [% ELSE %] >+ <option value="">None</option> >+ [% END %] >+ </select> >+ >+ <p class="more_bottom"> >+ <input type="hidden" name="op" value="do_search" /> >+ <input type="hidden" name="type" value="intranet" /> >+ <select name="authtypecode" id="authtype_all_headings"> >+ [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >+ [% FOREACH authority_type IN authority_types %] >+ [% IF authority_type.authtypecode == authtypecode %] >+ <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >+ [% ELSE %] >+ <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ >+ <input type="hidden" name="marclist" value="match" /> >+ <select name="operator"> >+ [% IF ( operator == 'contains' ) %] >+ <option value="contains" selected="selected">contains</option> >+ [% ELSE %] >+ <option value="contains">contains</option> >+ [% END %] >+ [% IF ( operator == 'start' ) %] >+ <option value="start" selected="selected">starts with</option> >+ [% ELSE %] >+ <option value="start">starts with</option> >+ [% END %] >+ [% IF ( operator == 'exact' ) %] >+ <option value="exact" selected="selected">is exactly</option> >+ [% ELSE %] >+ <option value="exact">is exactly</option> >+ [% END %] >+ </select> >+ >+ <input id="value_matchheading" type="text" name="value" value="[% value | html %]" placeholder="Enter any heading" /> >+ </p> >+ >+ <input type="submit" class="submit" id="submit" value="" /> >+ </form> > </div> >+ > <div id="entire_record" class="residentsearch"> > <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> >- <label class="tip" for="value_anywhere">Enter any authority field:</label> >- <input type="hidden" name="op" value="do_search" /> >- <input type="hidden" name="type" value="intranet" /> >- <select name="authtypecode" id="authtype_entire_record"> >- [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >- [% FOREACH authority_type IN authority_types %] >- [% IF authority_type.authtypecode == authtypecode %] >- <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >- [% ELSE %] >- <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >- [% END %] >- [% END %] >- </select> >- <input type="hidden" name="marclist" value="all" /> >- <input type="hidden" name="and_or" value="and" /> >- <input type="hidden" name="excluding" value="" /> >- <select name="operator"> >- [% IF ( operator == 'contains' ) %] >- <option value="contains" selected="selected">contains</option> >- [% ELSE %] >- <option value="contains">contains</option> >- [% END %] >- [% IF ( operator == 'start' ) %] >- <option value="start" selected="selected">starts with</option> >- [% ELSE %] >- <option value="start">starts with</option> >- [% END %] >- [% IF ( operator == 'exact' ) %] >- <option value="exact" selected="selected">is exactly</option> >- [% ELSE %] >- <option value="exact">is exactly</option> >- [% END %] >- </select> >- <input id="value_anywhere" type="text" name="value" value="[% value | html %]" class="head-searchbox" /> >- <select name="orderby"> >+ >+ <select name="orderby" class="upper"> > [% IF ( orderby == 'HeadingAsc' ) %] > <option value="HeadingAsc" selected="selected">Heading A-Z</option> > [% ELSE %] >@@ -221,15 +208,60 @@ > <option value="">None</option> > [% END %] > </select> >- <input type="submit" class="submit" value="Submit" /> >+ >+ <p class="more_bottom"> >+ <input type="hidden" name="op" value="do_search" /> >+ <input type="hidden" name="type" value="intranet" /> >+ <select name="authtypecode" id="authtype_entire_record"> >+ [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >+ [% FOREACH authority_type IN authority_types %] >+ [% IF authority_type.authtypecode == authtypecode %] >+ <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >+ [% ELSE %] >+ <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ >+ <input type="hidden" name="marclist" value="all" /> >+ <input type="hidden" name="and_or" value="and" /> >+ <input type="hidden" name="excluding" value="" /> >+ <select name="operator"> >+ [% IF ( operator == 'contains' ) %] >+ <option value="contains" selected="selected">contains</option> >+ [% ELSE %] >+ <option value="contains">contains</option> >+ [% END %] >+ [% IF ( operator == 'start' ) %] >+ <option value="start" selected="selected">starts with</option> >+ [% ELSE %] >+ <option value="start">starts with</option> >+ [% END %] >+ [% IF ( operator == 'exact' ) %] >+ <option value="exact" selected="selected">is exactly</option> >+ [% ELSE %] >+ <option value="exact">is exactly</option> >+ [% END %] >+ </select> >+ >+ <input id="value_anywhere" type="text" name="value" value="[% value | html %]" placeholder="Enter any authority field" /> >+ </p> >+ >+ <input type="submit" class="submit" id="submit" value="" /> > </form> > </div> >+ > <ul> >- <li><a class="keep_text" href="#mainmain_heading">Search main heading ($a only)</a></li> >- <li><a class="keep_text" href="#main_heading">Search main heading</a></li> >- <li><a class="keep_text" href="#matchheading_search">Search all headings</a></li> >- <li><a class="keep_text" href="#entire_record">Search entire record</a></li> >+ <li><a title="Search main heading ($a only)" class="iconsearch" href="#mainmain_heading"><i style="font-weight:bold">$a</i></a></li> >+ <li><a title="Search main heading" class="iconsearch" href="#main_heading"><i class="fa fa-header"></i></a></li> >+ <li><a title="Search all headings" class="iconsearch" href="#matchheading_search"><i class="fa fa-align-center"></i></a></li> >+ <li><a title="Search entire record" class="iconsearch" href="#entire_record"><i class="fa fa-folder-open-o"></i></a></li> >+ >+ <span class="name-icon active">Search main heading ($a only)</span> >+ <span class="name-icon">Search main heading</span> >+ <span class="name-icon">Search all headings</span> >+ <span class="name-icon">Search entire record</span> >+ > </ul> > </div><!-- /header_search --> >-</div><!-- /gradient --> > <!-- End Authorities Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >index 5b11a98ba6..1cc4d02ab9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >@@ -4,7 +4,7 @@ > <div id="toolbar" class="btn-toolbar"> > [% IF ( CAN_user_editauthorities ) %] > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> >+ <button class="toolbar-btn" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> > <i class="fa fa-plus"></i> New authority > <span class="caret"></span> > </button> >@@ -16,9 +16,7 @@ > </div> > [% IF servers.count > 0 %] > <div class="btn-group"> >- <button id="z3950_new" class="btn btn-default"> >- <i class="fa fa-search"></i> New from Z39.50/SRU >- </button> >+ <button class="toolbar-btn" id="z3950_new"><i class="fa fa-search"></i> New from Z39.50/SRU</button> > </div> > [% END %] > [% END %] >@@ -26,7 +24,7 @@ > [% IF ( authid ) %] > [% IF ( CAN_user_editauthorities ) %] > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> >+ <button class="toolbar-btn" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> > <i class="fa fa-pencil"></i> Edit <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -43,7 +41,7 @@ > [% END %] > > <div class="btn-group"> >- <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-download"></i> Save >+ <a class="btn btn-default dropdown-toggle principal" data-toggle="dropdown" href="#"><i class="fa fa-download"></i> Save > <span class="caret"></span> > </a> > <ul class="dropdown-menu"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc >index 7cb0f9864f..9de0c3ebe1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc >@@ -10,7 +10,7 @@ > <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> > </div> > <div class="modal-footer"> >- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> >+ <button type="button" class="btn btn-default cancel" data-dismiss="modal">Close</button> > </div> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc >index 4ef1173213..de61b1dde2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc >@@ -2,7 +2,8 @@ > [% USE Biblio %] > [% SET biblio_object_id = object || biblionumber || biblio.biblionumber %] > >-<div id="menu"> >+<div id="navmenu"> >+<div id="navmenulist"> > <ul> > [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %] > <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio_object_id | url %]">Normal</a></li> >@@ -46,3 +47,4 @@ > [% END %] > </ul> > </div> >+</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >index 7625708ecf..8f123b3eed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >@@ -9,7 +9,7 @@ > [% END %] > [% IF CAN_user_updatecharges_remaining_permissions %] > <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Make payment</a> >- <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Pay all charges</a></li> >+ <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Pay all charges</a></li> > [% END %] > </li> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >index 2bbfc7aad3..cd9340b725 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >@@ -65,7 +65,7 @@ > <input name="expiration" id="rexpiration" size="20" value="" class="flatpickr" data-flatpickr-futuredate="true" type="text" /> > </li> > </ol> >- <fieldset class="action"><input type="submit" value="Add restriction" /> <a href="#" class="cancel" id="cancel_manual_restriction">Cancel</a></fieldset> >+ <fieldset class="action"><input type="submit" class="principal" value="Add restriction" /> <a href="#" class="cancel" id="cancel_manual_restriction">Cancel</a></fieldset> > </fieldset> > </form> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc >index 35421e930e..db3d8d8443 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc >@@ -1,6 +1,6 @@ > [%# To select all include with selectall = 1 %] > <div class="branchselector"> >- <p><a href="#" id="checkall"> <i class="fa fa-check"></i> Select all</a> | <a href="#" id="checknone"> <i class="fa fa-remove"></i> Clear all</a></p> >+ <p><a id="CheckAll" href="#" id="checkall"> <i class="fa fa-check"></i> Select all</a> | <a id="CheckNone" href="#" id="checknone"> <i class="fa fa-remove"></i> Clear all</a></p> > <div class="branchgridrow"> > [% FOREACH branch IN branches %] > <div class="branchgriditem"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc >index 0d71209f11..4d26241ac8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc >@@ -1,41 +1,39 @@ > [% USE Koha %] > [% USE Branches %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Fund Admin Resident Search Box --> >+<div id="header_search"> > >- <div id="header_search"> >- <div id="budgets_search" class="residentsearch"> >- <p class="tip">Search funds:</p> >- <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post"> >- <label for="filter_budgetname">Fund code: </label><input class="query" type="text" name="filter_budgetname" id="filter_budgetname" size="20" value="[% filter_budgetname | html %]" /> >- <label for="filter_budgetbranch">Library: </label> >- <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;"> >- <option value=""></option> >- [% FOREACH branchloo IN Branches.all( selected => selected_branchcode ) %] >- [% IF branchloo.selected %] >- <option value="[% branchloo.branchcode | html %]" selected="selected">[% branchloo.branchname | html %]</option> >- [% ELSE %] >- <option value="[% branchloo.branchcode | html %]" >[% branchloo.branchname | html %]</option> >- [% END %] >+ <div id="budgets_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post"> >+ <input class="query multi-input" type="text" name="filter_budgetname" id="filter_budgetname" value="[% filter_budgetname | html %]" style="width:150px" placeholder="Fund code" /> >+ >+ <select name="filter_budgetbranch" id="filter_budgetbranch" class="multi-input" style="width:10em;position: relative;left: 170px;bottom: 3px;"> >+ <option disabled selected hidden>Library:</option> >+ [% FOREACH branchloo IN Branches.all( selected => selected_branchcode ) %] >+ [% IF branchloo.selected %] >+ <option value="[% branchloo.branchcode | html %]" selected="selected">[% branchloo.branchname | html %]</option> >+ [% ELSE %] >+ <option value="[% branchloo.branchcode | html %]" >[% branchloo.branchname | html %]</option> > [% END %] >- </select> >- <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> >- <input type="submit" class="submit" name="filter" value="Submit" /> >- </form> >- </div> >+ [% END %] >+ </select> >+ <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> >+ <input type="submit" class="submit" id="submit" name="filter" value="" /> >+ </form> >+ </div> > >- [% INCLUDE 'patron-search-box.inc' %] >- [% INCLUDE 'catalogue-search-box.inc' %] >+ [% INCLUDE 'patron-search-box.inc' %] >+ >+ [% INCLUDE 'catalogue-search-box.inc' %] >+ >+ <ul id="btn-space"> >+ <li><a title="Search funds" class="iconsearch" href="#budgets_search"><i class="fa fa-credit-card"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="name-icon active">Search funds</span> >+ <span class="name-icon">Check out</span> >+ <span class="name-icon">Search catalog</span> >+ </ul> >+</div><!-- /header_search --> > >- <ul> >- <li><a class="keep_text" href="#budgets_search">Search funds</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li><a class="keep_text" href="#circ_search">Check out</a></li> >- [% END %] >- [% IF ( CAN_user_catalogue ) %] >- <li><a class="keep_text" href="#catalog_search">Search the catalog</a></li> >- [% END %] >- </ul> >- </div> >-</div> > <!-- End Suggestions Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc >index 05b0961bc7..4379d814f9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc >@@ -2,7 +2,7 @@ > <div id="toolbar" class="btn-toolbar"> > [% IF ( budget_period_id ) %] > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> >+ <button class="toolbar-btn dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">New budget</a></li> > [% IF ( budget_period_locked || !CAN_user_acquisition_budget_add_del ) %] >@@ -18,7 +18,7 @@ > </div> > > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> >+ <button class="toolbar-btn dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&budget_period_id=[% budget_period_id | uri %]">Edit budget [% budget_period_description | html %]</a></li> > <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&budget_period_id=[% budget_period_id | uri %]">Duplicate budget [% budget_period_description | html %]</a></li> >@@ -26,7 +26,7 @@ > </div> > > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Planning <span class="caret"></span></button> >+ <button class="toolbar-btn dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Planning <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% IF ( CAN_user_acquisition_planning_manage ) %] > <li> >@@ -59,7 +59,7 @@ > </div> > > [% ELSE %] >- <div class="btn-group"><a class="btn btn-default" id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form"><i class="fa fa-plus"></i> New budget</a></div> >+ <div class="btn-group"><a class="toolbar-btn" id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form"><i class="fa fa-plus"></i> New budget</a></div> > [% END %] > > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >index 56450d6616..bbf4b700c4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >@@ -1,37 +1,39 @@ > [% USE Koha %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Catalogue Resident Search Box --> > <div id="header_search"> > > [% INCLUDE 'patron-search-box.inc' %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > <div id="checkin_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <label class="tip" for="ret_barcode">Scan a barcode to check in:</label> >- <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" type="text" /> >- >- <input value="Submit" class="submit" type="submit" /> >+ <form action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" method="post"> >+ <input id="ret_barcode" name="barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> >+ <input value="" id="submit" type="submit"/> > </form> > </div> >+ > <div id="renew_search" class="residentsearch"> > <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <label class="tip" for="ren_barcode">Scan a barcode to renew:</label> >- <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" /> >- <input value="Submit" class="submit" type="submit" /> >+ <input class="head-searchbox" name="barcode" id="ren_barcode" accesskey="r" type="text" placeholder="Scan a barcode to renew" /> >+ <input value="" type="submit" id="submit" /> > </form> > </div> > [% END %] > > [% INCLUDE 'catalogue-search-box.inc' %] > >-<ul> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-active"><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >+<ul id="btn-space"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ >+ >+ <span class="name-icon active">Check out</span> >+ <span class="name-icon">Check in</span> >+ <span class="name-icon">Renew</span> >+ <span class="name-icon">Search catalog</span> > </ul> > > </div><!-- /header_search --> >-</div><!-- /gradient --> > <!-- End Catalogue Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >index a1ca101dba..56bcadd552 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >@@ -4,7 +4,7 @@ > > [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_serials_create_subscription ) %] > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> >+ <button class="toolbar-btn dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] > <li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New record</a></li> >@@ -29,7 +29,7 @@ > > [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel ) or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> >+ <button class="toolbar-btn dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] > <li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]">Edit record</a></li> >@@ -92,7 +92,7 @@ > [% END %] > > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button> >+ <button class="toolbar-btn dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&op=export&bib=[% biblionumber | uri %]">BIBTEX</a></li> > <li><a href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li> >@@ -108,24 +108,24 @@ > [% IF (Koha.Preference("intranetbookbag")) %] > [% IF ( incart ) %] > <div class="btn-group"> >- <a id="cart[% biblionumber | html %]" class="btn btn-default addtocart incart" href="#"><i class="fa fa-shopping-cart"></i> Add to cart</a> >+ <a id="cart[% biblionumber | html %]" class="toolbar-btn addtocart incart" href="#"><i class="fa fa-shopping-cart"></i> Add to cart</a> > </div> > <div class="btn-group"> >- <a id="cartR[% biblionumber | html %]" class="btn btn-default cartRemove incart" href="#"><i class="fa fa-shopping-cart"></i> Remove from cart</a> >+ <a id="cartR[% biblionumber | html %]" class="toolbar-btn cartRemove incart" href="#"><i class="fa fa-shopping-cart"></i> Remove from cart</a> > </div> > [% ELSE %] > <div class="btn-group"> >- <a id="cart[% biblionumber | html %]" class="btn btn-default addtocart" href="#"><i class="fa fa-shopping-cart"></i> Add to cart</a> >+ <a id="cart[% biblionumber | html %]" class="toolbar-btn addtocart" href="#"><i class="fa fa-shopping-cart"></i> Add to cart</a> > </div> > <div class="btn-group"> >- <a id="cartR[% biblionumber | html %]" class="btn btn-default cartRemove" href="#"><i class="fa fa-shopping-cart"></i> Remove from cart</a> >+ <a id="cartR[% biblionumber | html %]" class="toolbar-btn cartRemove" href="#"><i class="fa fa-shopping-cart"></i> Remove from cart</a> > </div> > [% END %] > [% END %] > > [% IF Koha.Preference('virtualshelves') %] > <div class="btn-group"> >- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> >+ <button type="button" class="toolbar-btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> > <i class="fa fa-list"></i> Add to list <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -168,14 +168,14 @@ > </div> > [% END # /IF virtualshelves %] > >- <div class="btn-group"><a id="printbiblio" class="btn btn-default"><i class="fa fa-print"></i> Print</a></div> >+ <div class="btn-group"><a id="printbiblio" class="toolbar-btn"><i class="fa fa-print"></i> Print</a></div> > > [% IF ( CAN_user_reserveforothers ) %] > [% SET items = biblio.items %] > [% IF Context.Scalar(Context.Scalar(items, "filter_by_for_hold"), "count") %] > [% IF ( holdfor ) %] > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> >+ <button class="toolbar-btn dropdown-toggle" data-toggle="dropdown"> > <i class="fa fa-sticky-note-o"></i> > Place hold > <span class="caret"></span> >@@ -186,19 +186,19 @@ > </ul> > </div> > [% ELSE %] >- <div class="btn-group"><a id="placehold" class="btn btn-default" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]"><i class="fa fa-sticky-note-o"></i> Place hold</a></div> >+ <div class="btn-group"><a id="placehold" class="toolbar-btn" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]"><i class="fa fa-sticky-note-o"></i> Place hold</a></div> > [% END %] > [% END %] > [% END %] > > [% IF Koha.Preference('ArticleRequests') %] >- <div class="btn-group"><a id="placehold" class="btn btn-default" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber | html %]"><i class="fa fa-file-text-o"></i> Request article</a></div> >+ <div class="btn-group"><a id="placehold" class="toolbar-btn" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber | html %]"><i class="fa fa-file-text-o"></i> Request article</a></div> > [% END %] > > [% IF ( CAN_user_acquisition_order_manage ) %] > [% IF ( searchtoorder_basketno && searchtoorder_vendorid ) %] > <div class="btn-group"> >- <a class="btn btn-default" href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&basketno=[% searchtoorder_basketno | uri %]&biblionumber=[% biblionumber | uri %]"><i class="fa fa-shopping-basket"></i> Add order</a> >+ <a class="toolbar-btn" href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&basketno=[% searchtoorder_basketno | uri %]&biblionumber=[% biblionumber | uri %]"><i class="fa fa-shopping-basket"></i> Add order</a> > </div> > [% END %] > [% END %] >@@ -232,12 +232,12 @@ > </fieldset> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Export</button> >+ <button type="submit" class="principal">Export</button> > <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > <input type="hidden" name="op" value="export" /> > <input type="hidden" name="bib" value="[% biblionumber | html %]" /> > </form> > </div> >- </div> > </div> >+</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >index efdb9bb976..2d634bd7ed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >@@ -1,43 +1,50 @@ > [% USE Koha %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Cataloging Resident Search Box --> >- <div id="header_search"> >+[% PROCESS 'html_helpers.inc' %] >+[% PROCESS 'patronfields.inc' %] >+<!-- Begin Patrons Resident Search Box --> >+ >+<div id="header_search"> >+ >+ <div> > <div id="addbooks_search" class="residentsearch"> > <form name="search" action="addbooks.pl"> >- <label class="tip" for="cat_search">Search the catalog and the reservoir:</label> >- <input class="head-searchbox" type="text" name="q" id="cat_search" size="40" /> >- <input type="submit" class="submit" value="Submit" /> >+ <input class="head-searchboxname-icon" type="text" name="q" id="cat_search" placeholder="Search the catalog and the reservoir" /> >+ <input type="submit" id="submit" value="" /> > </form> > </div> > >- [% INCLUDE 'patron-search-box.inc' %] >+ [% INCLUDE 'patron-search-box.inc' %] > >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <div id="checkin_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <label class="tip" for="ret_barcode">Scan a barcode to check in:</label> >- <input class="head-searchbox" type="text" name="barcode" id="ret_barcode" size="40" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >- </div> >- <div id="renew_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <label class="tip" for="ren_barcode">Scan a barcode to renew:</label> >- <input class="head-searchbox" type="text" name="barcode" id="ren_barcode" size="40" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >- </div> >- [% END %] >- >- [% INCLUDE 'catalogue-search-box.inc' %] >- >- <ul> >- <li><a class="keep_text" href="#addbooks_search">Cataloging search</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %] >- <li><a class="keep_text" href="#catalog_search">Search the catalog</a></li> >- </ul> >- </div><!-- /header_search --> >-</div><!-- /gradient --> >-<!-- End Cataloging Resident Search Box --> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >+ <div id="checkin_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >+ <input class="head-searchbox" name="barcode" id="ret_barcode" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> >+ <input value="" type="submit" id="submit" /> >+ </form> >+ </div> >+ >+ <div id="renew_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >+ <input class="head-searchbox" name="barcode" id="ren_barcode" type="text" placeholder="Scan a barcode to renew" /> >+ <input value="" type="submit" id="submit" /> >+ </form> >+ </div> >+ [% END %] >+ >+ [% INCLUDE 'catalogue-search-box.inc' %] >+ >+ <ul id="btn-space"> >+ <li><a title="Search patrons" class="iconsearch" href="#addbooks_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ <li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="name-icon">Cataloging search</span> >+ <span class="name-icon active">Check out</span> >+ <span class="name-icon">Check in</span> >+ <span class="name-icon">Renew</span> >+ <span class="name-icon">Search catalog</span> >+ </ul> >+</div><!-- /header_search --> >+<!-- End Main page Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc >index 134bf93de8..129d488b30 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc >@@ -1,12 +1,11 @@ > [% IF ( CAN_user_catalogue ) %] > <div id="catalog_search" class="residentsearch"> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <label class="tip" for="search-form">Enter search keywords:</label> > [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] > [% INCLUDE 'search_indexes.inc' %] > [% END %] >- <input type="text" name="q" id="search-form" size="40" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="query form-text head-searchbox" /> >- <input type="submit" value="Submit" class="submit" /> >+ <input type="text" name="q" id="search-form" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="query form-text head-searchbox" placeholder='Enter search keywords' /> >+ <input value="" type="submit" id="submit" /> > </form> > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc >index 0eca171626..4347b52a04 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc >@@ -1,4 +1,5 @@ >- <li> >+<li> > <span class="circ-hlt">Patron's age is incorrect for their category.</span> > Ages allowed are [% age_low | html %]-[% age_high | html %]. >- <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | uri %]&step=3" class="btn btn-default btn-xs">Change category</a></li> >+ <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | uri %]&step=3" class="btn btn-default btn-xs">Change category</a> >+</li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc >index 553d3c0286..40601121e5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc >@@ -103,7 +103,7 @@ > </div> > <div class="modal-footer"> > <button id="draw-chart" class="btn btn-default">Draw</button> >- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> >+ <button type="button" class="btn btn-default cancel" data-dismiss="modal">Close</button> > </div> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc >index 4326f09c78..ad555f0e08 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc >@@ -1,26 +1,30 @@ > [% USE Koha %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Checkin Resident Search Box --> >+<!-- Begin Main page Resident Search Box --> >+ > <div id="header_search"> >-[% INCLUDE 'patron-search-box.inc' %] > >-[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >-<div id="renew_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <label class="tip" for="ren_barcode">Scan a barcode to renew:</label> >- <input class="head-searchbox" type="text" name="barcode" id="ren_barcode" size="40" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >-</div> >-[% END %] >+ [% INCLUDE 'patron-search-box.inc' %] >+ >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >+ <div id="renew_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >+ <input class="head-searchbox" type="text" name="barcode" id="ren_barcode" placeholder="Scan a barcode to renew" /> >+ <input value="" id="submit" type="submit" /> >+ </form> >+ </div> >+ [% END %] >+ >+ [% INCLUDE 'catalogue-search-box.inc' %] >+ >+ <ul id="btn-space"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >-[% INCLUDE 'catalogue-search-box.inc' %] >-<ul> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >-</ul> >+ <span class="name-icon active">Check out</span> >+ <span class="name-icon">Renew</span> >+ <span class="name-icon">Search catalog</span> >+ </ul> >+</div><!-- /header_search --> >+<!-- End Main page Resident Search Box --> > >-</div> >-</div><!-- /gradient --> >-<!-- End Checkin Resident Search Box --> >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 @@ > <label id="renew_as_unseen_label" for="override_limit">Renew as "unseen" if appropriate:</label> > <input type="checkbox" name="renew_as_unseen" id="renew_as_unseen_checkbox" value="1" /> > [% END %] >- <button class="btn btn-default" id="RenewCheckinChecked"><i class="fa fa-check"></i> Renew or check in selected items</button> >- <button class="btn btn-default" id="RenewAll"><i class="fa fa-book"></i> Renew all</button> >+ <button class="btn btn-default principal" id="RenewCheckinChecked"><i class="fa fa-check"></i> Renew or check in selected items</button> >+ <button class="btn btn-default principal" id="RenewAll"><i class="fa fa-book"></i> Renew all</button> > [% END %] > </fieldset> > >@@ -81,7 +81,7 @@ > <input type="hidden" id="output_format" name="output_format" value="iso2709" /> > <input type="hidden" id="dont_export_item" name="dont_export_item" value="0" /> > <input type="hidden" id="record_type" name="record_type" value="bibs" /> >- <button class="btn btn-default btn-sm" id="export_submit"><i class="fa fa-download"></i> Export</button> >+ <button class="btn btn-default btn-sm principal" id="export_submit"><i class="fa fa-download"></i> Export</button> > </fieldset> > [% END %] > </div> >@@ -121,7 +121,7 @@ > <input type="hidden" id="claims-returned-itemnumber" /> > </div> > <div class="modal-footer"> >- <button id="claims-returned-modal-btn-submit" type="button" class="btn btn-primary"><i class="fa fa-exclamation-circle"></i> Make claim</button> >+ <button id="claims-returned-modal-btn-submit" type="button" class="btn btn-primary principal"><i class="fa fa-exclamation-circle"></i> Make claim</button> > <button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button> > </div> > </div> >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 %] >-<div class="patroninfo [% patron_type_class | html %]"> > >-[% IF ( patronimages ) %] >+<div id="filters"> >+<div class="patroninfo [% patron_type_class | html %]"> >+ [% IF ( patronimages ) %] > <h5 class="text-center"> >-[% ELSE %] >+ [% ELSE %] > <h5> >-[% END %] >+ [% END %] >+ > [% IF ( patron_is_staff ) %] >- <i class="fa fa-shield fa-fw" title="Staff patron"></i> >+ <i class="fa fa-shield fa-fw" title="Staff patron"></i> > [% END %] >+ > [% IF ( patron_is_superlibrarian ) %] >- <i class="fa fa-bolt fa-fw" title="Superlibrarian patron"></i> >+ <i class="fa fa-bolt fa-fw" title="Superlibrarian patron"></i> > [% END %] >+ > [% INCLUDE 'patron-title.inc' %] >+ >+ [% IF ( patron.dateofbirth ) %] >+ <li class="patrondateofbirth"> >+ [% INCLUDE 'patron-age.inc' %] >+ </li> >+ [% END %] >+ > </h5> > >-[% IF Koha.Preference('showLastPatron') %] >+ [% IF Koha.Preference('showLastPatron') %] > <input type="hidden" id="hiddenborrowernumber" value="[% patron.borrowernumber | html %]"> > <input type="hidden" id="hiddenborrowername" value="[% patron.surname | html %] [% patron.firstname | html %]"> > <input type="hidden" id="hiddenborrowercard" value="[% patron.cardnumber | html %]"> >-[% END %] >+ [% END %] > >-[% IF ( patronimages ) %] >+ [% IF ( patronimages ) %] > <div> > <div class="patronimage-container"> > [% IF ( patron.image ) %] >@@ -48,57 +59,57 @@ > [% END %] > </div> > </div> >-[% END %] >+ [% END %] > >-<ul class="patronbriefinfo"> >- [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %] >+ <ul class="patronbriefinfo"> >+ [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %] > [% PROCESS 'display-address-style' %] > > [% IF ( patron.phone || patron.mobile || patron.phonepro ) %]<li class="patronphone"> >+ > [% IF ( patron.phone ) %] >- <a href="tel:[% patron.phone | url %]">[% patron.phone | html %]</a> >+ <a href="tel:[% patron.phone | url %]">[% patron.phone | html %]</a> > [% ELSE %] > [% IF ( patron.mobile ) %] >- <a href="tel:[% patron.mobile | url %]">[% patron.mobile | html %]</a> >+ <a href="tel:[% patron.mobile | url %]">[% patron.mobile | html %]</a> > [% ELSE %] > [% IF ( patron.phonepro ) %] >- <a href="tel:[% patron.phonepro | url %]">[% patron.phonepro | html %]</a> >+ <a href="tel:[% patron.phonepro | url %]">[% patron.phonepro | html %]</a> > [% END %] > [% END %] > [% END %]</li>[% END %] >+ > [% IF ( patron.email ) %] >- <li class="email"> <a href="mailto:[% patron.email | url %]" title="[% patron.email | html %]">[% patron.email | html %]</a></li> >+ <li class="email"> <a href="mailto:[% patron.email | url %]" title="[% patron.email | html %]">[% patron.email | html %]</a></li> > [% ELSE %] > [% IF ( patron.emailpro ) %] >- <li class="email"> <a href="mailto:[% patron.emailpro | url %]" title="[% patron.emailpro | html %]">[% patron.emailpro | html %]</a></li> >+ <li class="email"> <a href="mailto:[% patron.emailpro | url %]" title="[% patron.emailpro | html %]">[% patron.emailpro | html %]</a></li> > [% END %] > [% END %] >- [% IF ( patron.dateofbirth ) %] >- <li class="patrondateofbirth"> >- <span>Born:</span> >- [% INCLUDE 'patron-age.inc' %] >- </li> >- [% END %] >+ >+ > > [% UNLESS ( patron.address or patron.address2 ) %] >- <li><span class="empty" id="noaddressstored">No address stored.</span></li> >+ <li><span class="empty" id="noaddressstored">No address stored.</span></li> > [% END %] > [% UNLESS ( patron.city ) %] >- <li><span class="empty" id="nocitystored">No city stored.</span></li> >+ <li><span class="empty" id="nocitystored">No city stored.</span></li> > [% END %] >+ > [% UNLESS ( patron.phone or patron.mobile or patron.phonepro) %] >- <li> <span class="empty">No phone stored.</span></li> >+ <li> <span class="empty">No phone stored.</span></li> > [% END %] >+ > [% UNLESS ( patron.email or patron.emailpro) %] >- <li> <span class="empty">No email stored.</span></li> >+ <li> <span class="empty">No email stored.</span></li> > [% END %] >+ > [% UNLESS ( patron.dateofbirth ) %] >- <li> <span class="empty">No date of birth stored.</span></li> >+ <li> <span class="empty">No date of birth stored.</span></li> >+ [% 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 %] >- <li class="patroncategory">Category: [% patron.category.description | html %] ([% patron.categorycode | html %])</li> >- <li class="patronlibrary">Home library: [% Branches.GetName( patron.branchcode ) | html %]</li> >- <li class="patronborrowernumber">Borrowernumber: [% patron.borrowernumber | html %]</li> >- <li><span class="patronupdatedon">Updated on [% patron.updated_on | $KohaDates with_hours => 1 %]</span></li> >- [% IF patron.account_locked %] >+ [% END %] >+ >+ <li class="patroncategory">Category: [% patron.category.description | html %] ([% patron.categorycode | html %])</li> >+ <li class="patronlibrary">Home library: [% Branches.GetName( patron.branchcode ) | html %]</li> >+ <li class="patronborrowernumber">Borrowernumber: [% patron.borrowernumber | html %]</li> >+ <li><span class="patronupdatedon">Updated on [% patron.updated_on | $KohaDates with_hours => 1 %]</span></li> >+ >+ [% IF patron.account_locked %] > [% IF patron.login_attempts < 0 %] > <li class="blocker account_admin_locked">Account has been administratively locked</li> > [% ELSE %] > <li class="blocker account_locked">Account has been locked</li> > [% END %] >- [% END %] >- </ul></div> >-<div id="menu"> >-<ul> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | uri %]">Check out</a></li> >- [% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split(',').grep('^' _ patron.categorycode _ '$').size > 0 %] >- [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | uri %]&batch=1">Batch check out</a></li> > [% END %] >- [% END %] >- [% IF CAN_user_borrowers_edit_borrowers %] >- [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">Details</a></li> >- [% END %] >- [% IF ( CAN_user_updatecharges_remaining_permissions ) %] >- [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">Accounting</a></li> >- [% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- [% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% patron.borrowernumber | uri %]">Routing lists</a></li>[% END %] >- [% END %] >- [% IF CAN_user_borrowers_edit_borrowers %] >- [% IF ( intranetreadinghistory ) %] >- [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% patron.borrowernumber | uri %]">Circulation history</a></li> >+ </ul> >+</div> >+ >+<div id="navmenulist"> >+ <ul> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >+ [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | uri %]">Check out</a></li> >+ [% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split(',').grep('^' _ patron.categorycode _ '$').size > 0 %] >+ [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | uri %]&batch=1">Batch check out</a></li> >+ [% END %] > [% END %] >- [% END %] >- [% IF CAN_user_borrowers_edit_borrowers %] >- [% IF ( intranetreadinghistory ) %] >- [% IF ( holdshistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/holdshistory.pl?borrowernumber=[% patron.borrowernumber | uri %]">Holds history</a></li> >+ [% IF CAN_user_borrowers_edit_borrowers %] >+ [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">Details</a></li> > [% END %] >- [% END %] >- [% IF ( CAN_user_tools_view_system_logs ) %] >- [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=MEMBERS&modules=CIRCULATION&object=[% patron.borrowernumber | uri %]&src=circ">Modification log</a></li> >- [% END %] >- [% IF CAN_user_borrowers_edit_borrowers %] >- [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber | uri %]">Notices</a></li> >- [% END %] >- [% IF CAN_user_borrowers_edit_borrowers %] >- [% IF ( statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber | uri %]">Statistics</a></li> >- [% END %] >- [% IF CAN_user_borrowers_edit_borrowers %] >- [% IF ( EnableBorrowerFiles ) %] >- [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | uri %]">Files</a></li> >+ [% IF ( CAN_user_updatecharges_remaining_permissions ) %] >+ [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">Accounting</a></li> >+ [% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >+ [% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% patron.borrowernumber | uri %]">Routing lists</a></li>[% END %] >+ [% END %] >+ [% IF CAN_user_borrowers_edit_borrowers %] >+ [% IF ( intranetreadinghistory ) %] >+ [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% patron.borrowernumber | uri %]">Circulation history</a></li> >+ [% END %] >+ [% END %] >+ [% IF CAN_user_borrowers_edit_borrowers %] >+ [% IF ( intranetreadinghistory ) %] >+ [% IF ( holdshistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/holdshistory.pl?borrowernumber=[% patron.borrowernumber | uri %]">Holds history</a></li> >+ [% END %] >+ [% END %] >+ [% IF ( CAN_user_tools_view_system_logs ) %] >+ [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=MEMBERS&modules=CIRCULATION&object=[% patron.borrowernumber | uri %]&src=circ">Modification log</a></li> >+ [% END %] >+ [% IF CAN_user_borrowers_edit_borrowers %] >+ [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber | uri %]">Notices</a></li> >+ [% END %] >+ [% IF CAN_user_borrowers_edit_borrowers %] >+ [% IF ( statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber | uri %]">Statistics</a></li> >+ [% END %] >+ [% IF CAN_user_borrowers_edit_borrowers %] >+ [% IF ( EnableBorrowerFiles ) %] >+ [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | uri %]">Files</a></li> >+ [% END %] > [% END %] >- [% END %] > > [% IF CAN_user_suggestions_suggestions_manage %] > [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber | uri %]">Purchase suggestions</a></li> >@@ -179,6 +194,7 @@ > [% IF recallsview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/recallshistory.pl?borrowernumber=[% patron.borrowernumber | uri %]">Recalls history</a></li> > [% END %] > </ul></div> >+</div> > > [% IF patronimages && CAN_user_tools_batch_upload_patron_images %] > <!-- Modal --> >@@ -212,7 +228,7 @@ > <input type="hidden" id="image" name="filetype" value="image" /> > <input type="hidden" id="cardnumber" name="cardnumber" value="[% patron.cardnumber | html %]" /> > <input type="hidden" id="borrowernumber" name="borrowernumber" value="[% patron.borrowernumber | html %]" /> >- <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-upload"></i> Upload photo</button> >+ <button type="submit" class="btn btn-default principal btn-xs"><i class="fa fa-upload"></i> Upload photo</button> > <input name="op" type="hidden" value="Upload" /> > [% IF ( patron.image ) %] > <a id="delpicture" >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >index 01631fecce..9efa506f76 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >@@ -3,11 +3,9 @@ > <div id="navmenu"> > <div id="navmenulist"> > >- <ul> >- <li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation home</a></li> >- </ul> >+ <h2><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation home</a></h2> > >- <h5>Circulation</h5> >+ <h4>Circulation</h4> > <ul> > <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li> > <li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li> >@@ -33,18 +31,19 @@ > </ul> > > [% IF Koha.Preference('ArticleRequests') %] >- <h5>Patron request</h5> >+ <h4>Patron request</h4> > <ul> > <li><a href="/cgi-bin/koha/circ/article-requests.pl">Article requests</a></li> > </ul> > [% END %] > >- <h5>Circulation reports</h5> >+ <h4>Circulation reports</h4> > <ul> > <li><a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a></li> > <li><a href="/cgi-bin/koha/circ/pendingreserves.pl">Holds to pull</a></li> > <li><a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a></li> > <li><a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a></li> >+ <li><a href="/cgi-bin/koha/circ/transfers_to_send.pl">Transfers to send</a></li> > <li><a href="/cgi-bin/koha/circ/transferstoreceive.pl">Transfers to receive</a></li> > [% IF ( CAN_user_circulate_overdues_report ) %] > <li><a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >index 5e84e25a79..02a1acf98b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >@@ -1,34 +1,38 @@ > [% USE Koha %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Circulation Resident Search Box --> >+<!-- Begin Main page Resident Search Box --> > > <div id="header_search"> >+ > [% INCLUDE 'patron-search-box.inc' %] >+ >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >+ <div id="checkin_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" method="post"> >+ <input id="ret_barcode" name="barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> >+ <input value="" id="submit" type="submit"/> >+ </form> >+ </div> >+ >+ <div id="renew_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >+ <input class="head-searchbox" name="barcode" id="ren_barcode" accesskey="r" type="text" placeholder="Scan a barcode to renew" /> >+ <input value="" type="submit" id="submit" /> >+ </form> >+ </div> >+ [% END %] >+ > [% INCLUDE 'catalogue-search-box.inc' %] >-[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >-<div id="checkin_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <label class="tip" for="ret_barcode">Scan a barcode to check in:</label> >- <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" type="text" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >-</div> >-<div id="renew_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <label class="tip" for="ren_barcode">Scan a barcode to renew:</label> >- <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >-</div> >-[% END %] > >-<ul> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >-</ul> >+ <ul id="btn-space"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >-</div><!-- /header_search --> >-</div><!-- /gradient --> >-<!-- End Circulation Resident Search Box --> >+ <span class="name-icon active">Check out</span> >+ <span class="name-icon">Check in</span> >+ <span class="name-icon">Renew</span> >+ <span class="name-icon">Search catalog</span> >+ </ul> >+</div> >+<!-- End Main page Resident Search Box --> >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 %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Cities Resident Search Box --> > <div id="header_search"> > <div id="city_search" class="residentsearch"> >- <form action="[% script_name | html %]" method="post"> >- <label class="tip" for="city_name_filter">City search:</label> >- <input class="head-searchbox" type="text" name="city_name_filter" id="city_name_filter" value="[% city_name_filter | html %]" size="40" /> >- <input type="submit" name="submit" value="OK" class="submit" /> >- </form> >+ <form action="[% script_name | html %]" method="post"> >+ <input class="head-searchbox" type="text" name="city_name_filter" id="city_name_filter" value="[% city_name_filter | html %]" placeholder="City search" /> >+ <input type="submit" name="submit" value="" id="submit" /> >+ </form> > </div> > > [% INCLUDE 'patron-search-box.inc' %] >+ > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a class="keep_text" href="#city_search">Search cities</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >- </ul> >-</div> >+ <ul id="btn-space"> >+ <li><a title="Search cities" class="iconsearch" href="#city_search"><i class="fa fa-building-o"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="name-icon active">Search cities</span> >+ <span class="name-icon">Check out</span> >+ <span class="name-icon">Search the catalog</span> >+ </ul> > </div> > <!-- End Cities Resident Search Box --> >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 %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Patrons Admin Resident Search Box --> > > <div id="header_search"> > <div id="contract_description_search" class="residentsearch"> > <form action="[% script_name | html %]" method="post"> >- <label class="tip" for="searchfield">Search by contract name or/and description:</label> >- <input class="head-searchbox" type="text" name="searchfield" id="searchfield" size="40" value="[% searchfield | html %]" /> >- <input type="submit" class="submit" name="search" value="Search" /> >+ <input class="head-searchbox" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Search by contract name or/and description:"/> >+ <input type="submit" class="submit" id="submit" name="search" value="" /> > </form> > </div> > > [% INCLUDE 'patron-search-box.inc' %] >+ > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a class="keep_text" href="#contract_description_search">Search contracts</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >+ <ul id="btn-space"> >+ <li><a title="Search contracts" class="iconsearch" href="#contract_description_search"><i class="fa fa-pencil-square-o"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="name-icon active">Search contracts</span> >+ <span class="name-icon">Check out</span> >+ <span class="name-icon">Search the catalog</span> > </ul> > </div> >-</div><!-- /gradient --> > <!-- End Patrons Admin Resident Search Box --> >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 %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Currencies Resident Search Box --> >+ > <div id="header_search"> > <div id="currency_search" class="residentsearch"> > <form action="[% script_name | html %]" method="post"> >- <label class="tip" for="description">Currencies search:</label> >- <input class="head-searchbox" type="text" name="description" id="description" size="40" value="[% searchfield | html %]" /> >- <input type="submit" class="submit" name="search" value="Search" /> >+ <input class="head-searchbox" type="text" name="description" id="description" value="[% searchfield | html %]" placeholder="Currencies search" /> >+ <input type="submit" id="submit" name="search" value="" /> > </form> > </div> >+ > [% INCLUDE 'patron-search-box.inc' %] >+ > [% INCLUDE 'catalogue-search-box.inc' %] >- <ul> >- <li><a class="keep_text" href="#currency_search">Search currencies</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >- </ul> >+ >+ <ul id="btn-space"> >+ <li><a title="Search currencies" class="iconsearch" href="#currency_search"><i class="fa fa-dollar"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="name-icon active">Search currencies</span> >+ <span class="name-icon">Check out</span> >+ <span class="name-icon">Search catalog</span> >+ </ul> > </div> >-</div><!-- /gradient --> > <!-- End Currencies Resident Search Box --> >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 %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName|html %]</a></div><!-- Begin Desks Resident Search Box --> > <div id="header_search"> >+ > <div id="desk_search" class="residentsearch"> >- <form action="[% script_name|html %]" method="post"> >- <label class="tip" for="desk_name">Desk search:</label> >- <input class="head-searchbox" type="text" name="desk_name" id="desk_name" value="[% searchfield|html %]" size="40" /> >- <input type="submit" name="submit" value="OK" class="submit" /> >- </form> >+ <form action="[% script_name|html %]" method="post"> >+ <input class="head-searchbox" type="text" name="desk_name" placeholder="Desk search:" id="desk_name" value="[% searchfield|html %]" size="40" /> >+ <input type="submit" name="submit" value="" class="submit" id="submit" /> >+ </form> > </div> > > [% INCLUDE 'patron-search-box.inc' %] >+ > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a class="keep_text" href="#desk_search">Search desks</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >- </ul> >-</div> >+ <ul id="btn-space"> >+ <li><a title="Search desks" class="iconsearch" href="#desk_search"><i class="fa fa-desktop"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="name-icon active">Search desks</span> >+ <span class="name-icon">Check out</span> >+ <span class="name-icon">Search catalog</span> >+ </ul> > </div> > <!-- End Desks Resident Search Box --> >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 ) %] > <div id="search-facets"> > <h4>Refine your search</h4> >-<ul> >+<ul class="cadre"> > <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi_not_availablity | $raw %][% IF ( sort_by ) %]&sort_by=[% sort_by | uri %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %][% IF ( sort_by ) %]&sort_by=[% sort_by | uri %][% END %]&limit=available">Limit to currently available items</a>[% END %]</li></ul> > [% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search | html %][% END %])</li>[% END %] > </li> >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 %] > <div id="navmenu"> >-<div id="navmenulist"> >+ <div id="navmenulist"> > >-<h5>Run reports</h5> >-<ul> >- [% IF ( CAN_user_reports_execute_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a></li>[% END %] >-</ul> >-<h5>Reports dictionary</h5> >-<ul> >-<li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li> >-</ul> >-<h5>Useful resources</h5> >-<ul> >-<li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha report library</a></li> >-[% SET koha_version = Koha.Version %] >-[% IF koha_version.development %] >- <li><a href="http://schema.koha-community.org/master" target="blank">Koha database schema</a></li> >-[% ELSE %] >- <li><a href="http://schema.koha-community.org/[% koha_version.major | uri %]_[% koha_version.minor | uri %]" target="blank">Koha database schema</a></li> >-[% END %] >-</ul> >-</div> >+ [% IF ( CAN_user_reports_execute_reports ) %]<h4>Run reports</h4><ul><li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a></li></ul>[% END %] >+ >+ <h4>Reports dictionary</h4> >+ <ul> >+ <li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li> >+ </ul> >+ <h4>Useful resources</h4> >+ <ul> >+ <li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha report library</a></li> >+ [% SET koha_version = Koha.Version %] >+ [% IF koha_version.development %] >+ <li><a href="http://schema.koha-community.org/master" target="blank">Koha database schema</a></li> >+ [% ELSE %] >+ <li><a href="http://schema.koha-community.org/[% koha_version.major | uri %]_[% koha_version.minor | uri %]" target="blank">Koha database schema</a></li> >+ [% END %] >+ </ul> >+ </div> > </div> >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 %] >+ >+ >+ > <nav class="navbar"> >+ > <div class="navbar-header"> >- <a href="#" class="header-menu-link collapsed" data-toggle="collapse" data-target="#header" aria-expanded="false" aria-controls="header"> >- <i class="fa fa-bars"></i> Menu >- </a> >+ <ul id="logo"> >+ <a href="/cgi-bin/koha/mainpage.pl"></a> >+ </ul> >+ <a href="#" class="header-menu-link collapsed" data-toggle="collapse" data-target="#header" aria-expanded="false" aria-controls="header"><i class="fa fa-bars"></i> Menu</a> > </div> >+ > <div id="header" class="navbar-collapse collapse"> > <ul id="toplevelmenu" class="nav navbar-nav"> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %] >+ > [% IF CAN_user_borrowers_edit_borrowers %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %] >- <li id="catalog-search-link"> >- <a href="/cgi-bin/koha/catalogue/search.pl">Search</a> >- </li> >- <li class="dropdown" id="catalog-search-dropdown"> >- <a href="/cgi-bin/koha/catalogue/search.pl" class="dropdown-toggle" data-toggle="dropdown"><b class="caret"></b></a> >+ >+ <li class="dropdown"> >+ <a href="/cgi-bin/koha/catalogue/search.pl" class="dropdown-toggle" data-toggle="dropdown">Search <b class="caret"></b></a> > <ul class="dropdown-menu dropdown-menu-right"> > [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl">Advanced search</a></li> > <li><a href="/cgi-bin/koha/catalogue/itemsearch.pl">Item search</a></li>[% END %] > </ul> > </li> >- [% IF ( Koha.Preference('intranetbookbag') ) %] >- <li> >- <a href="#" id="cartmenulink"><i class="fa fa-shopping-cart"></i>Cart<span id="basketcount"></span></a> >- </li> >- [% END %] >- [% Koha.Preference('IntranetNav') | $raw %] >+ > <li class="dropdown"> > <a href="/cgi-bin/koha/mainpage.pl" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a> > <ul class="dropdown-menu dropdown-menu-right"> >@@ -67,152 +67,169 @@ > <li><a href="/cgi-bin/koha/about.pl">About Koha</a></li> > </ul> > </li> >+ <li>[% Koha.Preference('IntranetNav') | $raw %]</li> > </ul> > </div> >- <ul id="user-menu" class="nav navbar-nav navbar-right"> >- [% IF ( loggedinusername ) %] >- <li class="dropdown"> >- <a href="#" id="logged-in-menu" role="button" class="dropdown-toggle" data-toggle="dropdown"> >- <span id="logged-in-info-brief"> >- <i class="fa fa-user"></i> >- </span> >- <span id="logged-in-info-full"> >- [% SET is_superlibrarian = CAN_user_superlibrarian ? 'is_superlibrarian' : '' %] >- <span class="loggedinusername [% is_superlibrarian | html %]">[% logged_in_user.userid | html %]</span> >- <span class="separator">|</span> >- [% IF ( AutoLocation ) %] >- <brand> >- [% Branches.GetLoggedInBranchname | html %] >- </brand> >- [% ELSE %] >- <strong> >- <span class="logged-in-branch-name">[% Branches.GetLoggedInBranchname | html %]</span> >- <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span> >- </strong> >- [% END %] >- [% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %] >- <span class="separator">|</span> >- <strong> >- [% IF ( Desks.GetLoggedInDeskName == '' ) %] >- <span class="logged-in-desk-name">NO DESK SET</span> >- [% ELSE %] >- <span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName | html %]</span> >- <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span> >- [% END %] >- </strong> >- [% END %] >- [% IF Koha.Preference('UseCashRegisters') && !(Registers.session_register_name == '') %] >- <span class="separator">|</span> >- <strong> >- <span class="logged-in-register-name">[% Registers.session_register_name | html %]</span> >- <span class="logged-in-register-id content_hidden">[% Registers.session_register_id | html %]</span> >- </strong> >- [% END %] >- </span> >- <b class="caret"></b> >- </a> >- <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="logged-in-menu"> > >- <li class="loggedin-menu-label"> >- Logged in as:<br /> >- <span class="loggedinusername">[% logged_in_user.userid | html %]</span> >- </li> >- <li class="loggedin-menu-label"> >- [% IF ( AutoLocation ) %] >- <brand> >- [% Branches.GetLoggedInBranchname | html %] >- </brand> >- [% ELSE %] >- Location: <br /> >- <span class="logged-in-branch-name">[% Branches.GetLoggedInBranchname | html %]</span> >- <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span> >- [% END %] >- </li> >+ <div class="navbar-head"> >+ <ul id="toplevelmenu" class="nav navbar-nav"> >+ <li> >+ [% form %] >+ </li> >+ >+ [% IF ( Koha.Preference('intranetbookbag') ) %] >+ <li> >+ <a href="#" id="cartmenulink"><i class="fa fa-shopping-cart"></i><span id="basketcount"></span></a> >+ </li> >+ [% END %] >+ </ul> >+ </div> >+ >+ <ul id="user-menu" class="nav navbar-nav navbar-right"> >+ [% IF ( loggedinusername ) %] > >+ <li class="dropdown"> >+ <a href="#" id="logged-in-menu" role="button" class="dropdown-toggle" data-toggle="dropdown"> >+ >+ <span id="logged-in-info-brief"> >+ <i class="fa fa-user"> >+ <b class="caret"></b></i> >+ </span> >+ >+ <span id="logged-in-info-full"> >+ [% SET is_superlibrarian = CAN_user_superlibrarian ? 'is_superlibrarian' : '' %] >+ <span class="loggedinusername [% is_superlibrarian | html %]">[% logged_in_user.userid | html %]</span> >+ >+ [% IF ( AutoLocation ) %] >+ <brand> >+ [% Branches.GetLoggedInBranchname | html %] >+ </brand> >+ [% ELSE %] >+ <strong> >+ <span class="logged-in-branch-name">[% Branches.GetLoggedInBranchname | html %]<b class="caret"></b></span> >+ <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span> >+ </strong> >+ [% END %] > [% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %] >- <li class="loggedin-menu-label"> >- Desk: <br /> >- [% IF ( Desks.GetLoggedInDeskName == '' ) %] >- <span class="logged-in-desk-name">NO DESK SET</span> >- [% ELSE %] >- <span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName | html %]</span> >- <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span> >- [% END %] >- </li> >+ <span class="separator">|</span> >+ <strong> >+ [% IF ( Desks.GetLoggedInDeskName == '' ) %] >+ <span class="logged-in-desk-name">NO DESK SET</span> >+ [% ELSE %] >+ <span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName | html %]</span> >+ <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span> >+ [% END %] >+ </strong> > [% END %] >- > [% IF Koha.Preference('UseCashRegisters') && !(Registers.session_register_name == '') %] >- <li class="loggedin-menu-label"> >- Register: <br /> >+ <span class="separator">|</span> >+ <strong> > <span class="logged-in-register-name">[% Registers.session_register_name | html %]</span> > <span class="logged-in-register-id content_hidden">[% Registers.session_register_id | html %]</span> >- </li> >- [% END %] >- >- [% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %] >- <li role="separator" class="loggedin-menu-label divider"></li> >- <li> >- [% IF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %] >- <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library, desk and register</a> >- [% ELSIF Koha.Preference('UseCirculationDesks') %] >- <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a> >- [% ELSIF Koha.Preference('UseCashRegisters') %] >- <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and cash register</a> >- [% ELSE %] >- <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a> >- [% END %] >- </li> >- [% ELSIF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %] >- <li role="separator" class="loggedin-menu-label divider"></li> >- <li> >- <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk and cash register</a> >+ </strong> >+ [% END %] >+ </span> >+ </a> >+ >+ <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="logged-in-menu"> >+ <li class="loggedin-menu-label"> >+ Logged in as:<br /> >+ <span class="loggedinusername">[% logged_in_user.userid | html %]</span> >+ </li> >+ >+ <li class="loggedin-menu-label"> >+ [% IF ( AutoLocation ) %] >+ <brand> >+ [% Branches.GetLoggedInBranchname | html %] >+ </brand> >+ [% ELSE %] >+ Location: <br /> >+ <span class="logged-in-branch-name">[% Branches.GetLoggedInBranchname | html %]</span> >+ <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span> >+ [% END %] >+ </li> >+ >+ [% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %] >+ <li class="loggedin-menu-label"> >+ Desk: <br /> >+ [% IF ( Desks.GetLoggedInDeskName == '' ) %] >+ <span class="logged-in-desk-name">NO DESK SET</span> >+ [% ELSE %] >+ <span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName | html %]</span> >+ <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span> >+ [% END %] >+ </li> >+ [% END %] >+ >+ [% IF Koha.Preference('UseCashRegisters') && !(Registers.session_register_name == '') %] >+ <li class="loggedin-menu-label"> >+ Register: <br /> >+ <span class="logged-in-register-name">[% Registers.session_register_name | html %]</span> >+ <span class="logged-in-register-id content_hidden">[% Registers.session_register_id | html %]</span> > </li> >+ [% END %] >+ >+ [% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %] >+ <li role="separator" class="loggedin-menu-label divider"></li> >+ <li> >+ [% IF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %] >+ <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library, desk and register</a> > [% ELSIF Koha.Preference('UseCirculationDesks') %] >- <li role="separator" class="loggedin-menu-label divider"></li> >- <li> >- <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk</a> >- </li> >+ <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a> > [% ELSIF Koha.Preference('UseCashRegisters') %] >- <li role="separator" class="loggedin-menu-label divider"></li> >- <li> >- <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set cash register</a> >- </li> >- [% END %] >- [% IF EnableSearchHistory %] >- <li> >- <a class="toplinks" href="/cgi-bin/koha/catalogue/search-history.pl">Search history</a> >- </li> >+ <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and cash register</a> >+ [% ELSE %] >+ <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a> > [% END %] >+ </li> >+ [% ELSIF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %] >+ <li role="separator" class="loggedin-menu-label divider"></li> >+ <li> >+ <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk and cash register</a> >+ </li> >+ [% ELSIF Koha.Preference('UseCirculationDesks') %] >+ <li role="separator" class="loggedin-menu-label divider"></li> >+ <li> >+ <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk</a> >+ </li> >+ [% ELSIF Koha.Preference('UseCashRegisters') %] >+ <li role="separator" class="loggedin-menu-label divider"></li> >+ <li> >+ <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set cash register</a> >+ </li> >+ [% END %] >+ [% IF EnableSearchHistory %] >+ <li> >+ <a class="toplinks" href="/cgi-bin/koha/catalogue/search-history.pl">Search history</a> >+ </li> >+ [% END %] > >- [% IF loggedinusernumber %] >- <li class ="toplinks-myaccount"> >- <a class="toplinks" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loggedinusernumber | html %]">My account</a> >- </li> >- <li class="toplinks-mycheckouts"> >- <a class="toplinks" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% loggedinusernumber | html %]">My checkouts</a> >- </li> >- [% END %] >- <li> >- <a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a> >+ [% IF loggedinusernumber %] >+ <li class ="toplinks-myaccount"> >+ <a class="toplinks" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loggedinusernumber | html %]">My account</a> > </li> >- </ul> >- </li> >- [% INCLUDE 'langmenu-staff-top.inc' %] >- <li> >- <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >- </li> >- [% ELSE %] >- <li class="loggedout"> >- <span> >- <a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a> >- <span class="separator">|</span> >- <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >- </span> >- </li> >- [% END %] >- </ul> >+ <li class="toplinks-mycheckouts"> >+ <a class="toplinks" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% loggedinusernumber | html %]">My checkouts</a> >+ </li> >+ [% END %] >+ <li> >+ <a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a> >+ </li> >+ </ul> >+ </li> >+ >+ [% INCLUDE 'langmenu-staff-top.inc' %] >+ >+ [% ELSE %] >+ <li class="loggedout"> >+ <span> >+ <a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a> >+ <span class="separator">|</span> >+ </span> >+ </li> >+ [% END %] >+ </ul> > >- [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] > [% IF ( Koha.Preference('intranetbookbag') ) %]<div id="cartDetails">Your cart is empty.</div>[% END %] > > </nav> >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 %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Main page Resident Search Box --> >+<!-- Begin Main page Resident Search Box --> > > <div id="header_search"> >+ > [% INCLUDE 'patron-search-box.inc' %] >-[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >-<div id="checkin_search" class="residentsearch"> >- <label class="tip" for="ret_barcode">Scan a barcode to check in:</label> >- <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" type="text" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >-</div> >-<div id="renew_search" class="residentsearch"> >- <label class="tip" for="ren_barcode">Scan a barcode to renew:</label> >+ >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >+ <div id="checkin_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >+ <input name="barcode" id="ret_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> >+ <input value="" type="submit" id="submit" /> >+ </form> >+ </div> >+ >+ <div id="renew_search" class="residentsearch"> > <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" /> >- <input value="Submit" class="submit" type="submit" /> >+ <input name="barcode" id="ren_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to renew" /> >+ <input value="" type="submit" id="submit" /> > </form> > </div> >-[% END %] >- >-[% IF CAN_user_borrowers_edit_borrowers %] >-<div id="patron_search" class="residentsearch"> >- <label class="tip" for="searchmember">Enter patron card number or partial name:</label> >- <form action="/cgi-bin/koha/members/member.pl" method="post"> >- <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text" autocomplete="off" /> >- <input type="hidden" name="quicksearch" value="1" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >-</div>[% END %] >-[% INCLUDE 'catalogue-search-box.inc' %] >-<ul> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %] >- [% IF CAN_user_borrowers_edit_borrowers %]<li><a class="keep_text" href="#patron_search">Search patrons</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >-</ul> >+ [% END %] >+ >+ [% IF CAN_user_borrowers_edit_borrowers %] >+ <div id="patron_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/members/member.pl"> >+ <input name="searchmember" id="searchmember" class="head-searchbox" type="text" placeholder="Enter patron card number or partial name" /> >+ <input type="hidden" name="quicksearch" value="1" /> >+ <input value="" type="submit" id="submit" /> >+ </form> >+ </div> >+ [% END %] >+ >+ [% INCLUDE 'catalogue-search-box.inc' %] >+ >+ <ul id="btn-space"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a title="Search patrons" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >+ <span class="name-icon active">Check out</span> >+ <span class="name-icon">Check in</span> >+ <span class="name-icon">Renew</span> >+ <span class="name-icon">Search patrons</span> >+ <span class="name-icon">Search catalog</span> >+ </ul> > </div><!-- /header_search --> >-</div><!-- /gradient --> > <!-- End Main page Resident Search Box --> >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 %] > <div id="toolbar"> >- <a id="selectallbutton" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="clearallbutton" href="#"><i class="fa fa-remove"></i> Clear all</a> | <a id="clearonloanbutton" href="#">Clear on loan</a> >+ <a id="selectallbutton" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="clearallbutton" class="lienype" href="#"><i class="fa fa-remove"></i> Clear all</a> | <a id="clearonloanbutton" href="#">Clear on loan</a> > </div> > [% 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 %] > <div class="dropdown btn-group"> >- <button class="btn btn-default dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> >+ <button class="btn btn-default toolbar-btn dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> > <i class="fa fa-plus"></i> New ILL request <span class="caret"></span> > </button> >- <ul class="dropdown-menu" aria-labelledby="ill-backend-dropdown"> >+ <ul class="dropdown-menu toolbar-btn" aria-labelledby="ill-backend-dropdown"> > [% FOREACH backend IN backends %] > <li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backend | uri %]">[% backend | html %]</a></li> > [% END %] > </ul> > </div> > [% ELSE %] >- <a id="ill-new" class="btn btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backends.0 | html %]"> >+ <a id="ill-new" class="btn btn-default toolbar-btn" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backends.0 | html %]"> > <i class="fa fa-plus"></i> New ILL request > </a> > [% END %] > [% ELSE %] >- <a id="ill-new" class="btn btn-default disabled" href=""> >+ <a id="ill-new" class="btn btn-default toolbar-btn disabled" href=""> > <i class="fa fa-plus"></i> New ILL request > </a> > [% END %] > [% IF query_type == 'illlist' %] >- <a id="ill-list" class="btn btn-sm btn-default btn-group" href="/cgi-bin/koha/ill/ill-requests.pl"> >+ <a id="ill-list" class="btn btn-sm btn-default toolbar-btn btn-group" href="/cgi-bin/koha/ill/ill-requests.pl"> > <i class="fa fa-list"></i> Refresh > </a> > [% ELSE %] >- <a id="ill-list" class="btn btn-sm btn-default btn-group" href="/cgi-bin/koha/ill/ill-requests.pl"> >+ <a id="ill-list" class="btn btn-sm btn-default toolbar-btn btn-group" href="/cgi-bin/koha/ill/ill-requests.pl"> > <i class="fa fa-list"></i> List requests > </a> > [% 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 %] > <!-- koha core js --> > [% 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' %] > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=new">Label batch</a></li> > <li><a href="/cgi-bin/koha/labels/label-edit-layout.pl?op=new">Layout</a></li> >@@ -11,7 +11,7 @@ > </ul> > </div> > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Label batches</a></li> > <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Layouts</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc >index 1c5c9dfce1..ba36b858dc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc >@@ -1,4 +1,5 @@ >-<div id="lastborrower-window"> >- <div id="lastborrower-ref" class="lastborrower"><a id="lastborrowerlink" href="" title="">Last patron</a></div> >- <div id="lastborrower-remove" class="lastborrower"><i class="fa fa-remove"></i></div> >+<div id="lastborrower-window" class="lastborrower"> >+ <div id="lastborrower-ref"><a id="lastborrowerlink" href="" title="">Last patron</a></div> >+ <div id="lastborrower-bar">|</div> >+ <div id="lastborrower-remove"><i class="fa fa-remove"></i></div> > </div> >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >index 5a0dd0f28d..d94f383445 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >@@ -1,21 +1,25 @@ > [% USE Koha %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Notices Resident Search Box --> >+ > <div id="header_search"> >- <div id="notices_search" class="residentsearch"> >-<form action="/cgi-bin/koha/tools/letter.pl" method="post"> >- <label class="tip" for="searchfield">Search existing notices:</label> >- <input class="head-searchbox" type="text" name="searchfield" id="searchfield" size="40" value="" /> >- <input type="submit" class="submit" name="search" value="Search" /> >- </form> >- </div> >- [% INCLUDE 'patron-search-box.inc' %] >- [% INCLUDE 'catalogue-search-box.inc' %] >- <ul> >- <li><a class="keep_text" href="#notices_search">Search notices</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >- </ul> >+ <div id="notices_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/tools/letter.pl" method="post"> >+ <input class="head-searchbox" type="text" name="searchfield" id="searchfield" value="" placeholder="Search existing notices"/> >+ <input type="submit" class="submit" id="submit" name="search" value="" /> >+ </form> >+ </div> >+ >+ [% INCLUDE 'patron-search-box.inc' %] >+ >+ [% INCLUDE 'catalogue-search-box.inc' %] >+ >+ <ul id="btn-space"> >+ <li><a title="Search notices" class="iconsearch" href="#notices_search"><i class="fa fa-commenting-o"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="name-icon active" >Search notices</span> >+ <span class="name-icon">Check out</span> >+ <span class="name-icon">Search the catalog</span> >+ </ul> > </div> >-</div><!-- /gradient --> > <!-- End Notices Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc >index f358763c3b..1b6cb2f8fe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc >@@ -2,7 +2,7 @@ > [% USE AuthorisedValues %] > [% BLOCK 'alt-address-style' %] > <fieldset class="rows" id="memberentry_address"> >- <legend id="alt_address_lgd">Alternate address</legend> >+ <h3 id="alt_address_lgd">Alternate address</h3> > <ol> > [% IF Koha.Preference( 'AddressFormat' ) %] > [% PROCESS "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }" %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc >index 6211c412af..05a0e53192 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc >@@ -1,7 +1,7 @@ > [% USE Koha %] > [% BLOCK 'alt-contact-style' %] > <fieldset class="rows" id="memberentry_altaddress"> >- <legend id="alt_contact_lgd">Alternate contact</legend> >+ <h3 id="alt_contact_lgd">Alternate contact</h3> > <ol> > [% IF Koha.Preference( 'AddressFormat' ) %] > [% PROCESS "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }" %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc >index a5c95b9c55..2beb46ba50 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc >@@ -2,7 +2,7 @@ > [% USE AuthorisedValues %] > [% BLOCK 'main-address-style' %] > <fieldset class="rows" id="memberentry_mainaddress"> >- <legend id="main_address_lgd">Main address</legend> >+ <h3 id="main_address_lgd">Main address</h3> > <ol> > [% IF Koha.Preference( 'AddressFormat' ) %] > [% PROCESS "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }" %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >index 2e85df1919..71d44e46e7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >@@ -6,20 +6,20 @@ > [% USE scalar %] > <div id="toolbar" class="btn-toolbar"> > [% IF CAN_user_borrowers_edit_borrowers %] >- <a id="editpatron" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a id="editpatron" class="btn btn-default toolbar-btn" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-pencil"></i> Edit</a> > [% END %] > > [% IF CAN_user_borrowers_edit_borrowers %] > [% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %] >- <a id="addchild" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantor_id=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> Add guarantee</a> >+ <a id="addchild" class="btn btn-default toolbar-btn" href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantor_id=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> Add guarantee</a> > [% END %] >- <a id="changepassword" class="btn btn-default" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | html %]"><i class="fa fa-lock"></i> Change password</a> >- <a id="duplicate" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-copy"></i> Duplicate</a> >+ <a id="changepassword" class="btn btn-default toolbar-btn" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | html %]"><i class="fa fa-lock"></i> Change password</a> >+ <a id="duplicate" class="btn btn-default toolbar-btn" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-copy"></i> Duplicate</a> > [% END %] > > [% IF CAN_user_circulate_circulate_remaining_permissions %] > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-print"></i> Print <span class="caret"></span></button> >+ <button class="btn btn-default toolbar-btn dropdown-toggle" data-toggle="dropdown"><i class="fa fa-print"></i> Print <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a id="printsummary" href="#">Print summary</a></li> > <li><a id="printslip" href="#">Print slip</a></li> >@@ -33,13 +33,13 @@ > [% END %] > > [% IF ( CAN_user_reserveforothers ) %] >- <a id="searchtohold" class="btn btn-default" href="#"><i class="fa fa-search"></i> Search to hold</a> >+ <a id="searchtohold" class="btn btn-default toolbar-btn" href="#"><i class="fa fa-search"></i> Search to hold</a> > [% END %] > >- <a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal" class="btn btn-default"><i class="fa fa-comment-o"></i> Add message</a> >+ <a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal" class="btn btn-default toolbar-btn"><i class="fa fa-comment-o"></i> Add message</a> > > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button> >+ <button class="btn btn-default toolbar-btn dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button> > <ul class="dropdown-menu dropdown-menu-right"> > [% IF CAN_user_borrowers_edit_borrowers %] > <li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | html %]&destination=[% destination | html %]&reregistration=y">Renew patron</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc >index 153d9bac41..a07fba6bb6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc >@@ -6,7 +6,7 @@ > [%- SET age = (patron.get_age != undef) ? patron.get_age : patron.age -%] > [%- IF age >= 0 %] > [%- patron.dateofbirth | $KohaDates -%] >- <span class='age_years'>[% I18N.tnx('({age} year)', '({age} years)', age, { age => age }) | html %]</span> >+ <span class='age_years'>[% I18N.tnx('- {age} year', '- {age} years', age, { age => age }) | html %]</span> > [%- END -%] > [%- END -%] > [%- END -%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc >index 2dff1ba588..b0d723c516 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc >@@ -1,24 +1,25 @@ > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > <div id="circ_search" class="residentsearch"> >- <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post"> >- <label class="tip" for="findborrower">Enter patron card number or partial name:</label> >- [% IF ( PatronAutoComplete ) %] >- <div class="autocomplete"> >- <input autocomplete="off" id="findborrower" name="findborrower" size="40" class="head-searchbox" type="text" /> >- <input id="autocsubmit" type="submit" class="submit" value="Submit" /> >- [% IF ( stickyduedate ) %] >+ <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post"> >+ [% IF ( PatronAutoComplete ) %] >+ <div class="autocomplete"> >+ <input autocomplete="off" id="findborrower" style="width: calc(291px);" name="findborrower" class="head-searchbox" type="text" placeholder="Enter patron card number or partial name" /> >+ <input id="autocsubmit" type="submit" class="submit" value=""/> >+ >+ [% IF ( stickyduedate ) %] >+ <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" /> >+ <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" /> >+ [% END %] >+ </div> >+ >+ [% ELSE %] >+ <input id="findborrower" name="findborrower" class="head-searchbox" type="text" autocomplete="off" /> >+ [% IF ( stickyduedate ) %] > <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" /> > <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" /> >+ [% END %] >+ <input value="" class="submit" type="submit" /> > [% END %] >- </div> >- [% ELSE %] >- <input id="findborrower" name="findborrower" size="40" class="head-searchbox" type="text" autocomplete="off" /> >- [% IF ( stickyduedate ) %] >- <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" /> >- <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" /> >- [% END %] >- <input value="Submit" class="submit" type="submit" /> >- [% END %] >- </form> >- </div> >- [% END %] >+ </form> >+ </div> >+[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc >index d800b9c239..0c061d875e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc >@@ -4,108 +4,103 @@ > [% USE raw %] > [% PROCESS 'html_helpers.inc' %] > [% PROCESS 'patronfields.inc' %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Patrons Resident Search Box --> >-<div id="header_search"> >- <div id="patron_search" class="residentsearch"> >- <form action="/cgi-bin/koha/members/member.pl" method="post"> >- <label class="tip" for="searchmember">Enter patron card number or partial name:</label> >- <div class="autocomplete"> >- <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox" name="searchmember" type="text" value="[% searchmember | html %]" autocomplete="off" /> >- <input type="hidden" name="quicksearch" value="1" /> >- <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span> >- <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span> >- <input value="Search" class="submit" type="submit" /> >- </div> > >+<div id="header_search"> > >+ <div id="patron_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/members/member.pl" method="post"> >+ <div class="autocomplete"> >+ <input id="searchmember" data-toggle="tooltip" size="25" placeholder="Enter patron card number or partial name" class="head-searchbox" name="searchmember" type="text" value="[% searchmember | html %]" autocomplete="off" /> >+ <input type="hidden" name="quicksearch" value="1" /> >+ <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span> >+ <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span> >+ <input value="" class="submit" id="submit" type="submit" /> >+ </div> > >- <div id="filters"> >- <p><label for="searchfieldstype">Search fields:</label> >- <select name="searchfieldstype" id="searchfieldstype"> >- [% SET standard = Koha.Preference('DefaultPatronSearchFields') || 'firstname,middle_name,surname,othernames,cardnumber,userid' %] >- [% default_fields = [ standard, 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %] >- [% search_options = default_fields.merge(standard.split(',')).unique %] >- [% FOREACH s_o IN search_options %] >- [% display_name = PROCESS patron_fields name=s_o %] >- [% NEXT IF !display_name.length %] >- [% IF searchfieldstype == s_o %] >- <option selected="selected" value="[% s_o | html %]">[% display_name | $raw %]</option> >- [% ELSE %] >- <option value="[% s_o | html %]">[% display_name | $raw %]</option> >- [% END %] >- [% END %] >- </select> >- </p> >- <p> >- <label for="searchtype">Search type:</label> >- <select name="searchtype" id="searchtype"> >- [% IF searchtype == 'start_with' %] >- <option selected="selected" value='start_with'>Starts with</option> >- <option value='contain'>Contains</option> >- [% ELSE %] >- <option value='start_with'>Starts with</option> >- <option selected="selected" value='contain'>Contains</option> >- [% END %] >- </select> >- </p> >+ <p class="more" id="filters" style="display:none"> >+ <select name="searchfieldstype" id="searchfieldstype" style="position: relative;bottom: 5px;"> >+ <option disabled selected hidden>Search fields:</option> >+ [% pref_fields = Koha.Preference('DefaultPatronSearchFields').split(',') %] >+ [% default_fields = [ 'standard', 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %] >+ [% search_options = default_fields.merge(pref_fields).unique %] >+ [% FOREACH s_o IN search_options %] >+ [% display_name = PROCESS patron_fields name=s_o %] >+ [% NEXT IF !display_name.length %] >+ [% IF searchfieldstype == s_o %] >+ <option value="[% s_o | html %]">[% display_name | $raw %]</option> >+ [% ELSE %] >+ <option value="[% s_o | html %]">[% display_name | $raw %]</option> >+ [% END %] >+ [% END %] >+ </select> > >- <p> >- <label for="branchcode">Library: </label> >- [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %] >- <select name="branchcode_filter" id="branchcode"> >- [% IF branches.size != 1 %] >- <option value="">Any</option> >+ <select name="searchtype" id="searchtype" style="position: relative;bottom: 5px;"> >+ <option disabled selected hidden>Search type:</option> >+ [% IF searchtype == 'start_with' %] >+ <option value='start_with'>Starts with</option> >+ <option value='contain'>Contains</option> >+ [% ELSE %] >+ <option value='start_with'>Starts with</option> >+ <option value='contain'>Contains</option> > [% END %] >- [% PROCESS options_for_libraries libraries => branches %] >- </select> >- </p> >+ </select> > >- <p> >- <label for="categorycode">Category: </label> >- [% SET categories = Categories.all() %] >- <select name="categorycode_filter" id="categorycode"> >- <option value="">Any</option> >- [% FOREACH category IN categories %] >- [% IF category.categorycode == categorycode_filter %] >- <option value="[% category.categorycode | html %]" selected="selected">[% category.description | html %]</option> >- [% ELSE %] >- <option value="[% category.categorycode | html %]">[% category.description | html %]</option> >+ [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %] >+ <select name="branchcode_filter" id="branchcode" style="position: relative;bottom: 5px;"> >+ <option disabled selected hidden>Library:</option> >+ [% IF branches.size != 1 %] >+ <option value="">Any</option> > [% END %] >- [% END %] >- </select> >- </p> >+ [% PROCESS options_for_libraries libraries => branches %] >+ </select> >+ >+ [% SET categories = Categories.all() %] >+ <select name="categorycode_filter" id="categorycode" style="position: relative;bottom: 5px;"> >+ <option disabled selected hidden>Category:</option> >+ <option value="">Any</option> >+ [% FOREACH category IN categories %] >+ [% IF category.categorycode == categorycode_filter %] >+ <option value="[% category.categorycode | html %]" selected="selected">[% category.description | html %]</option> >+ [% ELSE %] >+ <option value="[% category.categorycode | html %]">[% category.description | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ </p> >+ </form> > </div> >- </form> >-</div> >+ > [% INCLUDE 'patron-search-box.inc' %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > <div id="checkin_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <label class="tip" for="ret_barcode">Scan a barcode to check in:</label> >- <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" type="text" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >+ <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >+ <input name="barcode" id="ret_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> >+ <input value="" type="submit" id="submit" /> >+ </form> >+ </div> >+ >+ <div id="renew_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >+ <input name="barcode" id="ren_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to renew" /> >+ <input value="" type="submit" id="submit" /> >+ </form> > </div> >- <div id="renew_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <label class="tip" for="ren_barcode">Scan a barcode to renew:</label> >- <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >- </div> > [% END %] > > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a class="keep_text" href="#patron_search">Search patrons</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >+ <ul id="btn-space"> >+ <li><a title="Search patrons" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="name-icon active">Search patrons</span> >+ <span class="name-icon">Check out</span> >+ <span class="name-icon">Check in</span> >+ <span class="name-icon">Renew</span> >+ <span class="name-icon">Search catalog</span> > </ul> >-</div><!-- /header_search --> >-</div><!-- /gradient --> >-<!-- End Patrons Resident Search Box --> >+</div><!-- /header_search --> >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >index 73ad418930..f04821e603 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >@@ -4,13 +4,15 @@ > [% USE raw %] > [% USE Asset %] > [% USE To %] >+[% PROCESS 'html_helpers.inc' %] >+[% PROCESS 'patronfields.inc' %] > > [%# Display a simple form %] > [% BLOCK patron_search_filters_simple %] > <form id="patron_search_form"> > <div class="hint">Enter patron card number or partial name:</div> > <input type="text" size="40" id="search_patron_filter" class="focus" autocomplete="off" /> >- <input type="submit" value="Search" /> >+ <input type="submit" class="principal" value="Search" /> > </form> > [% END %] > >@@ -23,7 +25,7 @@ > [%# - search_type: <select "contain" or "start with"> %] > [% BLOCK patron_search_filters %] > <form id="patron_search_form"> >- <fieldset class="brief"> >+ <fieldset class="sidebar"> > <h3>Search for patron</h3> > <ol> > <li> >@@ -91,8 +93,8 @@ > [% END %] > </ol> > <fieldset class="action"> >- <input type="submit" value="Search" /> >- <input type="button" value="Clear" id="clear_search" /> >+ <input type="submit" class="principal" value="Search" /> >+ <input type="button" value="Clear" class="cancel" id="clear_search" /> > </fieldset> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc >index 4626a406c9..3871baf967 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc >@@ -5,23 +5,27 @@ > > [% UNLESS ( no_add ) %] > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group" id="new-patron-button"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button> >- <ul class="dropdown-menu"> >- [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode | uri %]">[% category.description | html %]</a></li>[% END %] >- </ul> >+ <div class="btn-group"> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button> >+ <ul class="dropdown-menu"> >+ [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode | uri %]">[% category.description | html %]</a></li>[% END %] >+ </ul> > </div> >+ >+ <div class="btn-group"> > [% IF Koha.Preference('PatronQuickAddFields') || Koha.Preference('BorrowerMandatoryField') %] >- <div class="btn-group" id="quick-add-new-patron-button"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button> >- <ul class="dropdown-menu"> >- [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode | uri %]&quickadd=true">[% category.description | html %]</a></li>[% END %] >- </ul> >- </div> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button> >+ <ul class="dropdown-menu"> >+ [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode | uri %]&quickadd=true">[% category.description | html %]</a></li>[% END %] >+ </ul> >+ > [% END %] >+ </div> >+ >+ <div class="btn-group"> > [% IF CAN_user_tools_manage_patron_lists %] >- <a class="btn btn-default" href="/cgi-bin/koha/patron_lists/lists.pl" id="patron-lists-button"><i class="fa fa-edit"></i> Patron lists</a> >+ <a class="toolbar-btn" href="/cgi-bin/koha/patron_lists/lists.pl"><i class="fa fa-edit"></i> Patron lists</a> > [% END %] >- >+ </div> > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >index 97219917e7..510f8c3d11 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >@@ -2,6 +2,7 @@ > [% SET return_claims = patron.return_claims %] > > [% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || charges || charges_guarantors_guarantees || charges_guarantees || credits ) %] >+ <fieldset> > <h3>Attention</h3> > <ul> > [% IF ( has_modifications ) %] >@@ -126,6 +127,7 @@ > [% END %] > > </ul> >+ </fieldset> > > [% END # /F ( has_modifications || warndeparture... %] > >@@ -203,7 +205,7 @@ > > [% IF ( patron_messages ) %] > <div id="messages" class="circmessage"> >- <h4>Messages</h4> >+ <h3>Messages</h3> > <ul> > [% FOREACH patron_message IN patron_messages %] > <li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc >index b0163a0234..3ce84b4b8c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc >@@ -1,7 +1,7 @@ > [% INCLUDE 'blocking_errors.inc' %] > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=new">Card batch</a></li> > <li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Image</a></li> >@@ -11,7 +11,7 @@ > </ul> > </div> > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Card batches</a></li> > <li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Images</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc >index 3d3a3cd2e7..54627a4b73 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc >@@ -1,6 +1,6 @@ > [%- BLOCK patron_fields -%] > [%- SWITCH name -%] >- [%- CASE standard -%]<span>Standard</span> >+ [%- CASE 'standard' -%]<span>Standard</span> > [%- CASE 'borrowernumber' -%]<span>Borrowernumber</span> > [%- CASE 'cardnumber' -%]<span>Card number</span> > [%- CASE 'surname' -%]<span>Surname</span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc >index 81ba508518..cd0796b315 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc >@@ -1,34 +1,25 @@ > [% USE Koha %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Patrons Admin Resident Search Box --> > <div id="header_search"> >+ > <div id="patron_category_search" class="residentsearch"> >- <form action="[% script_name | html %]" method="post"> >- <label class="tip" for="description">Search by patron category name:</label> >- <input class="head-searchbox" type="text" name="description" size="40" value="[% searchfield | html %]" /> >- <input type="submit" class="submit" name="search" value="Search" /> >- </form> >+ <form action="[% script_name | html %]" method="post"> >+ <input class="head-searchbox" type="text" name="description" value="[% searchfield | html %]" placeholder="Search by patron category name" /> >+ <input type="submit" class="submit" id="submit" name="search" value="" /> >+ </form> > </div> >+ > [% INCLUDE 'patron-search-box.inc' %] >- [% IF ( CAN_user_catalogue ) %] >- <div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% INCLUDE 'search_indexes.inc' %] >- [% ELSE %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% END %] >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> >- <input type="submit" value="Submit" class="submit" /> >- </form> >- </div>[% END %] > >- <ul> >- <li><a class="keep_text" href="#patron_category_search">Search patron categories</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >- </ul> >-</div> >+ [% INCLUDE 'catalogue-search-box.inc' %] >+ >+ <ul id="btn-space"> >+ <li><a title="Search patron categories" class="iconsearch" href="#patron_category_search"><i class="fa fa-fw fa-id-card-o"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="name-icon active">Search patron categories</span> >+ <span class="name-icon">Check out</span> >+ <span class="name-icon">Search the catalog</span> >+ </ul> > </div> > <!-- End Patrons Admin Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >index 3878bfa742..55d4249a0f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >@@ -3,7 +3,7 @@ > <div id="navmenu"> > <div id="navmenulist"> > [% IF ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) %] >- <h5>Cash management</h5> >+ <h4>Cash management</h4> > <ul> > <li><a href="/cgi-bin/koha/pos/pay.pl">Point of sale</a></li> > [% IF !(Registers.session_register_name == '') %] >@@ -13,7 +13,7 @@ > </ul> > [% END %] > [% IF ( CAN_user_parameters_manage_cash_registers || CAN_user_parameters_manage_accounts) %] >- <h5>Administration</h5> >+ <h4>Administration</h4> > <ul> > [% IF ( CAN_user_parameters_manage_cash_registers ) %] > <li><a href="/cgi-bin/koha/admin/cash_registers.pl">Configure cash registers</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc >index fce33e32d2..e992ebd648 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc >@@ -1,22 +1,28 @@ > [% USE Koha %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div> >+ > <div id="header_search"> >- <div id="syspref_search" class="residentsearch"> >- <form action="/cgi-bin/koha/admin/preferences.pl"> >- <label class="tip" for="searchfield">System preference search:</label> >- <input type="hidden" name="tab" value="[% last_tab | html %]" /> >- <input type="hidden" name="op" value="search" /> >- <input class="head-searchbox" type="text" size="40" name="searchfield" id="searchfield" value=""> >- <input type="submit" class="submit" value="Search" /> >- </form> >+ >+ <div id="syspref_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/admin/preferences.pl"> >+ <input type="hidden" name="tab" value="[% last_tab | html %]" /> >+ <input type="hidden" name="op" value="search" /> >+ <input class="head-searchbox" type="text" name="searchfield" id="searchfield" value="" placeholder="System preference search"> >+ <input type="submit" id="submit" value="" /> >+ </form> > </div> >+ > [% INCLUDE 'patron-search-box.inc' %] >+ > [% INCLUDE 'catalogue-search-box.inc' %] >- <ul> >- <li><a class="keep_text" href="#syspref_search">Search system preferences</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >- </ul> >-</div> >-</div> >+ >+ <ul id="btn-space"> >+ <li><a title="Search system preferences" class="iconsearch" href="#syspref_search"><i class="fa fa-fw fa-cogs"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="name-icon active">Search system preferences</span> >+ <span class="name-icon">Check out</span> >+ <span class="name-icon">Search the catalog</span> >+ </ul> >+</div><!-- /header_search --> >+<!-- End Main page Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc >index 42ecb5cbec..1f2df49360 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc >@@ -1,5 +1,6 @@ > [% USE HtmlId %] >-<div id="menu"> >+<div id="navmenu"> >+<div id="navmenulist"> > <ul> > [% IF ( accounting ) %] > <li class="active"> >@@ -170,11 +171,12 @@ > </li> > </ul> > </div> >+</div> > > [% BLOCK subtabs %] > [% UNLESS ( searchfield ) %] > [% FOREACH TAB IN TABS %] >- <ul> >+ <ul class="goto"> > [% FOREACH LINE IN TAB.LINES %] > [% IF ( LINE.is_group_title ) %] > <li><a class="pref_sublink" href="#[% LINE.title | $HtmlId %]">[% LINE.title | html %]</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc >index d63b3e923d..6ae990f257 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc >@@ -2,53 +2,51 @@ > > <div id="navmenu"> > <div id="navmenulist"> >+ <h4>Guided reports</h4> >+ <ul> >+ <li><a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports</a></li> >+ [% IF ( CAN_user_reports_create_reports ) %] >+ <li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build new</a></li> >+ [% END %] >+ [% IF ( CAN_user_reports_execute_reports ) %] >+ <li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Use saved</a></li> >+ [% END %] >+ [% IF ( CAN_user_reports_create_reports ) %] >+ <li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">Create from SQL</a></li> >+ [% END %] >+ </ul> > >- <h5>Guided reports</h5> >- <ul> >- <li><a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports</a></li> >- [% IF ( CAN_user_reports_create_reports ) %] >- <li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build new</a></li> >- [% END %] >- [% IF ( CAN_user_reports_execute_reports ) %] >- <li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Use saved</a></li> >- [% END %] >- [% IF ( CAN_user_reports_create_reports ) %] >- <li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">Create from SQL</a></li> >- [% END %] >- </ul> >- >- <h5>Statistics wizards</h5> >- <ul> >- <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li> >- <li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li> >- <li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalog</a></li> >- <li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li> >- <li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials</a></li> >- <li><a href="/cgi-bin/koha/reports/cash_register_stats.pl">Cash register</a></li> >- <li><a href="/cgi-bin/koha/reports/reserves_stats.pl">Holds</a></li> >- </ul> >+ <h4>Statistics wizards</h4> >+ <ul> >+ <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li> >+ <li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li> >+ <li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalog</a></li> >+ <li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li> >+ <li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials</a></li> >+ <li><a href="/cgi-bin/koha/reports/cash_register_stats.pl">Cash register</a></li> >+ <li><a href="/cgi-bin/koha/reports/reserves_stats.pl">Holds</a></li> >+ </ul> > > [% IF Koha.ArePluginsEnabled() %] >- <h5>Report plugins</h5> >- <ul> >- <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">Report plugins</a></li> >- </ul> >+ <h4>Report plugins</h4> >+ <ul> >+ <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">Report plugins</a></li> >+ </ul> > [% END %] > >- <h5>Top lists</h5> >+ <h4>Top lists</h4> > <ul> > <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a></li> > <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-circulated items</a></li> > </ul> > >- <h5>Inactive</h5> >+ <h4>Inactive</h4> > <ul> > <li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Patrons who haven't checked out</a></li> > <li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items with no checkouts</a></li> > </ul> > >- >- <h5>Other</h5> >+ <h4>Other</h4> > <ul> > <li><a href="/cgi-bin/koha/reports/itemslost.pl">Lost items</a></li> > <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >index 5291fda6f8..5c891ee91d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >@@ -2,7 +2,7 @@ > <div id="toolbar" class="btn-toolbar"> > [% IF ( CAN_user_reports_create_reports ) %] > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New report <span class="caret"></span></button> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-plus"></i> New report <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">New guided report</a> </li> > <li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">New SQL report</a> </li> >@@ -16,14 +16,14 @@ > [% IF ( showsql || execute || editsql || save_successful ) %] > [% IF ( CAN_user_reports_delete_reports && !CAN_user_reports_create_reports ) %] > <div class="btn-group"> >- <a class="delete btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Delete%20Saved"> >+ <a class="toolbar-btn" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Delete%20Saved"> > <i class="fa fa-trash"></i> Delete > </a> > </div> > [% ELSE %] > [% IF ( CAN_user_reports_create_reports || CAN_user_reports_delete_reports ) %] > <div class="btn-group"> >- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" >+ <button type="button" class="btn btn-default toolbar-btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" > aria-expanded="false"> > <i class="fa fa-pencil"></i> Edit <span class="caret"></span> > </button> >@@ -59,12 +59,12 @@ > [% IF ( showsql || execute || editsql || save_successful ) %] > [% UNLESS ( errors ) # Unless there are errors saving a report %] > <div class="btn-group"> >- <a id="runreport" class="btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Run%20this%20report"> >+ <a id="runreport" class="toolbar-btn" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Run%20this%20report"> > <i class="fa fa-play"></i> Run report > </a> > </div> > <div class="btn-group"> >- <a class="btn btn-default" href="/cgi-bin/koha/tools/scheduler.pl?id=[% id | html %]"> >+ <a class="toolbar-btn" href="/cgi-bin/koha/tools/scheduler.pl?id=[% id | html %]"> > <i class="fa fa-clock-o"></i> Schedule > </a> > </div> >@@ -72,7 +72,7 @@ > > [% IF ( mana_id && Koha.Preference('Mana') == 1 ) %] > <div class="btn-group"> >- <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> Report mistake <span class="caret"></span></button> >+ <button class="toolbar-btn" data-toggle="dropdown"> Report mistake <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% FOREACH c IN mana_comments %] > <li class="mana-comment" data-id="[% c.id | $raw %]"> >@@ -112,7 +112,7 @@ > > > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" id="format"><i class="fa fa-download"></i> Download <span class="caret"></span></button> >+ <button class="toolbar-btn" data-toggle="dropdown" id="format"><i class="fa fa-download"></i> Download <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a id="csv" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&format=csv&report_id=[% id | html %]&reportname=[% name |uri %][% PROCESS params %]">[% PROCESS 'delimiter_text.inc' %]</a></li> > <li><a id="tab" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&format=tab&report_id=[% id | html %]&reportname=[% name |uri %][% PROCESS params %]">Tab separated text</a></li> >@@ -123,16 +123,16 @@ > </ul> > </div> > <div class="btn-group"> >- <button type="button" id="toggle_sql" class="btn btn-default toggle_sql" data-complete-text="<i class='fa fa-eye-slash'></i> [% t('Hide SQL code') | html %]" data-toggle="button" aria-pressed="false" autocomplete="off"> >+ <button type="button" id="toggle_sql toolbar-btn" class="btn btn-default toggle_sql" data-complete-text="<i class='fa fa-eye-slash'></i> [% t('Hide SQL code') | html %]" data-toggle="button" aria-pressed="false" autocomplete="off"> > <i class="fa fa-eye"></i> Show SQL code > </button> > </div> > <div class="btn-group"> > [% IF allresults.size %] >- <a class="btn btn-default" href="#" data-toggle="modal" data-target="#chartModal"><i class="fa fa-bar-chart"></i> Create chart</a> >+ <a class="toolbar-btn" href="#" data-toggle="modal" data-target="#chartModal"><i class="fa fa-bar-chart"></i> Create chart</a> > [% ELSE %] >- <a class="btn btn-default" href="#" data-toggle="modal" data-target="#chartModal"><i class="fa fa-bar-chart"></i> Create chart</a> >- <a class="btn btn-default fetch_chart_data" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Run this report&reportname=[% name |uri %][% PROCESS params %]&want_full_chart=1"><i class="fa fa-bar-chart"></i> Fetch all data for chart</a> >+ <a class="toolbar-btn" href="#" data-toggle="modal" data-target="#chartModal"><i class="fa fa-bar-chart"></i> Create chart</a> >+ <a class="toolbar-btn fetch_chart_data" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Run this report&reportname=[% name |uri %][% PROCESS params %]&want_full_chart=1"><i class="fa fa-bar-chart"></i> Fetch all data for chart</a> > [% END %] > > </div> >@@ -163,7 +163,7 @@ > <p> > Search reports by keyword: > <input type="text" id="mana_search_field" /> >- <input type="submit" class="mana_search_button" value="Search" /> >+ <input type="submit" class="mana_search_button principal" value="Search" /> > <span id="mana-loading" style="display:none"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </span> > </p> > </fieldset> >@@ -171,7 +171,7 @@ > </div> > </div> > <div class="modal-footer"> >- <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> >+ <button type="button" class="Cancel" data-dismiss="modal">Cancel</button> > </div> > </div> > </form> >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' %] > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="fa fa-plus"></i> New collection</a> >+ <a class="btn btn-default toolbar-btn" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="fa fa-plus"></i> New collection</a> > </div> > > [% IF ( colId ) %] > <div class="btn-group"> >- <a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId | html %]"><i class="fa fa-exchange"></i> Transfer</a> >+ <a class="btn btn-default toolbar-btn" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId | html %]"><i class="fa fa-exchange"></i> Transfer</a> > </div> > <div class="btn-group"> >- <a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&colId=[% colId | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default toolbar-btn" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&colId=[% colId | html %]"><i class="fa fa-pencil"></i> Edit</a> > </div> > <div class="btn-group"> >- <a class="btn btn-default confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&colId=[% colId | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default toolbar-btn confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&colId=[% colId | html %]"><i class="fa fa-trash"></i> Delete</a> > </div> > [% END %] > </div> >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 @@ > <div id="navmenu"> > <div id="navmenulist"> >- <h5>Serials</h5> >+ <h4>Serials</h4> > <ul> >- [% IF ( subscriptionid ) %] >- <li><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscriptionid | uri %]">Serial collection</a></li> >- [% UNLESS closed %] >- [% IF ( routing && CAN_user_serials_routing ) %] >- [% IF ( hasRouting ) %] >- <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]">Edit routing list</a></li> >- [% ELSE %] >- <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]&op=new">Create routing list</a></li> >- [% END %] >- [% END %] >- [% END %] >- [% END %] >+ [% IF ( subscriptionid ) %] >+ <li><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscriptionid | uri %]">Serial collection</a></li> >+ [% UNLESS closed %] >+ [% IF ( routing && CAN_user_serials_routing ) %] >+ [% IF ( hasRouting ) %] >+ <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]">Edit routing list</a></li> >+ [% ELSE %] >+ <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]&op=new">Create routing list</a></li> >+ [% END %] >+ [% END %] >+ [% END %] >+ [% END %] > > [% IF ( CAN_user_serials_claim_serials ) %] > <li><a href="/cgi-bin/koha/serials/claims.pl">Claims</a></li> >@@ -42,10 +42,10 @@ > </ul> > > [% IF ( CAN_user_reports ) %] >- <h5>Reports</h5> >- <ul> >- <li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials statistics wizard</a></li> >- </ul> >+ <h4>Reports</h4> >+ <ul> >+ <li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials statistics wizard</a></li> >+ </ul> > [% END %] > > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >index c245343fcf..6fdc16cfbd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >@@ -1,30 +1,35 @@ > [% USE Koha %] >-<div class="gradient"> >- <div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Serials Resident Search Box --> >- <div id="header_search"> >+<!-- Begin Main page Resident Search Box --> >+ >+<div id="header_search"> > <div id="subscription_search" class="residentsearch"> >- <p class="tip">Search subscriptions:</p> >- <form action="/cgi-bin/koha/serials/serials-search.pl" method="get"> >- [% IF ( routing ) %] >- <input type="hidden" name="routing" value="[% routing | html %]" /> >- [% END %] >- <input type="hidden" name="searched" value="1" /> >- <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> >+ <form action="/cgi-bin/koha/serials/serials-search.pl" method="get"> >+ [% IF ( routing ) %] >+ <input type="hidden" name="routing" value="[% routing | html %]" /> >+ [% END %] >+ <input type="hidden" name="searched" value="1" /> >+ <input type="text" placeholder="ISSN" size="3" class="multi-input" style="display:inline;right: 225px" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> > >- [% IF (UNIMARC) %] >- <label for="EAN_filter">EAN:</label> <input type="text" size="20" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter | html %]" /> >- [% END %] >- <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /> >- <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/serials/serials-search.pl">Advanced search</a> >- </form> >+ [% IF (UNIMARC) %] >+ <input type="text" placeholder="EAN" size="3" class="multi-input" style="display:inline;right: 130px" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter | html %]" /> >+ [% END %] >+ <input type="text" size="3" placeholder="Title" class="multi-input" style="display:inline" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /> >+ <input value="" class="submit" id="submit" type="submit" /> >+ </form> > </div> >+ > [% INCLUDE 'patron-search-box.inc' %] >+ > [% INCLUDE 'catalogue-search-box.inc' %] >- <ul> >- <li><a href="#subscription_search">Search subscriptions</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >+ >+ <ul id="btn-space"> >+ <li><a title="Search subscriptions" class="iconsearch" href="#subscription_search"><i class="fa fa-book"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="name-icon active">Search subscriptions</span> >+ <span class="name-icon">Check out</span> >+ <span class="name-icon">Search catalog</span> > </ul> >- </div><!-- /header_search --> >-</div><!-- /gradient --> >+</div><!-- /header_search --> > <!-- End Serials Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >index b9465d6e19..9ed4827702 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >@@ -4,16 +4,16 @@ > <div id="toolbar" class="btn-toolbar"> > [% IF CAN_user_serials_create_subscription %] > [% IF biblionumber_for_new_subscription %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-default" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription | html %]"><i class="fa fa-plus"></i> New subscription for this serial</a></div> >+ <div class="btn-group"><a id="newsubscription" class="toolbar-btn" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription | html %]"><i class="fa fa-plus"></i> New subscription for this serial</a></div> > [% ELSE %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-default" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="toolbar-btn" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div> > [% END %] > [% END %] > > [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %] > [% UNLESS ( cannotedit ) %] > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% IF ( CAN_user_serials_edit_subscription ) %] > <li> >@@ -51,31 +51,31 @@ > > [% IF not cannotedit or CAN_user_serials_receive_serials %] > [% IF CAN_user_serials_renew_subscription and not closed %] >- <div class="btn-group"><a id="renew" class="btn btn-default" href="#"><i class="fa fa-refresh"></i> Renew</a></div> >+ <div class="btn-group"><a id="renew" class="toolbar-btn" href="#"><i class="fa fa-refresh"></i> Renew</a></div> > [% END %] > [% IF CAN_user_serials_receive_serials and not closed %] >- <div class="btn-group"><a id="receive" class="btn btn-default" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid | html %]&serstatus=1,3"><i class="fa fa-inbox"></i> Receive</a></div> >+ <div class="btn-group"><a id="receive" class="toolbar-btn" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid | html %]&serstatus=1,3"><i class="fa fa-inbox"></i> Receive</a></div> > [% END %] > [% UNLESS cannotedit %] > [% IF closed %] >- <div class="btn-group"><a id="reopen" class="btn btn-default" href="#"><i class="fa fa-repeat"></i> Reopen</a></div> >+ <div class="btn-group"><a id="reopen" class="toolbar-btn" href="#"><i class="fa fa-repeat"></i> Reopen</a></div> > [% ELSE %] >- <div class="btn-group"><a id="close" class="btn btn-default" href="#"><i class="fa fa-times-circle"></i> Close</a></div> >+ <div class="btn-group"><a id="close" class="toolbar-btn" href="#"><i class="fa fa-times-circle"></i> Close</a></div> > [% END %] > [% END %] > [% END %] > > [% IF Koha.Preference('Mana') == 1 and Koha.Preference('AutoShareWithMana').grep('subscription').size == 0 %] > [% IF one_language_enabled==0 or mana_id %] >- <div class="btn-group"><a data-toggle="modal" data-toggle="tooltip" title="Share the subscription with other libraries. Your email address will be associated to your sharing." data-target="#mana_share_modal" class="btn btn-default"><i class="fa fa-share-alt"></i> Share</a></div> >+ <div class="btn-group"><a data-toggle="modal" data-toggle="tooltip" title="Share the subscription with other libraries. Your email address will be associated to your sharing." data-target="#mana_share_modal" class="toolbar-btn"><i class="fa fa-share-alt"></i> Share</a></div> > [% ELSE %] >- <div class="btn-group" id="mana-subscription-share" data-toggle="tooltip" title="Share the subscription with other libraries. Your email address will be associated to your sharing."><a class="btn btn-default"><i class="fa fa-share-alt"></i> Share</a></div> >+ <div class="btn-group" id="mana-subscription-share" data-toggle="tooltip" title="Share the subscription with other libraries. Your email address will be associated to your sharing."><a class="toolbar-btn"><i class="fa fa-share-alt"></i> Share</a></div> > [% END %] > [% END %] > > [% IF ( mana_id && Koha.Preference('Mana') == 1 ) %] > <div class="btn-group"> >- <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> Report mistake <span class="caret"></span></button> >+ <button class="toolbar-btn" data-toggle="dropdown"> Report mistake <span class="caret"></span></button> > <ul class="dropdown-menu mana-actions"> > [% IF ( mana_comments ) %] > [% FOREACH c IN mana_comments %] >@@ -93,9 +93,9 @@ > [% ELSIF CAN_user_serials_create_subscription %] > <div id="toolbar" class="btn-toolbar"> > [% IF ( biblionumber_for_new_subscription ) %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-default" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription | html %]"><i class="fa fa-plus"></i> New subscription for this serial</a></div> >+ <div class="btn-group"><a id="newsubscription" class="toolbar-btn" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription | html %]"><i class="fa fa-plus"></i> New subscription for this serial</a></div> > [% ELSE %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-default" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="toolbar-btn" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div> > [% END %] > </div> > [% END %] >@@ -116,7 +116,7 @@ > <a href="#" class="cancel" id="mana-comment-close">Cancel</a> > </div> > <div class="modal-footer"> >- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> >+ <button type="button" class="toolbar-btn" data-dismiss="modal">Close</button> > </div> > </form> > </div> <!-- /.modal-content --> >@@ -210,8 +210,8 @@ > [% END %] > </div> <!-- /.modal-body --> > <div class="modal-footer"> >- <button type="submit" form="mana_share_form" class="btn btn-default">Share</button> >- <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button> >+ <button type="submit" form="mana_share_form" class="principal">Share</button> >+ <button class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > </div> <!-- /.modal-content --> > </div> <!-- /.modal-dialog --> >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 @@ >+<nav id='shortcut'> >+ <ol> >+ <li> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </li> >+ >+ <li> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </li> >+ </ol> >+</nav> >\ 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 %] > <div id="toolbar" class="btn-toolbar"> >+<div> > [% IF no_op_set %] >- <a id="addrota" class="btn btn-default" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota"><i class="fa fa-plus"></i> New rota</a> >+ <a id="addrota" class="btn btn-default toolbar-btn" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota"><i class="fa fa-plus"></i> New rota</a> > [% END %] > [% IF op == 'manage_stages' %] >- <a id="editrota" class="btn btn-default" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&rota_id=[% rota_id | uri %]"><i class="fa fa-pencil"></i> Edit rota</a> >- <a class="btn btn-default" href="#" id="addstage" data-toggle="modal" data-target="#addStageModal"><i class="fa fa-plus"></i> Add stage</a> >+ <a id="editrota" class="btn btn-default toolbar-btn" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&rota_id=[% rota_id | uri %]"><i class="fa fa-pencil"></i> Edit rota</a> >+ <a class="btn btn-default toolbar-btn" href="#" id="addstage" data-toggle="modal" data-target="#addStageModal"><i class="fa fa-plus"></i> Add stage</a> > [% END %] > [% IF op == 'manage_items' %] > <a id="editrota" class="btn btn-default" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&rota_id=[% rota_id | uri %]"><i class="fa fa-pencil"></i> Edit rota</a> >- <a class="btn btn-default" href="#" id="additems" data-toggle="modal" data-target="#addItemsModal"><i class="fa fa-plus"></i> Add items</a> >+ <a class="btn btn-default toolbar-btn" href="#" id="additems" data-toggle="modal" data-target="#addItemsModal"><i class="fa fa-plus"></i> Add items</a> > [% END %] >-</div> >+</div></div> >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' %] > <div id="advsearch"> > <form action="" method="get"> >- <fieldset class="brief"> >+ <fieldset class="sidebar"> > <a href="#" class="toggle_element" data-element="#advsearch_form">Advanced search</a> > <div id="advsearch_form" style="display:none"> > <ol> >@@ -28,7 +28,7 @@ > <input type="text" id="supplier" name="supplier_filter" value="[% supplier_filter | html %]" /> > </li> > <li> >- <label for="branch">Library:</label> >+ <p for="branch">Library:</label> > <select id="branch" name="branch_filter"> > <option value="">All</option> > [%# FIXME Should not we filter the libraries? %] >@@ -44,7 +44,7 @@ > <input type="hidden" name="basketno" value="[% basketno | html %]" /> > [% END %] > <fieldset class="action"> >- <input type="submit" value="Search" /> >+ <input type="submit" class="principal" value="Search" /> > </fieldset> > </div> > </fieldset> >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 @@ > <div style="display:none;" id="Coded_Fields"> > <!-- SUBTYPE LIMITS --> > <fieldset> >- <legend>Coded fields</legend> >+ <h3>Coded fields</h3> > <p> > <label for="audience">Audience: </label> > <select id="audience" name="limit" class="subtype"> >@@ -128,7 +128,7 @@ > </fieldset> > > <fieldset> >- <legend>Serials</legend> >+ <h3>Serials</h3> > <p> > <label for="serial_type">Serial type: </label> > <select id="serial_type" name="limit" class="subtype"> >@@ -179,7 +179,7 @@ > </fieldset> > > <fieldset> >- <legend>Picture</legend> >+ <h3>Picture</h3> > <p> > <select name="limit" class="subtype"> > <option value="">Any</option> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >index 0247293045..60b1142a67 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >@@ -1,26 +1,28 @@ > [% USE Koha %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Suggestions Resident Search Box --> > <div id="header_search"> >+ > <div id="suggestions_search" class="residentsearch"> >- <p class="tip">Suggestions search:</p> >- <form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get"> >- <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >- <label for="searchtitle">Title:</label> <input type="text" id="searchtitle" name="title" size="10" value="[% title | html %]" /> >- <label for="searchauthor">Author:</label> <input type="text" id="searchauthor" name="author" size="10" value="[% author | html %]" /> >- <label for="searchpublishercode">Publisher:</label> <input type="text" id="searchpublishercode" name="publishercode" size="10" value="[% publishercode | html %]" /> >- <input type="submit" class="submit" value="Search" /> >+ <form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get"> >+ <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >+ <input type="text" id="searchtitle" class="head-searchbox" placeholder="Title:" name="title" size="10" value="[% title | html %]" /> >+ <input type="text" id="searchauthor" class="head-searchbox" placeholder="Author:" name="author" size="10" value="[% author | html %]" /> >+ <input type="text" class="head-searchbox" placeholder="Publisher:" id="searchpublishercode" name="publishercode" size="10" value="[% publishercode | html %]" /> >+ <input type="submit" class="submit" id="submit" value="" /> > </form> > </div> > > [% INCLUDE 'patron-search-box.inc' %] >+ > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a href="#suggestions_search">Search suggestions</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >- </ul> >+ <ul id="btn-space"> >+ <li><a title="Search suggestions" class="iconsearch" href="#suggestions_search"><i class="fa fa-comment-o"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="name-icon active">Search suggestions</span> >+ <span class="name-icon">Check out</span> >+ <span class="name-icon">Search catalog</span> >+ </ul> > </div> >-</div><!-- /gradient --> > <!-- End Suggestions Resident Search Box --> >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 @@ > > <div id="navmenu"> > <div id="navmenulist"> >-<ul> >- <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a></li> >-</ul> >+ >+ <h2><a class="titre" href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a></h2> >+ > [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons || CAN_user_tools_edit_patrons || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %] >-<h5>Patrons and circulation</h5> >+<h4>Patrons and circulation</h4> > <ul> > [% IF ( CAN_user_tools_manage_patron_lists ) %] > <li><a href="/cgi-bin/koha/patron_lists/lists.pl">Patron lists</a></li> >@@ -47,7 +47,7 @@ > </ul> > [% END %] > [% IF ( CAN_user_tools_items_batchdel || CAN_user_tools_items_batchmod || CAN_user_tools_records_batchdel || CAN_user_tools_records_batchmod || CAN_user_tools_export_catalog || CAN_user_tools_inventory || CAN_user_tools_label_creator || CAN_user_tools_rotating_collections || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) || CAN_user_tools_marc_modification_templates || CAN_user_tools_stage_marc_import || CAN_user_tools_manage_staged_marc || CAN_user_tools_upload_local_cover_images ) %] >-<h5>Catalog</h5> >+<h4>Catalog</h4> > <ul> > [% IF ( CAN_user_tools_items_batchdel ) %] > <li><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a></li> >@@ -96,7 +96,7 @@ > </ul> > [% END %] > [% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_additional_contents || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool ) || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %] >-<h5>Additional tools</h5> >+<h4>Additional tools</h4> > <ul> > [% IF ( CAN_user_tools_edit_calendar ) %] > <li><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc >index 3fc669e840..4fbe6bb691 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc >@@ -1,5 +1,6 @@ > [% IF ( booksellerid ) %] >-<div id="menu"> >+<div id="navmenu"> >+<div id="navmenulist"> > <ul> > [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]">Baskets</a></li>[% END %] > [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket groups</a></li>[% END %] >@@ -11,5 +12,5 @@ > <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&owner=1">Uncertain prices</a></li> > [% END %] [% END %] > </ul> >-</div> >+</div></div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc >index c5a6306a78..c0f4f41fca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc >@@ -1,11 +1,11 @@ > [% INCLUDE 'blocking_errors.inc' %] > > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a id="newshelf" class="btn btn-default" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=add_form&referer=[% op | html %]"><i class="fa fa-plus"></i> New list</a></div> >+ <div class="btn-group"><a id="newshelf" class="toolbar-btn" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=add_form&referer=[% op | html %]"><i class="fa fa-plus"></i> New list</a></div> > > [% IF ( can_add_biblios ) %] > <div class="btn-group"> >- <button type="button" class="btn btn-default" data-toggle="modal" data-target="#addToList"> >+ <button type="button" class="toolbar-btn" data-toggle="modal" data-target="#addToList"> > <i class="fa fa-plus"></i> Add items > </button> > </div> >@@ -14,7 +14,7 @@ > [% IF shelf AND op == 'view' %] > [% IF can_manage_shelf %] > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=edit_form&shelfnumber=[% shelf.shelfnumber | uri %]&referer=[% op | uri %]">Edit list</a></li> > <li><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=delete&shelfnumber=[% shelf.shelfnumber | html %]">Delete list</a></li> >@@ -23,7 +23,7 @@ > [% END %] > > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Download list <span class="caret"></span></button> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-download"></i> Download list <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=iso2709&shelfid=[% shelf.shelfnumber | uri %]">iso2709</a></li> > <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=ris&shelfid=[% shelf.shelfnumber | uri %]">RIS</a></li> >@@ -33,7 +33,7 @@ > [% END %] > </ul> > </div> >- <div class="btn-group"><a class="btn btn-default" href="#" id="sendlist"><i class="fa fa-envelope"></i> Send list</a></div> >- <div class="btn-group"><a class="btn btn-default" id="printlist" target="_blank" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | html %]&print=1"><i class="fa fa-print"></i> Print list</a></div> >+ <div class="btn-group"><a class="toolbar-btn" href="#" id="sendlist"><i class="fa fa-envelope"></i> Send list</a></div> >+ <div class="btn-group"><a class="toolbar-btn" id="printlist" target="_blank" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | html %]&print=1"><i class="fa fa-print"></i> Print list</a></div> > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >index 1e2fb6b7fd..28ab2bc930 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >@@ -1,23 +1,26 @@ > [% USE Koha %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin z3950 Admin Resident Search Box --> > <div id="header_search"> >+ > <div id="z3950_search" class="residentsearch"> >- <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post"> >- <label class="tip" for="searchfield">Z39.50/SRU server search:</label> >- <input class="head-searchbox" type="text" name="searchfield" id="searchfield" size="40" value="[% searchfield | html %]" /> >- <input type="submit" class="submit" name="search" value="Search" /> >+ <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post"> >+ <input class="head-searchbox" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Z39.50/SRU server search" /> >+ <input type="submit" class="submit" id="submit" name="search" value="" /> > </form> > </div> > > [% INCLUDE 'patron-search-box.inc' %] >+ > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a class="keep_text" href="#z3950_search">Search Z39.50/SRU servers</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >- </ul> >-</div> >+ <ul id="btn-space"> >+ <li><li><a title="Search Z39.50/SRU servers" class="iconsearch" href="#z3950_search"><i style="font-weight:bold">Z39.50</i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ >+ <span class="name-icon active">Search Z39.50/SRU servers</span> >+ <span class="name-icon">Check out</span> >+ <span class="name-icon">Search the catalog</span> >+ </ul> > </div> > <!-- End Members Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index 928ac2c476..e4a14a1f33 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -19,6 +19,12 @@ > <a href="#" aria-current="page">About Koha</a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index 94d28d5f17..5a80d0d2de 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -4,6 +4,9 @@ > [% USE Branches %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -11,28 +14,28 @@ > </head> > > <body id="acq_acqui-home" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="#" aria-current="page">Acquisitions</a> > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-[% INCLUDE 'acquisitions-toolbar.inc' %] > >-<h1>Acquisitions</h1> >+[% INCLUDE 'acquisitions-toolbar.inc' %] >+<h2>Acquisitions</h2> > [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] > [% UNLESS ( loop_budget ) %] > [% IF ( CAN_user_acquisition_period_manage ) %] >@@ -48,13 +51,14 @@ > <div class="col-sm-12"> > [% END %] > <div id="acqui_acqui_home_order"> >- <fieldset> >- <legend>Manage orders</legend> >- <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post"> >- <p><label for="supplierpage">Vendor: </label><input type="text" size="25" name="supplier" id="supplierpage" class="focus" /> >- <input type="submit" value="Search" /> >- </p> >- </form> >+ <fieldset class="rows"> >+ <h3>Manage orders</h3> >+ <fieldset> >+ <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post"> >+ <p>Vendor: <input type="text" size="25" name="supplier" id="supplierpage" class="focus" /> >+ <input type="submit" class="principal" value="Search" /></p> >+ </form> >+ <fieldset> > </fieldset> > </div> > </div> >@@ -62,8 +66,8 @@ > [% IF ( CAN_user_suggestions_suggestions_manage && ( suggestions_count || all_pendingsuggestions ) ) %] > <div class="col-sm-6"> > <div id="acqui_acqui_home_suggestions"> >- <fieldset> >- <legend>Pending suggestions</legend> >+ <fieldset class="rows"> >+ <h3>Pending suggestions</h3> > <p> > Manage suggestions: > <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]#ASKED"> >@@ -85,10 +89,12 @@ > > [% IF ( loop_budget ) %] > >+ <fieldset id="searchresults"> >+ > <h3>All available funds</h3> > > <div id="BudgetsAndFunds"> >- <div class="toolbar btn-toolbar"> >+ <div class="searchheader"> > <span class="actions"> > <a href="#" id="expand_all">Expand all</a> | > <a href="#" id="collapse_all">Collapse all</a> | >@@ -195,7 +201,7 @@ > [% END %] > </tbody> > </table> >- </div> >+ </div></fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index 2e4421ef38..5bc7fac680 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -15,6 +15,9 @@ > [%# As long as cataloging plugins rely on 'script' tags added inline, JS must be in the header %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% Asset.js("js/acq.js") | $raw %] > [% Asset.js("js/funds_sorts.js") | $raw %] > [% Asset.js("js/addorderiso2709.js") | $raw %] >@@ -22,13 +25,12 @@ > </head> > > <body id="acq_addorderiso2709" class="acq"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -44,6 +46,7 @@ > </li> > </ol> > </nav> >+ [% INCLUDE 'shortcut.inc' %] > > <div class="container-fluid"> > <div class="row"> >@@ -56,12 +59,13 @@ > [% END %] > > [% IF ( batch_details ) %] >- <h1> >+ <h2> > Add orders from [% comments | html %] > ([% file_name | html %] staged on [% upload_timestamp | $KohaDates with_hours => 1 %]) >- </h1> >+ </h2> > <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform"> > <div id="tabs" class="toptabs"> >+ <div id="searchresults"> > <ul> > <li><a href="#records_to_import">Select to import</a></li> > <li><a href="#items_info" class="items_info">Item information</a></li> >@@ -109,7 +113,7 @@ > > [% FOREACH biblio IN biblio_list %] > <fieldset class="biblio unselected rows" style="float:none;"> >- <legend> >+ <h3> > <label for="record_[% biblio.import_record_id | html %]" style="width:auto;"> > <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id | html %]" value="[% biblio.import_record_id | html %]" /> > <span class="citation">[% biblio.citation | html %]</span> >@@ -117,7 +121,7 @@ > <span class="links" style="font-weight: normal;"> > ( <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | uri %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% biblio.import_record_id | html %]" class="previewData">Card</a> | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]&breedingid=[% biblio.import_record_id | html %]&import_batch_id=[% biblio.import_batch_id | html %]&biblionumber=[% biblio.match_biblionumber | html %]">Add order</a> ) > </span> >- </legend> >+ </h3> > <div style="float:left"> > <ol> > <li class="status"> >@@ -193,7 +197,7 @@ > [% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %] > [% FOREACH item IN biblio.iteminfos %] > <fieldset> >- <legend>Item record [% item.item_id | html %]</legend> >+ <h3>Item record [% item.item_id | html %]</h3> > <ol> > <li> > <label for="homebranch_item_[% item.item_id | html %]">homebranch</label> >@@ -346,7 +350,7 @@ > > [% IF ( items ) %] > <fieldset class="rows" style="float:none;"> >- <legend>Item</legend> >+ <h3>Item</h3> > [% IF ( NoACQframework ) %] > <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div> > [% END %] >@@ -398,7 +402,7 @@ > <div id="accounting_details"> > <p>Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):</p> > <fieldset class="rows" style="float:none;"> >- <legend>Accounting details</legend> >+ <h3>Accounting details</h3> > <ol> > <li> > <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order --> >@@ -458,15 +462,16 @@ > </ol> > </fieldset> <!-- /.rows --> > </div> <!-- /#accounting_details --> >- </div> <!-- /#tabs --> >+ </div></div> <!-- /#tabs --> > > <fieldset class="action"> >- <input id="add_order" type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a> >+ <input id="add_order" type="submit" class="principal" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a> > </fieldset> > </form> <!-- /#Aform --> > [% ELSE # IF ( batch_details ) %] > <div> >- <h1>Choose the file to add to the basket</h1> >+ <h2>Choose the file to add to the basket</h2> >+ <div id="searchresults"> > <table id="files"> > <thead> > <tr> >@@ -511,7 +516,7 @@ > [% END # /FOREACH batch_lis %] > </tbody> > </table> <!-- /#files --> >- </div> >+ </div></div> > [% END # /IF ( batch_details ) %] > </div> [% # /div.col-sm-6 %] > </div> [% # /div.row %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index 9d2687881d..9700612894 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -4,8 +4,8 @@ > [% PROCESS 'i18n.inc' %] > [% BLOCK csv_export %] > <div class="btn-group"> >- <a id="exportbutton" class="btn btn-default" href="[% script_name | url %]?op=export&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]"><i class="fa fa-download"></i> Export as CSV</a> >- <a class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a> >+ <a id="exportbutton" class="btn btn-default toolbar-btn" href="[% script_name | url %]?op=export&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]"><i class="fa fa-download"></i> Export as CSV</a> >+ <a class="btn btn-default dropdown-toggle toolbar-btn" data-toggle="dropdown"><span class="caret"></span></a> > <ul class="dropdown-menu" id="export-csv-menu"> > <li><a href="#">Default</a></li> > [% IF csv_profiles.count %] >@@ -22,6 +22,9 @@ > [% USE AuthorisedValues %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for [% booksellername | html %] › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -31,13 +34,12 @@ > </head> > > <body id="acq_basket" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -63,6 +65,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -79,28 +82,28 @@ > [% UNLESS ( delete_confirmed ) %] > <div id="toolbar" class="btn-toolbar fh-fixedHeader"> > [% IF active %] >- <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div> >+ <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default toolbar-btn" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div> > [% END %] >- <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&op=add_form" class="btn btn-default" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div> >+ <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&op=add_form" class="btn btn-default toolbar-btn" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div> > [% IF CAN_user_acquisition_delete_baskets %] >- <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete basket</a></div> >+ <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default toolbar-btn" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete basket</a></div> > [% END %] > [% IF ( unclosable ) %] > [% ELSIF ( uncertainprices ) %] >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&owner=1" class="btn btn-default" id="uncertpricesbutton"><i class="fa fa-usd"></i> Uncertain prices</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&owner=1" class="btn btn-default toolbar-btn" id="uncertpricesbutton"><i class="fa fa-usd"></i> Uncertain prices</a></div> > <div title="Can not close baskets that have items with uncertain prices in them." class="btn-group"> >- <a href="" class="btn btn-default disabled" id="closebutton"><i class="fa fa-times-circle"></i> Close basket</a> >+ <a href="" class="btn btn-default disabled toolbar-btn" id="closebutton"><i class="fa fa-times-circle"></i> Close basket</a> > </div> > [% ELSE %] > <div class="btn-group"> >- <a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="closebutton"><i class="fa fa-times-circle"></i> Close basket</a> >+ <a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default toolbar-btn" id="closebutton"><i class="fa fa-times-circle"></i> Close basket</a> > </div> > [% END %] > > [% PROCESS csv_export %] > > [% IF Koha.Preference('EDIFACT') && ediaccount %] >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default toolbar-btn" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div> > [% END %] > > [% IF ( active && books_loop ) %] >@@ -108,7 +111,7 @@ > <form action="/cgi-bin/koha/acqui/basket.pl" method="post"> > <input type="hidden" name="op" value="email" /> > <input type="hidden" name="basketno" value="[% basketno | html %]" /> >- <button type="submit" class="btn btn-default" id="emailvendorbutton"><i class="fa fa-envelope"></i> E-mail order</button> >+ <button type="submit" class="btn btn-default toolbar-btn" id="emailvendorbutton"><i class="fa fa-envelope"></i> E-mail order</button> > </form> > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index 91e1292fcc..2ac177ab41 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -2,10 +2,16 @@ > [% USE Asset %] > [% USE Branches %] > [% USE Price %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Basket grouping for [% booksellername | html %] › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > <script> > > var MSG_CONFIRM_CLOSE_BASKETGROUP = _("Are you sure you want to close this basketgroup?"); >@@ -86,13 +92,12 @@ > > </head> > <body id="acq_basketgroup" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -112,6 +117,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > [% ELSE %] > <li> >@@ -124,6 +130,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > [% END %] > > >@@ -135,25 +142,26 @@ > [% IF ( grouping ) %] > [% IF (closedbg) %] > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="[% script_name | url %]?op=reopen&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]&mode=singlebg" class="btn btn-default" id="reopenbutton"><i class="fa fa-download"></i> Reopen basket group</a></div> >- <div class="btn-group"><a href="[% script_name | url %]?op=export&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="exportbutton"><i class="fa fa-download"></i> Export basket group as CSV</a></div> >- <div class="btn-group"><a href="[% script_name | url %]?op=print&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="printbutton"><i class="fa fa-download"></i> Print basket group in PDF</a></div> >+ <div class="btn-group"><a href="[% script_name | url %]?op=reopen&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]&mode=singlebg" class="btn btn-default toolbar-btn" id="reopenbutton"><i class="fa fa-download"></i> Reopen basket group</a></div> >+ <div class="btn-group"><a href="[% script_name | url %]?op=export&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default toolbar-btn" id="exportbutton"><i class="fa fa-download"></i> Export basket group as CSV</a></div> >+ <div class="btn-group"><a href="[% script_name | url %]?op=print&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default toolbar-btn" id="printbutton"><i class="fa fa-download"></i> Print basket group in PDF</a></div> > [% IF (ediaccount) %] >- <div class="btn-group"><a href="[% script_name | url %]?op=ediprint&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div> >+ <div class="btn-group"><a href="[% script_name | url %]?op=ediprint&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default toolbar-btn" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div> > [% END %] > </div> > [% END %] > [% IF (name && closedbg) %] >- <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h2>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h2> > [% ELSIF (name) %] >- <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h2>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h2> > [% ELSE %] >- <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h2>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h2> > [% END %] > <div id="basketgroupcolumns" class="row"> > [% UNLESS (closedbg) %] > <div class="col-xs-6 col-xs-push-6"> > >+ <fieldset id="searchresults"> > <div id="groups"> > <div class="workarea_alt" > > <h3>Ungrouped baskets</h3> >@@ -194,7 +202,7 @@ > </table> > </div> > </div> >- >+ </fieldset> > </div> > [% END %] > [% IF ( closedbg ) %] >@@ -203,7 +211,7 @@ > <div class="col-xs-6 col-xs-pull-6"> > [% END %] > <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post" id="groupingform" onsubmit="return submitForm(this)"> >- <fieldset id="various" class="brief"> >+ <fieldset id="various"> > <ol> > [% UNLESS (closedbg) %] > <li> >@@ -312,7 +320,7 @@ > <input type="hidden" name="basketgroupid" value="[% basketgroupid | html %]" /> > [% END %] > <input type="hidden" name="op" value="attachbasket" /> >- <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]" class="cancel">Cancel</a> >+ <input type="submit" class="principal" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]" class="cancel">Cancel</a> > </fieldset> > [% END %] > </form> >@@ -320,10 +328,11 @@ > </div> > [% ELSE %] > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]" class="btn btn-default toolbar-btn" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div> > </div> >- <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h2>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h2> > [% IF (NoEDIMessage) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %] >+ <div id="searchresults"> > <div id="basket_groups" class="toptabs"> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation"><a href="#opened" aria-controls="opened" role="tab" data-toggle="tab">Open</a></li> >@@ -414,7 +423,7 @@ > </table> > </div> > </div> >- </div> >+ </div></div> > [% END %] > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >index 4db81b1650..26f0c58aa0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >@@ -3,6 +3,9 @@ > [% USE Branches %] > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( add_form ) %] >@@ -15,13 +18,12 @@ > </head> > > <body id="acq_basketheader" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -46,6 +48,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -53,8 +56,8 @@ > > [% IF ( add_form ) %] > [% IF ( basketno ) %] >- <h1>Edit basket [% basketname | html %]</h1> >- [% ELSE %]<h1>Add a basket to [% booksellername | html %]</h1> >+ <h2>Edit basket [% basketname | html %]</h2> >+ [% ELSE %]<h2>Add a basket to [% booksellername | html %]</h2> > [% END %] > <form name="Aform" action="[% script_name | html %]" method="post" class="validated"> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >@@ -154,7 +157,7 @@ > > <fieldset class="action"> > <input type="hidden" name="op" value="add_validate" /> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > [% IF ( basketno ) %] > <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index c1e5fc8af0..1e2977f465 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -3,6 +3,9 @@ > [% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Search for vendor [% supplier | html %] › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -14,13 +17,12 @@ > </head> > > <body id="acq_booksellers" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -32,6 +34,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >index d40571d3bd..f74964e3ed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >@@ -9,7 +9,7 @@ > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -24,6 +24,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >index 8bb5e07d85..8b8a21de05 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >@@ -3,6 +3,9 @@ > [% USE Koha %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% UNLESS blocking_error %] >@@ -18,13 +21,12 @@ Acquisitions › Koha > > <body id="acq_duplicate_orders" class="acq"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -44,19 +46,20 @@ Acquisitions › Koha > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Duplicate existing orders</h1> >+<h2>Duplicate existing orders</h2> > [% INCLUDE 'blocking_errors.inc' %] > > [% IF op == 'search' || op == 'select' %] > <form action="/cgi-bin/koha/acqui/duplicate_orders.pl" method="post"> > <fieldset class="rows"> >- <legend> >+ <h3> > [% IF op == 'search' %] > <span>Search orders</span> > [% ELSE %] >@@ -64,14 +67,14 @@ Acquisitions › Koha > [% END %] > <span class="toggle_orders_filters" id="show_orders_filters"><a href="#">[+]</a></span> > <span class="toggle_orders_filters" id="hide_orders_filters"><a href="#">[-]</a></span> >- </legend> >+ </h3> > <div id="orders_filters"> > [% INCLUDE 'filter-orders.inc' %] > <input type="hidden" name="op" value="select" /> > <input type="hidden" name="basketno" value="[% basket.basketno | html %]" /> > > <input type="hidden" name="ordernumbers" value="[% ordernumbers.join(',') | html %]" /> >- <fieldset class="action"><input type="submit" value="Search" /></fieldset> >+ <fieldset class="action"><input type="submit" class="principal" value="Search" /></fieldset> > </div> > </fieldset> > </form> >@@ -176,7 +179,7 @@ Acquisitions › Koha > <fieldset class="action"> > <input type="hidden" name="op" value="batch_edit" /> > <input type="hidden" name="basketno" value="[% basket.basketno | html %]" /> >- <button type="submit" class="btn btn-default go_to_batch_edit">Next <i class="fa fa-fw fa-arrow-right"></i></button> >+ <button type="submit" class="btn btn-default go_to_batch_edit principal">Next <i class="fa fa-fw fa-arrow-right"></i></button> > </fieldset> > </form> > </div> >@@ -187,7 +190,7 @@ Acquisitions › Koha > <div id="accounting_details"> > <p>Duplicate all the orders with the following accounting details:</p> > <fieldset class="rows" style="float:none;"> >- <legend>Accounting details</legend> >+ <h3>Accounting details</h3> > <div class="hint" style="margin: 1em 1em 0">Check boxes to duplicate the original values</div> > <ol> > <li> >@@ -257,7 +260,7 @@ Acquisitions › Koha > <input type="hidden" name="basketno" value="[% basket.basketno | html %]" /> > <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order --> > <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" /> >- <button type="submit" class="btn btn-default">Duplicate orders</button> >+ <button type="submit" class="btn btn-default principal">Duplicate orders</button> > <a class="cancel" href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno | html %]">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt >index b05d6418a4..413cbe34d0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt >@@ -1,16 +1,19 @@ >+ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Basket ([% basketno | html %]) › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > > </head> > <body id="acq_edi_ean" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -20,6 +23,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >index 2d2bd5e064..f89409b643 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>EDIFACT messages › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -11,12 +14,11 @@ > </head> > > <body id="acq_edifactmsgs" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -26,6 +28,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt >index 4af2fb2a2e..17f152a5f4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt >@@ -1,16 +1,19 @@ >+ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>EDIFACT message display › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="acq_edifactmsgs" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -20,6 +23,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index 8f0436a5c5..ed30fe8b96 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -4,49 +4,52 @@ > [% USE TablesSettings %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( order_loop ) %]Orders search › Search results[% ELSE %]Order search[% END %] › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="acq_histsearch" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > </li> > >- [% IF ( order_loop ) %] >- <li> >- <a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Search results >- </a> >- </li> >- [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Order search >- </a> >- </li> >- [% END %] >+ [% IF ( order_loop ) %] >+ <li> >+ <a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> >+ </li> >+ <li> >+ <a href="#" aria-current="page"> >+ Search results >+ </a> >+ </li> >+ [% ELSE %] >+ <li> >+ <a href="#" aria-current="page"> >+ Order search >+ </a> >+ </li> >+ [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Order search</h1> >+ <h2>Order search</h2> > > [% IF !order_loop && search_done %] > <div class="dialog message"> >@@ -59,7 +62,7 @@ > [% END %] > > >- [% IF ( order_loop ) %]<h1>Search results</h1> >+ [% IF ( order_loop ) %]<h2>Search results</h2> > <div id="acqui_histsearch"> > <table id="histsearcht"> > <thead> >@@ -182,11 +185,11 @@ > <h4>Search orders</h4> > [% ELSE %] > <fieldset class="rows"> >- <legend>Search orders</legend> >+ <h3>Search orders</h3> > [% END %] > [% INCLUDE 'filter-orders.inc' %] > <input type="hidden" name="do_search" value="1" /> >- <fieldset class="action"><input type="submit" value="Search" /></fieldset> >+ <fieldset class="action"><input type="submit" class="principal" value="Search" /></fieldset> > </fieldset> > </form> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >index 906fa3c016..65df4b4864 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >@@ -2,20 +2,22 @@ > [% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Files › Invoice › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="acq_invoice_files" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -31,6 +33,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index 27c57bf0e2..5659d76b16 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -4,6 +4,9 @@ > [% USE KohaDates %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% USE AuthorisedValues %] > > [% INCLUDE 'doc-head-open.inc' %] >@@ -12,8 +15,7 @@ > </head> > > <body id="acq_invoice" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > [% SET readonly = NOT CAN_user_acquisition_edit_invoices %] > >@@ -21,7 +23,7 @@ > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -34,6 +36,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -143,7 +146,7 @@ > <fieldset class="action"> > <input type="submit" value="Save" /> > [% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %] >- <a href="invoice.pl?op=delete&invoiceid=[% invoiceid | uri %]" id="delete">Delete</a> >+ <a class="cancel" href="invoice.pl?op=delete&invoiceid=[% invoiceid | uri %]" id="delete">Delete</a> > [% END %] > </fieldset> > [% END %] >@@ -252,7 +255,7 @@ > [% END %] > [% UNLESS readonly %] > <td> >- <a class="btn btn-default btn-xs delete_adjustment" href="/cgi-bin/koha/acqui/invoice.pl?op=del_adj&adjustment_id=[% adjustment.adjustment_id | html %]&invoiceid=[% invoiceid | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default cancel btn-xs delete_adjustment" href="/cgi-bin/koha/acqui/invoice.pl?op=del_adj&adjustment_id=[% adjustment.adjustment_id | html %]&invoiceid=[% invoiceid | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > [% END %] > </tr> >@@ -327,7 +330,7 @@ > </fieldset> > <fieldset class="action"> > <input type="hidden" name="op" value="mod_adj" /> >- <input type="submit" value="Update adjustments" /> >+ <input type="submit" class="principal" value="Update adjustments" /> > </fieldset> > [% END %] > </fieldset> >@@ -469,11 +472,11 @@ > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> > >- <aside> >- <div class="col-sm-2 col-sm-pull-10"> >- [% INCLUDE 'acquisitions-menu.inc' %] >- </div> >- </aside> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'acquisitions-menu.inc' %] >+ </aside> >+ </div> > </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index b98c4d02b9..2fd57a1820 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -3,6 +3,9 @@ > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Invoices › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -10,14 +13,13 @@ > </head> > > <body id="acq_invoices" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -27,6 +29,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -299,7 +302,7 @@ > <div class="col-sm-2 col-sm-pull-10"> > <aside> > <form action="" method="get"> >- <fieldset class="sidebar brief"> >+ <fieldset class="sidebar"> > <h3>Search filters</h3> > <ol> > <li> >@@ -384,7 +387,7 @@ > </li> > </ol> > <fieldset class="action"> >- <input type="submit" value="Search" /> >+ <input type="submit" class="principal" value="Search" /> > </fieldset> > </fieldset> <!-- /.sidebar.brief --> > <input type="hidden" name="op" id="op" value="do_search" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index 03862a2261..9c375a91ab 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -5,20 +5,22 @@ > [% USE TablesSettings %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Late orders › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="acq_lateorders" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -28,13 +30,14 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>[% IF bookseller_filter %][% bookseller_filter.name | html %] : [% END %]Late orders</h1> >+<h2>[% IF bookseller_filter %][% bookseller_filter.name | html %] : [% END %]Late orders</h2> > <div id="acqui_lateorders"> > > [% IF error_claim %] >@@ -224,8 +227,8 @@ > <div class="col-sm-2 col-sm-pull-10"> > <aside> > <form action="lateorders.pl" method="get"> >-<fieldset class="brief"> >-<h4>Filter results:</h4> >+<fieldset class="sidebar"> >+<h3>Filter results</h3> > [% FOREACH ERROR_LOO IN ERROR_LOOP %] > [% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay | html %]) must be a number between 0 and 999.</p>[% END %] > [% END %] >@@ -251,8 +254,9 @@ > [% END %] > [% END %] > </select> >+ </li> > </ol> >- <fieldset class="action"><input type="submit" value="Filter" /></fieldset> >+ <fieldset class="action"><input type="submit" class="principal" value="Filter" /></fieldset> > </fieldset> > </form> > [% INCLUDE 'acquisitions-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >index 7763ed7a4b..c9cd455d9b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >@@ -15,7 +15,7 @@ > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> >@@ -33,6 +33,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >index 468e93c0a7..5650334914 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -5,6 +5,9 @@ > [% USE Price %] > [% USE ItemTypes %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( ordernumber ) %]Modify order details (line #[% ordernumber | html %])[% ELSE %]New order[% END %] › Basket [% basketno | html %] › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -12,13 +15,12 @@ > > <body id="acq_neworderempty" class="acq"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -45,6 +47,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > [% INCLUDE 'blocking_errors.inc' %] > >@@ -53,20 +56,20 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1> >+<h2> > [% IF ( ordernumber ) %] > Modify order line > [% ELSE %] > New order > [% END %] >-</h1> >+</h2> > > <div class="dialog alert order_error" style="display:none"></div> > > [% IF ( basketno ) %] > <div id="acqui_basket_summary"> > <fieldset class="rows"> >- <legend>Basket details</legend> >+ <h3>Basket details</h3> > <ol> > [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote | html %]</li>[% END %] > [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %] >@@ -93,7 +96,7 @@ > <input type="hidden" value="mod_basket" name="op" /> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> > </li> >- <fieldset class="action"><input type="submit" value="Change basketgroup" /></fieldset> >+ <fieldset class="action"><input type="submit" class="princial" value="Change basketgroup" /></fieldset> > [% END %] > </form> > [% END %] >@@ -105,7 +108,7 @@ > <form action="/cgi-bin/koha/acqui/addorder.pl" method="post" class="validated noEnterSubmit" id="Aform" onsubmit="return Check(this);" > > > <fieldset class="rows"> >- <legend>Patrons</legend> >+ <h3>Patrons</h3> > <ol> > <li> > <span class="label">To notify on receiving:</span> >@@ -120,19 +123,19 @@ > </ul> > <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids | html %]" /> > <input type="hidden" id="op" name="op" value="mod_users" /> >- <input type="button" id="add_user" onclick="UserSearchPopup();" value="Add user" /> >+ <input type="button" id="add_user" class="principal" onclick="UserSearchPopup();" value="Add user" /> > </div> > </li> > </ol> > </fieldset> > > <fieldset class="rows"> >- <legend> >+ <h3> > Catalog details > [% IF ( biblionumber ) %] > <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | uri %]"> Edit record</a></span> > [% END %] >- </legend> >+ </h3> > [% UNLESS ( existing ) %] > <input type="hidden" name="existing" value="no" /> > [% END %] >@@ -268,7 +271,7 @@ > > [% IF ( suggestionid ) %] > <fieldset class="rows"> >- <legend>Suggestion</legend> >+ <h3>Suggestion</h3> > <ol> > <li> > <span class="label">Suggested by: </span> >@@ -310,7 +313,7 @@ > </div> > > <fieldset class="rows" id="itemfieldset"> >- <legend>Item</legend> >+ <h3>Item</h3> > [% IF ( NoACQframework ) %] > <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div> > [% END %] >@@ -325,7 +328,7 @@ > [% END %][%# | html UNLESS subscriptionid %] > [% END %][%# IF (AcqCreateItemOrdering) %] > <fieldset class="rows"> >- <legend>Accounting details</legend> >+ <h3>Accounting details</h3> > <ol> > <li> > <label class="required" for="quantity">Quantity: </label> >@@ -492,7 +495,7 @@ > </fieldset> > <fieldset class="action"> > <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" /> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > [% IF (suggestionid) %] > <a class="cancel" href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]">Cancel</a> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt >index 2aea8d8480..37372dbf98 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt >@@ -1,17 +1,21 @@ >+ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] >+ > [% INCLUDE 'doc-head-open.inc' %] > <title>Duplicate warning › Basket [% basketno | html %] › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="acq_neworderempty_duplicate" class="acq"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -26,6 +30,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >index 2986089b95..db3dd9e427 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -5,19 +5,21 @@ > [% USE Koha %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Serials [% biblionumber | html %] › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="acq_newordersubscription" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -35,13 +37,14 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Serials subscriptions</h1> >+ <h2>Serials subscriptions</h2> > [% IF (done_searched) %] > <label for="show_only_renewed"> > <input type="checkbox" style="vertical-align: middle;" id="show_only_renewed" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >index 278984d2c7..aa81e685d4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >@@ -4,19 +4,21 @@ > [% USE Asset %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'suggestions-add-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Add order from a suggestion › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="acq_newordersuggestion" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'suggestions-add-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -34,6 +36,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >index f115cbd76c..32b2bee411 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >@@ -5,20 +5,22 @@ > [% USE Price %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Ordered › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="acq_ordered" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -30,6 +32,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index 648a170c51..477ba4851f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -7,19 +7,21 @@ > [% USE ItemTypes %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Receipt summary for : [% name | html %] [% IF ( invoice ) %]invoice, [% invoice | html %][% END %] › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="acq_orderreceive" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -36,6 +38,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index da43e7cbcd..ba396c1ae2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -5,6 +5,9 @@ > [% USE Price %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( invoiceclosedate ) %] >@@ -18,13 +21,12 @@ > </head> > > <body id="acq_parcel" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -46,6 +48,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > > <div class="main container-fluid"> >@@ -112,6 +115,7 @@ > </div> > [% UNLESS (invoiceclosedate) %] > <div id="acqui_receive_search"> >+ <fieldset id="searchresults"> > <h3>Pending orders</h3> > <table id="pending_orders" class="table table-bordered table-striped"> > <thead> >@@ -131,7 +135,7 @@ > </tr> > </thead> > </table> >- </div> >+ </fieldset></div> > [% ELSE %] > <p> > <span>Invoice is closed, so you can't receive orders anymore.</span> >@@ -320,7 +324,7 @@ > <form action="/cgi-bin/koha/acqui/invoice.pl" method="get"> > <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" /> > <fieldset class="action"> >- <input type="submit" value="Finish receiving" /> >+ <input type="submit" class="principal" value="Finish receiving" /> > </fieldset> > </form> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >index c81d40a231..bd7b4b79c7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -2,19 +2,21 @@ > [% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Receive shipment from vendor [% name | html %] › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="acq_parcels" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -29,6 +31,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -38,7 +41,7 @@ > <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> > [% END %] > <main> >-<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1> >+<h2>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h2> > > [% IF ( error_failed_to_create_invoice ) %] > <div id="error" class="dialog alert"> >@@ -68,7 +71,7 @@ > <input type="hidden" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" /> > <input type="hidden" name="shipmentcost" value="[% shipmentcost | html %]" /> > <input type="hidden" name="shipmentcost_budgetid" value="[% shipmentcost_budgetid | html %]" /> >- <input type="submit" class="button" value="Create new invoice anyway" /> >+ <input type="submit" class="button principal" value="Create new invoice anyway" /> > </form> > </div> > [% END %] >@@ -143,7 +146,7 @@ > <div id="parcels_new_parcel"> > <form method="get" action="parcels.pl" class="validated"> > <fieldset class="rows"> >- <legend>Receive a new shipment</legend> >+ <h3>Receive a new shipment</h3> > <ol> <li> > <label for="invoice" class="required">Vendor invoice:</label> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >@@ -187,8 +190,7 @@ > > </li> > </ol> >- </fieldset> >- <fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></fieldset> >+<input type="submit" class="button principal" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></fieldset> > </form> > </div> > </main> >@@ -198,8 +200,8 @@ > <div class="col-sm-2 col-sm-pull-10"> > <aside> > <form method="get" action="parcels.pl"> >- <fieldset class="brief"> >- <h4>Filter</h4> >+ <fieldset class="sidebar"> >+ <h3>Filter</h3> > <ol> > <li> <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /></li> > <li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter | html %]" id="filter" /></li> >@@ -226,7 +228,7 @@ > <option value="100">100</option> > </select></li> > </ol> >- <fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a></fieldset> >+ <fieldset class="action"><input type="submit" class="button principal" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a></fieldset> > </fieldset> > </form> > </aside> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >index 5eca17fe30..33fa768327 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -5,20 +5,22 @@ > [% USE Price %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Spent › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="acq_spent" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -30,6 +32,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index 1ccc71b4ce..c388936166 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -88,19 +88,21 @@ > [% END %] > > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Vendor [% name | html %] › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="acq_supplier" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -131,6 +133,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -139,26 +142,27 @@ > > [% IF ( enter ) %] > [% IF ( booksellerid ) %] >- <h1>Update: [% name | html %]</h1> >+ <h2>Update: [% name | html %]</h2> > [% ELSE %] >- <h1>Add vendor</h1> >+ <h2>Add vendor</h2> > [% END %] > [% END %] > [% UNLESS ( enter ) %][% INCLUDE 'acquisitions-toolbar.inc' %][% END %] > [% IF ( enter ) %] > <form action="updatesupplier.pl" name="updatesupplier" style="display:block" class="validated" method="post"> > <div id="toolbar" class="btn-toolbar"> >- <button class="btn btn-default" type="submit"><i class="fa fa-save"></i> Save</button> >+ <div> >+ <button class="btn btn-default principal" type="submit"><i class="fa fa-save"></i> Save</button> > [% IF ( booksellerid ) %] >- <a class="btn btn-default cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]"> >+ <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]"> > [% ELSE %] >- <a class="btn btn-default cancel" href="/cgi-bin/koha/acqui/acqui-home.pl"> >+ <a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl"> > [% END %] <i class="fa fa-remove"></i> Cancel</a> >- </div> >+ </div></div> > > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> > <fieldset class="rows"> >- <legend>Company details</legend> >+ <h3>Company details</h3> > <ol><li><label for="company" class="required">Name:</label> > <input type="text" size="40" id="company" name="company" value="[% name | html %]" required="required" class="required focus" /><span class="required">Required</span></li> > <li><label for="company_postal">Postal address: </label> >@@ -175,14 +179,14 @@ > <input type="text" size="40" id="accountnumber" name="accountnumber" value="[% accountnumber | html %]" /></li></ol> > </fieldset> > <fieldset class="rows"> >- <legend>Contacts</legend> >+ <h3>Contacts</h3> > <fieldset id="contact-template" class="supplier-contact"> >- <legend>Contact details</legend> >+ <h3nd>Contact details</h3nd> > [% INCLUDE edit_contact %] > </fieldset> > [% FOREACH contact IN contacts %] > <fieldset class="supplier-contact"> >- <legend>Contact details</legend> >+ <h3nd>Contact details</h3nd> > [% INCLUDE edit_contact %] > </fieldset> > [% END %] >@@ -190,7 +194,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Ordering information</legend> >+ <h3>Ordering information</h3> > <ol><li><label for="activestatus">Vendor is:</label> > [% IF ( active ) %] > <label class="radio" for="activestatus"> >@@ -306,7 +310,7 @@ > <textarea cols="40" rows="4" id="notes" name="notes" >[% notes | html %]</textarea></li> > </ol> > </fieldset> >- <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %] >+ <fieldset class="action"><input type="submit" class="principal" value="Save" /> [% IF ( booksellerid ) %] > <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl"> > [% END %]Cancel</a></fieldset> > >@@ -315,6 +319,7 @@ > <h1>[% name | html %]</h1> > <div class="row"> > <div id="supplier-company-details" class="col-sm-6"> >+ <fieldset> > <h2>Vendor details</h2> > <p><span class="label">Company name: </span>[% name | html %]</p> > <p><span class="label">Postal address: </span>[% postal | html %]</p> >@@ -355,9 +360,11 @@ > [% IF ( notes ) %]<p><strong>Notes: </strong> > [% notes | html %]</p>[% END %] > </div> <!-- .supplier-ordering-information --> >+ </fieldset> > </div> <!-- /.col-sm-6 --> > > <div class="col-sm-6"> >+ <div id="searchresults"> > <div class="supplier-contact-details"> > <h2>Contact</h2> > [% FOREACH contact IN contacts %] >@@ -375,9 +382,8 @@ > [% END %] > </p> > </div> >- > </div> >- >+</div> > </div> > > [% IF ( contracts ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >index 1243a06d13..1d559862a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -3,19 +3,21 @@ > [% USE Koha %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername | html %][% ELSE %]Orders with uncertain prices[% END %] › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="acq_uncertainprice" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -38,6 +40,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -79,7 +82,8 @@ > [% END %] > [% END %] > >- <h1>Orders with uncertain prices</h1> >+ <div id="searchresults"> >+ <h3>Orders with uncertain prices</h3> > <form action="[% scriptname | html %]" method="post"> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> > <label for="owner">Orders from:</label> >@@ -150,8 +154,9 @@ > [% END %] > </tbody> > </table> >- <fieldset class="action"><input type="submit" value="Save" /></fieldset> >+ <fieldset class="action"><input type="submit" value="Save" class="principal" /></fieldset> > </form> >+ </div> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >index 17eb1f5b06..5ed5e82b94 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( opsearch ) %]Order from external source[% ELSE %]Search results › Acquisitions › Order from external source[% END %] › Koha</title> > >@@ -40,13 +43,12 @@ tr.selected td { > </head> > > <body id="acq_z3950_search" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'acquisitions-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >@@ -75,13 +77,14 @@ tr.selected td { > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > [% IF ( opsearch ) %] > <form method="post" action="z3950_search.pl" name="f" class="checkboxed"> > <div class="row"> > <div class="col-sm-6"> >- <h1>Order from external source</h1> >+ <h2>Order from external source</h2> > <input type="hidden" name="op" id="op" value="do_search" /> > <fieldset class="rows"> > <ol> >@@ -145,7 +148,7 @@ tr.selected td { > > <div class="row"> > <div class="col-md-12"> >- <fieldset class="action"><input type="submit" class="submit" value="Search" /> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">Cancel</a></fieldset> >+ <fieldset class="action"><input type="submit" class="principal" value="Search" /> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">Cancel</a></fieldset> > </div> > </div> > </form> >@@ -266,7 +269,7 @@ tr.selected td { > [% IF ( show_nextbutton ) %] > <input type="button" name="changepage_next" value="Next page" data-currentpage="[% current_page | html %]" /> > [% END %] >- <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page | html %]" size="4" type="text" /> <input type="submit" name="changepage_goto" value="Go" /> >+ <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page | html %]" size="4" type="text" /> <input type="submit" class="principal" name="changepage_goto" value="Go" /> > </form> > > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >index 21d968fcd7..d7c6741aa0 100755 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >@@ -1,5 +1,8 @@ > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% SWITCH op %] >@@ -14,8 +17,7 @@ > [% show_marcfield = marcfield_tables.grep('^' _ tablename _ '$').size ? 1 : 0 %] > > <body id="ser_add_fields" class="ser"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -63,6 +65,14 @@ > > [% END %] > </ol> >+ >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -71,9 +81,11 @@ > <main> > > [% IF op == 'list' %] >- <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newfields" href="?op=add_form&tablename=[% tablename | uri %]"><i class="fa fa-plus"></i> Create field</a> >+ <div id="toolbar" class="btn-toolbar"> >+ <div> >+ <a class="toolbar-btn" id="newfields" href="?op=add_form&tablename=[% tablename | uri %]"><i class="fa fa-plus"></i> Create field</a> > </div> >+ </div> > [% END %] > > [% IF messages %] >@@ -191,16 +203,16 @@ > [% END %] > </li> > </ol> >- </fieldset> > <fieldset class="action"> > [% IF field %] > <input type="hidden" name="field_id" value="[% field.id | html %]" /> > [% END %] > <input type="hidden" name="tablename" value="[% tablename | html %]" /> > <input type="hidden" name="op" value="add" /> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a href="?tablename=[% tablename | uri %]" class="cancel">Cancel</a> > </fieldset> >+ </fieldset> > </form> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >index cd15f66e04..2261ebb32f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >@@ -1,12 +1,14 @@ > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="admin_admin-home" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -19,6 +21,14 @@ > </a> > </li> > </ol> >+ >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -57,16 +67,21 @@ > <form action="/cgi-bin/koha/admin/preferences.pl" method="post"> > <fieldset> > <h4><a href="/cgi-bin/koha/admin/preferences.pl">Global system preferences</a></h4> >- <p>Manage global system preferences like MARC flavor, date format, administrator email, and templates.</p> >- <input type="hidden" name="op" value="search" /> >- <input type="text" name="searchfield" value="[% searchfield | html %]" /> >- <input type="submit" name="ok" class="submit" value="Search" /> >+ <fieldset> >+ <p>Manage global system preferences like MARC flavor, date format, administrator email, and templates.</p> >+ <input type="hidden" name="op" value="search" /> >+ <input type="text" name="searchfield" value="[% searchfield | html %]" /> >+ <input type="submit" name="ok" class="principal" value="Search" /> >+ </fieldset> > </fieldset> > </form> > [% END %] > > [% IF ( CAN_user_parameters_manage_libraries || CAN_user_parameters_manage_itemtypes || CAN_user_parameters_manage_auth_values ) %] >- <div class="hint"><h4>Hint:</h4><p>Configure these parameters in the order they appear.</p></div> >+ <div class="hint"> >+ <h4>Hint:</h4><p>Configure these parameters in the order they appear.</p> >+ </div> >+ > <h3>Basic parameters</h3> > <dl> > [% IF ( CAN_user_parameters_manage_libraries ) %] >@@ -125,6 +140,7 @@ > [% IF ( CAN_user_parameters_manage_accounts || ( Koha.Preference('UseCashRegisters') && CAN_user_parameters_manage_cash_registers ) ) %] > <h3>Accounting</h3> > <dl> >+ > [% IF ( CAN_user_parameters_manage_accounts ) %] > <dt><a href="/cgi-bin/koha/admin/debit_types.pl">Debit types</a></dt> > <dd>Define debit types</dd> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt >index a34e4fa129..2698a61752 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt >@@ -2,13 +2,15 @@ > [% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE ''prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Advanced editor shortcuts › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="adveditor_shortcuts" class="admin"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'prefs-admin-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > [% PROCESS 'keyboard_shortcuts.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -23,6 +25,12 @@ > <a href="#" aria-current="page">Advanced editor shortcuts</a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >index 2ec2e9e901..a7ed262d2f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -3,6 +3,9 @@ > [% USE KohaDates %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'budgets-admin-search.inc' %] >+[% END %] > [%- BLOCK action_menu %] > <div class="btn-group dropup"> > <a class="btn btn-default btn-xs dropdown-toggle" id="budgetmenu_[% block_budget.budget_period_id | html %]" role="button" data-toggle="dropdown" href="#"> >@@ -72,12 +75,7 @@ > > <body id="admin_aqbudgetperiods" class="admin"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'budgets-admin-search.inc' %] >- >-<!-- ################################################################################# --> >-<!-- BREADCRUMBS --> >-<!-- ################################################################################# --> >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -167,6 +165,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -230,10 +234,8 @@ > </li> > > </ol> >- </fieldset> > >- <fieldset class="action"> >- <input type="submit" value="Save" /> >+ <input type="submit" value="Save" class="principal" /> > <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">Cancel</a> > </fieldset> > >@@ -302,12 +304,8 @@ > [% IF ( budget_period_locked ) %]<input type="checkbox" checked="checked" id="budget_period_locked" name="budget_period_locked" value="1" />[% ELSE %] <input type="checkbox" id="budget_period_locked" name="budget_period_locked" value="1"/> [% END %] > </li> > </ol> >- </fieldset> > >- <fieldset class="action"> >- <!-- "save changes" button --> >- <!-- ###################################### --> >- <input type="submit" value="Save" /> >+ <input type="submit" value="Save" class="principal" /> > [% IF ( budget_period_id ) %] > <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]" class="cancel">Cancel</a> > [% ELSE %] >@@ -403,11 +401,10 @@ > <input type="checkbox" name="move_remaining_unspent" id="move_remaining_unspent" /> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >+ > <input type="hidden" name="op" value="close_confirmed" /> > <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> >- <input type="submit" value="Move unreceived orders" /> >+ <input type="submit" class="principal" value="Move unreceived orders" /> > <a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Cancel</a> > </fieldset> > </form> >@@ -472,6 +469,7 @@ > > [% INCLUDE 'budgets-active-currency.inc' %] > >+<fieldset id="searchresults"> > <div id="budgetsTabs" class="toptabs"> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation" class="active"> >@@ -552,6 +550,7 @@ > </div> > </div> <!-- /.tab-content --> > </div> >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >index 71724c4746..b6543074ee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -4,6 +4,9 @@ > [% USE Branches %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'budgets-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > > <title>[% IF op == 'add_form' %][% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name | html %]'[% END %][% ELSE %]Add fund[% END %] ›[% END %] Funds › Administration › Koha</title> >@@ -12,8 +15,7 @@ > </head> > > <body id="admin_aqbudgets" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'budgets-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -74,6 +76,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -102,6 +110,7 @@ > [% INCLUDE 'budgets-active-currency.inc' %] > > [% IF budgets %] >+<fieldset id="searchresults"> > > [% UNLESS budget_period_id %] > <div class="toolbar btn-toolbar"> >@@ -113,7 +122,6 @@ > </span> > </div> > [% END %] >- > <table id="budgeth" class="group"> > <thead> > <tr> >@@ -231,7 +239,7 @@ > [% END %] > </tbody> > </table> >- >+</fieldset > [% ELSE %] > <p>No fund found</p> > [% END %] >@@ -400,12 +408,12 @@ > [% IF ( budget_id ) %] > <input type="hidden" name="budget_id" value="[% budget_id | html %]" /> > [% END %] >- </fieldset> >- > <fieldset class="action"> >- <input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a> >+ <input type="submit" class="principal" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a> > <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> > </fieldset> >+ </fieldset> >+ > </form> > > [% END %] <!-- add_form --> >@@ -441,9 +449,8 @@ > > [% IF op == 'list' %] > <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get"> >- <a href="#" id="filterbutton">Filters</a> >- <fieldset class="brief" id="fundfilters"> >- <h4>Fund filters</h4> >+ <fieldset class="sidebar" id="fundfilters"> >+ <h3>Fund filters</h3> > <ol> > <li> > <label for="filter_budgetbranch2">Library: </label> >@@ -480,7 +487,7 @@ > </ol> > > <input type="hidden" name="op" value="list" /> >- <input type="submit" class="submit" name="filter" value="Go" /> >+ <input type="submit" class="principal" name="filter" value="Go" /> > </fieldset> > </form>[% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >index f97eac73ed..bb9253ed7c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'contracts-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( add_form ) %] >@@ -18,8 +21,7 @@ > </head> > > <body id="acq_aqcontract" class="acq"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'contracts-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -93,6 +95,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -111,12 +119,12 @@ > <input type="hidden" name="op" value="add_validate" /> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> > <input type="hidden" name="checked" value="0" /> >+ <fieldset class="rows"> > [% IF ( contractnumber ) %] >- <h1>Modify contract [% contractname | html %] for [% booksellername | html %]</h1> >+ <h3>Modify contract [% contractname | html %] for [% booksellername | html %]</h3> > [% ELSE %] >- <h1>New contract for [% booksellername | html %]</h1> >+ <h3>New contract for [% booksellername | html %]</h3> > [% END %] >- <fieldset class="rows"> > <ol> > [% IF ( contractnumber ) %] > <li><span class="label">Contract id </span>[% contractnumber | html %] >@@ -142,21 +150,19 @@ > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]&contractnumber=[% contractnumber | html %]">Cancel</a> >+ <input type="submit" class="principal" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]&contractnumber=[% contractnumber | html %]">Cancel</a> > </fieldset> > </form> > [% END %] > [% IF ( add_validate ) %] >- <h1>Data recorded</h1> >+ <h2>Data recorded</h2> > <form action="[% script_name | html %]" method="post"> >- <input type="submit" value="OK" /> >+ <input type="submit" class="principal" value="OK" /> > </form> > [% END %] > [% IF ( delete_confirm ) %] > <div class="dialog alert"> >- <h1>Confirm deletion of contract <em>[% contractname | html %]</em></h1> >+ <h2>Confirm deletion of contract <em>[% contractname | html %]</em></h2> > <table> > <tr><th scope="row">Contract number:</th><td>[% contractnumber | html %]</td></tr> > <tr><th scope="row">Contract name:</th><td>[% contractname | html %]</td></tr> >@@ -179,14 +185,15 @@ > </div> > [% END %] > [% IF ( delete_confirmed ) %] >- <h1>Contract deleted</h1> >+ <h2>Contract deleted</h2> > <form action="[% script_name | html %]" method="post"> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >- <input type="submit" value="OK" /> >+ <input type="submit" class="principal" value="OK" /> > </form> > [% END %] > [% IF ( else ) %] > <h1>Contract(s) of [% booksellername | html %]</h1> >+ <fieldset id="searchresults"> > [% IF ( loop ) %] > <table> > <tr> >@@ -219,6 +226,7 @@ > [% END %] > </div> > [% END %] >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >index cbd85c4edc..0d03235cae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'budgets-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% PROCESS 'budget_planning.inc' %] > <title>Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %] › Funds › Budgets › Administration › Koha</title> >@@ -10,8 +13,7 @@ > </head> > > <body id="admin_aqplan" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'budgets-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -31,6 +33,12 @@ > <a href="#" aria-current="page">Planning</a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -41,7 +49,7 @@ > [% INCLUDE 'budgets-admin-toolbar.inc' %] > > <form method="post" id="Aform" name="Aform" action="/cgi-bin/koha/admin/aqplan.pl"> >-<h1>Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]</h1> >+<h2>Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]</h2> > <input type="hidden" name="authcat" value="[% authcat | html %]" /> > <!-- Budget Lines --> > >@@ -54,6 +62,8 @@ > <p><strong>Cells contain estimated values only.</strong></p> > [% END %] > >+ <fieldset id="searchresults"> >+ > <p id="selections"> > <strong>Show/hide columns:</strong> <span class="selected"><input type="checkbox" checked="checked" id="showall"/><label for="showall">Show all columns</label></span> <span><input type="checkbox" id="hideall"/><label for="hideall">Hide all columns</label></span> > [% FOREACH authvals_ro IN authvals_row %] >@@ -164,10 +174,11 @@ > > <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> > [% IF ( budget_period_locked ) %] >- <!-- <input STYLE="background: gray;" type="submit" value="Save" disabled="disabled"/> --> >+ <!-- <input STYLE="background: gray;" class="principal" type="submit" value="Save" disabled="disabled"/> --> > [% ELSE %] >- <input type="hidden" name="op" value="save" /> >- <fieldset class="action"><input type="submit" value="Save"/></fieldset> >+ <input type="hidden" name="op" class="principal" value="save" /> >+ <fieldset class="action"><input type="submit" class="principal" value="Save"/></fieldset> >+ </fieldset> > [% END %] > > >@@ -197,11 +208,10 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- > <form method="post" action="/cgi-bin/koha/admin/aqplan.pl"> > <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> >-<fieldset class="brief"> >-<h4>Filter</h4> >+<fieldset class="sidebar"> >+<h3>Filter</h3> > [% BLOCK planning_types %] > [% SWITCH type %] > [% CASE 'MONTHS' %]<span>by months</span> >@@ -223,44 +233,44 @@ > [% END %] > </select> > </li> >- <li class="radio"> >+ <li class="radio"><label for="show_mine"> > [% IF ( show_mine ) %] > <input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" /> > [% ELSE %] > <input type="checkbox" id="show_mine" name="show_mine" value="1" /> > [% END %] >- <label for="show_mine">Show my funds only</label> >+ Show my funds only</label> > </li> > >- <li class="radio"> >+ <li class="radio"><label for="show_active"> > [% IF ( show_active ) %] > <input type="checkbox" id="show_active" name="show_active" value="1" checked="checked" /> > [% ELSE %] > <input type="checkbox" id="show_active" name="show_active" value="1" /> > [% END %] >- <label for="show_active">Show active funds only</label> >+ Show active funds only</label> > </li> > > >- <li class="radio"> >+ <li class="radio"><label for="show_actual"> > [% IF ( show_actual ) %] > <input type="checkbox" id="show_actual" name="show_actual" value="1" checked="checked" /> > [% ELSE %] > <input type="checkbox" id="show_actual" name="show_actual" value="1" /> > [% END %] >- <label for="show_actual">Show actual/estimated values</label> >+ Show actual/estimated values</label> > </li> > </ol> > <fieldset class="action"> >- <input type="submit" name="option_submit" value="Submit" /> >+ <input type="submit" class="principal" name="option_submit" value="Submit" /> > <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> > </fieldset> > </fieldset> > </form> > [% IF ( budget_lines ) %] > <form method="post" action="/cgi-bin/koha/admin/aqplan.pl"> >-<fieldset class="brief"> >-<h4>Export</h4> >+<fieldset class="sidebar"> >+<h3>Export</h3> > <ol> > <li><label for="basename">Output to a file named: </label><input type="text" name="basename" id="basename" value="Export" /></li> > <li><label class="inline" for="MIME">Into an application</label> >@@ -276,7 +286,7 @@ > </select> > </li> > </ol> >- <fieldset class="action"> <input type="submit" value="Submit"/> >+ <fieldset class="action"> <input type="submit" class="principal" value="Submit"/> > <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="output" value="file" /></fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >index 9922efa583..fb80bf9cb8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >@@ -2,14 +2,16 @@ > [% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Audio alerts › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="admin_audio_alerts" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -25,6 +27,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -32,9 +40,9 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newalert" href="/cgi-bin/koha/admin/audio_alerts.pl"><i class="fa fa-plus"></i> New alert</a> >- </div> >+ <div id="toolbar" class="btn-toolbar"><div> >+ <a class="toolbar-btn" id="newalert" href="/cgi-bin/koha/admin/audio_alerts.pl"><i class="fa fa-plus"></i> New alert</a> >+ </div></div> > > <form id="new-alert-form" action="audio_alerts.pl" method="post" class="validated"> > <fieldset class="rows"> >@@ -78,11 +86,11 @@ > </select> > </li> > </ol> >- </fieldset> > <fieldset class="action"> >- <input id="save-alert" type="submit" value="Submit" /> >+ <input id="save-alert" class="principal" type="submit" value="Submit" /> > <a href="#" id="cancel-edit" class="cancel cancel-edit">Cancel</a> > </fieldset> >+ </fieldset> > </form> > > <form id="delete-alert-form" action="audio_alerts.pl" method="post"> >@@ -97,6 +105,7 @@ > [% END %] > </div> > [% END %] >+ <fieldset id="searchresults"> > <table id="audio-alerts-table"> > <thead id="audio-alerts-table-head"> > <tr> >@@ -139,11 +148,12 @@ > [% END %] > </tbody> > </table> >+ </fieldset> >+ </form> > > <p> >- <button id="delete-alerts" type="submit" class="btn btn-default disabled"><i class="fa fa-trash"></i> Delete selected alerts</button> >+ <button id="delete-alerts" type="submit" class="btn btn-default disabled principal"><i class="fa fa-trash"></i> Delete selected alerts</button> > </p> >- </form> > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >index 83ab4f28be..56b883c8b9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >@@ -1,14 +1,16 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Authority MARC subfield structure › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="admin_auth_subfields_structure" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -70,6 +72,12 @@ > [% END %] > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >index 1c04aa734f..22964aea66 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( add_form ) %] >@@ -38,8 +41,7 @@ Authority MARC framework › Administration › Koha > </head> > > <body id="admin_auth_tag_structure" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc'' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -158,6 +160,12 @@ Authority MARC framework › Administration › Koha > [% END %] > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index 46653abec4..5a84d78fb7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF op == 'add_form' %] >@@ -38,8 +41,7 @@ > </head> > > <body id="admin_authorised_values" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -94,6 +96,12 @@ > </li> > [% END # /IF op == 'add_form' %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> <!-- /#breadcrumbs --> > > <div class="main container-fluid"> >@@ -239,29 +247,30 @@ > </div> <!-- /.tab-content --> > </div> <!-- /#icons --> > [% END # /IF action_add_category %] >- </fieldset> >- > <fieldset class="action"> > <input type="hidden" name="id" value="[% av.id | html %]" /> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a class="cancel" href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=[% category_name | url %]">Cancel</a> > </fieldset> >+ </fieldset> >+ > </form> > [% END # /IF op == 'add_form' %] > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a id="addcat" class="btn btn-default" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form"><i class="fa fa-plus"> </i> New category</a> >+ <div> >+ <a id="addcat" class="toolbar-btn" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form"><i class="fa fa-plus"> </i> New category</a> > [% IF ( searchfield ) %] >- <a id="addauth" class="btn btn-default" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&category=[% category.category_name | url %]"><i class="fa fa-plus"> </i> New authorized value for [% category.category_name | html %]</a> >+ <a class="toolbar-btn" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&category=[% category.category_name | url %]"><i class="fa fa-plus"> </i> New authorized value for [% category.category_name | html %]</a> > [% END %] >- </div> >+ </div></div> > > [% IF ( searchfield ) %] >- <h1>Authorized values for category [% category.category_name | html %]</h1> >+ <h2>Authorized values for category [% category.category_name | html %]</h2> > [% PROCESS category_descriptions code_category = category.category_name %] > [% ELSE %] >- <h1>Authorized values</h1> >+ <h2>Authorized values</h2> > [% END %] > > [% IF ( searchfield ) %] >@@ -304,8 +313,8 @@ > [% END # /FOR m IN messages %] > > [% IF ( searchfield ) %] >- > <form action="/cgi-bin/koha/admin/authorised_values.pl" method="get" id="category"> >+ <fieldset> > <p> > <label for="category_search">Show category: </label> > <select name="searchfield" id="category_search"> >@@ -318,8 +327,10 @@ > [% END %] > </select> > </p> >+ </fieldset> > </form> <!-- /#category --> > >+ <fieldset id="searchresults"> > [% IF loop %] > <table id="categoriest" class="authorized_values_table"> > <thead> >@@ -383,9 +394,10 @@ > [% END %] > </div> > [% END # /IF loop %] >+ </fieldset> > > [% ELSE # category was selected %] >- >+ <fieldset> > <table id="categoriest" class="authorized_values_table"> > <thead> > <tr> >@@ -408,7 +420,7 @@ > [% END # /FOR c %] > </tbody> > </table> <!-- /#categoriest --> >- >+ </fieldset> > [% END # /IF ( searchfield )%] > > [% END # /IF op == 'list' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >index 5df96eda7d..4d1a77448d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF op == 'add_form' %] >@@ -16,8 +19,7 @@ Authority types › Administration › Koha > </head> > > <body id="admin_authtypes" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -58,6 +60,12 @@ Authority types › Administration › Koha > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -133,11 +141,11 @@ Authority types › Administration › Koha > [% END %] > </li> > </ol> >- </fieldset> > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <a class="cancel" href="/cgi-bin/koha/admin/authtypes.pl">Cancel</a> > </fieldset> >+ </fieldset> > </form> > [% END %] > >@@ -163,11 +171,13 @@ Authority types › Administration › Koha > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a id="authtype" class="btn btn-default" href="/cgi-bin/koha/admin/authtypes.pl?op=add_form"><i class="fa fa-plus"></i> New authority type</a> >- </div> >+ <div> >+ <a id="authtype" class="toolbar-btn" href="/cgi-bin/koha/admin/authtypes.pl?op=add_form"><i class="fa fa-plus"></i> New authority type</a> >+ </div></div> > >- <h1>Authority types</h1> >+ <h2>Authority types</h2> > <p>Define authority types, then authority MARC structure in the same way you define itemtypes and bibliographic MARC tag structure. Authority values are managed through plugins</p> >+ <fieldset id="searchresults"> > <table id="authtypes"> > <thead> > <tr> >@@ -217,8 +227,8 @@ Authority types › Administration › Koha > </fieldset> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Export</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> >+ <button type="submit" class="btn btn-default principal">Export</button> >+ <button class="btn btn-link cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > </form> > </div> >@@ -241,8 +251,8 @@ Authority types › Administration › Koha > <div id="importing_[% authority_type.authtypecode | html %]" style="display:none" class="importing"><img src="[% interface | html %]/[% theme | html %]/img/loading-small.gif" alt="" /><span class="importing_msg"></span></div> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Import</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button type="submit" class="btn btn-default principal">Import</button> >+ <button class="btn btn-link cancel" data-dismiss="modal" aria-hidden="true">Close</button> > </div> > </form> > </div> >@@ -254,6 +264,7 @@ Authority types › Administration › Koha > [% END %] > <tbody> > </table> >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt >index 4da24feed3..5936c877b7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt >@@ -3,6 +3,9 @@ > [% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% BLOCK show_job_status %] > [% SWITCH job.status %] > [% CASE "new" %] >@@ -58,8 +61,7 @@ > </head> > > <body id="admin_background_jobs" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -89,6 +91,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -108,7 +116,7 @@ > [% END %] > > [% IF op == 'view' %] >- <h1>Details of job #[% job.id | html %]</h1> >+ <h2>Details of job #[% job.id | html %]</h2> > > [% PROCESS "background_jobs/${job.type}.inc" %] > >@@ -154,8 +162,9 @@ > > [% IF op == 'list' %] > >- <h1>Background jobs</h1> >+ <h2>Background jobs</h2> > >+ <fieldset id="searchresults"> > [% IF jobs.count %] > <table id="table_background_jobs"> > <thead> >@@ -199,6 +208,7 @@ > There are no background jobs yet. > </div> > [% END %] >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >index 6162ebbd07..0b5c601f39 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF op == 'add_form' %] >@@ -16,8 +19,7 @@ MARC frameworks › Administration › Koha > </head> > > <body id="admin_biblio_framework" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -64,6 +66,12 @@ MARC frameworks › Administration › Koha > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -98,12 +106,13 @@ MARC frameworks › Administration › Koha > > [% IF op == 'list'%] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form"><i class="fa fa-plus"></i> New framework</a> >- </div> >+ <div> >+ <a class="toolbar-btn" id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form"><i class="fa fa-plus"></i> New framework</a> >+ </div></div> > [% END %] > > [% IF op == 'add_form' %] >- <h1>[% IF framework %]Modify framework text[% ELSE %]Add framework[% END %]</h1> >+ <h2>[% IF framework %]Modify framework text[% ELSE %]Add framework[% END %]</h2> > <form action="/cgi-bin/koha/admin/biblio_framework.pl" name="Aform" method="post" class="validated"> > <input type="hidden" name="op" value="add_validate" /> > <fieldset class="rows"> >@@ -127,9 +136,9 @@ MARC frameworks › Administration › Koha > <span class="required">Required</span> > </li> > </ol> >- </fieldset> > <fieldset class="action"> >- <input type="submit" value="Submit" class="submit" /> >+ <input type="submit" value="Submit" class="principal" /> >+ </fieldset> > </fieldset> > </form> > [% END %] >@@ -158,8 +167,9 @@ MARC frameworks › Administration › Koha > [% END %] > > [% IF op == 'list' %] >-<h1>MARC frameworks</h1> >+<h2>MARC frameworks</h2> > >+<fieldset id="searchresults"> > <table id="table_biblio_frameworks"> > <thead> > <tr> >@@ -202,8 +212,8 @@ MARC frameworks › Administration › Koha > </fieldset> > </div> <!-- /.modal-body --> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Export</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> >+ <button type="submit" class="btn btn-default principal">Export</button> >+ <button class="btn btn-link cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> <!-- /.modal-footer --> > </form> <!-- /.form_export --> > </div> <!-- /.modal-content --> >@@ -226,8 +236,8 @@ MARC frameworks › Administration › Koha > <div id="importing_default" style="display:none" class="importing"><img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /><span class="importing_msg"></span></div> > </div> <!-- /.modal-body --> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Import</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button type="submit" class="btn btn-default principal">Import</button> >+ <button class="btn btn-link cancel" data-dismiss="modal" aria-hidden="true">Close</button> > </div> <!-- /.modal-footer --> > </form> <!-- /.form_export --> > </div> <!-- /.modal-content --> >@@ -242,7 +252,7 @@ MARC frameworks › Administration › Koha > <td>[% loo.frameworktext | html %]</td> > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="frameworkactions[% loo.frameworkcode | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode | html %]"> >@@ -272,8 +282,8 @@ MARC frameworks › Administration › Koha > </fieldset> > </div> <!-- /.modal-body --> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Export</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> >+ <button type="submit" class="btn btn-default principal">Export</button> >+ <button class="btn btn-link cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> <!-- /.modal-footer --> > </form> <!-- /.form_export --> > </div> <!-- /.modal-content --> >@@ -296,8 +306,8 @@ MARC frameworks › Administration › Koha > <div id="importing_[% loo.frameworkcode | html %]" style="display:none" class="importing"><img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /><span class="importing_msg"></span></div> > </div> <!-- /.modal-body --> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default" title="[% loo.frameworkcode | html %]">Import</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button type="submit" class="btn btn-default principal" title="[% loo.frameworkcode | html %]">Import</button> >+ <button class="btn btn-link cancel" data-dismiss="modal" aria-hidden="true">Close</button> > </div> <!-- /.modal-footer --> > </form> <!-- /.form_export --> > </div> <!-- /.modal-content --> >@@ -308,6 +318,7 @@ MARC frameworks › Administration › Koha > > [% END %] > </table> >+</fieldset> > > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >index 801eeb7795..b9ff8a75cc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >@@ -2,6 +2,10 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Library checkin and transfer policy › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -9,13 +13,12 @@ > </head> > > <body id="admin_branch_transfer_limits" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -27,13 +30,14 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Library [% branchcode | html %] - [% Branches.GetName( branchcode ) | html %] Checkin and transfer policy</h1> >+<h2>Library [% branchcode | html %] - [% Branches.GetName( branchcode ) | html %] Checkin and transfer policy</h2> > <form method="get" action="/cgi-bin/koha/admin/branch_transfer_limits.pl" id="selectlibrary"> > <label for="branchselect">Select a library :</label> > <select name="branchcode" id="branchselect"> >@@ -42,6 +46,7 @@ > </form> > > <p class="help">Check the boxes for the libraries you allow your items to be transferred to.</p> >+ > <fieldset> > [% IF ( limitType == 'ccode' ) %]<strong>For all collection codes: </strong>[% ELSE %]<strong>For all item types: </strong>[% END %] > <a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a> >@@ -99,7 +104,7 @@ > <fieldset class="action"> > <input type="hidden" name="updateLimits" value="1" /> > <input type="hidden" name="branchcode" value="[% branchcode | html %]" /> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a class="cancel" href="/cgi-bin/koha/admin/admin-home.pl">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index 638ac9a36b..e7c146de4f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -2,6 +2,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% USE TablesSettings %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >@@ -18,13 +21,12 @@ Libraries › Administration › Koha > </head> > > <body id="admin_branches" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -77,6 +79,7 @@ Libraries › Administration › Koha > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -129,17 +132,18 @@ Libraries › Administration › Koha > > [% IF op == 'list' || op == 'view' %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> New library</a> >+ <a class="btn btn-default toolbar-btn" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> New library</a> > [% IF op == 'view' && library %] >- <a class="btn btn-default" id="editbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form&branchcode=[% library.branchcode | uri %]"><i class="fa fa-pencil"></i> Edit library</a> >+ <a class="btn btn-default toolbar-btn" id="editbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form&branchcode=[% library.branchcode | uri %]"><i class="fa fa-pencil"></i> Edit library</a> > [% END %] > </div> > [% END %] > >+<fieeldset id="searchresults"> > [% IF op == 'add_form' %] >- <h1>[% IF library %]Modify library[% ELSE %]New library[% END %]</h1> >+ <h2>[% IF library %]Modify library[% ELSE %]New library[% END %]</h2> > <form action="/cgi-bin/koha/admin/branches.pl" id="Aform" name="Aform" class="validated" method="post"> >- <fieldset class="rows"> >+ <fieldset> > <input type="hidden" name="op" value="add_validate" /> > [% IF library %] > <input type="hidden" name="is_a_modif" value="1" /> >@@ -168,7 +172,7 @@ Libraries › Administration › Koha > </ol> > </fieldset> > [% IF categories %] >- <fieldset class="rows"><legend>Group(s):</legend> >+ <fieldset><legend>Group(s):</legend> > <ol> > [% FOREACH category IN categories %] > <li> >@@ -184,7 +188,7 @@ Libraries › Administration › Koha > </ol> > </fieldset> > [% END %] >- <fieldset class="rows"> >+ <fieldset> > <ol> > <li><label for="branchaddress1">Address line 1: </label><input type="text" name="branchaddress1" id="branchaddress1" size="60" value="[% library.branchaddress1 | html %]" /></li> > <li><label for="branchaddress2">Address line 2: </label><input type="text" name="branchaddress2" id="branchaddress2" size="60" value="[% library.branchaddress2 | html %]" /></li> >@@ -293,7 +297,7 @@ Libraries › Administration › Koha > </ol> > </fieldset> > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a> > </fieldset> > </form> >@@ -302,7 +306,7 @@ Libraries › Administration › Koha > [% IF op == 'delete_confirm' and not ( items_count or patrons_count )%] > <div class="dialog alert"> > <form action="/cgi-bin/koha/admin/branches.pl" method="post"> >- <h1>Are you sure you want to delete [% library.branchname | html %] ([% library.branchcode | html %])?</h1> >+ <h2>Are you sure you want to delete [% library.branchname | html %] ([% library.branchcode | html %])?</h2> > <input type="hidden" name="op" value="delete_confirmed" /> > <input type="hidden" name="branchcode" value="[% library.branchcode | html %]" /> > <input type="hidden" name="branchname" value="[% library.branchname | html %]"> >@@ -315,7 +319,7 @@ Libraries › Administration › Koha > [% END %] > > [% IF op == 'list' %] >- <h1>Libraries</h1> >+ <h2>Libraries</h2> > [% IF libraries_count > 0 %] > <table id="libraries"> > <thead> >@@ -336,6 +340,7 @@ Libraries › Administration › Koha > <div class="dialog message">There are no libraries defined. <a href="/cgi-bin/koha/admin/branches.pl?op=add_form">Start defining libraries</a>.</div> > [% END %] > [% END %] >+</fieldset> > > [% IF op == 'view' && library %] > <h1>[% library.branchname | html %]</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >index 193685c792..14abed7018 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >@@ -3,6 +3,9 @@ > [% USE Branches %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF op == 'add_form' %] >@@ -18,13 +21,12 @@ Cash registers › Administration › Koha > </head> > > <body id="admin_cash_registers" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -66,6 +68,7 @@ Cash registers › Administration › Koha > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -152,7 +155,7 @@ Cash registers › Administration › Koha > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newcashregister" href="/cgi-bin/koha/admin/cash_registers.pl?op=add_form"><i class="fa fa-plus"></i> New cash register</a> >+ <a class="btn btn-default toolbar-btn" id="newcashregister" href="/cgi-bin/koha/admin/cash_registers.pl?op=add_form"><i class="fa fa-plus"></i> New cash register</a> > </div> > > <h1>Cash registers</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >index 8f9a736e5e..287b77a5d8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >@@ -6,6 +6,9 @@ > [% USE Price %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patrons-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode | html %]'[% ELSE %]New category[% END %][% END %] > [% IF op == 'delete_confirm' %][% IF ( patrons_in_category > 0 ) %]Cannot delete: category [% categorycode | html %] in use[% ELSE %]Confirm deletion of category '[% categorycode | html %]'[% END %][% END %] › Patron categories › Administration › Koha >@@ -15,13 +18,12 @@ > </head> > > <body id="admin_categorie" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patrons-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -85,6 +87,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -119,9 +122,9 @@ > <input type="hidden" name="op" value="add_validate" /> > <input type="hidden" name="checked" value="0" /> > [% IF category %] >- <h1>Modify category [% categorycode | html %]</h1> >+ <h2>Modify category [% categorycode | html %]</h2> > [% ELSE %] >- <h1>New category</h1> >+ <h2>New category</h2> > [% END %] > <fieldset class="rows"> > <ol> >@@ -143,9 +146,8 @@ > <span class="required">Required</span> > </li> > <li> >- <span class="label">Enrollment period: </span> > <fieldset> >- <legend>Choose one</legend> >+ <legend>Enrollment period</legend> > <ol> > <li> > <label for="enrolmentperiod">In months: </label> >@@ -422,7 +424,6 @@ > <div class="hint">If <i>Yes</i>, holds placed by patrons of this category will not be given priority</div> > </li> > </ol> >- </fieldset> > > [% IF ( EnhancedMessagingPreferences ) %] > <fieldset class="rows"> >@@ -431,9 +432,10 @@ > </fieldset> > [% END %] > <fieldset class="action"> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a href="/cgi-bin/koha/admin/categories.pl" class="cancel">Cancel</a> > </fieldset> >+ </fieldset> > </form> > [% END %] > >@@ -522,10 +524,12 @@ > [% IF op == 'list' %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newcategory" href="/cgi-bin/koha/admin/categories.pl?op=add_form"><i class="fa fa-plus"></i> New category</a> >- </div> >+ <div> >+ <a class="toolbar-btn" id="newcategory" href="/cgi-bin/koha/admin/categories.pl?op=add_form"><i class="fa fa-plus"></i> New category</a> >+ </div></div> > > <h1>Patron categories</h1> >+ <fieldset id="searchresults"> > [% IF searchfield %] > You searched for [% searchfield | html %]</span> > [% END %] >@@ -698,6 +702,7 @@ > [% ELSE %] > <div class="dialog alert">No categories have been defined. <a href="/cgi-bin/koha/admin/categories.pl?op=add_form">Create a new category</a>.</div> > [% END %] >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >index 8ee016c4b9..0c118f336a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >@@ -1,19 +1,21 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>MARC check > [% IF ( total ) %] :[% total | html %] errors found[% ELSE %] : Configuration OK![% END %] › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="admin_checkmarc" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -30,13 +32,14 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>MARC bibliographic framework test</h1> >+<h2>MARC bibliographic framework test</h2> > <table> > <tr> > <th>Test</th> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index 032f6fe9cb..5c955edc1a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cities-admin-search.inc' %] >+[% END %] > [% USE TablesSettings %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >@@ -19,13 +22,12 @@ > </head> > > <body id="admin_cities" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cities-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -64,6 +66,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -95,9 +98,9 @@ > > [% IF op == 'add_form' %] > [% IF city %] >- <h1>Modify a city</h1> >+ <h2>Modify a city</h2> > [% ELSE %] >- <h1>New city</h1> >+ <h2>New city</h2> > [% END %] > > <form action="/cgi-bin/koha/admin/cities.pl" name="Aform" method="post" class="validated"> >@@ -126,12 +129,12 @@ > <input type="text" name="city_country" id="city_country" size="80" maxlength="100" value="[% city.city_country | html %]" /> > </li> > </ol> >- </fieldset> >- > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <a class="cancel" href="/cgi-bin/koha/admin/cities.pl">Cancel</a> > </fieldset> >+ </fieldset> >+ > </form> > [% END %] > >@@ -169,14 +172,16 @@ > [% IF op == 'list' %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newcity" href="/cgi-bin/koha/admin/cities.pl?op=add_form"><i class="fa fa-plus"></i> New city</a> >- </div> >+ <div> >+ <a class="toolbar-btn" id="newcity" href="/cgi-bin/koha/admin/cities.pl?op=add_form"><i class="fa fa-plus"></i> New city</a> >+ </div></div> > > <h1>Cities</h1> > [% IF city_name_filter %] > Searching: [% city_name_filter | html %] > [% END %] > >+ <fieldset id="searchresults"> > [% IF cities_count > 0 %] > <div class="table_cities_table_controls"></div> > <table id="table_cities"> >@@ -196,6 +201,7 @@ > There are no cities defined. <a href="/cgi-bin/koha/admin/cities.pl?op=add_form">Create a new city</a>. > </div> > [% END %] >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >index b2fbe881bd..0372b8b49c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF op == 'add_source' %] >@@ -33,13 +36,12 @@ Classification sources › Administration › Koha > </head> > > <body id="admin_classsources" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -97,6 +99,7 @@ Classification sources › Administration › Koha > > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -151,9 +154,9 @@ Classification sources › Administration › Koha > > [% IF op == 'add_source' %] > [% IF class_source %] >-<h1>Modify classification source</h1> >+<h2>Modify classification source</h2> > [% ELSE %] >-<h1>Add classification source</h1> >+<h2>Add classification source</h2> > [% END %] > <form action="[% script_name | html %]" name="Aform" class="validated" method="post"> > <input type="hidden" name="op" value="add_source_validate" /> >@@ -205,19 +208,19 @@ Classification sources › Administration › Koha > <span class="required">Required</span> > </li> > </ol> >- </fieldset> > <fieldset class="action"> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a> > </fieldset> >+ </fieldset> > </form> > [% END %] > > [% IF op == 'add_sort_rule' %] > [% IF sort_rule %] >-<h1>Modify filing rule</h1> >+<h2>Modify filing rule</h2> > [% ELSE %] >-<h1>Add filing rule</h1> >+<h2>Add filing rule</h2> > [% END %] > <form action="[% script_name | html %]" name="Aform" class="validated" method="post"> > <input type="hidden" name="op" value="add_sort_rule_validate" /> >@@ -251,19 +254,19 @@ Classification sources › Administration › Koha > <span class="required">Required</span> > </li> > </ol> >- </fieldset> > <fieldset class="action"> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a> >+ </fieldset> > </fieldset> > </form> > [% END %] > > [% IF op == 'add_split_rule' %] > [% IF split_rule %] >-<h1>Modify splitting rule</h1> >+<h2>Modify splitting rule</h2> > [% ELSE %] >-<h1>Add splitting rule</h1> >+<h2>Add splitting rule</h2> > [% END %] > <form action="[% script_name | html %]" name="Aform" class="validated" method="post"> > <input type="hidden" name="op" value="add_split_rule_validate" /> >@@ -280,11 +283,13 @@ Classification sources › Administration › Koha > <span class="required">Required</span> > [% END %] > </li> >- <li><label for="description" class="required">Description: </label> >+ <li> >+ <label for="description" class="required">Description: </label> > <input class="required" required="required" type="text" id="description" name="description" size="50" maxlength="250" value="[% split_rule.description | html %]" /> > <span class="required">Required</span> > </li> >- <li><label for="split_routine" class="required">Splitting routine: </label> >+ <li> >+ <label for="split_routine" class="required">Splitting routine: </label> > <select class="required" required="required" id="split_routine" name="split_routine"> > [% FOREACH routine_name IN split_routines %] > [% IF routine_name == split_rule.split_routine %] >@@ -325,22 +330,23 @@ Classification sources › Administration › Koha > </div> > </li> > </ol> >- </fieldset> > <fieldset class="action"> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a> > </fieldset> >+ </fieldset> > </form> > [% END %] > > [% IF op == 'list' %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newsource" href="[% script_name | url %]?op=add_source"><i class="fa fa-plus"></i> New classification source</a> >- <a class="btn btn-default" id="newrule" href="[% script_name | url %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a> >- <a class="btn btn-default" id="newrule" href="[% script_name | url %]?op=add_split_rule"><i class="fa fa-plus"></i> New splitting rule</a> >+ <a class="btn btn-default toolbar-btn" id="newsource" href="[% script_name | url %]?op=add_source"><i class="fa fa-plus"></i> New classification source</a> >+ <a class="btn btn-default toolbar-btn" id="newrule" href="[% script_name | url %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a> >+ <a class="btn btn-default toolbar-btn" id="newrule" href="[% script_name | url %]?op=add_split_rule"><i class="fa fa-plus"></i> New splitting rule</a> > </div> > <h1>Classification configuration</h1> >+<fieldset> > <h2>Classification sources</h2> > <table> > <tr> >@@ -365,8 +371,10 @@ Classification sources › Administration › Koha > </tr> > [% END %] > </table> >+</fieldset> > >-<h2>Classification filing rules</h2> >+<fieldset> >+<h3>Classification filing rules</h3> > <table> > <tr> > <th>Code</th> >@@ -386,8 +394,10 @@ Classification sources › Administration › Koha > </tr> > [% END %] > </table> >+</fieldset> > >-<h2>Classification splitting rules</h2> >+<fieldset> >+<h3>Classification splitting rules</h3> > <table> > <tr> > <th>Code</th> >@@ -407,6 +417,7 @@ Classification sources › Administration › Koha > </tr> > [% END %] > </table> >+</fieldset> > > > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >index f6dafcb936..2da27d88bf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >@@ -2,18 +2,20 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Clone circulation and fine rules › Circulation and fine rules › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="admin_clone-rules" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -28,6 +30,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >index 1a02339635..7787156d1d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% SET panel_id = 0 %] > [% BLOCK pagelist %] > [% IF module.keys and module.keys.size > 0 %] >@@ -143,7 +146,7 @@ > </div> > [% END %] > <fieldset class="action"> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > </fieldset> > [% ELSE %] > There is no table to configure for this module. >@@ -177,12 +180,11 @@ > > <body id="admin_tables" class="admin"> > >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'prefs-admin-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -194,6 +196,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >index ff878f994f..a005647ca5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF op =='add_form' %] >@@ -19,13 +22,12 @@ > </head> > > <body id="admin_credit_types" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -54,6 +56,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -79,9 +82,9 @@ > > [% IF op == 'add_form' %] > [% IF credit_type %] >- <h1>Modify a credit type</h1> >+ <h2>Modify a credit type</h2> > [% ELSE %] >- <h1>New credit type</h1> >+ <h2>New credit type</h2> > [% END %] > > <form action="/cgi-bin/koha/admin/credit_types.pl" name="Aform" method="post" class="validated"> >@@ -143,21 +146,23 @@ > [% END %] > </li> > </ol> >- </fieldset> >- > <fieldset class="action"> >- <button id="save_credit_type" class="btn btn-default">Save</button> >+ <button id="save_credit_type" class="btn btn-default principal">Save</button> > <a class="cancel" href="/cgi-bin/koha/admin/credit_types.pl">Cancel</a> > </fieldset> >+ </fieldset> >+ > </form> > [% END %] > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newcredittype" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form"><i class="fa fa-plus"></i> New credit type</a> >- </div> >+ <div> >+ <a class="toolbar-btn" id="newcredittype" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form"><i class="fa fa-plus"></i> New credit type</a> >+ </div></div> > >- <h1>Account credit types</h1> >+ <h2>Account credit types</h2> >+ <fieldset id="searchresults"> > [% IF credit_types.count %] > <table id="table_credit_types"> > <thead> >@@ -218,6 +223,7 @@ > <a href="/cgi-bin/koha/admin/credit_types.pl?op=add_form">Create new credit type</a> > </div> > [% END %] >+ </fieldset> > [% END %] > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >index 60990b452e..68e7a5b69d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -4,6 +4,9 @@ > [% USE TablesSettings %] > [% USE HtmlTags %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'currencies-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF op == 'add_form' %][% IF currency %]Modify currency '[% currency.currency | html %]'[% ELSE %]New currency[% END %][% END %] > [% IF op == 'delete_confirm' %]Confirm deletion of currency '[% currency.currency | html %]'[% END %] >@@ -13,13 +16,12 @@ > </head> > > <body id="admin_currency" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'currencies-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -56,6 +58,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -64,8 +67,9 @@ > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form"><i class="fa fa-plus"></i> New currency</a> >-</div> >+<div> >+ <a class="toolbar-btn" id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form"><i class="fa fa-plus"></i> New currency</a> >+</div></div> > [% END %] > > [% FOR m IN messages %] >@@ -149,12 +153,12 @@ > <span id="hint" class="hint"></span> > </li> > </ol> >- </fieldset> >- > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input class="principal" type="submit" value="Submit" /> > <a href="/cgi-bin/koha/admin/currency.pl" class="cancel">Cancel</a> > </fieldset> >+ </fieldset> >+ > </form> > > [% END %] >@@ -162,7 +166,7 @@ > [% IF op =='delete_confirm' %] > [% IF nb_of_orders or nb_of_vendors %] > <div class="dialog alert"> >- <h1>Cannot delete currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</h1> >+ <h2>Cannot delete currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</h2> > <p> > [% IF nb_of_orders %] > <span>This currency is used by [% nb_of_orders | html %] orders.</span> >@@ -186,6 +190,7 @@ > <td>[% currency.rate | html %]</td> > </tr> > </table> >+ > <form action="/cgi-bin/koha/admin/currency.pl" method="post"> > <input type="hidden" name="op" value="delete_confirmed" /> > <input type="hidden" name="currency_code" value="[% currency.currency | html %]" /> >@@ -200,7 +205,7 @@ > > [% IF op == 'list' %] > >-<h1>Currencies and exchange rates</h1> >+<h2>Currencies and exchange rates</h2> > > [% IF currencies and no_active_currency %] > <div class="dialog alert"><h3>No active currency is defined</h3><p>Please edit one currency and mark it as active.</p></div> >@@ -210,6 +215,8 @@ > You searched for [% searchfield | html %]</span> > [% END %] > >+ <fieldset id="searchresults"> >+ > <table id='currencies-table'> > <thead> > <tr> >@@ -241,6 +248,7 @@ > [% END %] > </tbody> > </table> >+ </fieldset> > > <br /> > <div class="hint"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt >index ddd960ed26..5ada23c0a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt >@@ -3,6 +3,9 @@ > [% USE Branches %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF op =='add_form' %] >@@ -17,13 +20,12 @@ > </head> > > <body id="admin_debit_types" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -52,6 +54,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -77,9 +80,9 @@ > > [% IF op == 'add_form' %] > [% IF debit_type %] >- <h1>Modify a debit type</h1> >+ <h2>Modify a debit type</h2> > [% ELSE %] >- <h1>New debit type</h1> >+ <h2>New debit type</h2> > [% END %] > > <form action="/cgi-bin/koha/admin/debit_types.pl" name="Aform" method="post" class="validated"> >@@ -134,21 +137,23 @@ > <div class="hint">Select 'All libraries' if this debit type should be available at all libraries. Otherwise select libraries you want to associate debit type with.</div> > </li> > </ol> >- </fieldset> >- > <fieldset class="action"> >- <button id="save_debit_type" class="btn btn-default">Save</button> >+ <button id="save_debit_type" class="btn btn-default principal">Save</button> > <a class="cancel" href="/cgi-bin/koha/admin/debit_types.pl">Cancel</a> > </fieldset> >+ </fieldset> >+ > </form> > [% END %] > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newdebittype" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form"><i class="fa fa-plus"></i> New debit type</a> >- </div> >+ <div> >+ <a class="toolbar-btn" id="newdebittype" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form"><i class="fa fa-plus"></i> New debit type</a> >+ </div></div> > >- <h1>Account debit types</h1> >+ <h2>Account debit types</h2> >+ <fieldset id="searchresults"> > [% IF debit_types.count %] > <table id="table_debit_types"> > <thead> >@@ -214,6 +219,7 @@ > There are no account debit types defined. <a href="/cgi-bin/koha/admin/debit_types.pl?op=add_form">Create new debit type</a> > </div> > [% END %] >+ </fieldset> > [% END %] > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >index c6e955fc81..61d00779f8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >@@ -2,6 +2,9 @@ > [% USE Branches %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'desks-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF op =='add_form' %] >@@ -19,13 +22,12 @@ > </head> > > <body id="admin_desks" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'desks-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -64,6 +66,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -170,7 +173,7 @@ > [% IF op == 'list' %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newdesk" href="/cgi-bin/koha/admin/desks.pl?op=add_form"><i class="fa fa-plus"></i> New desk</a> >+ <a class="btn btn-default toolbar-btn" id="newdesk" href="/cgi-bin/koha/admin/desks.pl?op=add_form"><i class="fa fa-plus"></i> New desk</a> > </div> > > <h1>Desks</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >index 0d48c25b8b..4d4c09511e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >@@ -34,7 +34,7 @@ > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -46,6 +46,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >index 4e37967413..428ded6239 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >@@ -2,6 +2,9 @@ > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF acct_form %] >@@ -17,13 +20,12 @@ EDI accounts › Administration › Koha > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="admin_edi_acct" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -66,6 +68,7 @@ EDI accounts › Administration › Koha > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -80,12 +83,9 @@ EDI accounts › Administration › Koha > [% END %] > > [% IF display %] >- <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newediacct" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form"> >- <i class="fa fa-plus"></i> >- New account >- </a> >- </div> >+ <div id="toolbar" class="btn-toolbar"><div> >+ <a class="toolbar-btn" id="newediacct" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form"><i class="fa fa-plus"></i> New account</a> >+ </div></div> > [% END %] > > [% IF acct_form %] >@@ -260,18 +260,18 @@ EDI accounts › Administration › Koha > </div> > </li> > </ol> >- </fieldset> >- > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <a href="/cgi-bin/koha/admin/edi_accounts.pl" class="cancel">Cancel</a> > </fieldset> >+ >+ </fieldset> > </form> > > [% END %] > [% IF delete_confirm %] > <div class="dialog alert"> >-<h1>Delete this account?</h1> >+<h2>Delete this account?</h2> > <table> > <tr> > <th>Vendor</th> >@@ -299,8 +299,10 @@ EDI accounts › Administration › Koha > </div> > [% END %] > [% IF display %] >+<fieldset id="searchresults"> > [% IF ( ediaccounts ) %] >-<h1>Vendor EDI accounts</h1> >+<h2>Vendor EDI accounts</h2> >+ > > <table> > <tr> >@@ -380,6 +382,7 @@ EDI accounts › Administration › Koha > There are no EDI accounts. > </div> > [% END %] >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt >index 53e94fa47f..7b1eb0cb64 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ean_form %] >@@ -16,13 +19,12 @@ Library EANs › Administration › Koha > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="admin_edi_ean" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -61,6 +63,7 @@ Library EANs › Administration › Koha > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -68,12 +71,9 @@ Library EANs › Administration › Koha > <main> > > [% IF display %] >- <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newediean" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form"> >- <i class="fa fa-plus"></i> >- New EAN >- </a> >- </div> >+ <div id="toolbar" class="btn-toolbar"><div> >+ <a class="toolbar-btn" id="newediean" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form"><i class="fa fa-plus"></i> New EAN</a> >+ </div></div> > [% END %] > > [% IF ean_form %] >@@ -134,18 +134,18 @@ Library EANs › Administration › Koha > </select> > </li> > </ol> >- </fieldset> >- > <fieldset class="action"> >- <input type="submit" value="Submit"/> >+ <input type="submit" class="principal" value="Submit"/> > <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl" class="cancel">Cancel</a> > </fieldset> >+ </fieldset> >+ > </form> > [% END %] > > [% IF delete_confirm %] > <div class="dialog alert"> >-<h1>Delete EAN [% ean.ean | html %] for [% ean.branch.branchname | html %]?</h1> >+<h2>Delete EAN [% ean.ean | html %] for [% ean.branch.branchname | html %]?</h2> > <form action="/cgi-bin/koha/admin/edi_ean_accounts.pl" method="post"> > <input type="hidden" name="op" value="delete_confirmed" /> > <input type="hidden" name="id" value="[% ean.id | html %]" /> >@@ -158,7 +158,7 @@ Library EANs › Administration › Koha > [% END %] > > [% IF display %] >- <h1>Library EANs</h1> >+ <fieldset id="searchresults"> > [% IF ( eans ) %] > <table> > <tr> >@@ -196,6 +196,7 @@ Library EANs › Administration › Koha > There are no library EANs. > </div> > [% END %] >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >index e8b4943d63..54ecf56db1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Item circulation alerts › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -45,13 +48,12 @@ > </head> > > <body id="admin_item_circulation_alerts" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -63,6 +65,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -70,7 +73,7 @@ > <main> > <div class="row"> > <div class="col-sm-6"> >-<h1>Item circulation alerts</h1> >+<h2>Item circulation alerts</h2> > <h2>Select a library:</h2> > <form id="branch_selector" method="get" action="/cgi-bin/koha/admin/item_circulation_alerts.pl"> > <select id="branch" name="branch"> >@@ -107,7 +110,8 @@ > </div> <!-- /.col-sm-6 --> > </div> <!-- /.row --> > >- <h2>Circulation alerts for [% Branches.GetName( branch ) || 'Default' | html %]</h2> >+ <fieldset> >+ <h3>Circulation alerts for [% Branches.GetName( branch ) || 'Default' | html %]</h3> > <p>Click on the grid to toggle the settings.</p> > > >@@ -168,8 +172,8 @@ > </div> > </div> <!-- /.tab-content --> > >- </div> <!-- /#alerttabs --> >- >+ </div> <!-- /#alerttabs --></div> >+ </fieldset> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt >index a5a0e009fe..a71ddb6ef1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt >@@ -1,19 +1,21 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Item search fields › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="admin_itemssearchfields" class="admin"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'prefs-admin-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -38,6 +40,7 @@ > [% END %] > </ol> > </nav> >+ [% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >index e8e089c7de..03da8a7944 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Item search fields › Administration › Koha</title> >@@ -8,13 +11,12 @@ > </head> > > <body id="admin_itemssearchfields" class="admin"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'prefs-admin-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -26,6 +28,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -33,8 +36,9 @@ > <main> > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> New search field</a> >- </div> >+ <div> >+ <a class="toolbar-btn" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> New search field</a> >+ </div></div> > > [% IF field_added %] > <div class="dialog message"> >@@ -66,7 +70,9 @@ > [% END %] > [% IF fields.size %] > <div id="search_fields_list"> >- <h1>Item search fields</h1> >+ <h2>Item search fields</h2> >+ >+ <fieldset id="searchresults"> > > <table id="search_fields_table"> > <thead> >@@ -95,9 +101,9 @@ > [% END %] > </tbody> > </table> >- </div> >+ </fieldset></div> > [% ELSE %] >- <h1>Item search fields</h1> >+ <h2>Item search fields</h2> > <div class="dialog message"> > There are no item search fields defined. > </div> >@@ -108,11 +114,11 @@ > <legend><h1>Add a new field</h1></legend> > [% INCLUDE 'admin-items-search-field-form.inc' field=undef %] > <input type="hidden" name="op" value="add" /> >- </fieldset> > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" value="Submit" class="principal" /> > <a href="#" class="cancel hide_form">Cancel</a> > </fieldset> >+ </fieldset> > </form> > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >index 1066a8cd2d..2667076f09 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -6,6 +6,9 @@ > [% USE Price %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF op == 'add_form' %] >@@ -47,13 +50,12 @@ Item types › Administration › Koha > </head> > > <body id="admin_itemtypes" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -117,6 +119,7 @@ Item types › Administration › Koha > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -124,8 +127,9 @@ Item types › Administration › Koha > <main> > > [% IF op == 'list' %]<div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="fa fa-plus"></i> New item type</a> >-</div>[% END %] >+<div> >+ <a class="toolbar-btn" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="fa fa-plus"></i> New item type</a> >+</div></div>[% END %] > > [% FOREACH m IN messages %] > <div class="dialog [% m.type | html %]"> >@@ -152,7 +156,6 @@ Item types › Administration › Koha > </div> > [% END %] > >- > [% IF op == 'add_form' %] > [% IF itemtype %] > <h1>Modify item type</h1> >@@ -426,18 +429,20 @@ Item types › Administration › Koha > <div class="hint"><strong><a href="[856u]">open site</a></strong> will show the link just below the title</div> > </li> > </ol> >- </fieldset> >- >- <fieldset class="action"> >- <input type="submit" value="Save changes" /> >+ <fieldset class="action"> >+ <input type="submit" class="principal" value="Save changes" /> > <a href="/cgi-bin/koha/admin/itemtypes.pl" class="cancel">Cancel</a> > </fieldset> >+ </fieldset> >+ >+ > </form> > [% END %] > > [% IF op == 'delete_confirm' %] > <div class="dialog alert"> > <h1>Delete item type '[% itemtype.itemtype | html %]'?</h1> >+ <fieldset> > <table> > <tr> > <th scope="row">Item type</th> >@@ -455,18 +460,19 @@ Item types › Administration › Koha > [% END %] > <tr><th scope="row">Rental charge</th><td>[% itemtype.rentalcharge | $Price %]</td></tr> > </table> >+ </fieldset> > <form action="/cgi-bin/koha/admin/itemtypes.pl" method="post"> > <input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="itemtype" value="[% itemtype.itemtype | html %]" /> > <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this item type</button> > </form> > <form action="/cgi-bin/koha/admin/itemtypes.pl" method="post"> > <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button> >- </form> >- </div> >+ </form></div> > [% END %] > > [% IF op == 'list' %] > <h1>Item types administration</h1> >+<fieldset> > [% IF itemtypes %] > <table id="table_item_type"> > <thead> >@@ -594,6 +600,7 @@ Item types › Administration › Koha > [% ELSE %] > <div class="dialog message">There are no itemtypes defined</div> > [% END %] >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >index c3aa75586e..ccfce1f39c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >@@ -1,19 +1,21 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha to MARC mapping › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="admin_koha2marclinks" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -23,13 +25,14 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Koha to MARC mapping</h1> >+<h2>Koha to MARC mapping</h2> > <br/> > <div class="dialog message">If you make any change to the mappings, you must ask your administrator to run misc/batchRebuildBiblioTables.pl.</div> > <form action="/cgi-bin/koha/admin/koha2marclinks.pl" method="post" id="koha2marc"> >@@ -38,6 +41,7 @@ > <div class="dialog alert">Failed to add mapping for [% error_info | html %]</div> > [% END %] > >+<fieldset id="searchresults"> > <table id="kohafields"> > <thead><tr> > <th>Koha field</th> >@@ -64,6 +68,7 @@ > [% END %] > </tbody> > </table> >+</fieldset> > > <input id="remove_field" name="remove_field" type="hidden" value=""/> > <input id="add_field" name="add_field" type="hidden" value=""/> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >index 9686e1b9c4..826eddbba0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE KohaSpan %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Library groups › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -9,13 +12,12 @@ > </head> > > <body id="admin_library_groups" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -25,6 +27,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > [% FOR m IN messages %] > <div class="dialog [% m.type | html %]"> >@@ -66,13 +69,13 @@ > > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a id="add-group-root" class="btn btn-default add-group" href="#"> >+ <a id="add-group-root" class="btn btn-default add-group toolbar-btn" href="#"> > <i class="fa fa-plus"></i> Add group > </a> > </div> > </div> > >- <h1>Library groups</h1> >+ <h2>Library groups</h2> > > [% FOREACH root_group IN root_groups %] > <table class="library-groups"> >@@ -104,7 +107,7 @@ > <h3 id="add-group-modal-label">Add group</h3> > </div> > <div class="modal-body"> >- <fieldset class="rows"> >+ <fieldset> > <input type="hidden" id="add-group-modal-parent-id" name="parent_id" value="" /> > <input type="hidden" id="add-group-modal-action" name="action" value="add"> > <ol> >@@ -151,7 +154,7 @@ > </div> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Save</button> >+ <button type="submit" class="btn btn-default principal">Save</button> > <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a> > </div> > </div> >@@ -169,7 +172,7 @@ > <div class="modal-body"> > <input type="hidden" id="edit-group-modal-id" name="id" value="" /> > <input type="hidden" id="edit-group-modal-action" name="action" value="edit" /> >- <fieldset class="rows"> >+ <fieldset> > <ol> > <li> > <label for="edit-group-modal-title">Title: </label> >@@ -215,7 +218,7 @@ > </div> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Update</button> >+ <button type="submit" class="btn btn-default principal">Update</button> > <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a> > </div> > </div> >@@ -236,7 +239,7 @@ > Are you sure you want to delete <span id="delete-group-modal-title" class="name"></span>? > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> Delete</button> >+ <button type="submit" class="btn btn-danger principal"><i class="fa fa-trash"></i> Delete</button> > <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > </div> >@@ -257,7 +260,7 @@ > Are you sure you want to remove <span id="remove-library-modal-library" class="name"></span> from <span id="remove-library-modal-group" class="name"></span>? > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> Remove</button> >+ <button type="submit" class="btn btn-danger principal"><i class="fa fa-trash"></i> Remove</button> > <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt >index 348686ddad..19d53c2834 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% USE Koha %] > [% USE KohaSpan %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -15,13 +18,12 @@ > > </head> > <body id="admin_marc-overlay-rules" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -33,12 +35,13 @@ > </li> > </ol> > </nav> >+ [% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > >- <h1>Manage MARC overlay rules</h1> >+ <h2>Manage MARC overlay rules</h2> > > [% FOR m IN messages %] > <div class="dialog [% m.type | html %]"> >@@ -70,7 +73,7 @@ > <button type="button" class="approve" id="doremove"><i class="fa fa-fw fa-check"></i> Yes, remove</button> > </div> > [% END %] >- >+ <fieldset id="searchresults"> > <form action="/cgi-bin/koha/admin/marc-overlay-rules.pl" method="POST" id="marc-overlay-rules-form"> > <table id="marc-overlay-rules"> > <thead><tr> >@@ -134,7 +137,7 @@ > </select> > </th> > <th><button class="btn btn-default btn-xs" title="Add" id="add"><i class="fa fa-plus"></i> Add rule</button></th> >- <th><button id="btn_batchremove" disabled="disabled" class="btn btn-default btn-xs" title="Batch remove"><i class="fa fa-trash"></i> Delete selected</button></th> >+ <th><button id="btn_batchremove" disabled="disabled" class=" btn btn-default btn-xs " title="Batch remove"><i class="fa fa-trash"></i> Delete selected</button></th> > </tr> > </tfoot> > [% END %] >@@ -250,6 +253,7 @@ > </tbody> > </table> > </form> >+ </fieldset> > > <form action="/cgi-bin/koha/admin/marc-overlay-rules.pl" method="post"> > <input type="hidden" name="op" value="redo-matching" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >index 0ee1b7d199..316e6ff2a9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [%- IF ( add_form ) -%] >@@ -36,13 +39,12 @@ > </head> > > <body id="admin_marc_subfields_structure" class="admin"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'prefs-admin-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -104,6 +106,7 @@ > [% END %] > </ol> > </nav> <!-- /#breadcrumbs --> >+ [% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -111,13 +114,13 @@ > <main> > > [% IF ( add_form ) %] >- <h1> >+ <h2> > [% IF ( use_heading_flags_p ) %] > [% IF ( heading_edit_subfields_p ) %]<span>Tag</span> [% tagfield | html %] <span>Subfield constraints</span>[% END %] > [% ELSE %] > [% action | html %] > [% END %] >- </h1> >+ </h2> > > <form action="[% script_name | html %]" name="Aform" method="post"> > <input type="hidden" name="op" value="add_validate" /> >@@ -136,6 +139,7 @@ > [% END %][% END %] > > <div id="subfieldtabs" class="toptabs numbered"> >+ <fieldset> > <ul class="nav nav-tabs" role="tablist"> > [% FOREACH loo IN loop %] > <li id="tab_subfield_[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]" class="tab-item" role="presentation"> >@@ -155,8 +159,8 @@ > [% FOREACH loo IN loop %] > <div class="constraints tab-pane" role="tabpanel" id="sub[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]field"> > <div id="basic[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]" class="contraints"> >- <fieldset class="rows"> >- <legend>Basic constraints</legend> >+ <fieldset> >+ <h3>Basic constraints</h3> > <ol> > [% IF ( subfieldcode == 0 || subfieldcode ) %] > <li> >@@ -228,8 +232,8 @@ > </div> <!-- /#basic[%- PROCESS outputsubfield subfieldanchor = subfieldcode -%] --> > > <div id="advanced[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]" class="contraints"> >- <fieldset class="rows"> >- <legend>Advanced constraints</legend> >+ <fieldset> >+ <h3>Advanced constraints</h3> > <ol> > <li> > <label for="defaultvalue[% loo.row | html %]">Default value:</label> >@@ -291,8 +295,8 @@ > </div> <!-- /#advanced[%- PROCESS outputsubfield subfieldanchor = subfieldcode -%] --> > > <div id="oth[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]" class="constraints"> >- <fieldset class="rows"> >- <legend>Other options (choose one)</legend> >+ <fieldset> >+ <h3>Other options (choose one)</h3> > <ol> > <li> > <label for="authorised_value[% loo.row | html %]">Authorized value:</label> >@@ -337,17 +341,16 @@ > </div><!-- /constraints --> > [% END # /FOREACH loo %] > </div> <!-- /.tab-content --> >- </div><!-- /subfieldtabs --> > >- <fieldset class="action"> >- <input type="submit" value="Save changes" /> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | uri %]" class="cancel">Cancel</a> >+ <input type="submit" class="principal" value="Save changes" /> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | uri %]" class="cancel">Cancel</a> > </fieldset> >+ </div><!-- /subfieldtabs --> > </form> > [% END # /IF ( add_form ) %] > > [% IF ( delete_confirm ) %] > <div class="dialog alert"> >- <h1>Confirm deletion of subfield [% mss.tagsubfield | html %]?</h1> >+ <h3>Confirm deletion of subfield [% mss.tagsubfield | html %]?</h3> > <p>Subfield: [% mss.tagsubfield | html %]</p> > <p>Description: [% mss.liblibrarian | html_entity %]</p> > >@@ -369,11 +372,12 @@ > [% END # /IF ( delete_confirm ) %] > > [% IF ( else ) %] >- <h1>MARC subfield structure admin for [% tagfield | html %] [% IF ( frameworkcode ) %](framework [% frameworkcode | html %])[% ELSE %](default framework)[% END %]</h1> >+ <h2>MARC subfield structure admin for [% tagfield | html %] [% IF ( frameworkcode ) %](framework [% frameworkcode | html %])[% ELSE %](default framework)[% END %]</h2> > > <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.</p> > <p>The column 'Koha field' shows that the subfield is linked with a Koha field.</p> > >+ <fieldset> > <table id="table_marcsubfieldstructure"> > <thead> > <tr> >@@ -420,12 +424,13 @@ > [% END %] > </tbody> > </table> <!-- /#table_marcsubfieldstructure --> >+ </fieldset> > > <form action="[% script_name | html %]" method="get"> > <fieldset class="action"><input type="hidden" name="op" value="add_form" /> > <input type="hidden" name="tagfield" value="[% edit_tagfield | html %]" /> > <input type="hidden" name="frameworkcode" value="[% edit_frameworkcode | html %]" /> >- <input type="submit" value="Edit subfields" /> >+ <input type="submit" class="principal" value="Edit subfields" /> > <a class="cancel" href="marctagstructure.pl?searchfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | html %]">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >index 94dd186424..b77317f2da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( add_form ) %] >@@ -22,13 +25,12 @@ MARC frameworks › Administration › Koha > </head> > > <body id="admin_marctagstructure" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -102,6 +104,7 @@ MARC frameworks › Administration › Koha > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -109,24 +112,24 @@ MARC frameworks › Administration › Koha > <main> > > [% IF ( else ) %] >-<div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&frameworkcode=[% framework.frameworkcode | uri %]"><i class="fa fa-plus"></i> New tag</a> >-</div>[% END %] >+<div id="toolbar" class="btn-toolbar"><div> >+ <a class="toolbar-btn" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&frameworkcode=[% framework.frameworkcode | uri %]"><i class="fa fa-plus"></i> New tag</a> >+</div></div>[% END %] > >-<h1>MARC Framework for [% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]default MARC framework[% END %]</h1> >+<h2>MARC Framework for [% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]default MARC framework[% END %]</h2> > > [% IF ( add_form ) %] > > <form action="[% script_name | html %]" name="Aform" method="post" class="validated"> > > <fieldset class="rows"> >- <legend> >+ <h3> > [% IF heading_add_tag_p %] > <span>Add tag</span> > [% ELSE %] > <span>Modify tag</span> <input type="hidden" name="modif" value="1" />[% searchfield | html %] > [% END %] >- </legend> >+ </h3> > <input type="hidden" name="op" value="add_validate" /> > <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode | html %]" /> > <ol> >@@ -176,9 +179,8 @@ MARC frameworks › Administration › Koha > [% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => authorised_value ) %] > </select> > (if you select a value here, the indicators will be limited to the authorized value list)</li> >-</ol></fieldset> >- <fieldset class="action"> >- <input type="submit" value="Save changes" /> >+</ol> >+ <input type="submit" value="Save changes" class="principal"/> > <a class="cancel" href="[% script_name | url %]?frameworkcode=[% framework.frameworkcode | uri %]">Cancel</a> > </fieldset> > </form> >@@ -221,7 +223,7 @@ MARC frameworks › Administration › Koha > <option value="[% fw.frameworkcode | html %]">[% fw.frameworktext | html %]</option> > [% END %] > </select> >- <input type="submit" value="OK" /> >+ <input type="submit" value="OK" class="principal"/> > </form> > [% END %] > >@@ -243,7 +245,7 @@ MARC frameworks › Administration › Koha > [% END %] > [% END %] > </select> >- <input type="submit" value="Search" /> >+ <input type="submit" value="Search" class="principal"/> > <p> <label for="select_display">Display only used tags/subfields</label> > [% IF ( select_display ) %] > <input type="checkbox" name="select_display" id="select_display" value="True" checked="checked" /> >@@ -253,6 +255,7 @@ MARC frameworks › Administration › Koha > </fieldset> > </form> > >+<fieldset id="searchresults"> > <table id="table_marctagstructure"> > <thead> > <tr> >@@ -290,7 +293,7 @@ MARC frameworks › Administration › Koha > <td>[% loo.ind2_defaultvalue | html %]</td> > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield | html %]"> > <li><a href="?op=add_form&searchfield=[% loo.tagfield | uri %]&frameworkcode=[% framework.frameworkcode | uri %]"><i class="fa fa-pencil"></i> Edit tag</a></li> >@@ -304,6 +307,7 @@ MARC frameworks › Administration › Koha > [% END %] > </tbody> > </table> >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >index f9da8b684e..12d9abf161 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >@@ -59,8 +59,10 @@ > </style> > </head> > <body id="admin_matching-rules" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% form = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] >+[% INCLUDE 'header.inc' form=form %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -105,6 +107,8 @@ > </ol> > </nav> <!-- /#breadcrumbs --> > >+[% INCLUDE 'shortcut.inc' %] >+ > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >index 08bc96de1e..38f4416223 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >@@ -1,19 +1,21 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>OAI set mappings › OAI sets › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="admin_oai_set_mappings" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -26,6 +28,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >index 657284fd2e..7fdce2b6e6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( op_new ) %] >@@ -11,13 +14,12 @@ > </head> > > <body id="admin_oai_sets" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -52,6 +54,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -61,10 +64,10 @@ > [% IF ( op_new || op_mod ) %] > <form method="post" action="/cgi-bin/koha/admin/oai_sets.pl" class="validated"> > [% IF ( op_new ) %] >- <h1>Add a new OAI set</h1> >+ <h2>Add a new OAI set</h2> > <input type="hidden" name="op" value="savenew" /> > [% ELSIF ( op_mod ) %] >- <h1>Edit OAI set '[% spec | html %]'</h1> >+ <h2>Edit OAI set '[% spec | html %]'</h2> > <input type="hidden" name="op" value="savemod" /> > <input type="hidden" name="id" value="[% id | html %]" /> > [% END %] >@@ -90,19 +93,22 @@ > <li id="adddescription"><span class="label"> </span><a href="#" class="add_description"><i class="fa fa-fw fa-plus"></i> Add description</a></li> > > </ol> >- </fieldset> > <fieldset class="action"> >- <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a> >+ <input type="submit" class="principal" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/oai_sets.pl">Cancel</a> >+ </fieldset> > </fieldset> > </form> > [% ELSE %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newoaiset" href="/cgi-bin/koha/admin/oai_sets.pl?op=new"><i class="fa fa-plus"></i> New set</a> >- </div> >+ <div> >+ <a class="toolbar-btn" id="newoaiset" href="/cgi-bin/koha/admin/oai_sets.pl?op=new"><i class="fa fa-plus"></i> New set</a> >+ </div></div> > >- <h1>OAI sets</h1> >+ <h2>OAI sets</h2> > [% IF sets_loop %] >+ <div> >+ <fieldset id="searchresults"> > <table> > <thead> > <tr> >@@ -143,6 +149,8 @@ > [% END %] > </tbody> > </table> >+ </fieldset> >+ </div> > [% ELSE %] > <div class="dialog message"><p>There are no sets defined.</p></div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >index 63deb0a6f7..8e312e2aea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >@@ -3,6 +3,9 @@ > [% USE Branches %] > [% USE HtmlTags %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>OverDrive library authnames › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -10,13 +13,12 @@ > > <body id="admin_overdrive" class="admin"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -26,6 +28,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >index 6733c3a663..ea813ead0f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >@@ -5,6 +5,9 @@ > [% USE Branches %] > [% USE scalar %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( attribute_type_form ) %] >@@ -22,13 +25,12 @@ Patron attribute types › Administration › Koha > </head> > > <body id="admin_patron-attr-types" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -67,6 +69,7 @@ Patron attribute types › Administration › Koha > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -79,9 +82,9 @@ Patron attribute types › Administration › Koha > > [% IF ( attribute_type_form ) %] > [% IF ( edit_attribute_type ) %] >-<h1>Modify patron attribute type</h1> >+<h2>Modify patron attribute type</h2> > [% ELSE %] >-<h1>Add patron attribute type</h1> >+<h2>Add patron attribute type</h2> > [% END %] > [% IF ( duplicate_code_error ) %] > <div class="dialog message">Could not add patron attribute type "[% duplicate_code_error | html %]" >@@ -241,17 +244,17 @@ Patron attribute types › Administration › Koha > </div> > </li> > </ol> >- </fieldset> > <fieldset class="action"> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a class="cancel" href="/cgi-bin/koha/admin/patron-attr-types.pl">Cancel</a> > </fieldset> >+ </fieldset> > </form> > [% END %] > > [% IF ( delete_attribute_type_form ) %] > <div class="dialog alert"> >- <h1>Confirm deletion of patron attribute type <span class="ex">'[% code | html %]' ([% description | html %])</span>?</h1> >+ <h2>Confirm deletion of patron attribute type <span class="ex">'[% code | html %]' ([% description | html %])</span>?</h2> > <form action="[% script_name | html %]" name="Aform" method="post"> > <input type="hidden" name="op" value="[% confirm_op | html %]" /> > <input type="hidden" name="code" value="[% code | html %]" /> >@@ -266,10 +269,12 @@ Patron attribute types › Administration › Koha > [% IF ( display_list ) %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newrule" href="[% script_name | url %]?op=add_attribute_type"><i class="fa fa-plus"></i> New patron attribute type</a> >-</div> >+<div> >+ <a class="toolbar-btn" id="newrule" href="[% script_name | url %]?op=add_attribute_type"><i class="fa fa-plus"></i> New patron attribute type</a> >+</div></div> >+ > >-<h1>Patron attribute types</h1> >+<h2>Patron attribute types</h2> > [% IF ( added_attribute_type ) %] > <div class="dialog message">Added patron attribute type "[% added_attribute_type | html %]"</div> > [% END %] >@@ -288,6 +293,7 @@ Patron attribute types › Administration › Koha > — it was already absent from the database.</div> > [% END %] > [% IF ( available_attribute_types ) %] >+<fieldset id="searchresults"> > [% FOREACH attribute IN available_attribute_types %] > [% IF attribute.class %] > <h4>[% attribute.lib | html %]</h4> >@@ -350,6 +356,7 @@ Patron attribute types › Administration › Koha > [% END %] > [% ELSE %] > <p>There are no saved patron attribute types.</p> >+</fieldset> > [% END %] > > <div class="pages">[% pagination_bar | $raw %]</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >index 9a7b9acefc..416889d870 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -4,6 +4,9 @@ > [% USE Koha %] > [% USE HtmlId %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>System preferences › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -14,13 +17,12 @@ > [% Asset.css("lib/codemirror/lint.min.css") | $raw %] > </head> > <body id="admin_preferences" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -32,6 +34,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -55,7 +58,7 @@ > <div class="prefs-tab"> > <h2>[% TAB.tab_title | html %] preferences</h2> > <form action="/cgi-bin/koha/admin/preferences.pl" method="post"> >- [% UNLESS ( searchfield ) %]<div id="toolbar"><button class="save-all submit" type="submit">Save all [% TAB.tab_title | html %] preferences</button></div>[% END %] >+ [% UNLESS ( searchfield ) %]<div id="toolbar"><button class="save-all submit principal" type="submit">Save all [% TAB.tab_title | html %] preferences</button></div>[% END %] > <input type="hidden" name="op" value="save" /> > <input type="hidden" name="tab" value="[% TAB.tab_id | html %]" /> > >@@ -197,7 +200,7 @@ > [% IF ( loop.last ) %]</tbody></table>[% END %] > [% END %] > [% END %] >- <fieldset class="action"><button class="save-all submit" type="submit">Save all [% TAB.tab_title | html %] preferences</button> <a href="/cgi-bin/koha/admin/preferences.pl" class="force_reload cancel">Cancel</a></fieldset> >+ <fieldset class="action"><button class="save-all submit principal" type="submit">Save all [% TAB.tab_title | html %] preferences</button> <a href="/cgi-bin/koha/admin/preferences.pl" class="force_reload cancel">Cancel</a></fieldset> > </form> > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >index 05f3da43d2..7fc9d48517 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >@@ -13,8 +13,10 @@ a.add, a.delete { > </head> > > <body id="admin_searchengine_mappings" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] >+[% INCLUDE 'header.inc' form = formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -31,6 +33,7 @@ a.add, a.delete { > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > [% INCLUDE 'blocking_errors.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt >index c6f8d95257..4495692935 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Share content with Mana KB › Administration › Koha</title> >@@ -8,13 +11,12 @@ > </head> > > <body id="admin_share_content" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -26,11 +28,12 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> >- <div class="col-sm-6"> >+ <div class="col-sm-12"> > [% IF result.code != 201 && result.msg %] > <div class="dialog alert" role="alert"> > [% result.msg | html %] >@@ -102,7 +105,7 @@ > </ol> > <fieldset class="action"> > <input type="hidden" name="op" value="save" /> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > </fieldset> > </fieldset> > </form> >@@ -126,7 +129,7 @@ > </ol> > <fieldset class="action"> > <input type="hidden" name="op" value="reset" /> >- <input type="submit" value="Reset your token" /> >+ <input type="submit" class="principal" value="Reset your token" /> > </fieldset> > </fieldset> > </form> >@@ -146,7 +149,7 @@ > </ol> > <fieldset class="action"> > <input type="hidden" name="op" value="send" /> >- <input type="submit" value="Send to Mana KB" /> >+ <input type="submit" class="principal" value="Send to Mana KB" /> > </fieldset> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >index 249cec02dc..e463ec7026 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >@@ -8,6 +8,9 @@ > [% USE CirculationRules %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > > [% SET branchcode = humanbranch || undef %] > >@@ -29,13 +32,12 @@ > </head> > > <body id="admin_smart-rules" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -47,19 +49,20 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1 class="parameters"> >+ <h2 class="parameters"> > [% IF humanbranch %] > Defining circulation and fine rules for "[% Branches.GetName( humanbranch ) | html %]" > [% ELSE %] > Defining circulation and fine rules for all libraries > [% END %] >- </h1> >+ </h2> > <div class="help"> > <p>The rules are applied from most specific to less specific, using the first found in this order:</p> > <ul> >@@ -94,12 +97,13 @@ > <select name="tobranch" id="tobranch"> > [% PROCESS options_for_libraries libraries => Branches.all( unfiltered => 1 ) %] > </select> >- <input type="submit" id="clone_rules" value="Clone" /> >+ <input type="submit" id="clone_rules" class="principal" value="Clone" /> > </form> > [% END %] > [% END %] > > <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >+ <fieldset> > <input type="hidden" name="op" value="add" /> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> > <table id="default-circulation-rules"> >@@ -421,7 +425,7 @@ > </td> > <td class="actions"> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> >- <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button> >+ <button type="submit" class="btn btn-default btn-xs" ><i class="fa fa-save"></i> Save</button> > <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button> > </td> > <td><input type="text" name="note" id="note" size="15" value="" maxlength="100"></td> >@@ -582,12 +586,14 @@ > </tfoot> > </tbody> > </table> >+ </fieldset> > </form> > </div> > <div id="defaults-for-this-library" class="container"> > <h3>Default checkout, hold and return policy[% IF humanbranch %] for [% Branches.GetName( humanbranch ) | html %][% END %]</h3> > <p>You can set a default maximum number of checkouts, hold policy and return policy that will be used if none is defined below for a particular item type or category.</p> > <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >+ <fieldset> > <input type="hidden" name="op" value="set-branch-defaults" /> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> > <table> >@@ -761,7 +767,7 @@ > [% END %] > </td> > </tr> >- </table> >+ </table></fieldset> > </form> > </div> > [% IF ( show_branch_cat_rule_form ) %] >@@ -774,6 +780,7 @@ > no limit applies, except possibly for a limit you define for a specific item type. > </p> > <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >+ <fieldset> > <input type="hidden" name="op" value="add-branch-cat" /> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> > <table> >@@ -840,7 +847,7 @@ > <td><input name="max_holds" size="3" type="text" /></td> > <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td> > </tr> >- </table> >+ </table></fieldset> > </form> > </div> > [% END %] >@@ -854,6 +861,7 @@ > [% END %] > <p>Specify the maximum number simultaneous current article requests a patron of a given category can have.</p> > <form id="set-article-requests-daily-limit" method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >+ <fieldset> > <input type="hidden" name="op" value="add-open-article-requests-limit" /> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> > <table> >@@ -896,7 +904,7 @@ > <td><input name="open_article_requests_limit" size="3" type="text" /></td> > <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td> > </tr> >- </table> >+ </table></fieldset> > </form> > </div> > <div id="article-request-fee-category" class="container"> >@@ -907,6 +915,7 @@ > [% END %] > <p>Specify the article request fee for a given patron category.</p> > <form id="set-article-request-fee" method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >+ <fieldset> > <input type="hidden" name="op" value="set-article-request-fee" /> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> > <table> >@@ -954,7 +963,7 @@ > <td><input name="article_request_fee" size="3" type="text" /></td> > <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td> > </tr> >- </table> >+ </table></fieldset> > </form> > </div> > >@@ -969,6 +978,7 @@ > <p>Specify the default policy for lost item fees on return. > </p> > <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >+ <fieldset> > <input type="hidden" name="op" value="mod-refund-lost-item-fee-rule" /> > <input type="hidden" name="branch" value="[% current_branch | html %]" /> > <table> >@@ -1060,7 +1070,7 @@ > </td> > </td> > </tr> >- </table> >+ </table></fieldset> > </form> > </div> > >@@ -1085,6 +1095,7 @@ > </p> > > <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >+ <fieldset> > <input type="hidden" name="op" value="add-branch-item" /> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> > <table> >@@ -1192,7 +1203,7 @@ > </td> > <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</button></td> > </tr> >- </table> >+ </table></fieldset> > </form> > </div> > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >index 8650cef0f3..700e55e202 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >@@ -1,19 +1,21 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>SMS cellular providers › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="admin_sms_providers" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -25,6 +27,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -32,7 +35,7 @@ > <main> > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="new_provider" href="#"><i class="fa fa-plus"></i> New SMS provider</a> >+ <a class="btn btn-default toolbar-btn" id="new_provider" href="#"><i class="fa fa-plus"></i> New SMS provider</a> > </div> > > <h1>SMS cellular providers</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >index ae78a07dad..71f3465024 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF op == 'add_form' %] >@@ -13,13 +16,12 @@ > </head> > > <body id="admin_smtp_servers" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -54,6 +56,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -135,11 +138,11 @@ > <span>Enables additional debug output in the logs</span> > </li> > </ol> >- </fieldset> > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <a class="cancel" href="/cgi-bin/koha/admin/smtp_servers.pl">Cancel</a> > </fieldset> >+ </fieldset> > </form> > [% END %] > >@@ -217,19 +220,19 @@ > </select> > </li> > </ol> >- </fieldset> > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <a class="cancel" href="/cgi-bin/koha/admin/smtp_servers.pl">Cancel</a> > </fieldset> >+ </fieldset> > </form> > [% END %] > > [% IF op == 'list' %] > >- <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="new_smtp_server" href="/cgi-bin/koha/admin/smtp_servers.pl?op=add_form"><i class="fa fa-plus"></i> New SMTP server</a> >- </div> >+ <div id="toolbar" class="btn-toolbar"><div> >+ <a class="toolbar-btn" id="new_smtp_server" href="/cgi-bin/koha/admin/smtp_servers.pl?op=add_form"><i class="fa fa-plus"></i> New SMTP server</a> >+ </div></div> > > <h1>SMTP servers</h1> > >@@ -246,6 +249,7 @@ > </div> > > [% IF servers_count > 0 %] >+ <fieldset id="searchresults"> > <table id="smtp_servers"> > <thead> > <tr> >@@ -259,6 +263,7 @@ > </tr> > </thead> > </table> >+ </fieldset> > [% END %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >index 956d21e066..285fc99f54 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( add_form ) %] >@@ -26,13 +29,12 @@ > </head> > > <body id="admin_systempreferences" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -98,6 +100,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -207,17 +210,17 @@ > <label for="value-no" class="yesno">OFF</label> > [% END %] > </li> >- </ol></fieldset> >- <fieldset class="action"><input type="submit" value="Save" /> >+ </ol> >+ <fieldset class="action"><input type="submit" class="principal" value="Save" /> > [% IF ( return_tab ) %] > <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl?tab=[% return_tab | html %]">Cancel</a> > [% ELSE %] > <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl">Cancel</a> > [% END %] >- </fieldset> >+ </fieldset></fieldset> > > <fieldset class="brief"> >- <legend>Koha internal</legend> >+ <h3>Koha internal</h3> > <div class="hint">Note: change the variable type to one of the dropdown values as needed</div> > <ol> > <li><label for="preftype">Variable type:</label> >@@ -322,14 +325,18 @@ > [% IF ( else ) %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newstopword" href="[% script_name | url %]?op=add_form"><i class="fa fa-plus"></i> New preference</a> >+ <div> >+ <a class="toolbar-btn" id="newstopword" href="[% script_name | url %]?op=add_form"><i class="fa fa-plus"></i> New preference</a> >+ </div> > </div> > > [% IF ( tab != 'local_use' ) %] > <p>Please click on one of the tabs at the left side of this form.</p> >+ <fieldset id="searchresults"> > <table> > [% ELSE %] >- <h1>Local use preferences</h1> >+ <h2>Local use preferences</h2> >+ <fieldset id="searchresults"> > <table width="80%" id="sysprefst"> > <thead><tr> > <th>Preference</th> >@@ -337,6 +344,7 @@ > <th>Value</th> > <th class="noExport">Actions</th> > </tr></thead> >+ > [% END %] > <tbody>[% FOREACH loo IN loop %] > <tr> >@@ -454,6 +462,7 @@ > </tr> > [% END %]</tbody> > </table> >+ </fieldset> > > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt >index 595f2d841a..be9ce0582d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt >@@ -6,6 +6,9 @@ > [% USE ItemTypes %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Library checkin and transfer policy › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -16,13 +19,12 @@ > [% SET branches = Branches.all %] > > <body id="admin_branch_transfer_limits" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -33,12 +35,13 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> >- <h1>Checkin and transfer policy</h1> >+ <h2>Checkin and transfer policy</h2> > > <p> > [% IF BranchTransferLimitsType == "itemtype" %] >@@ -68,7 +71,7 @@ > </p> > > <p class="help">Check the boxes for the libraries you allow your items to be transferred to.</p> >- <fieldset> >+ <fieldset class="rows"> > <a id="check-all" class="limit-action" href="#"><i class="fa fa-check"></i> Check all</a> > | > <a id="uncheck-all" class="limit-action" href="#"><i class="fa fa-remove"></i> Uncheck all</a> >@@ -84,7 +87,7 @@ > <td> </td> > [% FOREACH to IN branches %] > <td> >- <p><a class="btn btn-default btn-xs check-all-col limit-action" data-to="[% to.branchcode | html %]" href="#"><i class="fa fa-check"></i> Check</a></p> >+ <p><a class="btn btn-default btn-xs check-all-col limit-action" data-to="[% to.branchcode | html %]" href="#"<i class="fa fa-check"></i> Check</a></p> > <p><a class="btn btn-default btn-xs uncheck-all-col limit-action" data-to="[% to.branchcode | html %]" href="#"><i class="fa fa-remove"></i> Uncheck</a></p> > </td> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >index 4d3a813fc2..45b90f2a23 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Transport cost matrix › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -13,13 +16,12 @@ > </head> > > <body id="admin_transport_cost_matrix" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -31,15 +33,16 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1 class="parameters"> >+ <h2 class="parameters"> > Defining transport costs between libraries >- </h1> >+ </h2> > [% IF ( WARNING_transport_cost_matrix_off ) %] > <div class="dialog message">Because the "UseTransportCostMatrix" system preference is currently not enabled, the transport cost matrix is not being used. <br/>Go to the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=UseTransportCostMatrix">UseTransportCostMatrix</a> system preference if you wish to enable this feature.</div> > [% END %] >@@ -94,9 +97,9 @@ > </tr> > [% END %] > </table> >- </fieldset> > <fieldset class="action"> >- <input type="submit" value="Save" class="submit" /> <a href="/cgi-bin/koha/admin/transport-cost-matrix.pl" class="cancel">Cancel</a> >+ <input type="submit" value="Save" class="principal" /> <a href="/cgi-bin/koha/admin/transport-cost-matrix.pl" class="cancel">Cancel</a> >+ </fieldset> > </fieldset> > </form> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >index 6d84ea4d51..86ae4329b9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Price %] >@@ -11,13 +14,12 @@ > </head> > > <body id="admin_usage_statistics" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -29,6 +31,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -63,7 +66,7 @@ > [% END %] > > <form id="category_form" action="/cgi-bin/koha/admin/usage_statistics.pl" method="post"> >- <h1>Modify the statistics you share with the Koha community</h1> >+ <h2>Modify the statistics you share with the Koha community</h2> > <div class="row"> > <div class="col-xs-12 col-sm-6"> > <fieldset class="rows"> >@@ -204,7 +207,7 @@ > > <li id="libraries_info"> > <fieldset class="rows"> >- <legend>Libraries</legend> >+ <h3>Libraries</h3> > <ol> > [% FOR l IN libraries %] > <li> >@@ -245,7 +248,7 @@ > > <fieldset class="action"> > <input type="hidden" name="op" value="update" /> >- <input type="submit" value="Update your statistics usage" /> >+ <input type="submit" class="principal" value="Update your statistics usage" /> > <a class="cancel" href="/cgi-bin/koha/admin/usage_statistics.pl">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index 8e783b298a..3402ec6c93 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'z3950-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > > [% BLOCK ServerType %] >@@ -24,13 +27,12 @@ > </head> > > <body id="admin_z3950servers" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'z3950-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >@@ -66,6 +68,7 @@ > > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -86,13 +89,13 @@ > <form action="[% script_name | html %]" name="Aform" method="post" id="serverentry"> > <input type="hidden" name="op" value="add_validated" /> > <input type="hidden" name="servertype" value="[% server.servertype||type||'zed' | html %]"/> >+ <fieldset class="rows"> > [% IF op == 'edit' %] >- <h1>Modify [% PROCESS ServerType %] server</h1> >+ <h3>Modify [% PROCESS ServerType %] server</h3> > <input type="hidden" name="id" value="[% server.id | html %]" /> > [% ELSE %] >- <h1>New [% PROCESS ServerType %] server</h1> >+ <h3>New [% PROCESS ServerType %] server</h3> > [% END %] >- <fieldset class="rows"> > <ol> > <li><label for="name" class="required">Server name: </label> > <input type="text" name="servername" id="servername" size="65" maxlength="100" value="[% server.servername | html %]" required="required" /> <span class="required">Required</span> >@@ -196,16 +199,16 @@ > </li> > > </ol> >+ <fieldset class="action"><input type="submit" class="principal" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/z3950servers.pl">Cancel</a></fieldset> > </fieldset> > >- <fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/z3950servers.pl">Cancel</a></fieldset> > </form> > [% END %] > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a id="newserver" class="btn btn-default" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="fa fa-plus"></i> New Z39.50 server</a> >- <a id="newserver" class="btn btn-default" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="fa fa-plus"></i> New SRU server</a> >+ <a id="newserver" class="btn btn-default toolbar-btn" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="fa fa-plus"></i> New Z39.50 server</a> >+ <a id="newserver" class="btn btn-default toolbar-btn" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="fa fa-plus"></i> New SRU server</a> > </div> > <h1>Z39.50/SRU servers administration</h1> > [% IF id %] >@@ -213,6 +216,7 @@ > [% ELSIF searchfield %] > You searched for [% searchfield | html %] > [% END %] >+ <fieldset id="searchresults"> > <table id="serverst"> > > <thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Preselected</th><th>Rank</th><th>Syntax</th><th>Encoding</th><th>Timeout</th><th>Record type</th><th>Attributes</th><th class="noExport">Actions</th> >@@ -245,6 +249,7 @@ > [% END %] > </tbody> > </table> >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >index 47e135312c..6ca5e99d1f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >@@ -38,7 +38,7 @@ > [% END %] > > [% IF ( different_ip ) %] >-<div id="login_error"><strong>Error: </strong>IP address has changed. Please log in again </div> >+<div id="login_error"><strong>Error: </strong>IP address has changed from '[% oldip %]' to '[% newip %]', please log in again </div> > [% END %] > > [% IF ( wrongip ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >index 11ccc81ad3..cbbea608f7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >@@ -1,17 +1,19 @@ > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'authorities-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Authorities › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="auth_authorities_home" class="auth"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'authorities-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="#" aria-current="page"> >@@ -20,6 +22,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -27,7 +30,7 @@ > > [% INCLUDE 'authorities-toolbar.inc' %] > >- <h1>Authorities</h1> >+ <h2>Authorities</h2> > > <div id="merge_in_progress"></div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >index 548b841aa1..d71c0a3f40 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -254,7 +254,7 @@ > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> >@@ -277,6 +277,7 @@ > [% END %] > </ol> > </nav> <!-- /#breadcrumbs --> >+ [% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -313,19 +314,19 @@ > <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> > > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="#" id="addauth" class="btn btn-default" accesskey="w"><i class="fa fa-save"></i> Save</a></div> >+ <div class="btn-group"><a href="#" id="addauth" class="btn btn-default toolbar-btn principal" accesskey="w"><i class="fa fa-save"></i> Save</a></div> > <div class="btn-group"> > [% IF ( authid ) %] >- <a class="btn btn-default" id="z3950submit" href="#"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a> >+ <a class="btn btn-default toolbar-btn" id="z3950submit" href="#"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a> > [% ELSE %] >- <a class="btn btn-default" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a> >+ <a class="btn btn-default toolbar-btn" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a> > [% END %] > </div> > <div class="btn-group"> > [% IF ( authid ) %] >- <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/authorities/detail.pl?authid=[% authid | url %]">Cancel</a> >+ <a class="btn btn-default cancel" id="cancel" href="/cgi-bin/koha/authorities/detail.pl?authid=[% authid | url %]">Cancel</a> > [% ELSE %] >- <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/authorities/authorities-home.pl">Cancel</a> >+ <a class="btn btn-default cancel" id="cancel" href="/cgi-bin/koha/authorities/authorities-home.pl">Cancel</a> > [% END %] > </div> > <div class="toolbar-tabs-container"> >@@ -363,6 +364,7 @@ > This authority is not used in any records. > [% END %] > </div> >+ <fieldset class="select-libs"> > <div id="authoritytabs" class="toptabs numbered"> > <ul> > [% FOREACH BIG_LOO IN BIG_LOOP %] >@@ -589,6 +591,7 @@ > <input type="hidden" name="tag_mandatory" value="[% hidden_loo.tag_mandatory | html %]" /> > [% END %] > </div> <!-- /.tab --> >+ </fieldset> > [% IF ( oldauthnumtagfield ) %] > <input type="hidden" name="tag" value="[% oldauthnumtagfield | html %]" /> > <input type="hidden" name="subfield" value="[% oldauthnumtagsubfield | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >index bbc1cc892b..b16528226f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'authorities-search.inc' %] >+[% END %] > [% PROCESS 'authorities.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >@@ -18,13 +21,12 @@ > </head> > > <body id="auth_detail" class="auth"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'authorities-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> >@@ -41,6 +43,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -56,11 +59,11 @@ > > > [% IF ( unknownauthid ) %] >- <h1>Authority does not exist</h1> >+ <h2>Authority does not exist</h2> > <div class="dialog message">The authority record you requested does not exist ([% errauthid | html %]).</div> > [% ELSE %] > >- <h1>Authority #[% authid | html %] ([% authtypetext | html %])</h1> >+ <h2>Authority #[% authid | html %] ([% authtypetext | html %])</h2> > > <div id="action"> > [% IF count %] >@@ -121,6 +124,9 @@ > </div> <!-- /.tab-pane --> > [% END # /FOREACH BIG_LOO %] > </div> <!-- /.tab-content --> >+ </fieldset> >+ </div> >+ </div> > </div> <!-- /#authoritiestabs --> > [% END # /IF ( unknownauthid ) %] > </div> <!-- /.col-md-8 col-md-offset-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >index 80e0e71562..05e00159fd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% PROCESS 'merge-record.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'authorities-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Merging records › Cataloging › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -13,13 +16,12 @@ div#result { margin-top: 1em; } > </head> > > <body id="auth_merge" class="cat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'authorities-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> >@@ -31,6 +33,7 @@ div#result { margin-top: 1em; } > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >index c61235dde1..78f1325846 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'authorities-search.inc' %] >+[% END %] > [% PROCESS 'authorities-search-results.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Authority search results › Authorities › Koha</title> >@@ -19,13 +22,12 @@ > </head> > > <body id="auth_searchresultlist" class="auth"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'authorities-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> >@@ -37,6 +39,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >index 5c62dad4f1..f327abc2b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >@@ -40,15 +40,16 @@ > <h1>Your cart</h1> > > <div id="toolbar" class="btn-toolbar"> >+ <div> > [% IF ( verbose ) %] >- <a href="basket.pl" class="btn btn-default showdetails showless"><i class="fa fa-folder"></i> Brief display</a> >+ <a href="basket.pl" class="toolbar-btn showdetails showless"><i class="fa fa-folder"></i> Brief display</a> > [% ELSE %] >- <a href="basket.pl" class="btn btn-default showdetails showmore"><i class="fa fa-folder-open"></i> More details</a> >+ <a href="basket.pl" class="toolbar-btn showdetails showmore"><i class="fa fa-folder-open"></i> More details</a> > [% END %] > >- <a class="btn btn-default" href="basket.pl" id="send_cart"><i class="fa fa-envelope"></i> Send</a> >+ <a class="toolbar-btn" href="basket.pl" id="send_cart"><i class="fa fa-envelope"></i> Send</a> > <div class="btn-group"> >- <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#" id="downloadcart"><i class="fa fa-download"></i> Download <span class="caret"></span> </a> >+ <a class="toolbar-btn dropdown-toggle" data-toggle="dropdown" href="#" id="downloadcart"><i class="fa fa-download"></i> Download <span class="caret"></span> </a> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&bib_list=[% bib_list | uri %]">iso2709</a></li> > <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=ris&bib_list=[% bib_list | uri %]">RIS</a></li> >@@ -58,9 +59,10 @@ > [% END %] > </ul> > </div> >- <a class="btn btn-default" href="basket.pl" id="print_cart"><i class="fa fa-print"></i> Print</a> >- <a class="btn btn-default" href="basket.pl" id="empty_cart"><i class="fa fa-trash"></i> Empty and close</a> >- <a class="btn btn-default close" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a> >+ <a class="toolbar-btn" href="basket.pl" id="print_cart"><i class="fa fa-print"></i> Print</a> >+ <a class="toolbar-btn" href="basket.pl" id="empty_cart"><i class="fa fa-trash"></i> Empty and close</a> >+ <a class="toolbar-btn close" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a> >+ </div> > </div> > > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >index 00e019de88..eebeab70b2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >@@ -2,6 +2,9 @@ > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( unknownbiblionumber ) %] >@@ -14,13 +17,12 @@ > </head> > <body id="catalog_ISBDdetail" class="catalog"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -44,25 +46,26 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1> >+ [% INCLUDE 'cat-toolbar.inc' %] >+ <h2> > [% IF ( unknownbiblionumber ) %] > Unknown record > [% ELSE %] > ISBD details for [% INCLUDE 'biblio-title-head.inc' %] > [% END %] >- </h1> >+ </h2> > > [% IF ( unknownbiblionumber ) %] > <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div> > [% ELSE %] > >- [% INCLUDE 'cat-toolbar.inc' %] > [% IF ( ocoins ) %] > <!-- COinS / OpenURL --> > <span class="Z3988" title="[% ocoins | html %]"></span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >index 1a4ecb6b86..176ec15356 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >@@ -2,6 +2,9 @@ > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( unknownbiblionumber ) %] >@@ -15,13 +18,12 @@ > > <body id="catalog_MARCdetail" class="catalog"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -45,6 +47,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -52,14 +55,14 @@ > <main> > > [% IF ( unknownbiblionumber ) %] >- <h1>Unknown record</h1> >+ <h2>Unknown record</h2> > <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div> > [% ELSE %] > > [% INCLUDE 'cat-toolbar.inc' %] > > [% UNLESS ( popup ) %] >- <h1>MARC record: [% biblionumber | html %] ( [% bibliotitle | html %] )</h1> >+ <h2>MARC record: [% biblionumber | html %] ( [% bibliotitle | html %] )</h2> > [% END %] > > <p><strong>With framework : <select name="Frameworks" id="Frameworks"> >@@ -117,6 +120,7 @@ > [% END %] > > <div id="bibliotabs" class="toptabs"> >+ <fieldset id="searchresults"> > <ul class="nav nav-tabs" role="tablist"> > [% IF ( tab0XX ) %] > <li role="presentation"><a href="#tab0XX" aria-controls="tab0XX" role="tab" data-toggle="tab">0</a></li> >@@ -192,6 +196,7 @@ > </div> > [% END %] > </div> <!-- /.tab-content --> >+ </fieldset> > </div> <!-- /#bibliotabs --> > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >index 29808258d1..77d9ba33b5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -3,6 +3,9 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'adv-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Advanced search › Catalog › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -26,13 +29,12 @@ > [%- END -%] > > <body id="catalog_advsearch" class="catalog"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'adv-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="#" aria-current="page"> >@@ -41,6 +43,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -49,31 +52,31 @@ > <form action="search.pl" method="get"> > <div id="advanced-search"> > <input type="hidden" name="advsearch" value="1"/> >- <h1>Advanced search</h1> >- <p> >- <a href="/cgi-bin/koha/catalogue/itemsearch.pl">Go to item search</a> >- [% IF searchid %] >- <div id="previous_search_link"></div> >- [% END %] >- </p> >+ <h2>Advanced search</h2> > > <!-- SEARCH BUTTONS --> > <div id="toolbar" class="btn-toolbar"> > <fieldset class="action" id="submit1"> > <div class="btn-group"> >- <button class="btn btn-default" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button> >+ <button class="btn btn-default principal" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button> > </div> > <div class="btn-group"> > [% IF ( expanded_options ) %] >- <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="btn btn-link"><i class="fa fa-search-minus"></i> Fewer options</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="btn toolbar-btn"><i class="fa fa-search-minus"></i> Fewer options</a> > </div> > [% ELSE %] >- <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="btn btn-link"><i class="fa fa-search-plus"></i> More options</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="btn toolbar-btn"><i class="fa fa-search-plus"></i> More options</a> > </div> > [% END %] > <div class="btn-group"> >- <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn btn-link"><i class="fa fa-trash"></i> Clear fields</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn toolbar-btn"><i class="fa fa-trash"></i> Clear fields</a> > </div> >+ <div class="btn-group"> >+ <a href="/cgi-bin/koha/catalogue/itemsearch.pl" class="btn btn-default toolbar-btn"><i class="fa fa-search"></i> Go to item search</a> >+ </div> >+ [% IF searchid %] >+ <div id="previous_search_link"></div> >+ [% END %] > </fieldset> <!-- /.action --> > </div> <!-- /#toolbar --> > <!-- /SEARCH BUTTONS --> >@@ -81,7 +84,7 @@ > [% IF ( outer_servers_loop ) %] > <!-- DATABASES --> > <fieldset> >- <legend>Select local databases</legend> >+ <h3>Select local databases</h3> > [% FOREACH local_servers_loo IN local_servers_loop %] > [% IF ( local_servers_loo.checked ) %] > <input type="checkbox" id="[% local_servers_loo.id | html %]" name="[% local_servers_loo.name | html %]" checked="checked" value="[% local_servers_loo.value | html %]" /> >@@ -99,7 +102,7 @@ > [% IF ( outer_servers_loop ) %] > <!-- REMOTE DATABASES --> > <fieldset id="databases"> >- <legend>Select remote databases</legend> >+ <h3>Select remote databases</h3> > [% FOREACH outer_servers_loo IN outer_servers_loop %] > [% IF ( outer_servers_loo.checked ) %] > <input type="checkbox" id="[% outer_servers_loo.id | html %]" name="[% outer_servers_loo.name | html %]" checked="checked" value="[% outer_servers_loo.value | html %]" /> >@@ -116,7 +119,7 @@ > > <!-- BOOLEAN SEARCH OPTIONS --> > <fieldset id="searchterms"> >- <legend>Search for </legend> >+ <h3>Search for </h3> > [% FOREACH query IN queries %] > [% IF ( expanded_options ) %] > [% IF loop.first %] >@@ -178,6 +181,7 @@ > > <!-- MC-TYPE LIMITS --> > <div id="advsearches" class="toptabs"> >+ <fieldset> > <ul class="nav nav-tabs" role="tablist"> > [% FOREACH advsearchloo IN advancedsearchesloop %] > <li role="presentation" id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]"> >@@ -230,13 +234,14 @@ > </div> <!-- /#advsearch-[% advsearchloo.advanced_search_type | html %] --> > [% END # /FOREACH advsearchloo %] > </div> <!-- /.tab-content --> >+ </fieldset> > </div> <!-- /#advsearches --> > <!-- /MC-TYPE LIMIT --> > > [% IF ( expanded_options ) %] > <!-- BASIC LIMITS --> > <fieldset id="basiclimits"> >- <legend>Limits</legend> >+ <h3>Limits</h3> > <fieldset id="pubrange"> > <!-- PUB / COPY YEAR LIMIT --><!-- FIXME: add publication,copyright,acquisition options --> > <p> >@@ -272,10 +277,10 @@ > [% PROCESS 'subtype_limits.inc' %] > <!-- SUBTYPE LIMITS --> > <fieldset id="subtype"> >- <legend>Subtype limits</legend><p> >+ <h3>Subtype limits</h3><p> > [% PROCESS subtype_dropdowns %] > <fieldset id="current_subtype_limits"> >- <legend>Current subtype limits</legend> >+ <h3>Current subtype limits</h3> > [% FOREACH subtype IN ['aud','fic','bio','ctype','l-format'] %] > [% FOREACH limit IN limits.$subtype %] > <span> >@@ -292,7 +297,7 @@ > > <!-- AVAILABILITY LIMITS --> > <fieldset id="availability"> >- <legend>Location and availability</legend> >+ <h3>Location and availability</h3> > <fieldset id="currently-avail"> > [% IF limit_available %] > <p><label for="available-items">Only items currently available:</label> <input type="checkbox" id="available-items" name="limit" value="available" checked="checked" /></p> >@@ -355,7 +360,7 @@ > > <!-- RANK LIMITS --> > <fieldset id="sortby"> >- <legend>Sorting</legend> >+ <h3>Sorting</h3> > <p> > <label for="sort_by">Sort by: </label> > <select id="sort_by" name="sort_by"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 14ac3460a4..997a773cff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -32,6 +32,9 @@ > [% SET plugins_intranet_catalog_biblio_tabs = KohaPlugins.get_plugins_intranet_catalog_biblio_tab({ biblio => biblio, biblio_id => biblionumber }) %] > > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( unknownbiblionumber ) %] >@@ -46,13 +49,12 @@ > > <body id="catalog_detail" class="catalog"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -76,6 +78,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -269,6 +272,7 @@ > </div> > > <div id="bibliodetails" class="toptabs"> >+<fieldset id="searchresults"> > > <ul class="nav nav-tabs" role="tablist"> > [% IF (SeparateHoldings) %] >@@ -1050,6 +1054,7 @@ Note that permanent location is a code, and location may be an authval. > [% END %] > > </div><!-- /tab-content --> >+</fieldset> > </div><!-- /bibliodetails --> > > <div id="export" style="margin-top: 1em;"> >@@ -1062,7 +1067,7 @@ Note that permanent location is a code, and location may be an authval. > <option value="marcxml">MARCXML</option> > <option value="marc8">MARC (non-Unicode/MARC-8)</option> > <option value="utf8">MARC (Unicode/UTF-8)</option> </select> >- <input type="submit" name="save" value="Download record" /></td> >+ <input type="submit" class="principal" name="save" value="Download record" /></td> > </tr> > <tr><td> > <input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="[% biblionumber | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >index 63cbeea4c4..6d8e82c9b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Images › [% INCLUDE 'biblio-title-head.inc' %] › Catalog › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -24,13 +27,12 @@ > > <body id="catalog_imageviewer" class="catalog"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -45,6 +47,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index 7bfb40dd1c..63e6504c96 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -5,6 +5,9 @@ > [% USE Branches %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Checkout history for [% INCLUDE 'biblio-title-head.inc' %] › Catalog › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -12,13 +15,12 @@ > > <body id="catalog_issuehistory" class="catalog"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -33,18 +35,19 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Checkout history for [% INCLUDE 'biblio-title.inc' %]</h1> >+<h2>Checkout history for [% INCLUDE 'biblio-title.inc' %]</h2> > [% IF biblio.author %]<h3>by [% biblio.author | html %]</h3>[% END %] > > [% SET show_patron_column = Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %] > >-<div class="searchresults"> >+<fildset id="searchresults"> > [% IF checkouts %] > <h4>Checked out [% checkouts.size | html %] times</h4> > <table id="table_issues"> >@@ -114,7 +117,7 @@ > <strong>[% biblio.title | html %][% IF biblio.author %], by [% biblio.author | html %][% END %]</strong> has never been checked out.</p></div> > > [% END %] >-</div> >+</fildset> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >index 27521c1635..323045009c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE To %] > [% USE Asset %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'home-search.inc' %] >+[% END %] > [% USE AuthorisedValues %] > > [%- BLOCK form_label -%] >@@ -148,13 +151,12 @@ > </head> > > <body id="catalog_itemsearch" class="catalog"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'home-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -166,22 +168,24 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> > >- <div id="item-search-block"> >- <h1>Item search</h1> >- >- <p><a href="/cgi-bin/koha/catalogue/search.pl">Go to advanced search</a></p> > <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform"> >+ <div id="item-search-block"> >+ <h2>Item search</h2> > <div id="toolbar" class="btn-toolbar"> >- <fieldset class="action"> >- <div class="btn-group"> >- <button class="btn btn-default"><i class="fa fa-search"></i> Search</button> >- </div> >- </fieldset> >+ <div> >+ <div class="btn-group"> >+ <button class="principal" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button> >+ </div> >+ <div class="btn-group"> >+ <a href="/cgi-bin/koha/catalogue/search.pl" class="toolbar-btn"><i class="fa fa-search"></i> Go to advanced search</a> >+ </div> >+ </div> > </div> > <fieldset> > [% INCLUDE form_field_select name="homebranch" options = branches empty_option = "All libraries" %] >@@ -262,13 +266,15 @@ > <input type="radio" id="format-barcodes" name="format" value="barcodes"/> <label for="format-barcodes">Barcodes file</label> > </div> > </fieldset> >- </form> > </div> >+ </form> > </div> > </div> > <div class="row"> > <div class="col-md-12"> >+ <fieldset id="searchresults"> > <div id="results-wrapper"></div> >+ </fieldset> > </div> > </div> > >@@ -433,7 +439,7 @@ > .append(exportButton); > > var results_heading = $('<div>').addClass('results-heading') >- .append("<h1>" + _("Item search results") + "</h1>") >+ .append("<h2>" + _("Item search results") + "</h2>") > .append($('<p>').append(advSearchLink)) > .append($('<p>').append(editSearchLink)) > .append(exportLinks); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >index 81732a1ce6..f5dc6f94ff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >@@ -2,6 +2,9 @@ > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > > <title> >@@ -16,13 +19,12 @@ > </head> > > <body id="catlaog_labeledMARCdetail" class="catalog"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -38,6 +40,7 @@ > </li> > </ol> > </nav> >+ [% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index 2f7ddbd78e..30aef39c4b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -5,6 +5,9 @@ > [% USE Branches %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Item details for [% INCLUDE 'biblio-title-head.inc' %] › Catalog › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -12,13 +15,12 @@ > </head> > <body id="catalog_moredetail" class="catalog"> > [% USE KohaDates %] >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -33,15 +35,16 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Item details for [% INCLUDE 'biblio-title-head.inc' %]</h1> >- > [% INCLUDE 'cat-toolbar.inc' %] >+ <h2>Item details for [% INCLUDE 'biblio-title-head.inc' %]</h2> >+ > > <div id="catalogue_detail_biblio"> > >@@ -161,11 +164,11 @@ > <input type="hidden" name="damaged" value="[% ITEM_DAT.damaged | html %]" /> > > [% IF ClaimReturnedLostValue && ITEM_DAT.itemlost == ClaimReturnedLostValue %] >- <input type="submit" name="submit" class="submit" value="Set status" disabled="disabled"/> >+ <input type="submit" name="submit" class="principal" value="Set status" disabled="disabled"/> > <p class="help-block">Item has been claimed as returned.</p> > [% ELSE %] > <input type="hidden" name="op" value="set_lost" /> >- <input type="submit" name="submit" class="submit" value="Set status" /> >+ <input type="submit" name="submit" class="principal" value="Set status" /> > [% END %] > </form> > [% ELSE %] >@@ -199,7 +202,7 @@ > [% END %] > </select> > <input type="hidden" name="op" value="set_damaged" /> >- <input type="submit" name="submit" class="submit" value="Set status" /></form> >+ <input type="submit" name="submit" class="principal" value="Set status" /></form> > [% ELSE %] > [% FOREACH itemdamagedloo IN itemdamagedloop %] > [% IF ( itemdamagedloo.selected ) %] >@@ -232,7 +235,7 @@ > [% END %] > </select> > <input type="hidden" name="op" value="set_withdrawn" /> >- <input type="submit" name="submit" class="submit" value="Set status" /></form> >+ <input type="submit" name="submit" class="principal" value="Set status" /></form> > [% ELSE %] > [% FOREACH itemwithdrawn IN itemwithdrawnloop %] > [% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %] >@@ -268,7 +271,7 @@ > [% END %] > </select> > <input type="hidden" name="op" value="set_exclude_priority" /> >- <input type="submit" name="submit" class="submit" value="Update" /></form> >+ <input type="submit" name="submit" class="principal" value="Update" /></form> > </li> > </ol> > </div> >@@ -331,7 +334,7 @@ > <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber | html %]" /> > <input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber | html %]" /><input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber | html %]" /> > <input type="hidden" name="op" value="set_public_note" /> >- <textarea name="itemnotes" rows="2" cols="30">[% ITEM_DAT.itemnotes | html %]</textarea><input type="submit" name="submit" class="submit" value="Update" /> >+ <textarea name="itemnotes" rows="2" cols="30">[% ITEM_DAT.itemnotes | html %]</textarea><input type="submit" name="submit" class="principal" value="Update" /> > </form> > [% ELSE %] > [% ITEM_DAT.itemnotes | html %] >@@ -345,7 +348,7 @@ > <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber | html %]" /> > <input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber | html %]" /><input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber | html %]" /> > <input type="hidden" name="op" value="set_non_public_note" /> >- <textarea name="itemnotes_nonpublic" rows="2" cols="30">[% ITEM_DAT.itemnotes_nonpublic | html %]</textarea><input type="submit" name="submit" class="submit" value="Update" /> >+ <textarea name="itemnotes_nonpublic" rows="2" cols="30">[% ITEM_DAT.itemnotes_nonpublic | html %]</textarea><input type="submit" name="submit" class="principal" value="Update" /> > </form> > [% ELSE %] > [% ITEM_DAT.itemnotes_nonpublic | html %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index f9b80cffe6..7533e1c3b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -6,6 +6,9 @@ > [% USE KohaDates %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > >@@ -14,8 +17,7 @@ > </head> > > <body id="catalog_results" class="catalog"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > [% IntranetCoce = Koha.Preference('IntranetCoce') %] > [% CoceProviders = Koha.Preference('CoceProviders') %] >@@ -25,7 +27,7 @@ > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -38,13 +40,14 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Search results</h1> >+ <h2>Search results</h2> > > [% IF ( outer_sup_results_loop ) %] > <div class="row"> >@@ -63,8 +66,8 @@ > </div> > [% END %] > >+ <div id="searchresults"> > [% IF ( total ) %] >- > <h3> > [% total | html %] result(s) found [% IF ( query_desc ) %]for <span class="results_query_desc">'[% query_desc | html %]'</span>[% END %][% IF limit_desc %] with limit(s): <span class="results_limit_desc">'[% limit_desc | html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName | html %] Catalog[% END %]. > </h3> >@@ -72,9 +75,8 @@ > > <div class="searchheader" id="searchheader"> > <div id="selection_ops"> >- <a href="#" id="select_all"><i class="fa fa-check"></i> Select all</a> >- | >- <a href="#" id="clear_all"><i class="fa fa-remove"></i> Clear all</a> >+ <a href="#" class="btn btn-link" id="select_all"><i class="fa fa-check"></i> Select all</a> >+ <a href="#" class="btn btn-link" id="clear_all"><i class="fa fa-remove"></i> Clear all</a> > | > [% IF Koha.Preference("StaffHighlightedWords") == 1 %] > <a href="#" class="highlight_toggle" id="highlight_toggle_off">Unhighlight</a> >@@ -90,7 +92,7 @@ > > [% IF Koha.Preference('virtualshelves') %] > <div class="btn-group"> >- <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> >+ <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" > > <i class="fa fa-list"></i> Add to list <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -123,11 +125,11 @@ > <li role="separator" class="divider"></li> > [% IF add_to_some_private_shelves.count > 10 or add_to_some_public_shelves.count > 10 %] > <li> >- <a href="#" class="addtolist morelists">More lists</a> >+ <a href="#" class="addtolist morelists">More lists</a> > </li> > [% END %] > <li> >- <a href="#" class="addtolist newlist">New list</a> >+ <a href="#" class="addtolist newlist">New list</a> > </li> > </ul> > </div> >@@ -136,8 +138,8 @@ > [% IF ( CAN_user_reserveforothers_place_holds && DisplayMultiPlaceHold ) %] > [% IF ( holdfor or holdforclub ) %] > <div id="placeholdc" class="btn-group"> >- <button class="btn btn-default btn-xs placehold"><i class="fa fa-sticky-note-o"></i> Place hold</button> >- <button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> >+ <button class="btn btn-default btn-xs placehold" ><i class="fa fa-sticky-note-o"></i> Place hold</button> >+ <button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -156,14 +158,14 @@ > </div> > [% ELSE %] > <div id="placeholdc" class="btn-group"> >- <a class="btn btn-default btn-xs placehold" href="#"><i class="fa fa-sticky-note-o"></i> Place hold</a> >+ <a class="btn btn-default btn-xs placehold" href="#" ><i class="fa fa-sticky-note-o"></i> Place hold</a> > </div> > [% END # /IF holfor %] > [% END # /IF CAN_user_reserveforothers_place_holds %] > > [% IF Koha.Preference('BrowseResultSelection') %] > <div id="browse_selection" class="btn-group"> >- <a class="btn btn-default btn-xs browse_selection" href="#"><i class="fa fa-sticky-note-o"></i> Browse selected records</a> >+ <a class="btn btn-default btn-xs browse_selection" href="#" ><i class="fa fa-sticky-note-o"></i> Browse selected records</a> > </div> > [% END %] > >@@ -201,7 +203,7 @@ > [% END %] > > <div class="btn-group"> >- <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> >+ <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" > > Sort <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -304,7 +306,7 @@ > [% END %] Library default: [% Koha.Preference('numSearchResults') | html %] > </a></li> > [% END %] >- <li><a href="/cgi-bin/koha/catalogue/search.pl?count=20[% PROCESS sort_search_query %]">[% IF results_per_page == '20' %]<i class="fa fa-check"></i>[% END %] 20</a></li> >+ <li><a results_batch_opshref="/cgi-bin/koha/catalogue/search.pl?count=20[% PROCESS sort_search_query %]">[% IF results_per_page == '20' %]<i class="fa fa-check"></i>[% END %] 20</a></li> > <li><a href="/cgi-bin/koha/catalogue/search.pl?count=40[% PROCESS sort_search_query %]" id="resultsperpage-40">[% IF results_per_page == '40' %]<i class="fa fa-check"></i>[% END %] 40</a></li> > <li><a href="/cgi-bin/koha/catalogue/search.pl?count=60[% PROCESS sort_search_query %]" id="resultsperpage-60">[% IF results_per_page == '60' %]<i class="fa fa-check"></i>[% END %] 60</a></li> > <li><a href="/cgi-bin/koha/catalogue/search.pl?count=80[% PROCESS sort_search_query %]" id="resultsperpage-80">[% IF results_per_page == '80' %]<i class="fa fa-check"></i>[% END %] 80</a></li> >@@ -317,26 +319,29 @@ > </div> <!-- /#searchheader --> > > [% ELSE # /IF total %] >+ <form method="post" name="fz3950" class="fz3950bigrpad"> >+ <div id="toolbar" class="btn-toolbar" style="background-color:transparent"><div> >+ <button class="btn btn-default toolbar-btn" type="button" id="z3950submit"><i class="fa fa-search"></i> Z39.50/SRU search</button> >+ </div></div> >+ </form> > > <div id="searchheader"> >- <form method="post" name="fz3950" class="fz3950bigrpad"> >- <button class="btn btn-default" type="button" id="z3950submit"><i class="fa fa-search"></i> Z39.50/SRU search</button> >- </form> > <h3>No results found</h3> > [% IF ( searchdesc ) %] > <p> > No results match your search [% IF ( query_desc ) %]for <span style="font-weight: bold;">'[% query_desc | html %]'</span>[% END %][% IF ( limit_desc ) %] with limit(s): <span style="font-weight: bold;">'[% limit_desc | html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName | html %] Catalog[% END %]. > </p> > [% IF CAN_user_acquisition_order_manage && searchtoorder_basketno && searchtoorder_vendorid %][%# Coming from the basket or vendor view %] >- <p><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% searchtoorder_basketno | uri %]">View basket<a></p> >+ <p><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% searchtoorder_basketno | uri %]">View basket<a></p> > [% END %] >- <a href="/cgi-bin/koha/catalogue/search.pl?advsearch=1&edit_search=1&[% query_cgi | $raw %]&[% limit_cgi | $raw %]&sort_by=[% sort_by | $raw %]">Edit this search</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?advsearch=1&edit_search=1&[% query_cgi | $raw %]&[% limit_cgi | $raw %]&sort_by=[% sort_by | $raw %]">Edit this search</a> > [% ELSE %] > <p>You did not specify any search criteria.</p> > [% END %] > </div> > [% END # /IF total %] > >+ > [% IF ( query_error ) %] > <div class="dialog alert"><p><strong>Error:</strong> [% query_error | html %]</p></div> > [% END %] >@@ -344,7 +349,7 @@ > <!-- Search Results Table --> > [% IF ( total ) %] > [% IF ( scan ) %] >- <h1>Scan index:</h1> >+ <h2>Scan index:</h2> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get"> > <table> > <tr> >@@ -411,7 +416,7 @@ > </form> > [% ELSE # /IF scan %] > >- <div id="searchresults"> >+ > [% INCLUDE 'page-numbers.inc' %] > > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" name="bookbag_form" id="bookbag_form"> >@@ -531,9 +536,9 @@ > > [% IF Koha.Preference('intranetbookbag') == 1 %] > [% IF ( SEARCH_RESULT.incart ) %] >- | <a class="addtocart" id="cart[% SEARCH_RESULT.biblionumber | html %]" href="#">In your cart</a> <a class="cartRemove" id="cartR[% SEARCH_RESULT.biblionumber | html %]" href="#">(remove)</a> >+ | <a class="addtocart" id="cart[% SEARCH_RESULT.biblionumber | html %]" href="#">In your cart</a> <a class="cartRemove" id="cartR[% SEARCH_RESULT.biblionumber | html %]" href="#">(remove)</a> > [% ELSE %] >- | <a class="addtocart" id="cart[% SEARCH_RESULT.biblionumber | html %]" href="#">Add to cart</a> <a style="display:none;" class="cartRemove" id="cartR[% SEARCH_RESULT.biblionumber | html %]" href="#">(remove)</a> >+ | <a class="addtocart" id="cart[% SEARCH_RESULT.biblionumber | html %]" href="#">Add to cart</a> <a style="display:none;" class="cartRemove" id="cartR[% SEARCH_RESULT.biblionumber | html %]" href="#">(remove)</a> > [% END %] > [% END # / IF intranetbookbag %] > >@@ -542,21 +547,21 @@ > [% END %] > > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] >- | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit record</a> >+ | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit record</a> > [% END %] > [% IF ( CAN_user_editcatalogue_edit_items ) %] >- | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit items</a> >+ | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit items</a> > [% END %] > > [% IF ( CAN_user_acquisition_order_manage ) %] > [% IF ( searchtoorder_basketno && searchtoorder_vendorid ) %] >- | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&basketno=[% searchtoorder_basketno | uri %]&biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Add order</a> >+ | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&basketno=[% searchtoorder_basketno | uri %]&biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Add order</a> > [% END %] > [% END %] > > [% IF ( OPACBaseURL ) %] > <span class="view-in-opac"> >- | <a href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]" target="_blank">OPAC view</a> >+ | <a href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]" target="_blank">OPAC view</a> > </span> > [% END %] > </p> <!-- /.holds --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >index 0ef57c025b..60943ebca1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% USE Koha %] > [% USE KohaDates %] >@@ -10,13 +13,12 @@ > > <body id="catalogue_search-history" class="catalogue"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -28,6 +30,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >index 25c74f9fcf..2c3ccd8b98 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >@@ -3,19 +3,21 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Stock rotation details for [% INCLUDE 'biblio-title-head.inc' %] › Catalog › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="catalog_stockrotation" class="catalog"> > [% USE KohaDates %] >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -30,6 +32,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >index 126e49e524..505c9d965d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -2,20 +2,22 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE TablesSettings %] >-[% SET footerjs = 1 %] >+[% SET footerjs = 1 %][% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Cataloging [% IF ( total || breeding_loop ) %] › Search results [% ELSIF ( query ) %] › No results found [% END %] › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="cat_addbooks" class="cat"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cataloging-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > [% IF ( total || breeding_loop ) %] > <li> >@@ -40,6 +42,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -48,12 +51,10 @@ > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] > <div id="toolbar" class="btn-toolbar"> > [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %] >- <a id="useadvanced" href="/cgi-bin/koha/cataloguing/editor.pl" class="btn btn-default"><i class="fa fa-pencil"></i> Advanced editor</a> >+ <a id="useadvanced" href="/cgi-bin/koha/cataloguing/editor.pl" class="toolbar-btn"><i class="fa fa-pencil"></i> Advanced editor</a> > [% END %] > <div class="btn-group"> >- <button class="btn btn-default" id="newRecord"><i class="fa fa-plus"></i> New record</button> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> >- <span class="caret"></span> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-plus"></i> New record<span class="caret"></span> > </button> > <ul class="dropdown-menu"> > <li><a id="newRecordDefault" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li> >@@ -64,8 +65,8 @@ > </div> > [% IF servers.count > 0 %] > <div class="btn-group"> >- <button class="btn btn-default" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> >+ <button class="toolbar-btn word" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button> >+ <button class="toolbar-btn arrow" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >index 31eaf8e3bd..b391f67026 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -3,6 +3,9 @@ > [% USE Koha %] > [% USE Branches %] > [% USE KohaDates %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% USE TablesSettings %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Items › [% biblio.title | html %] [% IF ( biblio.author ) %] by [% biblio.author | html %][% END %] (Record #[% biblio.biblionumber | html %]) › Cataloging › Koha</title> >@@ -29,13 +32,12 @@ > </head> > > <body id="cat_additem" class="cat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cataloging-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >@@ -50,13 +52,14 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-12"> > <main> > [% INCLUDE 'blocking_errors.inc' %] >-<h1>Items for [% biblio.title | html %] [% IF ( biblio.author ) %] by [% biblio.author | html %][% END %] (Record #[% biblio.biblionumber | html %])</h1> >+<h2>Items for [% biblio.title | html %] [% IF ( biblio.author ) %] by [% biblio.author | html %][% END %] (Record #[% biblio.biblionumber | html %])</h2> > > [% IF ( barcode_not_unique ) %]<div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div>[% END %] > [% IF ( no_next_barcode ) %]<div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div>[% END %] >@@ -68,6 +71,7 @@ > > <div id="cataloguing_additem_itemlist"> > [% IF items %] >+ <fieldset id="searchresults"> > [% SET date_fields = [ 'dateaccessioned', 'onloan', 'datelastseen', 'datelastborrowed', 'replacementpricedate' ] %] > <div> > <table id="itemst"> >@@ -135,11 +139,14 @@ > </tbody> > </table> > </div> >+ </fieldset> > [% END %] > > <div class="row"> > <div class="col-sm-2"> >+ <aside> > [% INCLUDE 'biblio-view-menu.inc' %] >+ </aside> > </div> > <div class="col-sm-10"> > >@@ -150,11 +157,14 @@ > <input type="hidden" name="popup" value="1" /> > [% END %] > <input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html %]" /> >+ >+ > [% IF op != 'saveitem' %] > <h2 id="additema">Add item [% IF (circborrowernumber) %]<em>(fast cataloging)</em>[% END %]</h2> > [% ELSE %] > <h2 id="edititem">Edit item #[% itemnumber | html %][% IF ( barcode ) %] / Barcode [% barcode | html %][% END %]</h2> > [% END %] >+ > <fieldset class="rows"> > [% PROCESS subfields_for_item subfields => subfields %] > </fieldset> >@@ -192,22 +202,22 @@ > [% END %] > > <fieldset class="action"> [% IF op != 'saveitem' %] >- <input type="submit" name="phony_submit" value="phony_submit" id="phony_submit" style="display:none;" onclick="return false;" /> >+ <input type="submit" class="principal" name="phony_submit" value="phony_submit" id= "phony_submit" style="display:none;" onclick="return false;" /> > <!-- Note : We use here a false submit button because we have several submit buttons and we don't want the user to believe they validated the adding of multiple items > when pressing the enter key, while in fact it is the first submit button that is validated, in our case the "add (single) item" button. > It is a bit tricky, but necessary in the sake of UI correctness. > --> > <span id="addsingle"> >- <input type="submit" name="add_submit" value="Add item" onclick="return Check(this.form)" /> >- <input type="submit" name="add_duplicate_submit" value="Add & duplicate" onclick="return Check(this.form)" /> >+ <input type="submit" name="add_submit" value="Add item" class="principal" onclick="return Check(this.form)" /> >+ <input type="submit" name="add_duplicate_submit" class="principal" value="Add & duplicate" onclick="return Check(this.form)" /> > </span> > <span id="addmultiple"> >- <input type="button" name="add_multiple_copies" id="add_multiple_copies" value="Add multiple copies of this item" /> >+ <input type="button" name="add_multiple_copies" class="principal" id="add_multiple_copies" value="Add multiple copies of this item" /> > </span> > <fieldset id="add_multiple_copies_span"> > <label for="number_of_copies">Number of copies of this item to add: </label> > <input type="text" id="number_of_copies" name="number_of_copies" value="" size="2" /> >- <input type="submit" id="add_multiple_copies_submit" name="add_multiple_copies_submit" value="Add" onclick="javascript:return Check(this.form) && CheckMultipleAdd(this.form.number_of_copies.value);" /> <a href="#" id="cancel_add_multiple" class="cancel">Cancel</a> >+ <input type="submit" id="add_multiple_copies_submit" class="principal" name="add_multiple_copies_submit" value="Add" onclick="javascript:return Check(this.form) && CheckMultipleAdd(this.form.number_of_copies.value);" /> <a href="#" id="cancel_add_multiple" class="cancel">Cancel</a> > <div class="hint"><p>The barcode you enter will be incremented for each additional item.</p></div> > </fieldset> > >@@ -215,7 +225,7 @@ > [% IF op != 'add_item' %] > <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" /> > [% END %] >- <input type="submit" value="Save changes" onclick="return Check(this.form)"> >+ <input type="submit" class="principal" value="Save changes" onclick="return Check(this.form)"> > <input type="button" id="addnewitem" value="Add a new item"> > <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Cancel</a> > [% END %]</fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >index ba6b88b95b..5b60aea461 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -7,7 +7,10 @@ > [% Asset.css("lib/codemirror/codemirror.min.css") | $raw %] > [% Asset.css("css/humanmsg.css") | $raw %] > [% Asset.js("js/cataloging.js") | $raw %] >-[% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %] >+[% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %][% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > </head> > <body id="cat_addbiblio" class="cat"> > >@@ -15,13 +18,13 @@ > <div>Loading, please wait...</div> > </div> > >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > [% PROCESS 'keyboard_shortcuts.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >@@ -33,6 +36,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -44,7 +48,7 @@ > <div id="editor"> > <input id="import-records-input" type="file" style="display: none"> > <div id="toolbar" class="btn-toolbar"> >- <button class="btn btn-default" id="new-record" title="Open fresh record"><i class="fa fa-plus"></i> <span>New record</span></button> >+ <button class="btn btn-default toolbar-btn" id="new-record" title="Open fresh record"><i class="fa fa-plus"></i> <span>New record</span></button> > <div class="btn-group"> > <button class="btn btn-default" id="save-record" title="Save current record (Ctrl-S)"><i class="fa fa-hdd-o"></i> <span>Save</span></button> > <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> >@@ -53,10 +57,10 @@ > <ul class="dropdown-menu" id="save-dropdown"> > </ul> > </div> >- <button class="btn btn-default" id="import-records" title="Import an MARC (ISO 2709) or MARCXML record"><i class="fa fa-download"></i> <span>Import record...</span></button> >- <button class="btn btn-default" id="open-macros" title="Run and edit macros"><i class="fa fa-play"></i> <span>Macros...</span></button> >+ <button class="btn btn-default toolbar-btn" id="import-records" title="Import an MARC (ISO 2709) or MARCXML record"><i class="fa fa-download"></i> <span>Import record...</span></button> >+ <button class="btn btn-default toolbar-btn" id="open-macros" title="Run and edit macros"><i class="fa fa-play"></i> <span>Macros...</span></button> > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button> >+ <button class="btn btn-default dropdown-toggle toolbar-btn" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button> > <ul id="prefs-menu" class="dropdown-menu"> > <li><a id="switch-editor" href="#">Switch to basic editor</a></li> > <li><a id="set-field-widgets" href="#"></a></li> >@@ -91,9 +95,9 @@ > <li><a class="set-font" style="font-family: Monaco" href="#">Monaco</a></li> > </ul> > </div> >- <button class="btn btn-default" id="show-alerts" title="Previous alerts"><i class="fa fa-bell"></i> Alerts <span class="caret"></span></button> >- <button class="btn btn-default" id="show-shortcuts" title="Supported keyboard shortcuts"><i class="fa fa-keyboard-o"></i> Keyboard shortcuts <span class="caret"></span></button> >- <button class="btn btn-default hide" id="set-keyboard-layout" data-target="#keyboard-layout" data-toggle="modal" title="Set virtual keyboard layout"><i class="fa fa-keyboard-o"></i> Keyboard layout </button> >+ <button class="btn btn-default toolbar-btn" id="show-alerts" title="Previous alerts"><i class="fa fa-bell"></i> Alerts <span class="caret"></span></button> >+ <button class="btn btn-default toolbar-btn" id="show-shortcuts" title="Supported keyboard shortcuts"><i class="fa fa-keyboard-o"></i> Keyboard shortcuts <span class="caret"></span></button> >+ <button class="btn btn-default hide toolbar-btn" id="set-keyboard-layout" data-target="#keyboard-layout" data-toggle="modal" title="Set virtual keyboard layout"><i class="fa fa-keyboard-o"></i> Keyboard layout </button> > </div> > [%# CodeMirror instance will be inserted here %] > <div id="statusbar"> >@@ -110,7 +114,7 @@ > <aside> > <h3>Search</h3> > <form id="quicksearch"> >- <fieldset class="brief"> >+ <fieldset class="sidebar"> > <ol> > <li><label for="search-by-keywords">Keywords:</label></li> > <li><input class="search-box" data-qualifier="term" id="search-by-keywords" placeholder="(Ctrl-Alt-K)" /></li> >@@ -235,7 +239,7 @@ > </div> > <div class="col-md-9"> > <!-- tabindex attribute allows JS-controlled focus --> >- <div id="searchresults" tabindex="-1"> >+ <fieldset id="searchresults" tabindex="-1"> > <div id="search-top-pages"> > <nav aria-label="Search results navigation"> > </nav> >@@ -252,7 +256,7 @@ > <nav aria-label="Search results navigation"> > </nav> > </div> >- </div> >+ </fieldset> > </div> > </div> > <div id="search-overlay"><span>Loading...</span><div class="progress"><div class="progress-bar progress-bar-striped active" style="width: 100%"></div></div></div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >index 4b868268f6..06cf33b341 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >@@ -1,15 +1,18 @@ >+ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Link to host record › Cataloging › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="catalog_linkitem" class="catalog"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >@@ -21,6 +24,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >index 84305e7b8a..f4893e9ddd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% PROCESS 'merge-record.inc' %] > > [% INCLUDE 'doc-head-open.inc' %] >@@ -15,13 +18,12 @@ div#result { margin-top: 1em; } > </head> > > <body id="cat_merge" class="cat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cataloging-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >@@ -33,6 +35,7 @@ div#result { margin-top: 1em; } > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >index 4f42c73856..8e94c820fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >@@ -1,16 +1,18 @@ > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Attach an item to [% INCLUDE 'biblio-title-head.inc' %] › Cataloging › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="catalog_moveitem" class="catalog"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -25,6 +27,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >index 8c039990af..a4231ca2cd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >@@ -43,7 +43,7 @@ > <li><label for="subjectsubdiv">Subject sub-division: </label> <input type="text" id="subjectsubdiv" name="subjectsubdiv" value="" /></li> > <li><label for="title">Title (any): </label> <input type="text" id="title" name="title" value="[% title | html %]" /></li> > <li><label for="uniformtitle">Title (uniform): </label> <input type="text" id="uniformtitle" name="uniformtitle" value="[% uniformtitle | html %]" /></li> >- <li><a id="resetZ3950Search" href="#"><i class="fa fa-trash"></i> Clear search form</a></li> >+ <li><a id="resetZ3950Search" href="#">Clear search form</a></li> > </ol> > </fieldset> > </div> >@@ -68,7 +68,7 @@ > </div> > <nav class="navbar navbar-default navbar-fixed-bottom"> > <div class="container-fluid"> >- <fieldset class="action"><input type="submit" class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset> >+ <fieldset class="action"><input type="submit principal" class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset> > </div> > </nav> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >index d0c1195cb2..d36cf96b84 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >@@ -77,7 +77,7 @@ > <label for="stdid">Standard ID: </label> <input type="text" id="stdid" name="stdid" value="[% stdid | html %]" /> > </li> > <li> >- <a id="resetZ3950Search" href="#"><i class="fa fa-trash"></i> Clear search form</a> >+ <a id="resetZ3950Search" href="#">Clear search form</a> > </li> > </ol> > <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" /> >@@ -108,7 +108,7 @@ > > <nav class="navbar navbar-default navbar-fixed-bottom"> > <div class="container-fluid"> >- <fieldset class="action"><input type="submit" class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset> >+ <fieldset class="action"><input type="submit" class="submit principal" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset> > </div> > </nav> > </form> <!-- /.checkboxed --> >@@ -207,7 +207,7 @@ > <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >- <h3 id="dataPreviewLabel">Preview</h3> >+ <h2 id="dataPreviewLabel">Preview</h2> > </div> > <div class="modal-body"> > <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div> >@@ -254,7 +254,7 @@ > <p> > <input type="hidden" name="biblionumber" value="[% biblionumber | html %]"/> > <input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]"/> >- <input type="submit" value="Try another search"/> >+ <input type="submit" class="principal" value="Try another search"/> > </p> > </form> > </div> <!-- /.col-xs-12 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >index ddef022617..4e1d3282d9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >@@ -6,6 +6,9 @@ > [% USE Asset %] > [% USE raw %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Article requests › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -129,14 +132,13 @@ > [% END %] > > <body id="circ_article-requests" class="circ"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -146,6 +148,7 @@ > </li> > </ol> > </nav> >+ [% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid starthidden"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >index 5f31c5b7c7..ebf08ab71c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >@@ -2,19 +2,21 @@ > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Circulation statistics for [% title | html %] › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="circ_bookcount" class="circ"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > > [% IF blocking_error %] >@@ -36,6 +38,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >index 849dedf04f..13e5992521 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >@@ -1,17 +1,19 @@ > [% USE Branches %] > [% USE Koha %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Overdues at [% Branches.GetLoggedInBranchname | html %] › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="circ_branchoverdues" class="circ"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -23,6 +25,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -33,7 +36,7 @@ > [% END %] > <main> > >-<h1>Circulation: Overdues at [% Branches.GetLoggedInBranchname | html %]</h1> >+<h2>Circulation: Overdues at [% Branches.GetLoggedInBranchname | html %]</h2> > > <form name="selectlocation" action="branchoverdues.pl" method="post"> > <label for="location">Shelving location selected: </label><select id="location" name="location"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >index 563aee1a32..907d728b68 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >@@ -2,18 +2,20 @@ > [% USE Branches %] > [% USE ItemTypes %] > [% USE AuthorisedValues %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Transfers › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="circ_branchtransfers" class="circ"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -25,6 +27,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -171,19 +174,17 @@ > <div id="branchtransfers"> > <form method="post" name="mainform" id="mainform" action="/cgi-bin/koha/circ/branchtransfers.pl"> > <fieldset class="brief"> >- <legend>Transfer</legend> >- <ol> >- <li> >- <label for="tobranchcd">Destination library: </label> >+ <h3>Transfer</h3> >+ <ol><li> >+ <p>Destination library: > <select name="tobranchcd" id="tobranchcd"> > [% PROCESS options_for_libraries libraries => Branches.all( selected => tobranchcd, unfiltered => 1) %] >- </select> >+ </select></p> > </li> > <li> >- <label for="barcode">Enter barcode: </label> >- <input name="barcode" id="barcode" size="15" class="focus" type="text" /> <input type="submit" value="Submit" /> >- </li> >- </ol> >+ <input name="barcode" size="15" type="text" placeholder="Enter barcode" /><button type="submit" class="submit">Submit</button> >+ </li></ol> >+ > </fieldset> > [% FOREACH trsfitemloo IN trsfitemloop %] > <input type="hidden" name="bc-[% trsfitemloo.counter | html %]" value="[% trsfitemloo.item.barcode | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt >index dcfc6ac4df..c6e8aa3370 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt >@@ -4,6 +4,9 @@ > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Checkout notes › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -11,13 +14,13 @@ > > <body id="circ_checkout-notes" class="circ"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+ > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -29,6 +32,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >index 6821d18f4b..b110d25552 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >@@ -1,18 +1,20 @@ > [% USE raw %] > [% USE Koha %] > [% USE Branches %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="circ_circulation-home" class="circ"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form = formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="#" aria-current="page"> >@@ -21,71 +23,49 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > >- <h1>Circulation</h1> >- > <div class="row"> >- > <div class="col-sm-5 col-md-4"> >- <h3>Circulation</h3> >+ <h1>Circulation</h1> > > <ul class="buttons-list"> >- <li> >- <a class="circ-button" href="/cgi-bin/koha/circ/circulation.pl"><i class="fa fa-upload"></i> Check out</a> >- </li> >- <li> >- <a class="circ-button" href="/cgi-bin/koha/circ/returns.pl"><i class="fa fa-download"></i> Check in</a> >- </li> >- <li> >- <a class="circ-button" href="/cgi-bin/koha/circ/renew.pl"><i class="fa fa-retweet"></i> Renew</a> >- </li> >+ <li><a class="menucirc" href="/cgi-bin/koha/circ/circulation.pl"><i class="fa fa-upload fa-2x"></i><h1> Check out</h1></a></li> >+ <li><a class="menucirc" href="/cgi-bin/koha/circ/returns.pl"><i class="fa fa-download fa-2x"></i><h1> Check in</h1></a></li> >+ <li><a class="menucirc" href="/cgi-bin/koha/circ/renew.pl"><i class="fa fa-retweet fa-2x"></i><h1> Renew</h1></a></li> > [% UNLESS IndependentBranches %] > <li> > [% IF Koha.Preference('UseCirculationDesks') %] >- <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library and desk</a> >+ <a class="menucirc" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home fa-2x"></i><h1> Set library and desk</h1></a> > [% ELSE %] >- <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library</a> >+ <a class="menucirc" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home fa-2x"></i><h1> Set library</h1></a> > [% END %] > </li> > [% END %] > [% IF ( fast_cataloging ) %] > [% IF ( CAN_user_editcatalogue_fast_cataloging ) %] >- <li> >- <a class="circ-button" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA"><i class="fa fa-plus"></i> Fast cataloging</a> >- </li> >+ <li><a class="menucirc" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA fa-2x"><i class="fa fa-plus"></i><h1> Fast cataloging</h1></a></li> > [% END %] > [% END %] > [% IF ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes ) %] >- <li> >- <a class="circ-button" href="/cgi-bin/koha/circ/checkout-notes.pl"><i class="fa fa-sticky-note"></i> Checkout notes</a> >- </li> >+ <li><a class="menucirc" href="/cgi-bin/koha/circ/checkout-notes.pl"><i class="fa fa-sticky-note fa-2x"></i><h1> Checkout notes</h1></a></li> > [% END %] > [% IF Koha.Preference('OnSiteCheckouts') %] >- <li> >- <a class="circ-button" href="/cgi-bin/koha/circ/on-site_checkouts.pl"><i class="fa fa-map-marker"></i> Pending on-site checkouts</a> >- </li> >+ <li><a class="menucirc" href="/cgi-bin/koha/circ/on-site_checkouts.pl"><i class="fa fa-map-marker fa-2x"></i><h1> Pending on-site checkouts</h1></a></li> > [% END %] > </ul> > </div> > > <div class="col-sm-5 col-md-4"> >- <h3>Holds</h3> >+ <h1>Holds</h1> > > <ul class="buttons-list"> >- <li> >- <a class="circ-button" href="/cgi-bin/koha/circ/view_holdsqueue.pl"><i class="fa fa-tasks"></i> Holds queue</a> >- </li> >- <li> >- <a class="circ-button" href="/cgi-bin/koha/circ/pendingreserves.pl"><i class="fa fa-hand-grab-o"></i> Holds to pull</a> >- </li> >- <li> >- <a class="circ-button" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa fa-calendar"></i> Holds awaiting pickup</a> >- </li> >- <li> >- <a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a> >- </li> >+ <li><a class="menucirc" href="/cgi-bin/koha/circ/view_holdsqueue.pl"><i class="fa fa-tasks fa-2x"></i><h1> Holds queue</h1></a></li> >+ <li><a class="menucirc" href="/cgi-bin/koha/circ/pendingreserves.pl"><i class="fa fa-hand-grab-o fa-2x"></i><h1> Holds to pull</h1></a></li> >+ <li><a class="menucirc" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa fa-calendar fa-2x"></i><h1> Holds awaiting pickup</h1></a></li> >+ <li><a class="menucirc" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart fa-2x"></i><h1> Hold ratios</h1></a></li> > </ul> > > [% IF Koha.Preference('UseRecalls') and CAN_user_recalls %] >@@ -106,70 +86,65 @@ > > <div class="col-sm-5 col-md-4"> > [% IF Koha.Preference('ArticleRequests') %] >- <h3>Patron request</h3> >+ <h1>Patron request</h1> > <ul class="buttons-list"> >- <li> >- <a class="circ-button" href="/cgi-bin/koha/circ/article-requests.pl" title="Article requests"><i class="fa fa-newspaper-o"></i> Article requests</a> >- </li> >+ <li><a class="menucirc" href="/cgi-bin/koha/circ/article-requests.pl" title="Article requests"><i class="fa fa-newspaper-o"></i><h1> Article requests</h1></a></li> > </ul> > [% END %] > >- <h3>Transfers</h3> >+ <h1>Transfers</h1> > > <ul class="buttons-list"> > [% IF !Koha.Preference('IndependentBranchesTransfers') || CAN_user_superlibrarian %] >- <li> >- <a class="circ-button" href="/cgi-bin/koha/circ/branchtransfers.pl"><i class="fa fa-exchange"></i> Transfer</a> >- </li> >+ <li><a class="menucirc" href="/cgi-bin/koha/circ/branchtransfers.pl"><i class="fa fa-exchange fa-2x"></i><h1> Transfer</h1></a></li> > [% END %] >- <li> >- <a class="circ-button" href="/cgi-bin/koha/circ/transfers_to_send.pl"><i class="fa fa-sign-out"></i> Transfers to send</a> >- </li> >- <li> >- <a class="circ-button" href="/cgi-bin/koha/circ/transferstoreceive.pl"><i class="fa fa-sign-in"></i> Transfers to receive</a> >- </li> >+ <li><a class="menucirc" href="/cgi-bin/koha/circ/transfers_to_send.pl"><i class="fa fa-sign-out fa-2x"></i><h1> Transfers to send</h1></a></li> >+ <li><a class="menucirc" href="/cgi-bin/koha/circ/transferstoreceive.pl"><i class="fa fa-sign-in fa-2x"></i><h1> Transfers to receive</h1></a></li> > </ul> > >- <h3>Overdues</h3> >+ <h1>Overdues</h1> > > <ul class="buttons-list"> > [% IF ( CAN_user_circulate_overdues_report ) %] > <li> >- <a class="circ-button" >+ <a class="menucirc" > href="/cgi-bin/koha/circ/overdue.pl" > title="Warning: This report is very resource intensive on systems with large numbers of overdue items." >- ><i class="fa fa-clock-o"></i> Overdues</a> >+ ><i class="fa fa-clock-o fa-2x"></i><h1> Overdues</h1></a> > </li> > [% END %] > <li> >- <a class="circ-button" >+ <a class="menucirc" > href="/cgi-bin/koha/circ/branchoverdues.pl" > title="Limited to your library. See report help for other details." >- ><i class="fa fa-clock-o"></i> Overdues with fines</a> >+ ><i class="fa fa-clock-o fa-2x"></i><i class="fond fa fa-dollar"></i><h1> Overdues with fines</h1></a> > </li> > </ul> > </div> > </div> >+ > <div class="row" id="intranet-circulation-home-html"> > <div class="col-md-12"> > [% Koha.Preference('IntranetCirculationHomeHTML') | $raw %] > </div> > </div> >+ > <div class="row" id="offline-circulation"> > <div class="col-md-12"> > <h4>Offline circulation</h4> > <div class="col-sm-5 col-md-3"> > [% IF (AllowOfflineCirculation) %] >- <a href="/cgi-bin/koha/circ/offline.pl">Built-in offline circulation interface</a> >+ <a class="noir" href="/cgi-bin/koha/circ/offline.pl">Built-in offline circulation interface</a> > [% END %] >- <p><a href="/cgi-bin/koha/offline_circ/process_koc.pl">Upload offline circulation file (.koc)</a></p> >- <p><a href="/cgi-bin/koha/offline_circ/list.pl">Pending offline circulation actions</a></p> >+ <p><a class="noir" href="/cgi-bin/koha/offline_circ/process_koc.pl">Upload offline circulation file (.koc)</a></p> >+ <p><a class="noir" href="/cgi-bin/koha/offline_circ/list.pl">Pending offline circulation actions</a></p> > </div> > <div class="col-sm-5 col-md-3"> >- <p><a href="https://github.com/bywatersolutions/koha-offline-circulation/releases"><i class="fa fa-window-maximize"></i> Get desktop application</a></p> >- <p><a href="https://addons.mozilla.org/[% lang | uri %]/firefox/addon/koct/"><i class="fa fa-firefox"></i> Get Firefox add-on</a></p> >+ <p><a class="noir" href="https://github.com/bywatersolutions/koha-offline-circulation/releases"><i class="fa fa-window-maximize"></i> Get desktop application</a></p> >+ <p><a class="noir" href="https://addons.mozilla.org/[% lang | uri %]/firefox/addon/koct/"><i class="fa fa-firefox"></i> Get Firefox add-on</a></p> > </div> > </div> > </div> >+ </div> > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 9a3131d730..1fa07be75c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -10,6 +10,9 @@ > [% USE Price %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %] > [% SET destination = "circ" %] >@@ -24,13 +27,12 @@ > > <body id="circ_circulation" class="circ"> > >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'circ-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -54,6 +56,7 @@ > [% END %] > </ol> > </nav> >+ [% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <main> >@@ -588,7 +591,7 @@ > <input type="hidden" name="barcode" value="[% item.barcode | html %]" /> > <input type="hidden" name="onsite_checkout" value="[% onsite_checkout | html %]" /> > <input type="hidden" name="auto_renew" value="[% auto_renew | html %]" /> >- <button class="btn btn-default btn-xs" type="submit" name="x"><i class="fa fa-check"></i> Check out</button> >+ <button class="btn btn-default principal btn-xs" type="submit" name="x"><i class="fa fa-check"></i> Check out</button> > </form> > </td> > </tr> >@@ -655,24 +658,23 @@ > > <label class="circ_barcode" for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label> > >- [% IF Koha.Preference('itemBarcodeFallbackSearch') %] >- <div class="hint">Enter item barcode or keyword:</div> >- [% ELSE %] >- <div class="hint">Enter item barcode:</div> >- [% END %] >- >+ <div></div> > [% IF NEEDSCONFIRMATION %] > <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" disabled="disabled" /> > [% ELSE %] >- <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" /> >+ [% IF Koha.Preference('itemBarcodeFallbackSearch') %] >+ <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" placeholder="Enter item barcode or keyword" /> >+ [% ELSE %] >+ <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" placeholder="Enter item barcode" /> >+ [% END %] > [% END %] > >- <button type="submit" class="btn btn-default">Check out</button> >- > <div id="show-circ-settings"> >- <a href="#"><i class="fa fa-caret-right circ-settings-icon"></i> Checkout settings</a> >+ <a href="#"><i class="fa-sign-out"></i></a> > </div> > >+ <button type="submit" class="btn btn-default principal">Check out</button> >+ > <div class="circ-settings"> > > [% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %] >@@ -807,7 +809,9 @@ > <div id="circmessages" class="circmessage attention"> > [% END %] > >+ <fieldset> > [% INCLUDE 'patron_messages.inc' %] >+ </fieldset> > > </div> <!-- /#circmessages --> > </div> <!-- /div or div.col-sm-6 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >index ef837f5b2f..c71fa839a2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >@@ -6,6 +6,9 @@ > [% USE Price %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% SET destination = "circ" %] > <title> >@@ -20,13 +23,12 @@ > > <body id="circ_circulation_batch_checkouts" class="circ"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -50,6 +52,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >index 3dd818a33d..d619ca1ed8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > <!DOCTYPE html> > [% IF (AllowOfflineCirculation) %] > [% SET manifestattr = 'manifest="/cgi-bin/koha/circ/offline-mf.pl"' %] >@@ -16,8 +19,7 @@ > </head> > > <body id="circ_offline" class="circ"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form = formulaire %] > <div class="loading-overlay" style="display: none;"> > <div>Downloading records, please wait...</div> > </div> >@@ -26,13 +28,14 @@ > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a id="go-to-home" href="#offline-home" aria-current="page">Offline circulation</a> > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >index 906b9d46d2..eb4da06562 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >@@ -5,19 +5,21 @@ > [% USE KohaDates %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Pending on-site checkouts › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="circ_stats" class="circ"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -29,6 +31,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index bec838b98f..9ae724de9e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -29,8 +29,10 @@ > </head> > > <body id="circ_overdue" class="circ"> >+[% form = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -47,6 +49,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index 61203de92e..9d0f637a39 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -7,20 +7,22 @@ > [%- USE Branches -%] > [%- USE ItemTypes -%] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Holds to pull › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="circ_pendingreserves" class="circ"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -32,6 +34,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -250,7 +253,7 @@ > </tfoot> > </table> > [% ELSE %] >- <strong>No items found.</strong> >+ <fieldset><strong>No items found.</strong></fieldset> > [% END %] > </div> > >@@ -260,37 +263,29 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >+ <form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" > >+ <fieldset class="sidebar"> >+ <h3>Refine results</h3> >+ <ol> >+ <li> >+ <label>Start date:</label> >+ <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" /> >+ </li> >+ <li> >+ <label>End date:</label> >+ <input type="text" size="10" id="to" name="to" value="[% to | $KohaDates %]" class="flatpickr" /> >+ </li> >+ </ol> > >-<div id="filters"> >- >-<form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" > >-<fieldset class="brief"> >-<h4>Refine results</h4> >-<ol> >-<li> >-<label for="from"> >- Start date: >-</label> >-<input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" /> >-</li> >-<li><label for="to"> >- End date: >-</label> >-<input type="text" size="10" id="to" name="to" value="[% to | $KohaDates %]" class="flatpickr" /> >-</li> >-</ol> >- >-[% IF ( HoldsToPullEndDate ) %] >- <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to [% HoldsToPullEndDate | html %] days ahead. Set other date ranges as needed.)</em></p> >-[% ELSE %] >- <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to today. Set other date ranges as needed.)</em></p> >-[% END %] >- >-<fieldset class="action"><input type="submit" name="run_report" value="Submit" class="submit"/></fieldset> >-</fieldset> >-</form> >+ [% IF ( HoldsToPullEndDate ) %] >+ <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to [% HoldsToPullEndDate | html %] days ahead. Set other date ranges as needed.)</em></p> >+ [% ELSE %] >+ <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to today. Set other date ranges as needed.)</em></p> >+ [% END %] > >-</div> >+ <button type="submit" class="submit principal">Submit</button> >+ </fieldset> >+ </form> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >index 913994d447..6813a95a74 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >@@ -3,6 +3,9 @@ > [% USE Koha %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > > <title>Renew [% title | html %] › Circulation › Koha</title> >@@ -11,13 +14,12 @@ > > <body id="circ_renew" class="circ"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -29,6 +31,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -196,34 +199,26 @@ > [% UNLESS error %] > <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off" > > >- <fieldset> >+ <fieldset class="brief"> > <h1>Renew</h1> > > [% IF Koha.Preference('UnseenRenewals') %] > <div class="renew_formfield"> >- <div> >- <label for="barcode" class="hint">Enter item barcode: </label> >- </div> >- <input name="barcode" id="barcode" size="14" class="barcode focus" type="text" /> >+ <input name="barcode" id="barcode" size="14" class="barcode focus" type="text" placeholder="Enter item barcode" /> > </div> > <div class="renew_formfield"> > <label for="unseen" class="hint">Record renewal as unseen if appropriate: </label> > <input value="1" name="unseen" id="unseen" type="checkbox" /> > </div> > [% ELSE %] >- <div> >- <label for="barcode" class="hint">Enter item barcode: </label> >- </div> >- >- <input name="barcode" id="barcode" size="14" class="barcode focus" type="text" /> >+ <input name="barcode" size="14" class="barcode focus" type="text" placeholder="Enter item barcode" /> > > [% END %] >- <button type="submit" class="btn btn-default">Submit</button> >+ <button type="submit" class="submit principal">Submit</button> > > <div class="circ-settings show"> > <div class="date-select" id="renew_date_override_fields"> >- <div><label for="hard_due_date" class="hint">Renewal due date [% INCLUDE 'date-format.inc' %]:</label></div> >- <input type="text" size="20" id="hard_due_date" name="hard_due_date" value="[% hard_due_date | $KohaDates with_hours => 1 %]" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-enable-time="true" /> >+ <input type="text" size="20" id="hard_due_date" name="hard_due_date" value="[% hard_due_date | $KohaDates with_hours => 1 %]" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-enable-time="true" placeholder="Renewal due date [% INCLUDE 'date-format.inc' %]" /> > </div> <!-- /.date-select --> > </div> > </fieldset> >@@ -232,15 +227,15 @@ > </form> > [% END %] > >- [% IF Koha.Preference('CircSidebar') %] >- </div> <!-- /.col-sm-10.col-sm-push-2 --> >- <div class="col-sm-2 col-sm-pull-10"> >- <aside> >- [% INCLUDE 'circ-nav.inc' %] >- </aside> >- </div> <!-- /.col-sm-2.col-sm-pull-10 --> >- </div> <!-- /.row --> >- [% END %] >+ [% IF Koha.Preference('CircSidebar') %] >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'circ-nav.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> >+ [% END %] > > </main> > </div> <!-- /.col-sm-12 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >index c94c19178d..f51e1d5e55 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >@@ -8,6 +8,9 @@ > [% USE AuthorisedValues %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% SET article_requests_view = 1 %] > [% SET biblionumber = biblio.biblionumber %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -59,13 +62,12 @@ > [% END %] > > <body id="circ_request-article" class="circ"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'circ-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > > [% IF blocking_error %] >@@ -85,6 +87,7 @@ > [% END %] > </ol> > </nav> >+ [% INCLUDE 'shortcut.inc' %] > > [% INCLUDE 'blocking_errors.inc' %] > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index 4f68aae453..5de8422029 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -17,8 +17,10 @@ > </head> > > <body id="circ_reserveratios" class="circ"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% form = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] >+[% INCLUDE 'header.inc' form = form %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -35,6 +37,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index dd295153a3..084682ef31 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -36,8 +36,10 @@ > <body id="circ_returns" class="circ"> > <span class="audio-alert-success"></span> > >+ [% form = BLOCK %] >+ [% INCLUDE 'checkin-search.inc' %] >+ [% END %] > [% INCLUDE 'header.inc' %] >- [% INCLUDE 'checkin-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -54,6 +56,7 @@ > </li> > </ol> > </nav> >+ [% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >index d89de8b7a3..81cbfedbc8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >@@ -5,6 +5,9 @@ > [% USE Registers %] > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% IF Koha.Preference('UseCirculationDesks') %] > <title>Set library and desk › Circulation › Koha</title> >@@ -17,13 +20,12 @@ > </style> > </head> > <body id="circ_set-library" class="circ"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -33,6 +35,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -82,13 +85,18 @@ Updated:<ul> > > <form method="post" action="set-library.pl"> > [% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %] >-<fieldset class="rows"> >- <legend>Set library</legend> >+<fieldset class="brief"> >+ <h3>Set library</h3> > <ol> >- <li><label for="branch">Choose library:</label> >+ <li><p>Choose library: > <select name="branch" id="branch"> > [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %] >- </select></li> >+ </select></p></li> >+ >+ <li> >+ <button class="submit principal" type="submit" >Submit</button> >+ <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a> >+ </li> > </ol> > </fieldset> > [% ELSE %] >@@ -98,20 +106,25 @@ Updated:<ul> > [% END %] > > [% IF Koha.Preference('UseCirculationDesks') && Desks.all %] >-<fieldset class="rows"> >- <legend>Set desk</legend> >+<fieldset class="brief"> >+ <h3>Set desk</h3> > <ol> > <li><label for="desk">Choose desk:</label> > <select name="desk_id" id="desk_id"> > [% PROCESS options_for_desks desks => Desks.all(), selected => desk_id %] > </select></li> >+ >+ <li> >+ <button class="submit principal" type="submit" >Submit</button> >+ <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a> >+ </li> > </ol> > </fieldset> > [% END %] > > [% IF Koha.Preference('UseCashRegisters') %] >-<fieldset class="rows"> >- <legend>Set cash register</legend> >+<fieldset class="brief"> >+ <h3>Set cash register</h3> > <ol> > <li> > <label for="register_id">Choose cash register:</label> >@@ -120,14 +133,14 @@ Updated:<ul> > [% PROCESS options_for_registers registers => Registers.all() %] > </select> > </li> >+ <li> >+ <button class="submit principal" type="submit" >Submit</button> >+ <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a> >+ </li> > </ol> > </fieldset> > [% END %] > >-<fieldset class="action"> >- <input type="submit" value="Submit" /> >- <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a> >-</fieldset> > <div class="noshow"> > [% FOREACH recycle_loo IN recycle_loop %] > <input type="text" name="[% recycle_loo.param | html %]" value="[% recycle_loo.value | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt >index bd578be835..13a0373193 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt >@@ -5,6 +5,9 @@ > [% USE Branches %] > [% USE ItemTypes %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% PROCESS 'transfer_reasons.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Transfers to send › Circulation › Koha</title> >@@ -12,13 +15,12 @@ > </head> > > <body id="circ_transferstosend" class="circ"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-labal="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -28,6 +30,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >index 4e916026b4..1df1ebdaa6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -4,19 +4,21 @@ > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Transfers to receive › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="circ_transferstoreceive" class="circ"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -28,6 +30,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -41,7 +44,7 @@ > <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> > [% END %] > >- <h1>Transfers made to your library as of [% show_date | $KohaDates %]</h1> >+ <h2>Transfers made to your library as of [% show_date | $KohaDates %]</h2> > [% IF ( branchesloop ) %] > <p>Your library is the destination for the following transfer(s)</p> > [% IF ( latetransfers ) %]<p>Transfers are <span class="error">considered late</span> after [% TransfersMaxDaysWarning | html %] days.</p>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >index 7d1032386c..07db67fe01 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >@@ -8,6 +8,9 @@ > [% USE TablesSettings %] > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Holds queue › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -15,13 +18,12 @@ > </head> > > <body id="circ_view_holdsqueue" class="circ"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -46,6 +48,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -59,7 +62,8 @@ > <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> > [% END %] > >-<h1>Holds queue</h1> >+<fieldset class="brief"> >+<h3>Holds queue</h3> > > [% IF ( run_report ) %] > [% IF ( total ) %] >@@ -236,45 +240,43 @@ > [% BLOCK filter_form %] > <form name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl"> > [% IF ( total ) %] >- <fieldset class="brief"> >+ <fieldset> > [% ELSE -%] >- <fieldset class="rows"> >+ <fieldset> > [% END %] > <ol> > <li> >- <label for="branchlimit">Library: </label> >+ <p>Library: > <select name="branchlimit" id="branchlimit"> > <option value="">All</option> > [% PROCESS options_for_libraries libraries => Branches.all( selected => branchlimit, only_from_group => 1 ) %] >- </select> >+ </select></p> > </li> > <li> >- <label for="itemtypeslimit">Item type: </label> >+ <p>Item type: > <select name="itemtypeslimit" id="itemtypeslimit"> > <option value="">All</option> > [% PROCESS options_for_item_types itemtypes => ItemTypes.Get(), selected_itemtype => itemtypeslimit %] >- </select> >+ </select></p> > </li> > <li> >- <label for="ccodeslimit">Collection: </label> >+ <p>Collection: > <select name="ccodeslimit" id="ccodeslimit"> > <option value="">All</option> > [% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'CCODE' ), selected_av => ccodeslimit %] >- </select> >+ </select></p> > </li> > <li> >- <label for="locationsslimit">Shelving location: </label> >+ <p>Shelving location: > <select name="locationslimit" id="locationslimit"> > <option value="">All</option> > [% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'LOC' ), selected_av => locationslimit %] >- </select> >+ </select></p> > </li> >+ <button type="submit" class="submit principal">Submit</button> >+ <input type="hidden" name="run_report" value="1" /> > </ol> > </fieldset> >- <fieldset class="action"> >- <input type="submit" value="Submit" /> >- <input type="hidden" name="run_report" value="1" /> >- </fieldset> > </form> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >index bccefdb7f1..b409d243d3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -6,19 +6,21 @@ > [% USE TablesSettings %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Holds awaiting pickup › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="circ_waitingreserves" class="circ"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc'form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -28,6 +30,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -81,6 +84,7 @@ > </div> > [% END %] > <div id="resultlist" class="toptabs"> >+ <fieldset id="searchresults"> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation" class="active"><a href="#holdswaiting" aria-controls="holdswaiting" role="tab" data-toggle="tab">Holds waiting: [% reservecount | html %]</a></li> > <li role="presentation"> >@@ -125,6 +129,7 @@ > <div class="dialog message">No holds found.</div> > [% END %] > </div> >+ </fieldset> > </div> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt >index 4383291728..e9ac6d2082 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt >@@ -4,19 +4,21 @@ > [% USE Branches %] > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Club enrollments › Patron clubs › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="club_enrollments" class="clubs"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -31,13 +33,14 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Club enrollments for <em>[% club.name | html %]</em></h1> >+ <h2>Club enrollments for <em>[% club.name | html %]</em></h2> > > <table id="enrollments-table"> > <thead> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt >index 0cd62451bf..9768a623d5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt >@@ -3,6 +3,9 @@ > [% USE AuthorisedValues %] > [% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF club %] >@@ -15,13 +18,12 @@ > </head> > > <body id="clubs_add_modify" class="clubs"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -40,6 +42,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -49,17 +52,17 @@ > <input type="hidden" name="id" value="[% club.id | html %]" /> > <input type="hidden" name="club_template_id" value="[% club_template.id | html %]" /> > >- <fieldset class="rows"> >- >- <legend> >- <h1> >+ <h2> > [% IF club %] > Modify club <em>[% club.name | html %]</em> > [% ELSE %] > Create a new <em>[% club_template.name | html %]</em> club > [% END %] >- </h1> >- </legend> >+ </h2> >+ >+ <fieldset class="rows"> >+ >+ > > <ol> > <li> >@@ -137,7 +140,7 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a href="clubs.pl" class="cancel">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >index 027b9a1bdc..c2210f7e17 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >@@ -4,6 +4,9 @@ > [% USE Branches %] > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Patron clubs › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -11,13 +14,12 @@ > </head> > > <body id="clubs_clubs" class="clubs"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -29,13 +31,38 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Patron clubs</h1> >+ <div id="toolbar" class="btn-toolbar"> >+ [% IF CAN_user_clubs_edit_templates %] >+ <div class="btn-group"> >+ <a class="btn btn-default toolbar-btn" href="templates-add-modify.pl"><i class="fa fa-plus"></i> New club template</a> >+ </div> >+ [% END %] >+ >+ [% IF CAN_user_clubs_edit_clubs %] >+ <div class="btn-group"> >+ [% IF club_templates.count %] >+ <button class="btn btn-default dropdown-toggle toolbar-btn" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button> >+ [% ELSE %] >+ <button disabled="disabled" class="btn btn-default dropdown-toggle toolbar-btn" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button> >+ [% END %] >+ <ul class="dropdown-menu"> >+ [% FOREACH t IN club_templates %] >+ <li><a href="/cgi-bin/koha/clubs/clubs-add-modify.pl?club_template_id=[% t.id | uri %]">[% t.name | html %]</a></li> >+ [% END %] >+ </ul> >+ </div> >+ [% END %] >+ </div> >+ >+ >+ <h2>Patron clubs</h2> > > [% IF club_template %] > <div class="dialog message"> >@@ -55,16 +82,9 @@ > </div> > [% END %] > >+ <fieldset id="rows"> > <h3>Club templates</h3> > >- [% IF CAN_user_clubs_edit_templates %] >- <div class="btn-toolbar"> >- <div class="btn-group"> >- <a class="btn btn-default" href="templates-add-modify.pl"><i class="fa fa-plus"></i> New club template</a> >- </div> >- </div> >- [% END %] >- > [% IF club_templates.count %] > <table id="club-templates-table"> > <thead> >@@ -114,26 +134,11 @@ > [% ELSE %] > <div class="dialog message">No club templates defined.</div> > [% END %] >+ </fieldset> > >+ <fieldset id="rows"> > <h3>Clubs</h3> > >- [% IF CAN_user_clubs_edit_clubs %] >- <div class="btn-toolbar"> >- <div class="btn-group"> >- [% IF club_templates.count %] >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button> >- [% ELSE %] >- <button disabled="disabled" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button> >- [% END %] >- <ul class="dropdown-menu"> >- [% FOREACH t IN club_templates %] >- <li><a href="/cgi-bin/koha/clubs/clubs-add-modify.pl?club_template_id=[% t.id | uri %]">[% t.name | html %]</a></li> >- [% END %] >- </ul> >- </div> >- </div> >- [% END %] >- > [% IF clubs.count %] > [% INCLUDE 'clubs-table.inc' %] > [% ELSE %] >@@ -143,6 +148,7 @@ > <div class="dialog message">No clubs defined. A club template must be defined before a club can be defined.</div> > [% END %] > [% END %] >+ </fieldset> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt >index 13f209ba46..682e252a13 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt >@@ -1,9 +1,9 @@ > [% USE AuthorisedValues %] > [% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %] > >-<h1> >+<h2> > Enroll in <em>[% club.name | html %]</em> >-</h1> >+</h2> > > <div class="container"> > <form id="patron-enrollment-form"> >@@ -28,7 +28,7 @@ > [% END %] > > <li> >- <a href="#" class="btn btn-sm btn-default" onclick="addEnrollment(); return false;">Finish enrollment</a> >+ <a href="#" class="btn btn-sm btn-default principal" onclick="addEnrollment(); return false;">Finish enrollment</a> > <a class="cancel" href="#" onclick="showClubs(); return false;">Cancel</a> > </li> > </ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt >index c74f614aad..f135d2cb37 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt >@@ -1,6 +1,9 @@ > [% USE Branches %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF club_template %] >@@ -19,13 +22,12 @@ > </head> > > <body id="clubs_templates_add_modify" class="clubs"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -44,6 +46,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -52,13 +55,13 @@ > <form method="post" class="validated"> > <input type="hidden" name="id" value="[% club_template.id | html %]" /> > >- <h1> >+ <h2> > [% IF club_template %] > Modify club template <em>[% club_template.name | html %]</em> > [% ELSE %] > Create a new club template > [% END %] >- </h1> >+ </h2> > > > <fieldset class="rows"> >@@ -107,7 +110,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Club fields:</legend> >+ <h3>Club fields</h3> > <p><span class="hint">These fields will be used in the creation of clubs based on this template</span></p> > <div id="club-template-fields"> > [% FOREACH f IN club_template.club_template_fields %] >@@ -141,14 +144,14 @@ > [% END %] > </div> > <fieldset class="action"> >- <a href="#" class="add_club_field"> >+ <a href="#" class="add_club_field"> > <i class="fa fa-plus"></i> Add new field > </a> > </fieldset> > </fieldset> > > <fieldset class="rows"> >- <legend>Enrollment fields</legend> >+ <h3>Enrollment fields</h3> > <p><span class="hint">These fields will be used when enrolling a patron in a club based on this template</span></p> > <div id="club-template-enrollment-fields"> > [% FOREACH f IN club_template.club_template_enrollment_fields %] >@@ -194,7 +197,7 @@ > > <fieldset class="action"> > <input type="hidden" name="id" value="[% club_template.id | html %]" /> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a href="clubs.pl" class="cancel">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >index 18f41c9442..d7986431a8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >@@ -1,17 +1,19 @@ > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Add reserves › [% course.course_name | html %] › Course reserves › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="courses_add_items_step1" class="course"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> >@@ -26,6 +28,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >index 399a36cb65..f4e37034a7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >@@ -1,5 +1,8 @@ > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF is_edit || course_reserve %]Edit reserve[% ELSE %]Add reserves[% END %] › [% course.course_name | html %] › Course reserves › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -7,13 +10,12 @@ > > <body id="courses_add_items_step2" class="course"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> >@@ -29,6 +31,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt >index 2534b0bc85..6b0114a552 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt >@@ -3,6 +3,9 @@ > [% USE ItemTypes %] > > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > > [% INCLUDE 'doc-head-open.inc' %] > <title>Add reserves › [% course.course_name | html %] › Course reserves › Koha</title> >@@ -10,13 +13,12 @@ > </head> > <body id="courses_add_items_step1" class="course"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> >@@ -31,6 +33,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt >index 87db994454..3f580eb20d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt >@@ -1,5 +1,8 @@ > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > > [% INCLUDE 'doc-head-open.inc' %] > <title>Remove reserves › Course reserves › Koha</title> >@@ -7,13 +10,12 @@ > </head> > <body id="courses_rm_items" class="course"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> >@@ -25,6 +27,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index b6332e5902..8f93ce092e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >@@ -6,6 +6,9 @@ > [% USE TablesSettings %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Course details for [% course.course_name | html %] › Course reserves › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -33,13 +36,12 @@ > > <body id="courses_course_details" class="course"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> >@@ -51,6 +53,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -61,17 +64,17 @@ > [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %] > <div id="toolbar"> > [% IF CAN_user_coursereserves_add_reserves %] >- <a class="btn btn-default" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id | html %]"><i class="fa fa-plus"></i> Add reserves</a> >- <a class="btn btn-default" id="add_items" href="/cgi-bin/koha/course_reserves/batch_add_items.pl?course_id=[% course.course_id | html %]"><i class="fa fa-plus"></i> Batch add reserves</a> >+ <a class="btn btn-default toolbar-btn" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id | html %]"><i class="fa fa-plus"></i> Add reserves</a> >+ <a class="btn btn-default toolbar-btn" id="add_items" href="/cgi-bin/koha/course_reserves/batch_add_items.pl?course_id=[% course.course_id | html %]"><i class="fa fa-plus"></i> Batch add reserves</a> > [% END %] > [% IF CAN_user_coursereserves_delete_reserves && course_reserves %] >- <a class="btn btn-default" id="rm_items" href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]&action=rm_all"><i class="fa fa-minus"></i> Remove all reserves</a> >+ <a class="btn btn-default toolbar-btn" id="rm_items" href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]&action=rm_all"><i class="fa fa-minus"></i> Remove all reserves</a> > [% END %] > [% IF ( CAN_user_coursereserves_manage_courses ) %] >- <a class="btn btn-default" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id | html %]"><i class="fa fa-pencil"></i> Edit course</a> >+ <a class="btn btn-default toolbar-btn" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id | html %]"><i class="fa fa-pencil"></i> Edit course</a> > [% END %] > [% IF ( CAN_user_coursereserves_manage_courses ) %] >- <a class="btn btn-default" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id | html %]&action=del"><i class="fa fa-trash"></i> Delete course</a> >+ <a class="btn btn-default toolbar-btn" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id | html %]&action=del"><i class="fa fa-trash"></i> Delete course</a> > [% END %] > </div><!-- /toolbar --> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >index fba0d9f573..9351fab197 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >@@ -3,6 +3,9 @@ > [% USE AuthorisedValues %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% PROCESS 'i18n.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Course reserves › Koha</title> >@@ -12,19 +15,19 @@ > > <body id="courses_course_reserves" class="course"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="#" aria-current="page">Course reserves</a> > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -33,10 +36,10 @@ > [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_delete_reserves %] > <div id="toolbar"> > [% IF ( CAN_user_coursereserves_manage_courses ) %] >- <a class="btn btn-default" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl"><i class="fa fa-plus"></i> New course</a> >+ <a class="btn btn-default toolbar-btn" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl"><i class="fa fa-plus"></i> New course</a> > [% END %] > [% IF ( CAN_user_coursereserves_delete_reserves ) %] >- <a class="btn btn-default" id="batch_rm" href="/cgi-bin/koha/course_reserves/batch_rm_items.pl"><i class="fa fa-minus"></i> Batch remove reserves</a> >+ <a class="btn btn-default toolbar-btn" id="batch_rm" href="/cgi-bin/koha/course_reserves/batch_rm_items.pl"><i class="fa fa-minus"></i> Batch remove reserves</a> > [% END %] > </div><!-- /toolbar --> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >index 1c7c3d7aac..e1c234e9e0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >@@ -1,5 +1,8 @@ > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF course_name %] Edit [% course_name | html %] [% ELSE %] New course [% END %] › Course reserves › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -15,13 +18,12 @@ > > <body id="courses_course" class="course"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> >@@ -33,6 +35,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > [% IF ( departments ) %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt >index 85ea459d6c..89de8a01ca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt >@@ -1,15 +1,19 @@ >+ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] >+ > [% INCLUDE 'doc-head-open.inc' %] > <title>Course reserves › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > <body id="courses_invalid_course" class="course"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="#" aria-current="page"> >@@ -18,6 +22,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt >index e93e70890c..e83dc0d87d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt >@@ -1,16 +1,19 @@ >+ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Error [% errno | html %] › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="err_[% errno | html %]" class="err"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="#" aria-current="page"> >@@ -19,6 +22,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index d5774b7331..2a97e5d38d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -4,6 +4,9 @@ > [% USE Koha %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% USE AuthorisedValues %] > [% USE TablesSettings %] > [% USE Price %] >@@ -14,13 +17,12 @@ > </head> > > <body id="illrequests" class="ill"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > > [% IF query_type == 'create' %] >@@ -50,6 +52,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -58,7 +61,7 @@ > <div class="col-sm-2"> > <aside> > <form method="get" id="illfilter_form"> >- <fieldset class="brief"> >+ <fieldset class="sidebar"> > <h3>Filters</h3> > <ol> > <li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >index 1b556f379b..10c64f14ed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -4,30 +4,34 @@ > [% USE Branches %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'home-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha staff interface</title> > [% Asset.css("css/mainpage.css") | $raw %] > [% INCLUDE 'doc-head-close.inc' %] > </head> >+ > <body id="main_intranet-main" class="intranet-main"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'home-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > >-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >- <ol> >- <li> >- <a href="#" aria-current="page">Home</a> >- </li> >- </ol> >-</nav> >+ <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >+ <ol> >+ <li> >+ <a href="/cgi-bin/koha/mainpage.pl" aria-current="page"><i class="fa fa-home"></i></a> >+ </li> >+ </ol> >+ </nav> >+ [% INCLUDE 'shortcut.inc' %] > > <div id="container-main" class="container-fluid"> > <div class="row"> > <h1 class="sr-only">Koha home</h1> > <div class="col-sm-3"> >+ <div id="area-news"> >+ <h3><span class="news_title">News</span></h3> > [% IF ( koha_news.count ) %] >- <div id="area-news"> >- <h3><span class="news_title">News</span></h3> > [% SET show_author = Koha.Preference('NewsAuthorDisplay') == 'staff' || Koha.Preference('NewsAuthorDisplay') == 'both' %] > [% FOREACH koha_new IN koha_news %] > <div class="newsitem" id="news[% koha_new.idnew | html %]"><h4>[% koha_new.title | html %]</h4> >@@ -41,133 +45,22 @@ > </p> > </div> > [% END %] >- </div><!-- /additional-contents --> > [% END %] >+ </div><!-- /additional-contents --> >+ >+ <div id="area-news"> >+ <h3>Quote of the day</h3> >+ > [% IF ( daily_quote ) %] >- <div id="area-news"> >- <h3>Quote of the day</h3> > <div class="newsitem"> > <span id="daily-quote-text">[% daily_quote.text | html %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source | html %]</span> > </div> >- </div> > [% END %] >- </div> <!-- /.col-sm-2 --> >- <div class="col-sm-9"> >- <div class="row"> >- <div class="col-xs-6"> >- <ul class="biglinks-list"> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li> >- <a class="icon_general icon_circulation" href="/cgi-bin/koha/circ/circulation-home.pl"><i class="fa fa-fw fa-exchange"></i>Circulation</a> >- </li> >- [% END %] >- >- [% IF CAN_user_borrowers_edit_borrowers %] >- <li> >- <a class="icon_general icon_patrons" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-fw fa-id-card-o"></i>Patrons</a> >- </li> >- [% END %] >- >- [% IF ( CAN_user_catalogue ) %] >- <li> >- <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/search.pl"> >- <span class="fa-stack"> >- <i class="fa fa-fw fa-book fa-stack-1x"></i> >- <i class="fa fa-fw fa-search fa-stack-2x"></i> >- </span> >- Advanced search >- </a> >- </li> >- <li> >- <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/itemsearch.pl"> >- <span class="fa-stack"> >- <i class="fa fa-fw fa-list fa-stack-1x"></i> >- <i class="fa fa-fw fa-search fa-stack-2x"></i> >- </span> >- Item search >- </a> >- </li> >- [% END %] >- >- <li> >- <a class="icon_general icon_lists" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt"></i>Lists</a> >- </li> >- >- [% IF ( UseCourseReserves ) %] >- <li> >- <a class="icon_general icon_course_reserves" href="/cgi-bin/koha/course_reserves/course-reserves.pl"><i class="fa fa-fw fa-book"></i>Course reserves</a> >- </li> >- [% END %] >- >- <li> >- <a class="icon_general icon_authorities" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-fw fa-link"></i>Authorities</a> >- </li> >- [% IF Koha.Preference('ILLModule') && CAN_user_ill %] >- <li> >- <a class="icon_general icon_ill" href="/cgi-bin/koha/ill/ill-requests.pl"><i class="fa fa-fw fa-retweet"></i>ILL requests</a> >- </li> >- [% END %] >- </ul> >- </div> <!-- /.col-xs-6 --> >- <div class="col-xs-6"> >- <ul class="biglinks-list"> >- >- [% IF ( Koha.Preference('EnablePointOfSale') && Koha.Preference('UseCashRegisters') && CAN_user_cash_management_takepayment ) %] >- <li> >- <a class="icon_general icon_pos" href="/cgi-bin/koha/pos/pay.pl"><i class="fa fa-fw fa-shopping-cart"></i>Point of sale</a> >- </li> >- [% END %] >- >- [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %] >- <li> >- <a class="icon_general icon_cataloging" href="/cgi-bin/koha/cataloguing/addbooks.pl"><i class="fa fa-fw fa-tag"></i>Cataloging</a> >- </li> >- [% END %] >- >- [% IF ( CAN_user_serials ) %] >- <li> >- <a class="icon_general icon_serials" href="/cgi-bin/koha/serials/serials-home.pl"><i class="fa fa-fw fa-newspaper-o"></i>Serials</a> >- <span class="biglink"></span> >- </li> >- [% END %] >- >- [% IF ( CAN_user_acquisition ) %] >- <li> >- <a class="icon_general icon_acquisitions" href="/cgi-bin/koha/acqui/acqui-home.pl"><i class="fa fa-fw fa-gift"></i>Acquisitions</a> >- <span class="biglink"></span> >- </li> >- [% END %] >- >- [% IF ( CAN_user_reports ) %] >- <li> >- <a class="icon_general icon_reports" href="/cgi-bin/koha/reports/reports-home.pl"><i class="fa fa-fw fa-pie-chart"></i>Reports</a> >- </li> >- [% END %] >- >- >- [% IF ( CAN_user_tools ) %] >- <li> >- <a class="icon_general icon_tools" href="/cgi-bin/koha/tools/tools-home.pl"><i class="fa fa-fw fa-wrench"></i>Tools</a> >- </li> >- [% END %] >- >- [% IF ( CAN_user_parameters ) %] >- <li> >- <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl"><i class="fa fa-fw fa-cogs"></i>Koha administration</a> >- </li> >- [% END %] >- <li> >- <a class="icon_general icon_koha" href="/cgi-bin/koha/about.pl"><img src="[% interface | html %]/[% theme | html %]/img/koha-egg.svg" alt="Koha Logo SVG"/> About Koha</a> >- </li> >- </ul> >- </div> <!-- /.col-sm-6 --> >+ </div> > >- </div> <!-- /.row --> >- <div class="row"> >- <div class="col-sm-12"> >- [%# Following statement must be in one line for translatability %] >+ [%# Following statement must be in one line for translatability %] > [% IF ( CAN_user_tools_moderate_comments && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) || ( CAN_user_suggestions_suggestions_manage && ( pendingsuggestions || all_pendingsuggestions )) || ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) || pending_article_requests || ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) || ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) || already_ran_jobs %] >- <div id="area-pending"> >+ <div id="area-news"> > [% IF pending_article_requests %] > <div class="pending-info" id="article_requests_pending"> > >@@ -179,7 +72,7 @@ > [% IF CAN_user_suggestions_suggestions_manage && ( pendingsuggestions || all_pendingsuggestions ) %] > <div class="pending-info" id="suggestions_pending"> > >- Suggestions pending approval: >+ <h3>Suggestions pending approval</h3> > <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]#ASKED"> > <span id="pendingsuggestions" class="pending-number-link">[% Branches.GetLoggedInBranchname | html %]: [% pendingsuggestions | html %]</span> > </a> >@@ -244,25 +137,97 @@ > </div> > > [% END %] >+ </div> <!-- /.col-sm-3 --> >+ >+ <div class="col-sm-9"> >+ <div class="col-sm-11"> >+ <div class="row"> >+ <div class="mainmenu"><ul class="biglinks-list"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >+ <li><a class="home-page" href="/cgi-bin/koha/circ/circulation-home.pl"><i class="fa fa-fw fa-exchange fa-2x"></i><h1>Circulation</h1></a></li> >+ [% END %] >+ >+ [% IF CAN_user_borrowers_edit_borrowers %] >+ <li><a class="home-page" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-fw fa-id-card-o fa-2x"></i><h1>Patrons</h1></a></li> >+ [% END %] >+ >+ </ul></div> >+ <div class="mainmenu"><ul class="biglinks-list"> >+ >+ [% IF ( CAN_user_catalogue ) %] >+ <li><a class="home-page" href="/cgi-bin/koha/catalogue/search.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Advanced search</h1></a></li> >+ <li><a class="home-page" href="/cgi-bin/koha/catalogue/itemsearch.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Item search</h1></a></li> >+ [% END %] >+ >+ <li><a class="home-page" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt fa-2x"></i><h1>Lists</h1></a></li> >+ >+ [% IF ( UseCourseReserves ) %] >+ <li><a class="home-page" href="/cgi-bin/koha/course_reserves/course-reserves.pl"><i class="fa fa-fw fa-book fa-2x"></i><h1>Course reserves</h1></a></li> >+ [% END %] > >- </div> <!-- /.col-sm-12 --> >+ </ul></div> >+ <div class="mainmenu"><ul class="biglinks-list"> >+ >+ <li><a class="home-page" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-fw fa-link fa-2x"></i><h1>Authorities</h1></a></li> >+ [% IF Koha.Preference('ILLModule') && CAN_user_ill %] >+ <li><a class="home-page" href="/cgi-bin/koha/ill/ill-requests.pl"><i class="fa fa-fw fa-retweet fa-2x"></i><h1>ILL requests</h1></a></li> >+ [% END %] >+ >+ [% IF ( Koha.Preference('EnablePointOfSale') && Koha.Preference('UseCashRegisters') && CAN_user_cash_management_takepayment ) %] >+ <li><a class="home-page" href="/cgi-bin/koha/pos/pay.pl"><i class="fa fa-fw fa-shopping-cart fa-2x"></i><h1>Point of sale</h1></a></li> >+ [% END %] >+ >+ [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %] >+ <li><a class="home-page" href="/cgi-bin/koha/cataloguing/addbooks.pl"><i class="fa fa-fw fa-tag fa-2x"></i><h1>Cataloging</h1></a></li> >+ [% END %] >+ >+ [% IF ( CAN_user_serials ) %] >+ <li><a class="home-page" href="/cgi-bin/koha/serials/serials-home.pl"><i class="fa fa-fw fa-newspaper-o fa-2x"></i><span class="biglink"></span><h1>Serials</h1></a></li> >+ [% END %] >+ >+ [% IF ( CAN_user_acquisition ) %] >+ <li><a class="home-page" href="/cgi-bin/koha/acqui/acqui-home.pl"><i class="fa fa-fw fa-gift fa-2x"></i><span class="biglink"></span><h1>Acquisitions</h1></a></li> >+ [% END %] >+ </ul></div> > </div> <!-- /.row --> >+ </div> <!-- /.col-sm-11 --> > >- [% IF ( IntranetmainUserblock ) %] >- <div class="row"> >- <div class="col-sm-12"> >- <div id="area-userblock"> >- <div class="user-info"> >- [% IntranetmainUserblock | $raw %] >- </div> >+ <div class="col-sm-1"> >+ <div class="settings-links"><ul class="biglinks-list"> >+ [% IF ( CAN_user_reports ) %] >+ <li><a class="home-page settings" href="/cgi-bin/koha/reports/reports-home.pl"><i class="fa fa-fw fa-pie-chart fa-2x"></i><h1>Reports</h1></a></li> >+ [% END %] >+ >+ [% IF ( CAN_user_tools ) %] >+ <li><a class="home-page settings" href="/cgi-bin/koha/tools/tools-home.pl"><i class="fa fa-fw fa-wrench fa-2x"></i><h1>Tools</h1></a></li> >+ [% END %] >+ >+ [% IF ( CAN_user_parameters ) %] >+ <li><a class="home-page settings" href="/cgi-bin/koha/admin/admin-home.pl"><i class="fa fa-fw fa-cogs fa-2x"></i><h1>Administration</h1></a></li> >+ [% END %] >+ >+ <li><a class="home-page settings" href="/cgi-bin/koha/about.pl"><img src="/intranet-tmpl/prog/img/koha-egg.svg" alt="Koha Logo SVG"><h1>About Koha</h1></a></li> >+ </ul></div> >+ </div> <!-- /.col-sm-1 --> >+ >+ <div class="col-sm-12"> >+ [% IF ( IntranetmainUserblock ) %] >+ <div class="row"> >+ <div class="col-sm-12"> >+ <div id="area-userblock"> >+ <div class="user-info"> >+ [% IntranetmainUserblock | $raw %] > </div> > </div> > </div> >- [% END %] >- </div> <!-- /.col-sm-9 --> >+ </div> >+ [% END %] >+ </div> <!-- /.col-sm-12 --> >+ </div> <!-- /.col-sm-9 --> > > </div> <!-- /.row --> > </div> <!-- /.container-fluid --> >+ <div class="koha-mainpage"><div class="koha-bottom"><a target="_blank" href="https://koha-community.org/"></a></div></div> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >index f020565e43..d3c3049747 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %]<title>Barcode image generator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("css/humanmsg.css") | $raw %] >@@ -40,13 +43,12 @@ > </head> > > <body id="labels_spinelabel-home" class="tools labels"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -58,6 +60,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -66,7 +69,7 @@ > <h2>Barcode image generator</h2> > > <form action="/cgi-bin/koha/svc/barcode" method="post" id="barcodegen"> >- <fieldset class="brief"> >+ <fieldset class="searchresults"> > <div class="row"> > <div class="col-sm-6"> > <ol> >@@ -109,11 +112,11 @@ > </li> > </ol> > <fieldset class="action"> >- <input type="submit" value="Show barcode" /> >+ <input type="submit" class="principal" value="Show barcode" /> > </fieldset> > </div> > <div class="col-sm-6"> >- <div id="barcode_container"> >+ <div id="barcode_container" style="overflow:auto"> > <img id="barcode_image" /> > <textarea readonly="readonly" rows="5" cols="40" id="urltext"></textarea> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt >index 9440e482c1..55d15c5232 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt >@@ -3,13 +3,13 @@ > <body id="labels_label-bib-search" class="tools labels"> > <div id="main-compact"> > >-<h1>Search</h1> >+<h2>Search</h2> > > <form name="f" method="post"> > <input type="hidden" name="op" value="do_search" /> > <input type="hidden" name="type" value="intranet" /> > <div class="details"> >- <h2>Search on</h2> >+ <h3>Search on</h3> > <p> > <label for="category">Name or ISSN: </label> > [% category | html %] >@@ -25,7 +25,7 @@ > <input type="hidden" id="index" name="index" value="[% index | html %]" /> > </p> > <p> >- <input type="submit" value="Start search" class="submit" /> >+ <input type="submit" value="Start search" class="submit principal" /> > </p> > </div> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >index 273bb5ceb2..e4118c947f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >@@ -2,19 +2,21 @@ > [% USE Asset %] > [% USE ItemTypes %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF batch_id %]Edit label batch ([% batch_id | html %])[% ELSE %]New label batch[% END %]› Batches › Label creator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="labels_label-edit-batch" class="tools labels" onload="dofocus();"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -49,6 +51,7 @@ > [% END %] > </ol> > </nav> >+ [% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -58,11 +61,11 @@ > [% INCLUDE 'labels-toolbar.inc' %] > > [% IF description %] >- <h1>Edit [% description | html %]</h1> >+ <h2>Edit [% description | html %]</h2> > [% ELSIF batch_id %] >- <h1>Edit label batch [% batch_id | html %]</h1> >+ <h2>Edit label batch [% batch_id | html %]</h2> > [% ELSE %] >- <h1>New label batch</h1> >+ <h2>New label batch</h2> > [% END %] > > [% IF ( err ) %] >@@ -123,13 +126,15 @@ > </div> > </form> > <div id="batch-manage" class="btn-toolbar"> >- <a class="btn btn-default" id="additems" href="#"><i class="fa fa-plus"></i> Add item(s)</a>[% IF ( table_loop ) %] >+ <a class="btn btn-default" id="additems" href="#"><i class="fa fa-plus"></i> Add item(s)</a> >+ [% IF ( table_loop ) %] > <a class="btn btn-default" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a> > <a class="btn btn-default" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected items</a> > <a class="btn btn-default" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a> > <a class="btn btn-default" id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a> > <a class="btn btn-default" id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected items</a> >- <a class="btn btn-default" id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export full batch</a>[% END %] >+ <a class="btn btn-default" id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export full batch</a> >+ [% END %] > </div> > [% IF ( table_loop ) %] > <form name="items"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >index e3393c763b..ee9e8082c9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >@@ -1,5 +1,8 @@ > [% USE raw %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [%- BLOCK translate_label_types -%] > [%- SWITCH type -%] > [%- CASE 'BIB' -%]<span> Only the bibliographic data is printed</span> >@@ -23,12 +26,11 @@ > [% END %] > <body id="labels_label-edit-layout" class="tools labels"> > [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -55,6 +57,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -200,9 +203,8 @@ > [% END %] > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="submit" value="Save" /> >+ >+ <input type="submit" class="principal" value="Save" /> > <a class="cancel" href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Cancel</a> > <input type="hidden" name="op" value="save" /> > <input type="hidden" name="layout_id" value="[% layout_id | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >index 48073db2f9..6ced0b5bea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >@@ -1,18 +1,20 @@ > [% USE raw %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( profile_id ) %]Edit printer profile [% profile_id | html %] [% ELSE %] New printer profile [% END%] › Profiles › Label creator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="labels_label-edit-profile" class="tools labels"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -35,6 +37,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -44,13 +47,13 @@ > [% INCLUDE 'labels-toolbar.inc' %] > > [% IF ( profile_id ) %] >- <h1>Edit printer profile [% profile_id | html %]</h1> >+ <h2>Edit printer profile [% profile_id | html %]</h2> > [% ELSE %] >- <h1>New printer profile</h1> >+ <h2>New printer profile</h2> > [% END%] > > <form name="input" action="/cgi-bin/koha/labels/label-edit-profile.pl" method="get"> >- <fieldset class="rows"><legend>Profile settings</legend> >+ <fieldset class="rows"><h3>Profile settings</h3> > <ol> > <li> > [% IF ( profile_id ) %] >@@ -103,7 +106,7 @@ > </ol> > </fieldset> > >- <fieldset class="rows"><legend>Offset:</legend> >+ <fieldset class="rows"><h3>Offset:</h3> > <ol> > <li> > <label for="offset_horz">Horizontal: </label><input type="text" size="4" name="offset_horz" id="offset_horz" value="[% offset_horz | html %]" /> >@@ -114,7 +117,7 @@ > </ol> > </fieldset> > >- <fieldset class="rows"><legend>Creep:</legend> >+ <fieldset class="rows"><h3>Creep:</h3> > <ol> > <li> > <label for="creep_horz">Horizontal: </label><input type="text" size="4" name="creep_horz" id="creep_horz" value="[% creep_horz | html %]" /> >@@ -123,9 +126,8 @@ > <label for="creep_vert">Vertical: </label><input type="text" size="4" name="creep_vert" id="creep_vert" value="[% creep_vert | html %]" /> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="submit" value="Save" /> >+ >+ <input type="submit" value="Save" class="principal"/> > <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile" class="cancel">Cancel</a> > <input type="hidden" name="op" value="save" /> > <input type="hidden" name="profile_id" value="[% profile_id | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >index a1bb56fe4f..3b9e4bbfc7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >@@ -1,17 +1,19 @@ > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Print barcode range › Label creator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'greybox.inc' %] > </head> > <body id="labels_label-home" class="tools labels"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -25,6 +27,7 @@ > </a> > </li> > </ol> >+[% INCLUDE 'shortcut.inc' %] > </nav> > > <div class="main container-fluid"> >@@ -32,7 +35,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > [% INCLUDE 'labels-toolbar.inc' %] >- <h1>Print barcode range</h1> >+ <h2>Print barcode range</h2> > <form name="add_by_number" action="/cgi-bin/koha/labels/label-edit-batch.pl" method="post"> > <input type="hidden" name="op" value="add" /> > <fieldset class="rows"> >@@ -46,9 +49,8 @@ > <input type="text" inputmode="numeric" pattern="[0-9]*" name="to" id="to-input" value="0" style="text-align: right;"/> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <button type="button" class="btn btn-default" id="print">Print range</button> >+ >+ <button type="button" class="btn btn-default principal" id="print">Print range</button> > </fieldset> > </form> > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt >index b3c06474f4..4be1fe985a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt >@@ -1,18 +1,20 @@ > [% USE raw %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( template_id ) %]Edit label template [% template_id | html %] [% ELSE %] New label template [% END %] › Templates › Label creator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="labels_label-edit-template" class="tools labels"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -34,6 +36,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -42,9 +45,9 @@ > [% INCLUDE 'labels-toolbar.inc' %] > > [% IF ( template_id ) %] >- <h1>Edit label template [% template_id | html %]</h1> >+ <h2>Edit label template [% template_id | html %]</h2> > [% ELSE %] >- <h1>New label template</h1> >+ <h2>New label template</h2> > [% END %] > > <form name="input" action="/cgi-bin/koha/labels/label-edit-template.pl" method="get"> >@@ -161,7 +164,7 @@ > [% END %] > [% IF ( profile_list.size == 1 ) %] > <br> >- <a href="/cgi-bin/koha/labels/label-edit-profile.pl?op=new">Make a new printer profile.</a> >+ <a href="/cgi-bin/koha/labels/label-edit-profile.pl?op=new"Make a new printer profile.</a> > [% END %] > </li> > </ol> >@@ -169,7 +172,7 @@ > </div> > </div> > <fieldset class="action"> >- <input type="submit" class="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Cancel</a> >+ <input type="submit" class="principal" value="Save" /><a class="cancel" href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Cancel</a> > <input type="hidden" name="op" value="save" /> > [% IF ( template_id ) %] > <input type="hidden" name="template_id" value="[% template_id | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >index 0cf9deaa62..363a3a0950 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >@@ -1,18 +1,20 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Label creator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="labels_label-home" class="tools labels"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -24,6 +26,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index d64c60d531..7a371565d1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% BLOCK translate_label_element %] > [%- SWITCH element -%] > [%- CASE 'layout' -%][% t('layout') | html %] >@@ -20,13 +23,12 @@ > </head> > > <body id="labels_label-manage" class="tools labels"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -41,6 +43,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -48,7 +51,7 @@ > <main> > > [% INCLUDE 'labels-toolbar.inc' %] >- <h1>Manage labels</h1> >+ <h2>Manage labels</h2> > > [% IF ( error ) %] > <div class="dialog alert"> >@@ -59,14 +62,15 @@ > <div id="manage-label-layouts"> > [% IF ( table_loop ) %] > <form name="layouts" action="/cgi-bin/koha/label-manage.pl?label_element=[% label_element | html %]"> >+ <fieldset id="searchresults"> > [% IF ( label_element == 'layout' ) %] >- <h2>Currently available layouts</h2> >+ <h3>Currently available layouts</h3> > [% ELSIF ( label_element == 'template' ) %] >- <h2>Currently available templates</h2> >+ <h3>Currently available templates</h3> > [% ELSIF ( label_element == 'profile' ) %] >- <h2>Currently available profiles</h2> >+ <h3>Currently available profiles</h3> > [% ELSIF ( label_element == 'batch' ) %] >- <h2>Currently available batches</h2> >+ <h3>Currently available batches</h3> > [% END %] > <table id="labels-table"> > [% FOREACH table_loo IN table_loop %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >index 7349d8fb06..eaf94eb312 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >@@ -8,7 +8,7 @@ > > <body id="labels_label-print" class="tools labels"> > <div class="main container-fluid"> >- <h1>Label printing/exporting</h1> >+ <h2>Label printing/exporting</h2> > [% IF ( batches ) %] > <form> > <h3>Click on the following links to download the exported batch(es).</h3> >@@ -21,32 +21,32 @@ > [% FOREACH batche IN batches %] > <fieldset> > [% IF ( batche.label_ids ) %] >- <legend>[% IF ( batche.label_count == 1 ) %][% batche.label_count | html %] single label[% ELSE %][% batche.label_count | html %] single labels[% END %]</legend> >+ <h3>[% IF ( batche.label_count == 1 ) %][% batche.label_count | html %] single label[% ELSE %][% batche.label_count | html %] single labels[% END %]</h3> > <a class="document pdf" href="/cgi-bin/koha/labels/label-create-pdf.pl?batch_id=0&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %]&from=[% batche.from | html %]&to=[% batche.to | html %]&barcode_length=[% batche.barcode_length| html %]">Download as PDF</a> > >- <p><a class="document csv" href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.label_ids | html %]">Download as CSV</a></p> >+ <p><a class="document csv" href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.label_ids | html %]">Download as CSV</a></p> > >- <p><a class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.label_ids | html %]">Download as XML</a></p> >+ <p><a class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.label_ids | html %]">Download as XML</a></p> > [% ELSIF ( batche.item_numbers ) %] >- <legend>[% IF ( batche.label_count == 1 ) %][% batche.label_count | html %] single label[% ELSE %][% batche.label_count | html %] single labels[% END %]</legend> >- <p><a class="document pdf" href="/cgi-bin/koha/labels/[% batche.create_script | html %]?template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %][% batche.item_numbers | html %]">Download as PDF</a></p> >+ <h3>[% IF ( batche.label_count == 1 ) %][% batche.label_count | html %] single label[% ELSE %][% batche.label_count | html %] single labels[% END %]</h3> >+ <p><a class="document pdf" href="/cgi-bin/koha/labels/[% batche.create_script | html %]?template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %][% batche.item_numbers | html %]">Download as PDF</a></p> > >- <p><a class="document csv" href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.item_numbers | html %]">Download as CSV</a></p> >+ <p><a class="document csv" href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.item_numbers | html %]">Download as CSV</a></p> > >- <p><a class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.item_numbers | html %]">Download as XML</a></p> >+ <p><a class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.item_numbers | html %]">Download as XML</a></p> > [% ELSIF ( batche.batch_id) %] >- <legend>Label batch number [% batche.batch_id | html %]</legend> >- <p><a class="document pdf" href="/cgi-bin/koha/labels/label-create-pdf.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %]">Download as PDF</a> >+ <h3>Label batch number [% batche.batch_id | html %]</h3> >+ <p><a class="document pdf" href="/cgi-bin/koha/labels/label-create-pdf.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %]">Download as PDF</a> > </p> > <p> >- <a class="document csv" href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]">Download as CSV</a> >+ <a class="document csv" href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]">Download as CSV</a> > </p> > <p> >- <a class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]">Download as XML</a></p> >+ <a class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]">Download as XML</a></p> > [% ELSIF (batche.from && batche.to) %] >- <legend>Barcodes from [% batche.from | html %] to [% batche.to | html %]</legend> >+ <h3>Barcodes from [% batche.from | html %] to [% batche.to | html %]</h3> > <p> >- <a class="document pdf" href="/cgi-bin/koha/labels/label-create-pdf.pl?batch_id=0&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %]&from=[% batche.from | html %]&to=[% batche.to | html %]&barcode_length=[% batche.barcode_length | html %]">Download as PDF</a> >+ <a class="document pdf" href="/cgi-bin/koha/labels/label-create-pdf.pl?batch_id=0&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %]&from=[% batche.from | html %]&to=[% batche.to | html %]&barcode_length=[% batche.barcode_length | html %]">Download as PDF</a> > </p> > [% END %] > </fieldset> >@@ -105,7 +105,7 @@ > </ol> > </fieldset> > <fieldset class="action"> >- <input type="submit" value="Export" /> >+ <input type="submit" class="principal" value="Export" /> > <a href="#" class="cancel gb-close">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >index 3e31ec279b..f4f9284dee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >@@ -29,7 +29,7 @@ > > <body id="labels_result" class="tools labels"> > <div class="main container-fluid"> >- <h1>Search results</h1> >+ <h2>Search results</h2> > <div class="results"> > [% PROCESS pagination %] > [% IF ( results ) %] >@@ -99,7 +99,7 @@ > </form> > </div> > [% PROCESS pagination %] >- <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div> >+ <div id="closewindow"><a href="#" class="btn btn-default btn-default close cancel">Close</a></div> > </div> > > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >index 8cf3a91bb5..dd4375e437 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >@@ -7,11 +7,11 @@ > <body id="labels_search" class="tools labels"> > <div class="main container-fluid"> > >-<h1>Search for items >+<h2>Search for items > [% IF ( batch_id ) %] > to add to Batch [% batch_id | html %] > [% END %] >-</h1> >+</h2> > > <form name="f" method="post" action="/cgi-bin/koha/labels/label-item-search.pl"> > <input type="hidden" name="op" value="do_search" /> >@@ -71,7 +71,7 @@ to add to Batch [% batch_id | html %] > </fieldset> > > [% IF ( sort_by_loop ) %] >-<fieldset><legend>Sort by: </legend> >+<fieldset><h3>Sort by: </h3> > <p><select id="sort_by" name="sort_by"> > <option value="">Field-weighted, relevance ranked</option> > [% FOREACH sort_by_loo IN sort_by_loop %] >@@ -101,7 +101,7 @@ to add to Batch [% batch_id | html %] > </ol> > </fieldset> > >-<fieldset class="action"><input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset> >+<fieldset class="action"><input type="submit" value="Search" class="principal" /> <a class="cancel close" href="#">Cancel</a></fieldset> > </form> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt >index 42f87e3470..65d4d7a790 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt >@@ -1,18 +1,20 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %]<title>Quick spine label creator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="labels_spinelabel-home" class="tools labels"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -24,21 +26,22 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Quick spine label creator</h1> > <form action="/cgi-bin/koha/labels/spinelabel-print.pl" method="post" id="spinelabelprint"> > <fieldset class="brief"> >+<h3>Quick spine label creator</h3> > <ol> > <li><label for="barcode">Barcode: </label> > <input type="text" name="barcode" id="barcode" class="focus" required="required" /> > </li> > </ol> >- <fieldset class="action"><input type="submit" value="View spine label" /></fieldset> >+ <fieldset class="action"><input class="principal" type="submit" value="View spine label" /></fieldset> > </fieldset> > </form> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >index 1a328dac49..fb58590585 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >@@ -5,6 +5,9 @@ > [%- USE AuthorisedValues -%] > [%- USE Branches -%] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search.inc' %] >+[% END %] > [% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Details of [% IF type == 'credit' %]credit[% ELSE %]debit[% END %] › [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha</title> >@@ -12,13 +15,13 @@ > </head> > > <body id="pat_accountline_details" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -54,6 +57,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -145,7 +149,7 @@ > </tbody> > </table> > >- <h3>History</h3> >+ <h2>History</h2> > <table class="accountline-offsets-table" id="accountline-debits-table"> > <thead> > <tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >index 71fcf5b6d6..e4297ffbf6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >@@ -2,18 +2,21 @@ > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>API Keys › Patrons › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="pat_apikeys" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -25,6 +28,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index 5223997277..0ae5a3703b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -9,6 +9,9 @@ > [% USE Branches %] > [% USE Registers %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% SET registers = Registers.all( filters => { current_branch => 1 } ) %] > > [% PROCESS 'accounts.inc' %] >@@ -19,13 +22,13 @@ > </head> > > <body id="pat_borraccount" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -37,6 +40,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -106,16 +110,16 @@ > [% IF account.amountoutstanding <= 0 %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding | $Price %]</td> > <td class="actions"> > [% IF ( account.is_credit ) %] >- <a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs receipt-print-action"><i class="fa fa-print"></i> Print</a> >+ <a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs receipt-print-action" ><i class="fa fa-print"></i> Print</a> > [% ELSE %] >- <a target="_blank" href="printinvoice.pl?action=print&accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs invoice-print-action"><i class="fa fa-print"></i> Print</a> >+ <a target="_blank" href="printinvoice.pl?action=print&accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs invoice-print-action" ><i class="fa fa-print"></i> Print</a> > [% END %] >- <a href="accountline-details.pl?accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs details-action"><i class="fa fa-list"></i> Details</a> >+ <a href="accountline-details.pl?accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs details-action" ><i class="fa fa-list"></i> Details</a> > [% IF account.is_debit && account.amountoutstanding > 0 %] > <a class="btn btn-default btn-xs pay-action" href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% account.borrowernumber | html %]&pay_individual=1&debit_type_code=[% account.debit_type_code | html %]&amount=[% account.amount | html %]&amountoutstanding=[% account.amountoutstanding | html %]&description=[% account.description | html %]&itemnumber=[% account.itemnumber | html %]&accountlines_id=[% account.accountlines_id | html %]"><i class="fa fa-money"></i> Pay</a> > [% END %] > [% IF account.is_credit && account.status != 'VOID' %] >- <a href="boraccount.pl?action=void&accountlines_id=[% account.accountlines_id | uri %]&borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs void-action"><i class="fa fa-ban"></i> Void payment</a> >+ <a href="boraccount.pl?action=void&accountlines_id=[% account.accountlines_id | uri %]&borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs void-action" ><i class="fa fa-ban"></i> Void payment</a> > [% END %] > [% IF account.is_debit && account.amount == account.amountoutstanding && account.status != 'CANCELLED' && !(account.debit_type_code == 'PAYOUT') %] > <form method="post" action="/cgi-bin/koha/members/cancel-charge.pl"> >@@ -129,7 +133,7 @@ > </form> > [% END %] > [% IF CAN_user_updatecharges_payout && account.is_credit && ( account.amountoutstanding < 0 ) %] >- <button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-account="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id | html %]" data-amount="[% account.amountoutstanding | $Price %]" class="btn btn-default btn-xs payout-action"><i class="fa fa-money"></i> Issue payout</button> >+ <button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-account="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id | html %]" data-amount="[% account.amountoutstanding | $Price %]" class="btn btn-default btn-xs payout-action" ><i class="fa fa-money"></i> Issue payout</button> > [% END %] > [% IF CAN_user_updatecharges_refund && account.is_debit && ( account.amountoutstanding != account.amount ) && !(account.status == 'REFUNDED') && !(account.debit_type_code == 'PAYOUT') %] > <button type="button" class="btn btn-default btn-xs refund-action" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id | html %]" data-amount="[% account.amount | $Price %]" data-amountoutstanding="[% account.amountoutstanding | $Price %]" data-member="[% account.borrowernumber | html %]"><i class="fa fa-money"></i> Issue refund</button> >@@ -148,7 +152,7 @@ > <td class="credit" style="text-align: right;">[% total | $Price %]</td> > <td> > [% IF CAN_user_updatecharges_payout %] >- <button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-amount="[% total | $Price %]" class="btn btn-default btn-xs payout-amount-action"><i class="fa fa-money"></i> Payout amount</button> >+ <button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-amount="[% total | $Price %]" class="btn btn-default btn-xs payout-amount-action" ><i class="fa fa-money"></i> Payout amount</button> > [% END %] > </td> > [% ELSE %] >@@ -181,7 +185,7 @@ > <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> >- <h4 class="modal-title" id="issuePayoutLabel">Issue payout</h4> >+ <h2 class="modal-title" id="issuePayoutLabel">Issue payout</h2> > </div> > <div class="modal-body"> > [% IF Koha.Preference('UseCashRegisters') && ( registers.size == 0 ) %] >@@ -189,7 +193,7 @@ > You must have at least one cash register associated with this branch before you can record cash payouts. > </div> > [% END %] >- <fieldset class="rows"> >+ <fieldset> > <ol> > <li> > <span id="paid" class="label">Outstanding credit: </span><span>[% payout.amount | $Price %]</span> >@@ -217,8 +221,8 @@ > </div> <!-- /.modal-body --> > <div class="modal-footer"> > <input type="hidden" name="op" value="payout"> >- <button type="submit" class="btn btn-default" id="borr_payout_confirm">Confirm</button> >- <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> >+ <button type="submit" class="btn btn-default principal" id="borr_payout_confirm">Confirm</button> >+ <button type="button" class="btn btn-default cancel" data-dismiss="modal">Cancel</button> > </div> <!-- /.modal-footer --> > </div> <!-- /.modal-content --> > </div> <!-- /.modal-dialog --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >index fb65d243cd..67c2a1ba66 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >@@ -3,18 +3,21 @@ > [% USE Price %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Delete patron [% patron.firstname | html %] [% patron.surname | html %] › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="pat_deletemem" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -26,6 +29,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >index 728342d0f9..3854a547a3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >@@ -4,18 +4,21 @@ > [% USE AuthorisedValues %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% UNLESS blocking_error %]Discharge for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])[% END %] › Patrons › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="discharge" class="discharge"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > > [% IF blocking_error %] >@@ -36,6 +39,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >index 37f267c1e5..61c582da9d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >@@ -3,29 +3,33 @@ > [% USE Branches %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Pending discharge requests › Patrons › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="pat_discharges" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > >-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >- <ol> >- <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Pending discharge requests >- </a> >- </li> >- </ol> >-</nav> >+ <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >+ <ol> >+ <li> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> >+ </li> >+ <li> >+ <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >+ </li> >+ <li> >+ <a href="#" aria-current="page"> >+ Pending discharge requests >+ </a> >+ </li> >+ </ol> >+ </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >index 541128e4ee..44fcfae09c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >@@ -4,19 +4,22 @@ > [% USE Branches %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Files for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="pat_files" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -28,6 +31,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -36,7 +40,7 @@ > > [% INCLUDE 'members-toolbar.inc' %] > >- <h1>Files</h1> >+ <h2>Files</h2> > > [% IF errors %] > <div class="dialog alert"> >@@ -77,7 +81,7 @@ > > <form method="post" action="/cgi-bin/koha/members/files.pl" enctype="multipart/form-data"> > <fieldset class="rows"> >- <legend>Upload new file</legend> >+ <h3>Upload new file</h3> > <ol> > <li><input type="hidden" name="op" value="upload" /> > <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" /> >@@ -89,7 +93,7 @@ > <li><label for="uploadfile">File:</label><input name="uploadfile" type="file" id="uploadfile" /></li> > > </ol> >- <fieldset class="action"><input name="upload" type="submit" id="upload" value="Upload file" /></fieldset> >+ <fieldset class="action"><input name="upload" type="submit" id="upload" class="principal" value="Upload file" /></fieldset> > </fieldset> > </form> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >index cb53a59913..179d963702 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >@@ -7,19 +7,22 @@ > [% USE TablesSettings %] > [% USE ItemTypes %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Holds history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="pat_holdshistory" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -31,6 +34,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -38,7 +42,7 @@ > <main> > > [% INCLUDE 'members-toolbar.inc' %] >-<h1>Holds history</h1> >+<h2>Holds history</h2> > > [% UNLESS Koha.Preference('intranetreadinghistory') %] > <div class="dialog alert">Staff members are not allowed to access patron's holds history</div> >@@ -51,6 +55,7 @@ > [% SET show_itemtype_column = Koha.Preference('AllowHoldItemTypeSelection') %] > > <div id="holdshistory"> >+<fieldset> > <table id="table_holdshistory"> > <thead> > <tr> >@@ -116,6 +121,7 @@ > [% END %] > </tbody> > </table> >+ </fieldset> > </div> > > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >index 20879d16ae..386fd8526b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >@@ -5,14 +5,17 @@ > [% USE AuthorisedValues %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] › Housebound › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="housebound-home" class="housebound"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > [% BLOCK 'homebound-details' %] > <div class="rows"> >@@ -61,7 +64,7 @@ > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -73,6 +76,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >index fa95e58d57..e298c1cb07 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >@@ -4,6 +4,9 @@ > [% USE Koha %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% USE AuthorisedValues %] > [% USE TablesSettings %] > >@@ -13,13 +16,13 @@ > </head> > > <body id="pat_illrequestshistory" class="pat"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] >+ [% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -31,6 +34,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >index ca3e93d84a..c5e8f2ecdb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >@@ -3,6 +3,9 @@ > [% USE Koha %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > > [% PROCESS 'accounts.inc' %] > >@@ -12,13 +15,13 @@ > </head> > > <body id="pat_mancredit" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -30,6 +33,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -54,8 +58,8 @@ > <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" /> > <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" /> > >- <fieldset class="rows"> >- <legend>Manual credit</legend> >+ <fieldset> >+ <h3>Manual credit</h3> > <ol> > <li> > <label for="type">Credit type: </label> >@@ -72,7 +76,7 @@ > </ol> > </fieldset> > >- <fieldset class="action"><input type="submit" name="add" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a></fieldset> >+ <fieldset class="action"><input type="submit" name="add" class="principal" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]" class="cancel">Cancel</a></fieldset> > </form> > > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >index 05de80543b..93350e2f14 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >@@ -4,6 +4,9 @@ > [% USE Price %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > > [% PROCESS 'accounts.inc' %] > >@@ -13,13 +16,13 @@ > </head> > > <body id="pat_maninvoice" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -31,6 +34,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -64,8 +68,8 @@ > <form action="/cgi-bin/koha/members/maninvoice.pl" method="post" id="maninvoice"> > <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" /> > <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" /> >- <fieldset class="rows"> >- <legend>Manual invoice</legend> >+ <fieldset> >+ <h3>Manual invoice</h3> > <ol> > <li> > <label for="type">Type: </label> >@@ -86,9 +90,9 @@ > </ol> > </fieldset> > <fieldset class="action"> >- <button type="submit" name="add" value="save">Save</button> >- <button type="submit" name="add" value="save and pay">Save and pay</button> >- <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a> >+ <button type="submit" name="add" class="principal" value="save">Save</button> >+ <button type="submit" name="add" class="principal" value="save and pay">Save and pay</button> >+ <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]" class="cancel">Cancel</a> > </fieldset> > </form> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >index b64a0bd32a..b960592cca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% PROCESS 'permissions.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >@@ -11,13 +14,13 @@ > </head> > > <body id="pat_member-flags" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -29,6 +32,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -44,9 +48,12 @@ > <h1>Set permissions for [% INCLUDE 'patron-title.inc' no_html = 1 %]</h1> > > <div id="permissionstree"> >- <div id="permissions_toolbar" class="btn-toolbar"> >- <button type="submit" class="btn btn-default"><i class="fa fa-save"></i> Save</button> >- <a class="btn btn-default" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-remove"></i> Cancel</a> >+ <div id="permissions_toolbar" class="btn-toolbar" style="width: 851px !important;"> >+ <div id="up"> >+ <button type="submit" class="principal"><i class="fa fa-save"></i> Save</button> >+ <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-remove"></i> Cancel</a> >+ </div> >+ <div id="down"> > <a class="toggleall toggleall_on btn btn-link" href="#"><i class="fa fa-plus-square-o"></i> Show all</a> > <a class="toggleall toggleall_off btn btn-link" href="#"><i class="fa fa-minus-square-o"></i> Hide all</a> > <a id="CheckAllFlags" class="btn btn-link" href="#"> >@@ -60,6 +67,7 @@ > <a href="#" id="clear_filter" style="display:none"><i class="fa fa-remove"></i></a> > </div> > </div> >+ </div> > <div class="permissions"> > [% FOREACH loo IN loop %] > [% IF ( loo.expand ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt >index f4990e4e3a..ea39176c25 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt >@@ -3,6 +3,9 @@ > [% USE Koha %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% patron.surname | html %], [% patron.firstname | html %][% END %] › Patrons › Koha >@@ -11,13 +14,13 @@ > </head> > > <body id="pat_member-password" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -36,6 +39,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -45,7 +49,7 @@ > [% INCLUDE 'members-toolbar.inc' %] > > [% IF ( newpassword ) %] >-<h1>Password updated</h1> >+<h2>Password updated</h2> > > [% ELSE %] > >@@ -100,12 +104,12 @@ > <input name="newpassword2" id="newpassword2" type="password" size="20" /> > </li> > </ol> >-</fieldset> > <fieldset class="action"> > <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" /> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a> > </fieldset> >+</fieldset> > </form>[% END %] > > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >index 7c523061e3..c702197d97 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -5,6 +5,9 @@ > [% USE Branches %] > [% USE Categories %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% PROCESS 'patronfields.inc' %] > [% SET libraries = Branches.all %] > [% SET categories = Categories.all.unblessed %] >@@ -16,13 +19,12 @@ > </head> > > <body id="pat_member" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form= formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > [% IF ( searching ) %] > <li> >@@ -42,6 +44,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -64,9 +67,9 @@ > </div> > [% END %] > >- <div id="searchresults"> >+ <fieldset id="searchresults"> > [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %] >- <div class="searchheader fh-fixedHeader" id="searchheader" style="display:none;"> >+ <div class="searchheader fh-fixedHeader" id="searchheader"> > <div> > <a href="#" class="btn btn-link" id="select_all"><i class="fa fa-check"></i> Select all</a> > | >@@ -103,7 +106,7 @@ > [% columns.unshift('checkbox') | html %] > [% END %] > [% PROCESS patron_search_table table_id => 'memberresultst' columns => columns %] >- </div> >+ </fieldset> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >index c5f17cb6f0..d90c2abe07 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -32,8 +32,10 @@ legend:hover { > </head> > > <body id="pat_memberentrygen" class="pat"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% form = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+ [% END %] >+ [% INCLUDE 'header.inc' form= form %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -73,6 +75,7 @@ legend:hover { > [% END %] > </ol> > </nav> <!-- /#breadcrumbs --> >+ [% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt >index 7d3ba0b643..e73339d421 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt >@@ -5,14 +5,17 @@ > [% USE Categories %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Update patron records › Patrons › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="pat_update" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > [% BLOCK display_names %] > [% SWITCH field %] >@@ -92,7 +95,7 @@ > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl">Hom<i class="fa fa-home"></i>e</a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -104,6 +107,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >index 0461c5a862..72a3e6c439 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >@@ -4,6 +4,9 @@ > [% USE Categories %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Merge patron records › Patrons › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -46,8 +49,8 @@ > [% END %] > </head> > <body id="pat_merge" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > [% BLOCK display_names %] > [% SWITCH rs %] >@@ -82,7 +85,7 @@ > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -92,6 +95,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -103,7 +107,7 @@ > [% IF ( patrons.count == 2 ) %] > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <button class="btn btn-default" id="compare_patrons"> >+ <button class="btn btn-default toolbar-btns" id="compare_patrons"> > <i class="fa fa-arrows-h"></i> Compare patrons > </button> > </div> >@@ -154,7 +158,7 @@ > <input type="hidden" name="id" value="[% p.id | html %]" /> > [% END %] > <input type="hidden" name="action" value="merge" /> >- <input id="merge-patrons" type="submit" value="Merge patrons" /> >+ <input id="merge-patrons" class="principal" type="submit" value="Merge patrons" /> > </fieldset> > > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 98ab46586d..5e19825c0d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -22,8 +22,10 @@ > </head> > > <body id="pat_moremember" class="pat"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% form = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+ [% END %] >+ [% INCLUDE 'header.inc' form = form %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -49,6 +51,7 @@ > [% END %] > </ol> > </nav> >+ [% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >index 8922a7557c..3d8d8e889f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -5,6 +5,9 @@ > [% USE Branches %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -14,13 +17,13 @@ > </head> > > <body id="pat_notices" class="pat"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] >+ [% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -32,6 +35,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -39,8 +43,9 @@ > <main> > > [% INCLUDE 'members-toolbar.inc' %] >- <h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1> >+ <h2>Sent notices for [% INCLUDE 'patron-title.inc' %]</h2> > >+ <fieldset id="searchresults"> > [% IF ( QUEUED_MESSAGES ) %] > <table id="noticestable"> > <thead> >@@ -107,6 +112,7 @@ > [% ELSE %] > <div class="dialog message">There is no record of any messages that have been sent to this patron.</div> > [% END %] >+ </fieldset> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >index 577e552843..600d7785f2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -7,6 +7,9 @@ > [% USE TablesSettings %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Make a payment for [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha</title> >@@ -14,13 +17,13 @@ > </head> > > <body id="pat_pay" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -32,6 +35,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >index 125ccc6e10..fdf3d12a19 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >@@ -5,6 +5,9 @@ > [% USE Registers %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > [% BLOCK cash_register_required %] >@@ -32,13 +35,13 @@ > </head> > > <body id="pat_paycollect" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -67,6 +70,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >index 24da899b90..145741c387 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >@@ -5,19 +5,22 @@ > [% USE AuthorisedValues %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Purchase suggestions for [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="pat_purchase_suggestions" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -29,6 +32,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -36,12 +40,15 @@ > <main> > > [% INCLUDE 'members-toolbar.inc' %] >- <h1>Purchase suggestions</h1> > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&suggestedby=[% patron.borrowernumber | html %]&redirect=purchase_suggestions&borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> New purchase suggestion</a> >+ <div> >+ <a class="toolbar-btn" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&suggestedby=[% patron.borrowernumber | html %]&redirect=purchase_suggestions&borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> New purchase suggestion</a> >+ </div> > </div> > >+ <h1>Purchase suggestions</h1> >+ > [% IF suggestions.size %] > <table id="suggestions"> > <thead> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >index a4b6f1aca3..789a092643 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -6,19 +6,22 @@ > [% USE Branches %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Circulation history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="pat_readingrec" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -30,6 +33,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -37,7 +41,7 @@ > <main> > > [% INCLUDE 'members-toolbar.inc' %] >-<h1>Circulation history</h1> >+<h2>Circulation history</h2> > > [% UNLESS Koha.Preference('intranetreadinghistory') %] > <div class="dialog alert">Staff members are not allowed to access patron's checkout history</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt >index b1f3c62233..2dd0c33050 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt >@@ -3,17 +3,19 @@ > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Recalls history for [% INCLUDE 'patron-title.inc' %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="recalls_history" class="pat"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <div id="breadcrumbs"> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> › >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> › > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> › > Recalls history for [% INCLUDE 'patron-title.inc' %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >index ce35ab360a..d7833224d4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >@@ -4,19 +4,22 @@ > [% USE AuthorisedValues %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Subscription routing lists for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="pat_routing_lists" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -28,6 +31,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -39,7 +43,7 @@ > <h1>Subscription routing lists for [% INCLUDE 'patron-title.inc' %]</h1> > <!-- Search Bar --> > <p class="tip">Search subscriptions:</p> >-<form action="/cgi-bin/koha/serials/serials-search.pl" method="get">[% IF ( routing ) %]<input type="hidden" name="routing" value="[% routing | html %]" />[% END %]<input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /><input type="submit" value="Search" class="submit" /> >+<form action="/cgi-bin/koha/serials/serials-search.pl" method="get">[% IF ( routing ) %]<input type="hidden" name="routing" value="[% routing | html %]" />[% END %]<input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /><input type="submit" value="Search" class="principal" /> > </form> > <!-- Search Bar End --> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >index fecba041ea..0a8216028a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >@@ -22,7 +22,7 @@ > > [% PROCESS patron_search_table table_id => 'memberresultst' columns => columns %] > >- <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div> >+ <div id="closewindow"><a href="#" class="btn btn-default btn-default close cancel">Close</a></div> > > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >index 14298e6f44..3993334e28 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >@@ -4,6 +4,9 @@ > [% USE AuthorisedValues %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% UNLESS blocking_error %] >@@ -13,14 +16,14 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > >-<body id="pat_statistics" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+<body id="pat_statistics"> >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > > [% IF blocking_error %] >@@ -43,6 +46,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -51,7 +55,7 @@ > > [% INCLUDE 'members-toolbar.inc' %] > >- <h1>Statistics for [% INCLUDE 'patron-title.inc' %]</h1> >+ <h2>Statistics for [% INCLUDE 'patron-title.inc' %]</h2> > [% IF ( datas.size ) %] > <table id="statistics"> > <thead> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt >index a0ae7afafc..c65fe40624 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt >@@ -2,18 +2,20 @@ > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Two-factor authentication › Patrons › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="pat_two_factor_auth" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >@@ -25,6 +27,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt >index 9c7563be11..53df299f65 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt >@@ -1,15 +1,17 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Add offline circulations to queue › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > </head> > <body id="ocirc_enqueue_koc" class="circ ocirc"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form = formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -19,6 +21,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >index fdcbd9e422..98e3c64f76 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >@@ -1,19 +1,21 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE "doc-head-open.inc" %] > <title>Offline circulation › Circulation › Koha</title> > [% INCLUDE "doc-head-close.inc" %] > </head> > > <body id="ocirc_list" class="circ ocirc"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'circ-search.inc' %] >+ [% INCLUDE 'header.inc' form = formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -25,6 +27,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >index f82e6e6f80..f85361b2b1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >@@ -1,19 +1,21 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Offline circulation file upload › Circulation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="ocirc_process_koc" class="circ ocirc"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form = formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> >@@ -37,6 +39,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -67,7 +70,7 @@ > <input class="required" required="required" type="file" id="fileToUpload" size="50" name="fileToUpload" /> > <span class="required">Required</span> > </li></ol> >- <fieldset class="action"><input type="button" class="submit" value="Upload file" id="upload_file" /></fieldset> >+ <fieldset class="action"><input type="button" class="submit principal" value="Upload file" id="upload_file" /></fieldset> > </fieldset> > </form> > <div id="fileuploadstatus" class="progress_panel" style="display:none">Upload progress: <progress id="fileuploadprogress" max="100" value="0"></progress> <span class="fileuploadpercent">0</span>%</div> >@@ -76,14 +79,14 @@ > > <form action="enqueue_koc.pl" id="processfile" method="post" enctype="multipart/form-data"> > <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" /> >- <input type="submit" value="Add to offline circulation queue" id="queueformsubmit" /> >+ <input type="submit" class="principal" value="Add to offline circulation queue" id="queueformsubmit" /> > </form> > > <form action="process_koc.pl" id="enqueuefile" method="post" enctype="multipart/form-data"> > <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" /> > <input type="hidden" name="runinbackground" id="runinbackground" value="" /> > <input type="hidden" name="completedJobID" id="completedJobID" value="" /> >- <!-- <input type="submit" value="Apply directly" id="mainformsubmit" /> --> >+ <!-- <input class="principal" type="submit" value="Apply directly" id="mainformsubmit" /> --> > <!-- FIXME: Job freezes when submitted, disabling button as a temporary mitigation --> > <div id="jobstatus" style="display:none">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div> > <div id="jobfailed" style="display:none"></div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >index 33c57a2c82..3ffc8d1bba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >@@ -9,7 +9,7 @@ > <div class="row"> > <div id="onboarding-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > <div id="logo"><a href="#">Koha</a></div> >- <h1>Web installer › Create a library</h1> >+ <h2>Web installer › Create a library</h2> > > [% INCLUDE 'onboarding_messages.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >index edc3088c0f..8525a963fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >@@ -19,7 +19,7 @@ > <div id="onboarding-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > <div id="logo"><a href="#">Koha</a></div> > >- <h1>Web installer › Create a patron category</h1> >+ <h2>Web installer › Create a patron category</h2> > > [% INCLUDE 'onboarding_messages.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >index 7fb6602397..eacff7a4f0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >@@ -11,7 +11,7 @@ > <div class="row"> > <div id="onboarding-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > <div id="logo"><a href="#">Koha</a></div> >- <h1>Web installer › Create Koha administrator patron</h1> >+ <h2>Web installer › Create Koha administrator patron</h2> > > [% INCLUDE 'onboarding_messages.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >index 4ed736a8f0..17d149f439 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >@@ -8,7 +8,7 @@ > <div class="row"> > <div id="onboarding-step4" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > <div id="logo"><a href="#">Koha</a></div> >- <h1>Web installer › Create a new item type</h1> >+ <h2>Web installer › Create a new item type</h2> > > [% INCLUDE 'onboarding_messages.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >index ed96a4fa73..25dcdd78b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >@@ -17,7 +17,7 @@ > > [% IF all_done %] > >- <h1>Web installer › Complete</h1> >+ <h2>Web installer › Complete</h2> > [% INCLUDE 'onboarding_messages.inc' %] > > <div id="steps"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt >index 0777c50afe..02d7fcae07 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF list.patron_list_id %] >@@ -12,14 +15,13 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > >-<body id="patlist_add_modify" class="pat patlist"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+<body id="patlist_add_modify" class="patlist"> >+[% INCLUDE 'header.inc' form = formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -38,33 +40,36 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > > <div class="container-fluid"> > <div class="row"> > <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3"> >- <h1> >+ <h2> > [% IF list.patron_list_id %] > Modify patron list > [% ELSE %] > New patron list > [% END %] >- </h1> >+ </h2> > > <form method="post" action="/cgi-bin/koha/patron_lists/add-modify.pl" class="validated"> > <fieldset class="rows"> > >- <legend> >+ <h3> > [% IF list.patron_list_id %] > Modify patron list > [% ELSE %] > Create a new patron list > [% END %] >- </legend> >+ </h3> > > <ol> > <li> >- <label class="required" for="list-name">Name:</label> >+ <label class="req[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %]uired" for="list-name">Name:</label> > <input id="list-name" name="name" type="text" class="required" required="required" value="[% list.name | html %]" /> > </li> > >@@ -78,15 +83,12 @@ > </li> > > <li> >- <span class="label">Owner: </span>[% logged_in_user.userid | html %] >+ <label>Owner: </label>[% logged_in_user.userid | html %] > </li> > </ol> > >- </fieldset> >- >- <fieldset class="action"> > <input type="hidden" name="patron_list_id" value="[% list.patron_list_id | html %]" /> >- <input type="submit" value="Save" /> >+ <button type="submit" class="principal">Save</button> > <a href="lists.pl" class="cancel">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >index af946b4527..c70347ac36 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >@@ -3,6 +3,9 @@ > [% USE KohaDates %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% INCLUDE 'columns_settings.inc' %] > <title>Add patrons › [% list.name | html %] › Patron lists › Tools › Koha</title> >@@ -24,14 +27,13 @@ > </style> > </head> > >-<body id="patlist_list" class="pat patlist"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+<body id="patlist_list" class="patlist"> >+[% INCLUDE 'header.inc' form = formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -49,13 +51,14 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>[% list.name | html %]</h1> >+ <h2>[% list.name | html %]</h2> > > [% IF ( not_found.size > 0 ) %] > [% IF id_column == 'borrowernumbers' %] >@@ -103,7 +106,7 @@ > > <form action="list.pl" id="add_patrons" method="post" class="clearfix"> > <fieldset class="rows"> >- <legend>Add patrons</legend> >+ <h3>Add patrons</h3> > <ol> > <li id="patron_search_line"> > <label for="find_patron">Patron search: </label> >@@ -133,15 +136,13 @@ > </li> > </span> > </ol> >- </fieldset> >- <fieldset id="patron_ids_submit" class="action"> >- <input type="submit" value="Submit" /> >+ <button class="principal" type="submit">Submit</button> > </fieldset> > > <div class="clearfix"></div> > > <fieldset id="patrons_to_add_fieldset"> >- <legend>Patrons to be added</legend> >+ <h3>Patrons to be added</h3> > <div id="patrons_to_add"></div> > > <fieldset class="action"> >@@ -153,18 +154,21 @@ > </form> > > <form action="list.pl" id="remove_patrons" method="post"> >+ <fieldset id="searchresults"> >+ > > <div class="searchheader" id="searchheader"> >- <span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | >- <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span> | >+ <div> >+ <span class="checkall"><a id="CheckAll" class="btn btn-link" href="#"><i class="fa fa-check"></i> Select all</a></span> >+ <span class="clearall"><a id="CheckNone" class="btn btn-link" href="#"><i class="fa fa-remove"></i> Clear all</a></span> | > <div class="btn-group"> >- <button class="btn btn-default btn-xs list-remove" type="submit"><i class="fa fa-trash"></i> Remove selected</button> >+ <button id="merge-patrons" class="btn btn-default btn-xs list-remove" type="submit"><i class="fa fa-trash"></i> Remove selected</button> > </div> >- | > <div class="btn-group"> >- <button class="btn btn-default btn-xs merge-patrons"><i class="fa fa-compress"></i> Merge selected patrons</button> >+ <button id="merge-patrons" class="btn btn-default btn-xs merge-patrons"><i class="fa fa-compress"></i> Merge selected patrons</button> > </div> > </div> >+ </div> > > <table id="patron-list-table"> > <thead> >@@ -212,8 +216,7 @@ > </table> > > <input type="hidden" name="patron_list_id" value="[% list.patron_list_id | html %]" /> >- <button type="submit" class="btn btn-default btn-sm list-remove"><i class="fa fa-trash" aria-hidden="true"></i> Remove selected patrons</button> >- <button class="btn btn-default btn-sm merge-patrons" type="submit"><i class="fa fa-compress"></i> Merge selected patrons</button> >+ </fieldset> > </form> > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >index 7dfa414206..093dbb4e87 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >@@ -1,20 +1,22 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Patron lists › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'greybox.inc' %] > </head> > >-<body id="patlist_lists" class="pat patlist"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+<body id="patlist_lists" class="patlist"> >+[% INCLUDE 'header.inc' form = formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -26,6 +28,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -34,14 +37,16 @@ > > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a class="btn btn-default" href="add-modify.pl"><i class="fa fa-plus"></i> New patron list</a> >+ <a class="toolbar-btn" class="btn btn-default" href="add-modify.pl"><i class="fa fa-plus"></i> New patron list</a> > </div> > </div> > >- <h1>Your patron lists</h1> >+ <h2>Your patron lists</h2> > >+ <fieldset id="searchresults"> > [% IF ( lists ) %] > >+ > <table id="patron-lists-table"> > <thead> > <tr> >@@ -123,7 +128,9 @@ > > [% ELSE %] > <div class="dialog message">There are no patron lists.</div> >+ > [% END %] >+ </fieldset> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >index 554342bed3..7f8b28b353 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >@@ -1,14 +1,16 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF batch_id %]Edit ([% batch_id | html %])[% ELSE %]New[% END %] › Batches › Patron card creator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="pcard_edit-batch" class="tools pcard"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -36,6 +38,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -45,10 +53,10 @@ > > [% INCLUDE 'patroncards-toolbar.inc' %] > >- <h1>[% IF description %]<span>Edit</span> [% description | html %] >+ <h2>[% IF description %]<span>Edit</span> [% description | html %] > [% ELSIF batch_id %]<span>Edit patron card batch</span> [% batch_id | html %] > [% ELSE %]<span>New patron card batch</span>[% END %] >- </h1> >+ </h2> > > [% IF ( duplicate_message ) %] > <div class="dialog message"> >@@ -76,17 +84,18 @@ > </div> > </form> > <div id="batch-manage" class="action"> >- <a class="btn btn-default" id="additems" href="#"><i class="fa fa-plus"></i> Add patron(s)</a>[% IF ( table_loop ) %] >- <a class="btn btn-default" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a> >- <a class="btn btn-default" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected patrons</a> >- <a class="btn btn-default" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a> >- <a class="btn btn-default" id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a> >- <a class="btn btn-default" id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected card(s)</a> >- <a class="btn btn-default" id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export card batch</a>[% END %] >+ <a id="additems" href="#"><i class="fa fa-plus"></i> Add patron(s)</a>[% IF ( table_loop ) %] >+ <a id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a> >+ <a id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected patrons</a> >+ <a ="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a> >+ <a id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a> >+ <a id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected card(s)</a> >+ <a id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export card batch</a>[% END %] > </div> > [% IF ( table_loop ) %] >+ <fieldset id="searchresults"> > <form name="items"> >- <h2>Patrons in batch number [% batch_id | html %]</h2> >+ <h3>Patrons in batch number [% batch_id | html %]</h3> > <table id="batcht"> > [% FOREACH table_loo IN table_loop %] > [% IF ( table_loo.header_fields ) %] >@@ -128,6 +137,7 @@ > </tbody> > </table> > </form> >+ </fieldset> > [% ELSE %] > <fieldset class="rows" style="border-bottom: 0px; border: 0px;"> > <ol><li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >index f8e1c2f536..f3692e76d2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >@@ -1,12 +1,14 @@ > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( layout_id ) %]Edit ([% layout_id | html %])[% ELSE %]New[% END %] › Layout › Patron card creator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="pcard_edit-layout" class="tools pcard"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -32,6 +34,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -41,16 +49,16 @@ > > [% INCLUDE 'patroncards-toolbar.inc' %] > >- <h1>[% IF ( layout_id ) %]<span>Edit patron card layout</span> [% layout_id | html %] >+ <h2>[% IF ( layout_id ) %]<span>Edit patron card layout</span> [% layout_id | html %] > [% ELSE %]<span>Create patron card layout</span>[% END %] >- </h1> >+ </h2> > > <!-- NOTE: The order of the elements on this form is crictical to correct processing. You've been warned... --> > <form name="input" action="/cgi-bin/koha/patroncards/edit-layout.pl" method="get"> > <div class="row"> > <div class="col-sm-6"> > <fieldset class="rows"> >- <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card text layout</legend> >+ <h3>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card text layout</h3> > <ol> > <li> > <fieldset> >@@ -476,7 +484,7 @@ > </div> > </div> > <fieldset class="action"> >- <input class="btn btn-default btn-default" type="submit" value="Save" /> >+ <input class="btn btn-default btn-default principal" type="submit" value="Save" /> > <a class="cancel" href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Cancel</a> > <input type="hidden" name="op" value="save" /> > <input type="hidden" name="layout_id" value="[% layout_id | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt >index 740cc3d1fa..8d152429b9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt >@@ -1,12 +1,14 @@ > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( profile_id ) %]Edit ([% profile_id | html %])[% ELSE %]New[% END%] › Profiles › Patron card creator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="pcard_edit-profile" class="tools pcard"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -32,6 +34,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -43,7 +51,7 @@ > > <h1>[% IF (profile_id) %]Edit[% ELSE %]Create[% END%] printer profile[% IF (profile_id) %] ([% profile_id | html %])[% END %]</h1> > <form name="input" action="/cgi-bin/koha/patroncards/edit-profile.pl" method="get"> >- <fieldset class="rows"><legend>Profile settings</legend> >+ <fieldset class="rows"><h3>Profile settings</h3> > <ol> > <li> > [% IF ( profile_id ) %] >@@ -85,7 +93,7 @@ > </ol> > </fieldset> > >- <fieldset class="rows"><legend>Offset:</legend> >+ <fieldset class="rows"><h3>Offset:</h3> > <ol> > <li> > <label for="offset_horz">Horizontal: </label><input type="text" size="4" name="offset_horz" id="offset_horz" value="[% offset_horz | html %]" /> >@@ -96,7 +104,7 @@ > </ol> > </fieldset> > >- <fieldset class="rows"><legend>Creep:</legend> >+ <fieldset class="rows"><h3>Creep:</h3> > <ol> > <li> > <label for="creep_horz">Horizontal: </label><input type="text" size="4" name="creep_horz" id="creep_horz" value="[% creep_horz | html %]" /> >@@ -107,7 +115,7 @@ > </ol> > </fieldset> > <fieldset class="action"> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile" class="cancel">Cancel</a> > <input type="hidden" name="op" value="save" /> > <input type="hidden" name="profile_id" value="[% profile_id | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt >index c9bdbf73b5..0722657b71 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt >@@ -1,14 +1,16 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF (template_id) %]Edit ([% template_id | html %])[% ELSE %]New[% END %] › Templates › Patron card creator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="pcard_edit-template" class="tools pcard"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -34,6 +36,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -42,7 +50,7 @@ > <main> > > [% INCLUDE 'patroncards-toolbar.inc' %] >- <h1>[% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id | html %])[% END %]</h1> >+ <h2>[% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id | html %])[% END %]</h2> > <form name="input" action="/cgi-bin/koha/patroncards/edit-template.pl" method="get"> > <div class="row"> > <div class="col-sm-6"> >@@ -159,7 +167,7 @@ > </div> > > <fieldset class="action"> >- <input type="submit" class="submit" value="Save" /> >+ <input class="principal" type="submit" class="submit" value="Save" /> > <a class="cancel" href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Cancel</a> > <input type="hidden" name="op" value="save" /> > [% IF ( template_id ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >index c37ff366c3..126c7b04ae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >@@ -1,10 +1,13 @@ >+ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Patron card creator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="pcard_home" class="tools pcard"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >@@ -19,6 +22,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -28,7 +37,7 @@ > > [% INCLUDE 'patroncards-toolbar.inc' %] > >- <h1>Patron card creator</h1> >+ <h2>Patron card creator</h2> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >index 0616f0bca8..1fa0b2d2f5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >@@ -1,12 +1,14 @@ > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Images › Patron card creator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="pcard_image-manage" class="tools pcard"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >@@ -24,6 +26,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -32,15 +40,15 @@ > <main> > > [% INCLUDE 'patroncards-toolbar.inc' %] >- <h1>Image manager</h1> >+ <h2>Image manager</h2> > [% INCLUDE 'patroncards-errors.inc' %] > <div class="row"> > <div class="col-sm-6"> >- <h2>Upload additional images for patron cards</h2> >+ <fieldset class="rows"> >+ <h3>Upload additional images for patron cards</h3> > <p>Manage additional images to use as logo, decoration or background on a patron card layout.</p> > <form name="upload_images" method="post" action="/cgi-bin/koha/patroncards/image-manage.pl" enctype="multipart/form-data"> >- <fieldset class="brief"> >- <div class="hint">Only PNG, GIF, JPEG, XPM formats are supported. Maximum image size is 2MB.</div> >+ <div class="hint">Only PNG, GIF, JPEG, XPM formats are supported. Maximum image size is 2MB.</div> > <ol> > <li> > <label for="uploadfile">Select the file to upload: </label> >@@ -49,19 +57,20 @@ > </li> > <li> > <label for="image_name">Image name: </label> >+ >+ <input type="text" id="image_name" name="image_name" size="20" /> >+ > <div class="hint"> > This will be the name by which you will refer to this image in the patron card layout editor. > </div> > <div class="hint"> > To replace an image, delete it, upload a new file and give it the same image name. > </div> >- >- <input type="text" id="image_name" name="image_name" size="20" /> > </li> > </ol> > <div class="action"> > <input type="hidden" name="op" value="upload" /> >- <input class="btn btn-default btn-default" id="uploadsu" type="submit" value="Upload" /> >+ <input class="btn btn-default btn-default principal" id="uploadsu" type="submit" value="Upload" /> > </div> > [% IF ( IMPORT_SUCCESSFUL ) %] > <div class="dialog message"> >@@ -70,15 +79,15 @@ > <li>Image name: [% IMAGE_NAME | html %]</li></ul> > </div> > [% END %] >- </fieldset> >- > </form> >+ </fieldset> > </div> >+ > <div class="col-sm-6"> >- <h2>Delete images</h2> >- [% IF ( TABLE ) %] >- <form name="delete_images" method="post" action="/cgi-bin/koha/patroncards/image-manage.pl" enctype="multipart/form-data"> >- <fieldset class="brief"> >+ <fieldset class="rows"> >+ <h3>Delete images</h3> >+ [% IF ( TABLE ) %] >+ <form name="delete_images" method="post" action="/cgi-bin/koha/patroncards/image-manage.pl" enctype="multipart/form-data"> > <div class="hint"> > Select one or more images to delete. > </div> >@@ -128,10 +137,10 @@ > <h3>Image(s) successfully deleted</h3> > </div> > [% END %] >- </fieldset> > </form> >+ </fieldset> > [% ELSE %] >- <fieldset class="brief"> >+ > <div class="hint"> > No images are currently available. > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >index 81bef9eef3..512745ccb9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >@@ -1,6 +1,9 @@ > [% USE CGI %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% BLOCK translate_card_element %] > [%- SWITCH element -%] > [%- CASE 'layout' -%][% t('layout') | html %] >@@ -29,8 +32,7 @@ > </head> > > <body id="pcard_manage" class="tools pcard"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -49,6 +51,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -58,13 +66,14 @@ > > [% INCLUDE 'patroncards-toolbar.inc' %] > >- <h1>Patron card templates</h1> >+ <h2>Patron card templates</h2> > > [% INCLUDE 'patroncards-errors.inc' %] > <div id="manage-patroncards-layouts"> > [% IF ( table_loop ) %] > <form name="layouts" action="/cgi-bin/koha/manage.pl?card_element=[% card_element | html %]"> >- <h2>Currently available [% PROCESS translate_card_element element=card_element_title FILTER lower %]</h2> >+ <fieldset id="rows"> >+ <h3>Currently available [% PROCESS translate_card_element element=card_element_title FILTER lower %]</h3> > <table> > [% FOREACH table_loo IN table_loop %] > [% IF ( table_loo.header_fields ) %] >@@ -109,11 +118,12 @@ > [% END %] > </table> > <fieldset class="action"> >- [% IF ( print ) %]<input type="button" id="print" value="Export selected batches" />[% END %] >+ [% IF ( print ) %]<input type="button" id="print" class="principal" value="Export selected batches" />[% END %] >+ </fieldset> > </fieldset> > [% IF patron_lists %] > <fieldset class="rows"> >- <legend>Or use a patron list</legend> >+ <h3>Or use a patron list</h3> > <ol> > <li> > <label for="patron_list_id">Patron list: </label> >@@ -125,9 +135,7 @@ > </select> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="button" id="printlist" value="Export from patron list" /> >+ <input type="button" id="printlist" class="principal" value="Export from patron list" /> > </fieldset> > [% END %] > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt >index 195cd7aa4d..f3cf0665fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt >@@ -7,41 +7,41 @@ > > <body id="pcard_print" class="tools pcard"> > <div class="container-fluid"> >- <h1>Patron card printing/exporting</h1> >+ <h2>Patron card printing/exporting</h2> > [% IF ( batches ) %] > <form> >- <h3>Click on the following link(s) to download the exported batch(es).</h3> > <fieldset> > [% FOREACH batche IN batches %] > [% IF ( batche.label_ids ) %] >- <legend>[% batche.card_count | html %] Single patron cards</legend> >+ <h3>[% batche.card_count | html %] Single patron cards</h3> > <p> > <a class="document pdf" href="/cgi-bin/koha/patroncards/[% batche.create_script | html %]?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]]&layout_back_id=[% batche.layout_back_id | html %]&start_card=[% batche.start_card | html %][% batche.label_ids | html %]">label_single_[% batche.card_count | html %].pdf</a> > </p> > [% ELSIF ( batche.borrower_numbers ) %] >- <legend>[% batche.card_count | html %] Single patron cards</legend> >+ <h3>[% batche.card_count | html %] Single patron cards</h3> > <p> > <a class="document pdf" href="/cgi-bin/koha/patroncards/[% batche.create_script | html %]?template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&layout_back_id=[% batche.layout_back_id | html %]&start_card=[% batche.start_card | html %][% batche.borrower_numbers | html %]">label_single_[% batche.card_count | html %].pdf</a> > </p> > [% ELSE %] >- <legend>Card batch number [% batche.batch_id | html %]</legend> >+ <h3>Card batch number [% batche.batch_id | html %]</h3> > <p> > <a class="document pdf" href="/cgi-bin/koha/patroncards/create-pdf.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&layout_back_id=[% batche.layout_back_id | html %]&start_card=[% batche.start_card | html %]">label_batch_[% batche.batch_id | html %].pdf</a> > </p> > [% END %] > [% END %] >- </fieldset> >+ <p>Click on the link(s) to download the exported batch(es).</p> > >- <fieldset class="action"> >- <input type="button" class="gb-close" value="Done" /> >+ <input type="button" class="gb-close principal" value="Done" /> > </fieldset> > </form> > [% ELSIF ( patronlist_id && template_id && layout_id ) %] > <div id="export_patron_list"> >- <h3>Click on the link to download the patron cards from the patron list.</h3> >+ <fieldset> >+ <h3>Click on the link to download the patron cards from the patron list</h3> > <p> > <a class="document pdf" href="/cgi-bin/koha/patroncards/create-pdf.pl?patronlist_id=[% patronlist_id | html %]&template_id=[% template_id | html %]&layout_id=[% layout_id | html %]&layout_back_id=[% layout_back_id | html %]&start_card=[% start_card | html %]">label_patronlist_[% patronlist_id | html %].pdf</a> > </p> >+ </fieldset> > </div> > [% ELSE %] > <h3> >@@ -68,6 +68,16 @@ > [% END %] > [% IF (patronlist_id) %] <input type="hidden" name="patronlist_id" value="[% patronlist_id | html %]" /> [% END %] > <fieldset class="rows"> >+ <h3> >+ [% IF ( label_ids ) %] >+ [% IF ( card_count == 1 ) %]Exporting [% card_count | html %] patron card[% ELSE %]Exporting [% card_count | html %] patron cards[% END %] >+ [% ELSIF ( borrower_numbers ) %] >+ [% IF ( borrower_count == 1 ) %]Exporting [% borrower_count | html %] patron card[% ELSE %]Exporting [% borrower_count | html %] patron cards[% END %] >+ [% ELSIF ( patronlist_id ) %] Exporting from patron list >+ [% ELSE %] >+ [% IF ( multi_batch_count == 1 ) %][% multi_batch_count | html %] batch to export[% ELSE %][% multi_batch_count | html %] batches to export[% END %] >+ [% END %] >+ </h3> > <ol> > <li> > <label style="width:9em" for="template_id">Select a template to be applied: </label> >@@ -101,9 +111,8 @@ > <input type="text" size="5" id="start_card" name="start_card" class="focus" title="Starting card number" value="1" /> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="submit" value="Export" /> >+ >+ <input type="submit" class="principal" value="Export" /> > <a href="#" class="cancel gb-close">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt >index c2c9df05e7..88f1ce25ba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt >@@ -1,3 +1,7 @@ >+ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Upload plugin › Plugins › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -5,13 +9,12 @@ > </head> > > <body id="plugins_plugins_disabled" class="plugins"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/plugins/plugins-home.pl">Plugins</a> >@@ -23,11 +26,12 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="container-fluid"> > <div class="row"> > <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3"> >- <h1>Plugins disabled!</h1> >+ <h2>Plugins disabled!</h2> > > <p>To enable Koha plugins, the flag enable_plugins must be set in the Koha configuration file</p> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >index c43c5fb2ee..103b7137c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >@@ -8,8 +8,10 @@ > </head> > > <body id="plugins_plugins_home" class="plugins"> >+[% form = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -26,6 +28,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt >index 8a1d5fa151..459e6e7f6f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt >@@ -1,3 +1,7 @@ >+ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Upload plugin › Plugins › Tools › Koha </title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -5,13 +9,12 @@ > </head> > > <body id="plugins_plugins_upload" class="plugins"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/plugins/plugins-home.pl">Plugins</a> >@@ -23,12 +26,13 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="container-fluid"> > <div class="row"> > <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3"> > >- <h1>Upload Koha plugin</h1> >+ <h2>Upload Koha plugin</h2> > [% IF ( ERRORS ) %] > <div class="dialog alert"> > [% FOREACH ERROR IN ERRORS %] >@@ -42,17 +46,16 @@ > </div> > [% END %] > <form method="post" action="/cgi-bin/koha/plugins/plugins-upload.pl" enctype="multipart/form-data"> >- <fieldset class="brief"> >+ <fieldset class="rows"> > <div class="hint"><strong>NOTE:</strong> Only KPZ file format is supported.</div> > <ol> > <li> > <label for="uploadfile">Select the file to upload: </label><input type="file" id="uploadfile" name="uploadfile" /> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >+ > <input type="hidden" name="op" value="Upload" /> >- <input type="submit" value="Upload" class="submit" /> >+ <input class="principal" type="submit" value="Upload" class="submit" /> > </fieldset> > </form> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt >index 905ed4c0f0..64af647b73 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt >@@ -6,6 +6,9 @@ > [% USE TablesSettings %] > [% USE Registers %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% SET registers = Registers.all( filters => { current_branch => 1 } ) %] > <title>Payments › Koha</title> >@@ -13,13 +16,12 @@ > </head> > > <body id="payments" class="pos"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="#" aria-current="page"> >@@ -28,6 +30,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >index 59b561e1ce..146d6452b5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >@@ -5,6 +5,9 @@ > [% USE AuthorisedValues %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Cashup › Koha</title> >@@ -13,13 +16,12 @@ > </head> > > <body id="register" class="pos"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/pos/pay.pl">Cash management</a> >@@ -31,6 +33,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -64,7 +67,7 @@ > > [% IF ( CAN_user_cash_management_cashup ) %] > <div id="toolbar" class="btn-toolbar"> >- <button id="pos_cashup" type="button" class="btn btn-default" data-toggle="modal" data-target="#confirmCashupModal" ><i class="fa fa-money"></i> Record cashup</button> >+ <button id="pos_cashup" type="button" class="btn btn-default toolbar-btn" data-toggle="modal" data-target="#confirmCashupModal" ><i class="fa fa-money"></i> Record cashup</button> > </div> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt >index 9d5c94c9ec..f91f1439d6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt >@@ -4,19 +4,21 @@ > [% USE KohaDates %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Cashup › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="cashup" class="pos"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'circ-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/pos/pay.pl">Cash management</a> >@@ -28,6 +30,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -55,7 +58,7 @@ > > [% IF CAN_user_cash_management_cashup %] > <div id="toolbar" class="btn-toolbar"> >- <button type="button" class="cashup_all btn btn-default" data-toggle="modal" data-target="#confirmCashupAllModal"><i class="fa fa-money"></i> Cashup all</button> >+ <button type="button" class="cashup_all btn btn-default toolbar-btn" data-toggle="modal" data-target="#confirmCashupAllModal"><i class="fa fa-money"></i> Cashup all</button> > </div> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >index aa41d41a16..ec2fc6ce12 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >@@ -1,17 +1,19 @@ > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( do_it ) %]Acquisitions statistics › Results[% ELSE %]Acquisitions statistics[% END %] › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="rep_acquisitions_stats" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -34,13 +36,14 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Acquisitions statistics </h1> >+<h2>Acquisitions statistics </h2> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] > [% IF ( mainloo.loopfilter.size ) %] >@@ -104,7 +107,7 @@ > [% ELSE %] > <form method="post" action="/cgi-bin/koha/reports/acquisitions_stats.pl"> > <fieldset class="rows"> >- <legend>Acquisitions statistics</legend> >+ <h3>Acquisitions statistics</h3> > <table> > <thead> > <tr> >@@ -273,7 +276,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend> Cell value </legend> >+ <h3> Cell value </h3> > <ol> > <li> > <label for="cellvalue1">Count items:</label><input type="radio" name="Cellvalue" id="cellvalue1" value="1" checked="checked" /> >@@ -294,7 +297,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Output</legend> >+ <h3>Output</h3> > <ol> > <li> > <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> >@@ -317,10 +320,8 @@ > </select> > </li> > </ol> >- </fieldset> > >- <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="do_it" value="1" /> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >index af079b3e56..2a3515cce6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >@@ -2,19 +2,21 @@ > [% USE KohaDates %] > [% USE ItemTypes %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Patrons with the most checkouts › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="rep_bor_issues_top" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -37,6 +39,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -44,8 +47,8 @@ > <main> > > [% IF ( do_it ) %] >+ <h2>Patrons with the most checkouts</h2> > [% FOREACH mainloo IN mainloop %] >- <h1>Patrons with the most checkouts</h1> > [% IF ( mainloo.loopfilter ) %] > [% IF mainloo.loopfilter.size %] > <p>Filtered on:</p> >@@ -114,7 +117,7 @@ > </table> > [% END %] > [% ELSE %] >- <h1>Patrons with the most checkouts</h1> >+ <h2>Patrons with the most checkouts</h2> > <form method="post" action="/cgi-bin/koha/reports/bor_issues_top.pl"> > <fieldset class="rows"> > <ol> >@@ -185,7 +188,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Output</legend> >+ <h3>Output</h3> > <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /></li> > <li><label for="outputfile">To a file: </label><input type="radio" name="output" value="file" id="outputfile" /> > <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> >@@ -210,7 +213,7 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="do_it" value="1" /> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt >index f3dba0031d..15845f9881 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt >@@ -1,17 +1,19 @@ > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Patrons with no checkouts › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="rep_borrowers_out" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -23,6 +25,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -30,8 +33,8 @@ > <main> > > [% IF ( do_it ) %] >+ <h2>Patrons with no checkouts</h2> > [% FOREACH mainloo IN mainloop %] >- <h1>Patrons with no checkouts</h1> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on:</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -58,7 +61,7 @@ > </table> > [% END %] > [% ELSE %] >- <h1>Patrons with no checkouts</h1> >+ <h2>Patrons with no checkouts</h2> > <form method="post" action="/cgi-bin/koha/reports/borrowers_out.pl"> > <fieldset class="rows"> > <ol> >@@ -74,7 +77,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Limits</legend> >+ <h3>Limits</h3> > <ol> > <li><label for="numberlimit">Limit to: </label><select name="Limit" id="numberlimit"> > <option value ="" selected="selected">None</option> >@@ -96,7 +99,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Output</legend> >+ <h3>Output</h3> > <ol> > <li> > <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> >@@ -124,7 +127,7 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="do_it" value="1" /> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >index 2017c62cf6..25ff5ac89e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >@@ -2,6 +2,9 @@ > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( do_it ) %]Patrons statistics › Results[% ELSE %]Patrons statistics[% END %] › Reports › Koha</title> > >@@ -13,13 +16,12 @@ > </head> > > <body id="rep_borrowers_stats" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -42,13 +44,14 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Patrons statistics</h1> >+<h2>Patrons statistics</h2> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] > [% IF ( mainloo.loopfilter.size>0 ) %] >@@ -91,7 +94,7 @@ > [% ELSE %] > > <form method="post" action="/cgi-bin/koha/reports/borrowers_stats.pl"> >- <fieldset class="rows"><legend>Patrons statistics</legend> >+ <fieldset class="rows"><h3>Patrons statistics</h3> > <table> > <thead> > <tr> >@@ -283,7 +286,7 @@ > > > <fieldset class="rows"> >- <legend>Output</legend> >+ <h3>Output</h3> > <ol> > <li> > <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> >@@ -308,10 +311,8 @@ > </select> > </li> > </ol> >- </fieldset> > >- <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="do_it" value="1" /> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >index 2e3bc98874..9dbaf94f67 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >@@ -14,8 +14,10 @@ > </head> > > <body id="cash_register_stats" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% form = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] >+[% INCLUDE 'header.inc' form = form %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -44,6 +46,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt >index 4a1f29c7e8..b005424349 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt >@@ -1,18 +1,20 @@ > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Most-circulated items[% IF ( do_it ) %] › Results[% END %] › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="rep_cat_issues_top" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -35,6 +37,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -43,8 +46,8 @@ > > [% IF ( do_it ) %] > >+ <h2>Top [% mainloo.limit | html %] Most-circulated items</h2> > [% FOREACH mainloo IN mainloop %] >- <h1>Top [% mainloo.limit | html %] Most-circulated items</h1> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on:</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -85,7 +88,7 @@ > </table> > [% END %] > [% ELSE %] >- <h1>Most-circulated items</h1> >+ <h2>Most-circulated items</h2> > <form method="post" action="/cgi-bin/koha/reports/cat_issues_top.pl"> > <fieldset class="rows"> > <ol> >@@ -149,7 +152,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Limits</legend> >+ <h3>Limits</h3> > <ol><li><label for="numberlimit">Limit to:</label><select name="Limit" id="numberlimit"> > <option value ="" selected="selected">None</option> > <option value="5" selected="selected"> 5</option> >@@ -174,7 +177,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Output</legend> >+ <h3>Output</h3> > <ol> > <li> > <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> >@@ -202,7 +205,7 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="do_it" value="1" /> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt >index 522f5cbcca..d4c99f2a2e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt >@@ -1,3 +1,7 @@ >+ >+[% SET footerjs = 1 %][% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Items with no checkouts › Reports › Koha</title> >@@ -7,13 +11,12 @@ > </style> > </head> > <body id="rep_catalogue_out" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -25,6 +28,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -32,7 +36,7 @@ > <main> > > [% IF ( do_it ) %] >- <h1>Items with no checkouts</h1> >+ <h2>Items with no checkouts</h2> > [% FOREACH mainloo IN mainloop %] > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on:</p> >@@ -98,7 +102,7 @@ > [% END %] > [% END %] > [% ELSE %] >- <h1>Items with no checkouts</h1> >+ <h2>Items with no checkouts</h2> > <form method="post" action="/cgi-bin/koha/reports/catalogue_out.pl"> > > <fieldset class="rows"> >@@ -120,7 +124,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Limits</legend> >+ <h3>Limits</h3> > <ol> > <li> > <label for="numberlimit">Limit to: </label> >@@ -145,7 +149,7 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="do_it" value="1" /> > <input type="hidden" name="output" value="screen" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >index 28ca91a789..dde16ccf9e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >@@ -1,18 +1,20 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > <title>[% IF ( do_it ) %]Catalog statistics › Results[% ELSE %]Catalog statistics[% END %] › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="rep_catalogue_stats" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -35,13 +37,14 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Catalog statistics</h1> >+<h2>Catalog statistics</h2> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] > [% IF ( mainloo.loopfilter ) %] >@@ -96,7 +99,7 @@ > > <form method="post" action="/cgi-bin/koha/reports/catalogue_stats.pl"> > <fieldset class="rows"> >- <legend>Catalog statistics</legend> >+ <h3>Catalog statistics</h3> > <table> > <thead> > <tr> >@@ -274,7 +277,7 @@ > </table><br /></fieldset> > > <fieldset class="rows"> >- <legend>Cell value</legend> >+ <h3>Cell value</h3> > <ol> > <li> > <label for="cellvalue_items">Count total items</label> >@@ -292,7 +295,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Output</legend> >+ <h3>Output</h3> > <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /></li> > <li><label for="outputfile">To a file: </label><input type="radio" name="output" value="file" id="outputfile" /> > <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> >@@ -314,10 +317,7 @@ > </select> > </li> > </ol> >- </fieldset> >- >- <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="do_it" value="1" /> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >index a0d15d20fe..d827ceaa42 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >@@ -1,4 +1,7 @@ > [% SET footerjs = 1 %] >+[% SET footerjs = 1 %][% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Dictionary › Guided reports › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -6,8 +9,7 @@ > </head> > > <body id="rep_dictionary" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > [%- BLOCK area_name -%] > [%- SWITCH area -%] >@@ -23,7 +25,7 @@ > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -72,6 +74,12 @@ > </a> > </li> > >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > [% ELSIF ( step_5 ) %] > <li> > <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> >@@ -91,6 +99,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -99,8 +108,9 @@ > > [% IF ( start_dictionary ) %] > <div id="toolbar"> >- <a id="newdictionary" class="btn btn-default" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="fa fa-plus"></i> New definition</a> >- </div> >+ <div> >+ <a id="newdictionary" class="toolbar-btn" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="fa fa-plus"></i> New definition</a> >+ </div></div> > [% END %] > <h1>Dictionary</h1> > [% IF ( start_dictionary ) %] >@@ -122,7 +132,7 @@ > [%- END -%] > [% END %] > </select> >- <input name="submit" value="Go" type="submit" /> >+ <input name="submit" class="principal" value="Go" type="submit" /> > [% END %] > </form> > <br /> >@@ -143,7 +153,7 @@ > <td class="actions"><form method="post" action="/cgi-bin/koha/reports/dictionary.pl"> > <input type="hidden" name="id" value="[% definition.id | html %]" /> > <input type="hidden" name="phase" value="Delete Definition" /> >- <button type="submit" name="submit" class="btn btn-default btn-xs" id="delete"><i class="fa fa-trash"></i> Delete</button> >+ <button type="submit" name="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> > </form></td> > </tr> > [% END %] >@@ -154,9 +164,9 @@ > [% END %] > > [% IF ( new_dictionary ) %] >-<h3>Add new definition</h3> >+<h2>Add new definition</h2> > <form action="/cgi-bin/koha/reports/dictionary.pl" method="post"> >-<fieldset class="rows"><legend>Step 1 of 5: Name the new definition</legend><ol> >+<fieldset class="rows"><h3>Step 1 of 5: Name the new definition</h3><ol> > <li> > <label for="definition_name">Definition name:</label> > <input type="text" id="definition_name" name="definition_name" /> >@@ -165,18 +175,17 @@ > <label for="definition_description">Definition description:</label> > <textarea name="definition_description" id="definition_description" rows="3" cols="20"></textarea> > </li> >-</ol></fieldset> >- >-<fieldset class="action"><input type="hidden" name="phase" value="New Term step 2" /> >-<input name="submit" value="Next" type="submit" /></fieldset> >+</ol> >+<input type="hidden" name="phase" value="New Term step 2" /> >+<input name="submit" class="principal" value="Next" type="submit" /></fieldset> > </form> > [% END %] > > [%- IF ( step_2 ) -%] >-<h3>Add new definition</h3> >+<h2>Add new definition</h2> > <form action="/cgi-bin/koha/reports/dictionary.pl" method="post"> > <fieldset class="rows"> >- <legend>Step 2 of 5: Choose the area</legend> >+ <h3>Step 2 of 5: Choose the area</h3> > <ol> > <li> > <input type="hidden" name="phase" value="New Term step 3" /> >@@ -189,16 +198,15 @@ > </select> > </li> > </ol> >- </fieldset> >- <fieldset class="action"><input name="submit" value="Next" type="submit" /></fieldset> >+<input name="submit" class="principal" value="Next" type="submit" /></fieldset> > </form> > [%- END -%] > > [% IF ( step_3 ) %] >-<h3>Add new definition</h3> >+<h2>Add new definition</h2> > <form action="/cgi-bin/koha/reports/dictionary.pl" method="post"> > <fieldset class="rows"> >-<legend>Step 3 of 5: Choose a column</legend> >+<h3>Step 3 of 5: Choose a column</h3> > <input type="hidden" name="area" value="[% area | html %]" /> > <input type="hidden" name="definition_name" value="[% definition_name | html %]" /> > <input type="hidden" name="definition_description" value="[% definition_description | html %]" /> >@@ -225,16 +233,15 @@ > </select> > > <input type="hidden" name="phase" value="New Term step 4" /> >-</fieldset> >-<fieldset class="action"><input type="submit" name="submit" value="Next" /></fieldset> >+<input type="submit" class="principal" name="submit" value="Next" /></fieldset> > </form> > [% END %] > > [% IF ( step_4 ) %] >-<h3>Add new definition</h3> >+<h2>Add new definition</h2> > <form action="/cgi-bin/koha/reports/dictionary.pl" method="post"> > <fieldset class="rows"> >-<legend>Step 4 of 5: Specify a value</legend> >+<h3>Step 4 of 5: Specify a value</h3> > <input type="hidden" name="area" value="[% area | html %]" /> > <input type="hidden" name="definition_name" value="[% definition_name | html %]" /> > <input type="hidden" name="definition_description" value="[% definition_description | html %]" /> >@@ -273,9 +280,8 @@ > [% END %] > </ol> > <input type="hidden" name="phase" value="New Term step 5" /> >-</fieldset> >-<fieldset class="action"> >-<input type="submit" name="submit" value="Next" /> >+ >+<input type="submit" class="principal" name="submit" value="Next" /> > </fieldset> > </form> > [% END %] >@@ -287,10 +293,10 @@ > <input type="hidden" name="definition_description" value="[% definition_description | html %]" /> > <input type="hidden" name="columnstring" value="[% columnstring | html %]" /> > >-<h3>Add new definition</h3> >+<h2>Add new definition</h2> > > <fieldset class="rows"> >- <legend>Step 5 of 5: Confirm details</legend> >+ <h3>Step 5 of 5: Confirm details</h3> > <ol> > <li> > <span class="label">Name:</span>[%- definition_name | html -%] >@@ -317,11 +323,9 @@ > </table> > </li> > </ol> >-</fieldset> >- >-<fieldset class="action"><input type="hidden" name="sql" value="[% query | html %]" /> >+<input type="hidden" name="sql" value="[% query | html %]" /> > <input type="hidden" name="phase" value="New Term step 6" /> >-<input type="submit" name="submit" value="Save" /> </fieldset> >+<input type="submit" class="principal" name="submit" value="Save" /> </fieldset> > > </form> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index 9551980fb2..8568df4cc1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -63,8 +63,10 @@ > </head> > > <body id="rep_guided_reports_start" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -147,6 +149,8 @@ > </ol> > </nav> <!-- /#breadcrumbs --> > >+[% INCLUDE 'shortcut.inc' %] >+ > <div id="update_sql" class="modal" tabindex="-1" role="dialog" aria-labelledby="update_sql_label" aria-hidden="true"> > <div class="modal-dialog"> > <div class="modal-content"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt >index 0cf4e3fdac..6bbd840fc2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt >@@ -1,18 +1,20 @@ > [% USE Branches %] > [% SET footerjs = 1 %] >+[% SET footerjs = 1 %][% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Average loan time › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="rep_issues_avg_stats" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -35,13 +37,14 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Average checkout period</h1> >+<h2>Average checkout period</h2> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] > [% IF ( mainloo.loopfilter ) %] >@@ -88,7 +91,7 @@ > > <form method="post" action="/cgi-bin/koha/reports/issues_avg_stats.pl"> > <fieldset class="rows"> >- <legend>Average checkout period statistics</legend> >+ <h3>Average checkout period statistics</h3> > <table> > <thead> > <tr> >@@ -221,7 +224,7 @@ > > > <fieldset class="rows"> >- <legend>Output</legend> >+ <h3>Output</h3> > <ol> > <li> > <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> >@@ -250,7 +253,7 @@ > <input type="hidden" name="Filter" value="" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="do_it" value="1" /> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > </fieldset> > </form> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >index 46dc8ac727..ab02c1d396 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >@@ -1,5 +1,8 @@ > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Circulation statistics[% IF ( do_it ) %] › Results[% END %] › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -9,13 +12,12 @@ > </head> > > <body id="rep_issues_stats" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -38,13 +40,14 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Circulation statistics</h1> >+<h2>Circulation statistics</h2> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] > [% IF ( mainloo.loopfilter ) %] >@@ -111,7 +114,7 @@ > > <form method="post" action="/cgi-bin/koha/reports/issues_stats.pl"> > <fieldset class="rows"> >- <legend>Circulation statistics</legend><table> >+ <h3>Circulation statistics</h3><table> > <thead> > <tr> > <th>Title</th> >@@ -339,7 +342,7 @@ > </table><br /></fieldset> > > <fieldset class="rows"> >- <legend>Cell value</legend> >+ <h3>Cell value</h3> > <ol> > <li> > <label for="cellvalue1">Count total items:</label> >@@ -357,7 +360,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Output</legend> >+ <h3>Output</h3> > <ol> > <li> > <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> >@@ -385,7 +388,7 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="do_it" value="1" /> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >index 9ccc075100..aea35a47be 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -7,19 +7,21 @@ > [% USE ItemTypes %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% SET footerjs = 1 %][% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Lost items › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="rep_itemslost" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -43,6 +45,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -50,7 +53,7 @@ > <main> > > >-<h1>Lost items</h1> >+<h2>Lost items</h2> > > [% IF ( get_items ) %] > >@@ -188,7 +191,7 @@ > </li> > > </ol></fieldset> >-<fieldset class="action"> <input type="submit" value="Submit" /> >+<fieldset class="action"> <input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="get_items" value="1" /></fieldset> > </form> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >index 57fe194b5b..a3ef24cdb5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >@@ -3,6 +3,9 @@ > [% USE Branches %] > [% USE ItemTypes %] > [% SET footerjs = 1 %] >+[% SET footerjs = 1 %][% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Catalog by item types › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -11,13 +14,12 @@ > </head> > > <body id="rep_itemtypes" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -40,6 +42,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -48,8 +51,8 @@ > > > [% IF ( do_it ) %] >+ <h2>Reports on item types [% IF branch %] held at [% Branches.GetName( branch ) | html %][% END %]</h2> > [% FOREACH mainloo IN mainloop %] >- <h1>Reports on item types [% IF branch %] held at [% Branches.GetName( branch ) | html %][% END %]</h1> > <table id="itemtypest"> > <thead> > <tr> >@@ -88,7 +91,7 @@ > </li> > </ol> > </fieldset> >- <fieldset class="action"><input type="submit" value="Submit" /> >+ <fieldset class="action"><input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="do_it" value="1" /> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >index 2b06ed6e72..d713676fae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >@@ -2,19 +2,20 @@ > [% USE Asset %] > [% USE Price %] > [% USE TablesSettings %] >-[% SET footerjs = 1 %] >+[% SET footerjs = 1 %][% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Orders by fund › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="rep_orders_by_budget" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -37,6 +38,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -44,8 +46,8 @@ > <main> > > >-[% IF ( current_budget_name ) %]<h1>Orders for fund '[% current_budget_name | html %]'</h1> >-[% ELSE %]<h1>Orders by fund</h1> >+[% IF ( current_budget_name ) %]<h2>Orders for fund '[% current_budget_name | html %]'</h2> >+[% ELSE %]<h2>Orders by fund</h2> > [% END %] > > [% IF ( get_orders ) %] >@@ -101,7 +103,7 @@ > [% ELSE %] > <form name="f" action="/cgi-bin/koha/reports/orders_by_fund.pl" method="post"> > <fieldset class="rows"> >- <legend>Filters</legend> >+ <h3>Filters</h3> > <ol><li><label for="budgetfilter">Fund: </label> > <select name="budgetfilter" id="budgetfilter"> > <option value="">All funds</option> >@@ -123,7 +125,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Output</legend> >+ <h3>Output</h3> > <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li> > <li><label for="outputfile">To a file:</label> > <input type="radio" name="output" value="file" id="outputfile" /> >@@ -151,7 +153,7 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="get_orders" value="1" /></fieldset> > </form> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >index 5c2de9cbf3..0af91a2c32 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >@@ -1,3 +1,6 @@ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% USE Koha %] > [% USE raw %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -5,13 +8,12 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="rep_reports-home" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="#" aria-current="page"> >@@ -20,6 +22,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -30,7 +33,7 @@ > > [% IF ( CAN_user_reports_execute_reports || CAN_user_reports_create_reports ) %] > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get"> >- <fieldset class="brief"> >+ <fieldset> > <h2>Guided reports</h2> > <input name="phase" value="Use saved" type="hidden"> > <input name="filter_set" value="1" type="hidden"> >@@ -45,12 +48,12 @@ > <p> > <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved"><i class="fa fa-list"></i> Use saved</a> > </p> >- <label for="filter_keyword">Search by keyword:</label> <input id="filter_keyword" name="filter_keyword" value="" size="16" type="text" /> <input value="Search" type="submit" /> >+ <label for="filter_keyword">Search by keyword:</label> <input id="filter_keyword" name="filter_keyword" value="" size="16" type="text" /> <input value="Search" class="principal" type="submit" /> > </fieldset> > </form> > [% END %] > >- <h5>Reports dictionary</h5> >+ <h2>Reports dictionary</h2> > <ul> > <li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li> > </ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >index 181fb4e188..286e73edb2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >@@ -1,5 +1,8 @@ > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Holds statistics[% IF ( do_it ) %] › Results[% END %] › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -9,13 +12,12 @@ > </head> > > <body id="rep_reserve_stats" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -38,6 +40,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -45,7 +48,7 @@ > <main> > > >-<h1>Holds statistics</h1> >+<h2>Holds statistics</h2> > [% IF ( do_it ) %] > [% IF ( mainloop ) %] > [% IF ( loopfilter ) %] >@@ -97,7 +100,7 @@ > > <form method="post" action="/cgi-bin/koha/reports/reserves_stats.pl"> > <fieldset class="rows"> >- <legend>Holds statistics</legend><table> >+ <h3>Holds statistics</h3><table> > <thead> > <tr> > <th>Title</th> >@@ -292,11 +295,11 @@ > </tbody> > </table><br /></fieldset> > >-<fieldset class="rows"><legend>Cell value </legend><ol><li><label for="cellvalue1">Count holds:</label> <input type="radio" name="Cellvalue" value="1" id="cellvalue1" checked="checked" /> </li> >+<fieldset class="rows"><h3>Cell value </h3><ol><li><label for="cellvalue1">Count holds:</label> <input type="radio" name="Cellvalue" value="1" id="cellvalue1" checked="checked" /> </li> > <li><label for="cellvalue2">Count unique borrowers:</label> <input type="radio" name="Cellvalue" value="2" id="cellvalue2" /> </li><li><label for="cellvalue3">Count unique items:</label> <input type="radio" name="Cellvalue" id="cellvalue3" value="3" /> </li><li><label for="cellvalue4">Count unique bibliographic records:</label> <input type="radio" name="Cellvalue" id="cellvalue4" value="4" /> </li></ol></fieldset> > > <fieldset class="rows"> >- <legend>Output</legend> >+ <h3>Output</h3> > <ol> > <li> > <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> >@@ -324,7 +327,7 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="do_it" value="1" /> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >index 0a0f60370c..7bbba7d45f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >@@ -3,6 +3,9 @@ > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Serials subscriptions stats › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -12,13 +15,12 @@ > </head> > > <body id="rep_serials_stats" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> >@@ -30,13 +32,14 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Serials subscriptions</h1> >+ <h2>Serials subscriptions</h2> > [% IF ( do_it ) %] > <table id="resulttable"> > <thead> >@@ -109,7 +112,7 @@ > > > <fieldset class="rows"> >- <legend>Output</legend> >+ <h3>Output</h3> > <ol> > <li> > <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> >@@ -137,7 +140,7 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="report_name" value="[% report_name | html %]" /> > <input type="hidden" name="do_it" value="1" /> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 9e62356d58..150ff21ad1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -13,6 +13,9 @@ > [% USE TablesSettings %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% SET libraries = Branches.all %] > [% SET categories = Categories.all.unblessed %] >@@ -93,14 +96,13 @@ > > <body id="circ_request" class="catalog"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > [% UNLESS ( multi_hold ) %] > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -115,11 +117,12 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > [% ELSE %] > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >@@ -143,6 +146,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > [% END # UNLESS multi_hold %] > > <div class="main container-fluid"> >@@ -336,7 +340,7 @@ > [% END %] > [% UNLESS ( multi_hold ) %] > <fieldset class="action"> >- <input type="submit" value="Place hold" /> >+ <input type="submit" class="principal" value="Place hold" /> > </fieldset> > [% ELSE %] > <table id="requesttitles"> >@@ -632,7 +636,7 @@ > [% ELSIF ( none_available ) %] > <button type="submit" disabled="disabled" class="btn btn-default btn-disabled">Place hold</button> > [% ELSE %] >- <button type="submit" class="btn btn-default">Place hold</button> >+ <button type="submit" class="btn btn-default principal">Place hold</button> > [% END %] > [% END %] > </fieldset> >@@ -961,9 +965,9 @@ > [% ELSIF ( no_bibs_available ) %] > <button type="submit" class="btn btn-default btn-disabled" disabled="disabled">Place holds</button> > [% ELSIF ( none_available ) %] >- <button type="submit" class="btn btn-default">Place holds</button> >+ <button type="submit" class="btn btn-default principal">Place holds</button> > [% ELSE %] >- <button type="submit" class="btn btn-default" id="multi_hold_submit">Place holds</button> >+ <button type="submit" class="btn btn-default principal" id="multi_hold_submit">Place holds</button> > [% END %] > [% ELSE %] > [% IF ( override_required ) %] >@@ -971,7 +975,7 @@ > [% ELSIF ( none_available ) %] > <button type="submit" class="btn btn-default btn-disabled" disabled="disabled">Place hold</button> > [% ELSE %] >- <button type="submit" class="btn btn-default">Place hold</button> >+ <button type="submit" class="btn btn-default principal">Place hold</button> > [% END %] > [% END %] > [% END # /IF patron %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >index 5a203ca4e7..4e75c578f8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >@@ -1,18 +1,20 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( status ) %]Approved comments[% ELSE %]Comments awaiting moderation[% END %] › Comments › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="tools_reviewswaiting" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -31,13 +33,14 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Comments</h1> >+<h2>Comments</h2> > > <!-- The manual invoice and credit buttons --> > <div class="statictabs"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >index c607e61f38..2afd031516 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >@@ -1,19 +1,21 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Add or remove items › Collection [% colTitle | html %] › Rotating collections › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="rcoll_addItems" class="tools rcoll"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -31,20 +33,22 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> >- <h1>Add/remove items from collection</h1> > > [% IF ( ! colId ) %] >+ <h1>Add/remove items from collection</h1> > <div class="dialog message"> > <p>Invalid collection id</p> > <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> > </div> > [% ELSE %] > [% INCLUDE 'rotating-collections-toolbar.inc' %] >+ <h1>Add/remove items from collection</h1> > <h2>Collection <em>[% colTitle | html %]</em></h2> > > [% IF ( previousActionAdd ) %] >@@ -90,7 +94,7 @@ > <div> > <form action="addItems.pl" method="post"> > <fieldset class="brief"> >- <legend>Add or remove items</legend> >+ <h3>Add or remove items</h3> > <ol> > <li> > <label for="barcode">Barcode: </label> >@@ -105,7 +109,7 @@ > <p> > <input type="hidden" id="colId" name="colId" value="[% colId | html %]" /> > <input type="hidden" name="action" value="addItem" /> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > </p> > </fieldset> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt >index eecf14ca8f..9f344de6a9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [%- IF ( action == "new" ) %] >@@ -12,13 +15,12 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="rcoll_editCollections" class="tools rcoll"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -45,6 +47,7 @@ > [% END -%] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -112,9 +115,9 @@ > > [% IF action == "new" || action == "edit" %] > [% IF ( previousActionEdit ) %] >- <h1>Edit collection <em>[% editColTitle | html %]</em></h1> >+ <h2>Edit collection <em>[% editColTitle | html %]</em></h2> > [% ELSE %] >- <h1>Add new collection</h1> >+ <h2>Add new collection</h2> > [% END %] > > <form action="editCollections.pl" method="post" class="validated"> >@@ -146,9 +149,8 @@ > [% END %] > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <p><input type="submit" value="Submit" /> <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl" class="cancel">Cancel</a></p> >+ >+ <p><input type="submit" class="principal" value="Submit" /> <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl" class="cancel">Cancel</a></p> > </fieldset> > </form> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >index 77ae56e76f..877fdfe618 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >@@ -2,19 +2,21 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Rotating collections › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="rcoll_rotatingCollections" class="tools rcoll"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -26,6 +28,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -34,9 +37,10 @@ > > [% INCLUDE 'rotating-collections-toolbar.inc' %] > >- <h1>Rotating collections</h1> >+ <h2>Rotating collections</h2> > <div> > [% IF ( collectionsLoop ) %] >+ <fieldset id="searchresults"> > <table id="rotating-collections-table"> > <thead> > <tr> >@@ -68,6 +72,7 @@ > [% END %] > </tbody> > </table> >+ </fieldset> > [% ELSE %] > <div class="dialog message">There are no collections currently defined.</div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt >index 43a1dfb90a..ae57ef5046 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt >@@ -2,18 +2,20 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Transfer collection › Rotating collections › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="rcoll_transferCollection" class="tools rcoll"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >@@ -31,13 +33,14 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Transfer collection <em>[% colTitle | html %]</em></h1> >+ <h2>Transfer collection <em>[% colTitle | html %]</em></h2> > > [% IF ( messages ) %] > [% FOREACH message IN messages %] >@@ -78,9 +81,8 @@ > </select> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="submit" value="Transfer collection"> <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl" class="cancel">Cancel</a> >+ >+ <input type="submit" class="principal" value="Transfer collection"> <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl" class="cancel">Cancel</a> > </fieldset> > </form> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >index 42f2f42626..d56dc873b6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >@@ -1,19 +1,21 @@ > [% USE Branches %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Check expiration › Serials › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="ser_checkexpiration" class="ser"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'serials-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> >@@ -25,17 +27,18 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Check expiration</h1> >+<h2>Check expiration</h2> > > <form name="f" action="/cgi-bin/koha/serials/checkexpiration.pl" method="get" class="validated"> > <fieldset class="rows"> >- <legend>Filter results:</legend> >+ <h3>Filter results:</h3> > > <ol> > <ol> >@@ -68,8 +71,8 @@ > [% END %] > </li> > </ol> >+<fieldset class="action"><input type="submit" class="principal" value="Search" /></fieldset> > </fieldset> >-<fieldset class="action"><input type="submit" value="Search" /></fieldset> > </form> > > [% IF ( subscriptions_loop ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >index 9966c18f6b..08594a113c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -3,19 +3,20 @@ > [% USE AuthorisedValues %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( supplierid ) -%] Claims for [% suppliername | html %] › [% END %] Claims › Serials › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="ser_claims" class="ser"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'serials-search.inc' %] >- >+ [% INCLUDE 'header.inc' form=formulaire %] > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> >@@ -38,6 +39,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >@@ -94,7 +96,7 @@ > </option> > [% END %] > </select> >- <input type="submit" value="OK" /> >+ <input type="submit" class="principal" value="OK" /> > </fieldset> > </form> <!-- /#claims --> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt >index 9338c4fa44..a53948bf38 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt >@@ -1,17 +1,19 @@ > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Preview routing list › Serials › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="ser_routing-preview" class="ser"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'serials-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> >@@ -26,6 +28,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >index 74e36cc475..093a8bbd31 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >@@ -1,17 +1,19 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( op ) %]Create routing list[% ELSE %]Edit routing list[% END %] › [% title | html %] › Serials › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="ser_routing" class="ser"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'serials-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > > [% IF blocking_error %] >@@ -40,6 +42,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index 2e7196f69a..614974a6bb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -4,19 +4,21 @@ > [% USE Branches %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Serial collection information for [% bibliotitle | html %] › Serials › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="ser_serials-collection" class="ser"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'serials-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> >@@ -28,6 +30,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >index d1b93145f4..29b1de4c6f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >@@ -1,3 +1,7 @@ >+ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% USE raw %] > [% USE Asset %] > [% USE AuthorisedValues %] >@@ -78,13 +82,12 @@ $(document).ready(function() { > }</style> > </head> > <body id="ser_serials-edit" class="ser"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'serials-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> >@@ -96,6 +99,7 @@ $(document).ready(function() { > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt >index c951daa715..ff5036ef9f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt >@@ -3,18 +3,20 @@ > [% USE KohaDates %] > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Serials [% biblionumber | html %] › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="ser_serials-home" class="ser"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'serials-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="#" aria-current="page"> >@@ -23,6 +25,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >index fa5a68e8f2..4ae6df4fb2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >@@ -6,6 +6,9 @@ > [% USE KohaDates %] > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Serials [% biblionumber | html %] › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -13,13 +16,12 @@ > </head> > > <body id="ser_serials-search" class="ser"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'serials-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > [% IF ( done_searched ) %] > <li> >@@ -39,6 +41,7 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > [% url_params = [] %] > [% FOREACH param IN CGI.params.pairs %] >@@ -355,14 +358,11 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- >- [% INCLUDE 'serials-menu.inc' %] > [% IF ( done_searched ) %] > [% UNLESS ( mana ) %] >- <div id="advsearch"> > <form action="/cgi-bin/koha/serials/serials-search.pl" method="get"> >- <fieldset class="brief"> >- <h4>Search subscriptions</h4> >+ <fieldset class="sidebr"> >+ <h3>Search subscriptions</h3> > <ol> > <li> > <label for="issn">ISSN:</label> >@@ -399,8 +399,8 @@ > </select> > </li> > <li> >- <label for="location">Location:</label> >- [% PROCESS 'av-build-dropbox.inc' name="location_filter", category="LOC", default=location_filter, all=1 %] >+ <p for="location">Location: >+ [% PROCESS 'av-build-dropbox.inc' name="location_filter", category="LOC", default=location_filter, all=1 %]</p> > </li> > <li> > <label for="to">Expires before:</label> >@@ -429,14 +429,14 @@ > </ol> > <input type="hidden" name="searched" value="1" /> > <fieldset class="action"> >- <input type="submit" value="Search" /> >+ <input type="submit" class="principal" value="Search" /> > </fieldset> > >- </fieldset> <!-- /.brief --> >+ </fieldset> <!-- /.sidebar --> > </form> >- </div> <!-- /#advsearch --> > [% END # / UNLESS ( mana ) %] > [% END # / IF ( done_searched ) %] >+ [% INCLUDE 'serials-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >index 74eafacd8c..883e4d817b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >@@ -5,6 +5,9 @@ > [% USE Branches %] > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( modify ) %][% bibliotitle | html %] › Modify subscription[% ELSE %]New subscription[% END %] › Serials › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -19,8 +22,7 @@ fieldset.rows table { clear: none; margin: 0; } > </head> > > <body id="ser_subscription-add" class="ser"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'serials-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -56,6 +58,12 @@ fieldset.rows table { clear: none; margin: 0; } > [% END %] > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > [% INCLUDE 'blocking_errors.inc' %] >@@ -63,7 +71,7 @@ fieldset.rows table { clear: none; margin: 0; } > <div class="main container-fluid"> > <div class="row"> > <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> >- <h1>[% IF ( modify ) %] Modify subscription for <em>[% bibliotitle | html %]</em>[% ELSE %]Add a new subscription[% END %] (<span id="page_number">1/2</span>)</h1> >+ <h2>[% IF ( modify ) %] Modify subscription for <em>[% bibliotitle | html %]</em>[% ELSE %]Add a new subscription[% END %] (<span id="page_number">1/2</span>)</h2> > </div> > </div> > <form method="post" id="subscription_add_form" name="f" action="/cgi-bin/koha/serials/subscription-add.pl" class="validated"> >@@ -78,14 +86,14 @@ fieldset.rows table { clear: none; margin: 0; } > <input type="hidden" name="user" value="[% logged_in_user.userid | html %]" /> > <input type="hidden" name="irreg_check" value="0" /> > <fieldset id="subscription_add_information" class="rows"> >- <legend>Subscription details</legend> >+ <h3>Subscription details</h3> > <ol> > [% IF ( subscriptionid ) %] > <li><span class="label">Subscription number: </span> [% subscriptionid | html %]</li> > [% END %] > <li> > <label for="aqbooksellerid">Vendor: </label> >- <input type="text" name="aqbooksellerid" id="aqbooksellerid" value="[% aqbooksellerid | html %]" size="8" /> (<input type="text" name="aqbooksellername" id="aqbooksellername" value="[% aqbooksellername | html %]" disabled="disabled" readonly="readonly" />) <a href="#" id="vendor_search"><i class="fa fa-search"></i> Search for a vendor</a> >+ <input type="text" name="aqbooksellerid" id="aqbooksellerid" value="[% aqbooksellerid | html %]" size="8" /> (<input type="text" name="aqbooksellername" id="aqbooksellername" value="[% aqbooksellername | html %]" disabled="disabled" readonly="readonly" />) <a href="#" id="vendor_search"><i class="fa fa-search"></i> Search for a vendor</a> > </li> > <li> > <label for="biblionumber" class="required">Record:</label> >@@ -183,7 +191,7 @@ fieldset.rows table { clear: none; margin: 0; } > <div class="hint">Selecting a notice will allow patrons to subscribe to notifications when a new issue is received.</div> > [% ELSE %] > <span class="label">Patron notification: </span> >- <div class="hint">To notify patrons of new serial issues, you must <a href="/cgi-bin/koha/tools/letter.pl">define a notice</a>.</div> >+ <div class="hint">To notify patrons of new serial issues, you must <a href="/cgi-bin/koha/tools/letter.pl">define a notice</a>.</div> > [% END %] > </li> > <li> >@@ -255,7 +263,7 @@ fieldset.rows table { clear: none; margin: 0; } > </ol> > </fieldset> > <fieldset class="action"> >- <button type="button" id="subscription_add_next" style="float:right;">Next <i class="fa fa-long-arrow-right"></i></button> >+ <button type="button" class="principal" id="subscription_add_next" style="float:right;">Next <i class="fa fa-long-arrow-right"></i></button> > </fieldset> > </div> <!-- /.col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 --> > </div> <!-- /.row#page_1 --> >@@ -271,7 +279,7 @@ fieldset.rows table { clear: none; margin: 0; } > </div> > <div id="subscription_form_planning"> > <fieldset class="rows"> >- <legend>Serials planning</legend> >+ <h3>Serials planning</h3> > <ol> > <li> > <label for="acqui_date" class="required">First issue publication date:</label> >@@ -411,8 +419,8 @@ fieldset.rows table { clear: none; margin: 0; } > </li> > <li> > <span class="label"> </span> >- <a href="#" class="toggle_advanced_pattern show_advanced_pattern"><i class="fa fa-plus-square"></i> Show advanced pattern</a> >- <a href="#" style="display:none;" class="toggle_advanced_pattern hide_advanced_pattern"><i class="fa fa-minus-square"></i> Hide advanced pattern</a> >+ <a href="#" class="toggle_advanced_pattern show_advanced_pattern"><i class="fa fa-plus-square"></i> Show advanced pattern</a> >+ <a href="#" style="display:none;" class="toggle_advanced_pattern hide_advanced_pattern"><i class="fa fa-minus-square"></i> Hide advanced pattern</a> > </li> > </ol> > >@@ -503,14 +511,14 @@ fieldset.rows table { clear: none; margin: 0; } > </li> > <li> > <span class="label"> </span> >- <a href="#" id="modifyadvancedpatternbutton"><i class="fa fa-pencil"></i> Modify pattern</a> >- <button type="button" class="btn btn-default btn-xs" id="saveadvancedpatternbutton" style="display:none"><i class="fa fa-save"></i> Save as new pattern</button> >- <a class="cancel" href="#" id="restoreadvancedpatternbutton" style="display:none">Cancel modifications</a> >+ <a href="#" id="modifyadvancedpatternbutton"><i class="fa fa-pencil"></i> Modify pattern</a> >+ <button type="button" class="btn btn-default btn-xs principal" id="saveadvancedpatternbutton" style="display:none"><i class="fa fa-save"></i> Save as new pattern</button> >+ <a class="cancel" href="#" id="restoreadvancedpatternbutton" style="display:none">Cancel modifications</a> > </li> > </ol> > </div> <!-- /#advancedpredictionpattern --> > <fieldset class="action"> >- <button type="button" id="testpatternbutton" class="btn btn-default btn-sm"><i class="fa fa-play"></i> Test prediction pattern</button> >+ <button type="button" id="testpatternbutton" class="btn btn-default btn-sm principal"><i class="fa fa-play"></i> Test prediction pattern</button> > </fieldset> > </fieldset> > >@@ -527,8 +535,8 @@ fieldset.rows table { clear: none; margin: 0; } > <input type="hidden" id="unitsperissue" name="unitsperissue" value=""/> > <input type="hidden" id="issuesperunit" name="issuesperunit" value=""/> > <fieldset class="action"> >- <button type="button" id="subscription_add_previous" style="float:left"><i class="fa fa-long-arrow-left"></i> Previous</button> >- <input id="save-subscription" type="submit" value="Save subscription" style="float:right;" accesskey="w"/> >+ <button type="button" id="subscription_add_previous" class="cancel" style="float:left"><i class="fa fa-long-arrow-left"></i> Previous</button> >+ <input id="save-subscription" type="submit" value="Save subscription" class="principal" style="float:right;" accesskey="w"/> > </fieldset> > </div> > </div> >@@ -550,7 +558,7 @@ fieldset.rows table { clear: none; margin: 0; } > <div class="modal-body"> > </div> > <div class="modal-footer"> >- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> >+ <button type="button" class="btn btn-default cancel" data-dismiss="modal">Close</button> > </div> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt >index 360b18e41d..219896fce8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt >@@ -1,3 +1,7 @@ >+ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% USE AuthorisedValues %] > [% USE Branches %] > [% USE ItemTypes %] >@@ -8,8 +12,7 @@ > [% INCLUDE 'calendar.inc' %] > </head> > <body id="ser_subscription-batchedit" class="ser"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'serials-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -25,6 +28,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >index ee7d25a256..b964b80559 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >@@ -7,6 +7,9 @@ > [% USE Price %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Details for subscription #[% subscriptionid | html %] › Serials › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -14,8 +17,7 @@ > </head> > > <body id="ser_subscription-detail" class="ser"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'serials-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -40,6 +42,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >index 3566022ae8..5f231dd72b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >@@ -1,12 +1,14 @@ > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Frequencies › Serials › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="ser_subscription_frequencies" class="ser"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'serials-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > [% BLOCK translate_frequnit %] > [% SWITCH frequnit %] >@@ -29,6 +31,14 @@ > <a href="#" aria-current="page">Frequencies</a> > </li> > </ol> >+ >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -38,9 +48,9 @@ > > [% IF (new or modify) %] > [% IF (new) %] >- <h1>New frequency</h1> >+ <h2>New frequency</h2> > [% ELSE %] >- <h1>Edit frequency: [% description | html %]</h1> >+ <h2>Edit frequency: [% description | html %]</h2> > [% END %] > <form action="/cgi-bin/koha/serials/subscription-frequencies.pl" id="add_frequency_form" method="post"> > [% IF (modify) %] >@@ -101,10 +111,12 @@ > [% ELSE %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newfrequency" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=new"><i class="fa fa-plus"></i> New frequency</a> >+ <div> >+ <a class="toolbar-btn" id="newfrequency" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=new"><i class="fa fa-plus"></i> New frequency</a> >+ </div> > </div> > >- <h1>Frequencies</h1> >+ <h2>Frequencies</h2> > [% IF still_used %] > <div class="dialog alert"> > <p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt >index f8524e1a56..9cb6c0b214 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt >@@ -1,18 +1,20 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Subscription history › Serials › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="ser_subscription_history" class="ser"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'serials-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> >@@ -24,6 +26,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt >index 802698e678..b3582614ec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt >@@ -1,19 +1,21 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Numbering patterns › Serials › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="ser_subscription_numberpatterns" class="ser"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'serials-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> >@@ -46,22 +48,30 @@ > [% END %] > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > >+ >+ <div id="toolbar" class="btn-toolbar"> >+ <div> >+ <a class="toolbar-btn" id="newnumberpattern" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=new"><i class="fa fa-plus"></i> New numbering pattern</a> >+ </div> >+ </div> >+ > [% IF (new or modify) %] > [% IF (new) %] >- <h1>New numbering pattern</h1> >+ <h2>New numbering pattern</h2> > [% IF (error_existing_numberpattern) %] > <div class="dialog alert"> > <p>A pattern with this name already exists.</p> > </div> > [% END %] > [% ELSE %] >- <h1>Modify pattern: [% label | html %]</h1> >+ <h2>Modify pattern: [% label | html %]</h2> > [% IF (error_existing_numberpattern) %] > <div class="dialog alert"> > <p>Another pattern with this name already exists.</p> >@@ -180,9 +190,9 @@ > </table> > </fieldset> > <fieldset class="action"> >- <button type="submit" class="btn btn-default">Save</button> >- <button type="reset" class="btn btn-default">Reset</button> >- <a class="cancel" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl">Cancel</a> >+ <button type="submit" class="btn btn-default principal">Save</button> >+ <button type="reset" class="btn btn-default cancel">Reset</button> >+ <a class="btn btn-default cancel" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl">Cancel</a> > </fieldset> > </form> > >@@ -254,7 +264,7 @@ > </form> > > [% ELSE %] >- <h1>Numbering patterns</h1> >+ <h2>Numbering patterns</h2> > [% IF still_used %] > <div class="dialog alert"> > <p> >@@ -282,10 +292,6 @@ > </div> > [% END %] > >- <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newnumberpattern" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=new"><i class="fa fa-plus"></i> New numbering pattern</a> >- </div> >- > [% IF (numberpatterns_loop.size) %] > <table id="numberpatternst"> > <thead> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt >index 0bcfe25354..332cbb89f3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt >@@ -1,15 +1,18 @@ >+ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'serials-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Alert subscribers for [% bibliotitle | html %] › Serials › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="ser_viewalerts" class="ser"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'serials-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="/cgi-bin/koha/mainpage.pl"><i class="fa fa-home"></i></a> > </li> > <li> > <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> >@@ -21,6 +24,7 @@ > </li> > </ol> > </nav> >+[% INCLUDE 'shortcut.inc' %] > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 1e266d5855..abb6ef446f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -53,8 +53,10 @@ > </head> > > <body id="acq_suggestion" class="acq"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% form = BLOC %] >+ [% INCLUDE 'cat-search.inc' %] >+ [% END %] >+ [% INCLUDE 'header.inc' form = formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -103,6 +105,7 @@ > [% END %] > </ol> > </nav> <!-- /.breadcrumbs --> >+ [% INCLUDE 'shortcut.inc' %] > > [% IF ( op == 'show' ) %] > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >index cc25b9f11d..c0d4713ebe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( do_it ) %]Review[% ELSE %]Review tags[% END %] › Tags › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -10,8 +13,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > </head> > > <body id="tags_list" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -28,7 +30,13 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <a href="#" aria-current="page"> > Results for tag <em>[% tag | html %]</em> > </a> >- </li> >+ </li >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol>> > </ol> > </nav> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index abd19df0a8..936bb596a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( do_it ) %]Review[% ELSE %]Review tags[% END %] › Tags › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -15,8 +18,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > </head> > > <body id="tags_review" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -32,6 +34,12 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -41,7 +49,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > > <div class="row"> > <div class="col-sm-8 col-sm-push-2"> >-<h1>Tags</h1> >+<h2>Tags</h2> > <form method="post" action="/cgi-bin/koha/tags/review.pl"> > <h4><span>Displaying</span> > [% IF ( filter_approved_all ) %]<span>all</span>[% END %] >@@ -168,7 +176,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > </div> > <div class="col-sm-2 col-sm-push-2"> > <aside> >- <fieldset class="brief"> >+ <fieldset class="sidebar"> > <h4>Terms summary</h4> > <ul> > <li><a href="/cgi-bin/koha/tags/review.pl?approved=1">Approved</a>: >@@ -186,12 +194,12 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > </ul> > <span id="terms_summary_status"> </span> > </fieldset> >- <fieldset class="brief"> >+ <fieldset class="sidebar"> > <h4>Check lists</h4> > <div class="description">Enter a word or phrase to check against approved/rejected lists: </div> > <form method="post" action="/cgi-bin/koha/tags/review.pl"> > <input type="text" size="14" name="test" id="test" /> >- <fieldset class="action"><button type="submit" value="Test" class="approval_btn btn btn-default btn-sm" id="test_button" name="op-test"><i class="fa fa-check-square-o" aria-hidden="true"></i> Test</button></fieldset> >+ <fieldset class="action"><button type="submit" value="Test" class="approval_btn btn btn-default btn-sm principal" id="test_button" name="op-test"><i class="fa fa-check-square-o" aria-hidden="true"></i> Test</button></fieldset> > <div id="verdict"> > [% IF ( test_term ) %] > [% IF ( verdict_ok ) %] >@@ -209,13 +217,14 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > </div> > <div class="col-sm-2 col-sm-pull-10"> > <aside> >+ <div id="filters"> > <form method="post" action="/cgi-bin/koha/tags/review.pl"> >-<fieldset class="brief"> >+<fieldset class="sidebar"> > <h4>Filters</h4> > <ol> >- <li><label for="tag">Term:</label> <input type="text" name="tag" id="tag" value="[% filter_tag | html %]" /> >+ <li><p for="tag">Term:<input type="text" name="tag" id="tag" value="[% filter_tag | html %]" /></p> > </li> >- <li><label for="approved">Status:</label> >+ <li><p for="approved">Status: > <select name="approved" id="approved"> > [% IF ( filter_approved_all ) %]<option selected="selected" value="all">all</option> > [% ELSE %]<option value="all">all</option>[% END %] >@@ -225,23 +234,24 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > [% ELSE %]<option value="0">pending</option>[% END %] > [% IF ( filter_approved_rej ) %]<option selected="selected" value="-1">rejected</option> > [% ELSE %]<option value="-1">rejected</option>[% END %] >- </select> >+ </select></p> > </li> >- <li><label for="approver">Reviewer:</label> <input type="text" name="approver" id="approver" value="[% filter_approver | html %]" /> >+ <li><p for="approver">Reviewer: <input type="text" name="approver" id="approver" value="[% filter_approver | html %]" /></p> > </li> > <li> >- <label for="from">Date: from </label> >+ <p for="from">Date: from > <input type="text" size="10" id="from" name="from" value="[% filter_date_approved_from | html %]" class="flatpickr" data-date_to="to" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> > >- <label for="to">...to </label> >+ <p for="to">...to > <input type="text" size="10" id="to" name="to" value="[% filter_date_approved_to | html %]" class="flatpickr" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> > </li> > </ol> >- <fieldset class="action"><button type="submit" class="btn btn-default btn-sm"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset> >+ <fieldset class="action"><button type="submit" class="btn btn-default btn-sm principal"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset> > </fieldset> > </form> >+</div> > </aside> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt >index 154b713771..6590d113d3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt >@@ -2,13 +2,15 @@ > [% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Access files</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="tools_access_files" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -24,6 +26,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -31,7 +39,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Access files</h1> >+ <h2>Access files</h2> > > [% IF ( error_no_dir ) %] > <div class="dialog alert"><strong>Error: </strong>Files could not be found because the "access_dir" option was not set in "koha-conf.xml". Contact your system administrator to add this option.</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >index f996ec72ad..3c2f3fcb5c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >@@ -4,6 +4,9 @@ > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Additional contents › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -28,8 +31,7 @@ > </head> > > <body id="tools_additional-contents" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -71,6 +73,12 @@ > [% END %] > > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > [% IF op == 'add_form' %] >@@ -119,42 +127,40 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- >- <div id="news-filter"> > <form action="/cgi-bin/koha/tools/additional-contents.pl" method="get"> >- <h4>Filter</h4> >- <fieldset class="brief"> >- <ol> >- <li> >- <label for="news_keyword">Keyword:</label> >- <input type="text" name="news_keyword" id="news_keyword" /> >- </li> >- <li> >- <label for="news_display_location">Display location:</label> >- <select name="news_display_location" id="news_display_location"> >- <option value="">All</option> >- [% PROCESS locations_options category => category %] >- </select> >- </li> >- <li> >- <label for="news_library">Library: </label> >- <select id="news_library" name="news_library"> >- <option value=""></option> >- <option value="">All libraries</option> >- [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %] >- </select> >- </li> >- <li> >- <label> >- <input type="checkbox" name="show_expired" id="show_expired" /> Show expired >- </label> >- </li> >- </ol> >+ <fieldset class="sidebar"> >+ <h3>Filter</h3> >+ >+ <ol> >+ <li> >+ <label for="news_keyword">Keyword:</label> >+ <input type="text" name="news_keyword" id="news_keyword" /> >+ </li> >+ <li> >+ <label for="news_display_location">Display location:</label> >+ <select name="news_display_location" id="news_display_location"> >+ <option value="">All</option> >+ [% PROCESS locations_options category => category %] >+ </select> >+ </li> >+ <li> >+ <label for="news_library">Library: </label> >+ <select id="news_library" name="news_library"> >+ <option value=""></option> >+ <option value="">All libraries</option> >+ [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %] >+ </select> >+ </li> >+ <li> >+ <label> >+ <input type="checkbox" name="show_expired" id="show_expired" /> Show expired >+ </label> >+ </li> >+ </ol> > </fieldset> > </form> >- </div> > >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'tools-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > [% END %] >@@ -162,16 +168,17 @@ > </div> <!-- /.main.container-fluid --> > > [% BLOCK add_form %] >+<div class="col-sm-12"> > [% IF additional_content %] >- <h1>Modify an additional content</h1> >+ <h2>Modify an additional content</h2> > [% ELSE %] >- <h1>New additional content ([% IF category == 'news' %]News[% ELSE %]HTML customizations[% END %])</h1> >+ <h2>New additional content ([% IF category == 'news' %]News[% ELSE %]HTML customizations[% END %])</h2> > [% END %] > > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <button class="btn btn-default" id="submit_form"><i class="fa fa-save"></i> Save</button> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> >+ <button class="btn btn-default principal" id="submit_form"><i class="fa fa-save"></i> Save</button> >+ <button class="btn btn-default principal dropdown-toggle" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -179,10 +186,11 @@ > </ul> > </div> > [% IF category == 'news' %] >- <a class="btn btn-default cancel" href="/cgi-bin/koha/tools/additional-contents.pl"><i class="fa fa-remove"></i> Cancel</a> >+ <a class="cancel" href="/cgi-bin/koha/tools/additional-contents.pl"><i class="fa fa-remove"></i> Cancel</a> > [% ELSE %] >- <a class="btn btn-default cancel" href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations"><i class="fa fa-remove"></i> Cancel</a> >+ <a class="cancel" href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations"><i class="fa fa-remove"></i> Cancel</a> > [% END %] >+ </div> > </div> > > <form id="add_additional_content" method="post" action="/cgi-bin/koha/tools/additional-contents.pl" class="validate"> >@@ -250,6 +258,7 @@ > > [% IF languages.size %] > <div id="tabs" class="toptabs"> >+ <fieldset> > <ul class="nav nav-tabs" role="tablist"> > [% FOR language IN languages %] > [% IF language.lang == 'default' %] >@@ -262,7 +271,7 @@ > <div class="tab-content"> > [% FOR language IN languages %] > <div id="lang_[% language.lang | uri %]" class="lang clearfix tab-pane" data-lang="[% language.description | html %]"> >- <fieldset class="rows"> >+ <fieldset> > <ol> > <li> > <label for="title_[% language.lang | html %]">Title: </label> >@@ -278,6 +287,7 @@ > </div> > [% END %] > </div> <!-- /.tab-content --> >+ </fieldset> > </div> > [% ELSE %] > <div id="lang_default"> >@@ -287,13 +297,15 @@ > </div> > [% END %] > </form> >+</div> > [% END %] > > [% BLOCK list %] > > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&category=[% category | uri %]&editmode=[% editmode | uri %]" class="btn btn-default" id="newentry"> <i class="fa fa-plus"></i> New entry</a><button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> >+ <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&category=[% category | uri %]&editmode=[% editmode | uri %]" class="toolbar-btn word" id="newentry"> <i class="fa fa-plus"></i> New entry</a> >+ <button class="toolbar-btn arrow dropdown-toggle" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu pull-right"> >@@ -310,17 +322,18 @@ > > <h2>Additional contents ([% IF category == 'news' %]News[% ELSE %]HTML customizations[% END %])</h2> > [% IF category == 'news' %] >- See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a> >+ See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations" >HTML customizations</a> > [% ELSE %] >- See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a> >+ See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news" >News</a> > [% END %] > [% IF ( CAN_user_parameters_manage_sysprefs ) %] >- <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserJS'>OPACUserJS</a> >- <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserCSS'>OPACUserCSS</a> >+ <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserJS' >OPACUserJS</a> >+ <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserCSS' >OPACUserCSS</a> > [% END %] > > [% IF additional_contents.count %] > <form id="del_form" method="post" action="/cgi-bin/koha/tools/additional-contents.pl"> >+ <fieldset> > <table id="table_additional_contents"> > <thead> > <tr> >@@ -367,7 +380,7 @@ > <td>[% IF ( c.author) %][% INCLUDE 'patron-title.inc' patron=c.author %][% END %]</td> > <td> > <div class="btn-group"> >- <a class="preview_news btn btn-default btn-xs" data-number="[% loop.count | html %]"><i class="fa fa-eye" aria-hidden="true"></i> Preview content</a> >+ <a class="preview_news btn btn-default btn-xs" data-number="[% loop.count | html %]" ><i class="fa fa-eye" aria-hidden="true"></i> Preview content</a> > </div> > <div id="contentModal[% loop.count | html %]" class="modal" tabindex="-1" role="dialog" data-number="[% loop.count | html %]"> > <div class="modal-dialog" role="document"> >@@ -379,14 +392,15 @@ > [% c.content | $raw %] > </div> > <div class="modal-footer"> >- <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> >+ <button type="button" class="btn btn-secondary cancel" data-dismiss="modal">Close</button> > </div> > </div> > </div> > </td> > <td class="actions"> > <div class="btn-group dropup"> >- <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&id=[% c.idnew | uri %]&editmode=[% editmode | uri %]" class="btn btn-default btn-xs"> <i class="fa fa-pencil"></i> Edit</a><button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> >+ <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&id=[% c.idnew | uri %]&editmode=[% editmode | uri %]" class="btn btn-default btn-xs" > <i class="fa fa-pencil"></i> Edit</a> >+ <button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu pull-right"> >@@ -400,7 +414,7 @@ > </ul> > </div> > <div class="btn-group"> >- <a href="#" class="delete_news btn btn-default btn-xs" data-idnew="[% c.idnew | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a href="#" class="delete_news btn btn-default btn-xs" data-idnew="[% c.idnew | html %]" ><i class="fa fa-trash"></i> Delete</a> > </div> > </td> > </tr> >@@ -409,7 +423,8 @@ > </table> > <input type="hidden" name="op" value="delete_confirmed" /> > <input type="hidden" name="category" value="[% category | html %]" /> >- <fieldset class="action"><input type="submit" class="button" value="Delete selected" /></fieldset> >+ <fieldset class="action"><input type="submit" class="button principal" value="Delete selected" /></fieldset> >+</fieldset> > </form> > <form action="/cgi-bin/koha/tools/additional-contents.pl" method="post" id="delete_single"> > <input type="hidden" id="del_op" name="op" value="delete_confirmed" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >index 5e8864597a..ee8a12d270 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >@@ -7,8 +7,10 @@ > </head> > > <body id="tools_automatic_item_modification_by_age" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% form = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] >+[% INCLUDE 'header.inc' form=form %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -38,6 +40,8 @@ > </ol> > </nav> > >+ [% INCLUDE 'shortcut.inc' %] >+ > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >index 5814326646..b14bf697a5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >@@ -4,6 +4,9 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% PROCESS 'i18n.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Batch item deletion › Tools › Koha</title> >@@ -13,8 +16,7 @@ > <![endif]--> > </head> > <body id="tools_batchMod-del" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -28,6 +30,12 @@ > <a href="#" aria-current="page">Batch item deletion</a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >index e437a8702e..6bf83d011e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >@@ -4,6 +4,9 @@ > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Batch item modification › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -13,9 +16,7 @@ > </head> > > <body id="tools_batchMod-edit" class="tools"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >- >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -29,29 +30,35 @@ > <a href="#" aria-current="page">Batch item modification</a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> > >- <h1>Batch item modification</h1> >+ <h2>Batch item modification</h2> > [% IF op == 'enqueued' %] > <div class="dialog message"> > <p>The job has been enqueued! It will be processed as soon as possible.</p> >- <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> >- | <a href="/cgi-bin/koha/tools/batchMod.pl" title="New batch item modification">New batch item modification</a></p> >+ <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> >+ | <a href="/cgi-bin/koha/tools/batchMod.pl" title="New batch item modification">New batch item modification</a></p> > </div> > > <fieldset class="action"> > [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] > [% IF searchid %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]">Return to the record</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]">Return to the record</a> > [% ELSE %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a> > [% END %] > [% ELSIF src %] >- <a href="[% src | url %]">Return to where you were</a> >+ <a href="[% src | url %]">Return to where you were</a> > [% ELSE %] >- <a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a> >+ <a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a> > [% END %] > </fieldset> > [% END %] >@@ -172,15 +179,16 @@ > > [% UNLESS (too_many_items_process) %] > <div id="cataloguing_additem_newitem"> >- <h2>Edit items</h2> >- <div class="hint">Checking the box right next to the subfield label will disable the entry and delete the subfield on all selected items. Leave fields blank to make no change.</div> >+ > <fieldset class="rows"> >+ <h3>Edit items</h3> >+ <div class="hint">Checking the box right next to the subfield label will disable the entry and delete the subfield on all selected items. Leave fields blank to make no change.</div> > [%# no_plugin from batchMod-edit, jQuery is included at the end of the template and cataloguing plugins are not working in this situation %] > [% PROCESS subfields_for_item subfields => subfields, add_regex => 1, add_delete_checkbox => 1, no_plugin => 1 %] > </fieldset> > > <fieldset class="rows"> >- <legend>Other attributes</legend> >+ <h3>Other attributes</h3> > <ol> > <li> > <div class="subfield_line"> >@@ -196,25 +204,25 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" id="mainformsubmit" value="Save" /> >+ <input type="submit" class="principal" id="mainformsubmit" value="Save" /> > <a href="/cgi-bin/koha/tools/batchMod.pl" class="cancel">Cancel</a> > </fieldset> > </div> <!-- /#cataloguing_additem_newitem --> > [% ELSE %] >- <p><a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a></p> >+ <p><a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a></p> > [% END # /UNLESS too_many_items_process %] > [% ELSE # IF show %] > <fieldset class="action"> > [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] > [% IF searchid %] >- <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> >+ <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> > [% ELSE %] >- <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> >+ <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> > [% END %] > [% ELSIF src %] >- <a class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square-o"></i> Return to where you were</a> >+ <a class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square-o"></i> Return to where you were</a> > [% ELSE %] >- <a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a> >+ <a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a> > [% END %] > </fieldset> <!-- /.action --> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >index a87ed0d939..1e37dd1430 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >@@ -1,13 +1,15 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( del ) %]Batch item deletion[% ELSE %]Batch item modification[% END %] › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="tools_batchMod" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -32,6 +34,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -39,10 +47,10 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Batch item [% IF ( del ) %]deletion[% ELSE %]modification[% END %]</h1> >+ <h2>Batch item [% IF ( del ) %]deletion[% ELSE %]modification[% END %]</h2> > <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batchMod.pl"> > <fieldset class="rows"> >- <legend>Use a file</legend> >+ <h3>Use a file</h3> > <ol> > <li> > <label for="barcode_file">Barcode file: </label><input type="radio" name="filecontent" value="barcode_file" id="barcode_file" checked="checked" /></li> >@@ -53,7 +61,7 @@ > </ol> > </fieldset> > <fieldset class="rows"> >- <legend>Or scan items one by one</legend> >+ <h3>Or scan items one by one</h3> > <ol> > <li> > <label for="barcodelist">Barcode list (one barcode per line): </label> >@@ -65,7 +73,7 @@ > > [% UNLESS del %] > <fieldset class="rows"> >- <legend>Use default values</legend> >+ <h3>Use default values</h3> > <ol class="radio"> > <li> > <label> >@@ -79,7 +87,7 @@ > > [% IF ( del ) %]<input type="hidden" name="del" value="1" />[% END %] > <fieldset class="action"> >- <input type="submit" value="Continue" class="button" /> >+ <input class="principal" type="submit" value="Continue" class="button" /> > <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> > </fieldset> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >index 85c618b716..109a757acd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% PROCESS 'authorities-search-results.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Batch record deletion › Tools › Koha</title> >@@ -8,8 +11,7 @@ > </head> > > <body id="tools_batch_delete_records" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -23,6 +25,12 @@ > <a href="#" aria-current="page">Batch record deletion</a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -30,7 +38,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Batch record deletion</h1> >+ <h2>Batch record deletion</h2> > [% FOREACH message IN messages %] > [% IF message.type == 'success' %] > <div class="dialog message"> >@@ -59,7 +67,7 @@ > [% IF op == 'form' %] > <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batch_delete_records.pl" id="record_ids_selection"> > <fieldset class="rows"> >- <legend>Record type</legend> >+ <h3>Record type</h3> > <ol> > <li><label for="biblio_type">Bibliographic: </label><input type="radio" name="recordtype" value="biblio" id="biblio_type" checked="checked" /></li> > <li><label for="authority_type">Authorities: </label><input type="radio" name="recordtype" value="authority" id="authority_type" /></li> >@@ -67,13 +75,14 @@ > </fieldset> > > <div id="batch_del_form" class="toptabs"> >+ <fieldset id="searchresults"> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation" class="active"> > <a href="#uploadfile_tab" aria-controls="uploadfile_tab" role="tab" data-toggle="tab">Upload a file</a> > </li> > [% IF lists.count %] > <li id="show_list_option" role="presentation"> >- <a href="#shelves_tab" aria-controls="shelves_tab" role="tab" data-toggle="tab">Select a list of records</a> >+ <a href="#shelves_tab" aria-controls="shelves_tab" role="tab" data-toggle="tab">Select a list of records</a> > </li> > [% END %] > <li role="presentation"> >@@ -124,11 +133,12 @@ > </div> > > </div> <!-- /.tab-content --> >+ </fieldset> > </div> > > <fieldset class="action"> > <input type="hidden" name="op" value="list" /> >- <input type="submit" value="Continue" class="button" /> >+ <input class="principal" type="submit" value="Continue" class="button" /> > <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >index 17e8635501..b9d1cf9d16 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% USE Branches %] > [% USE Categories %] > [% USE KohaDates %] >@@ -14,8 +17,7 @@ > </head> > > <body id="tools_batch_extend_due_dates" class="tools"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -29,6 +31,12 @@ > <a href="#" aria-current="page">Batch extend due dates</a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -36,7 +44,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Batch extend due dates</h1> >+ <h2>Batch extend due dates</h2> > > [% IF ( messages ) %] > <div class="dialog message"> >@@ -61,7 +69,7 @@ > [% IF view == 'form' %] > <form method="post" action="/cgi-bin/koha/tools/batch_extend_due_dates.pl" id="extend_due_dates_form"> > <fieldset class="rows"> >- <legend>Checkout criteria:</legend> >+ <h3>Checkout criteria:</h3> > <ol> > <li> > <label for="categorycodes">Patrons' categories: </label> >@@ -92,7 +100,7 @@ > </ol> > </fieldset> > <fieldset class="rows"> >- <legend>New due date:</legend> >+ <h3>New due date:</h3> > <ol> > <li> > <label for="new_hard_due_date">Hard due date: </label> >@@ -106,7 +114,7 @@ > </ol> > </fieldset> > <fieldset class="rows"> >- <legend>Options:</legend> >+ <h3>Options:</h3> > <ol> > <li> > <label for="preview_results">Preview results:</label> >@@ -117,7 +125,7 @@ > </fieldset> > <fieldset class="action"> > <input type="hidden" name="op" value="list" /> >- <input type="submit" value="Continue" class="button" /> >+ <input type="submit" value="Continue" class="button principal" /> > <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> > </fieldset> > </form> <!-- /#extend_due_dates_form --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >index 7710466e8f..0f2b33de49 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% PROCESS 'authorities-search-results.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Batch record modification › Tools › Koha</title> >@@ -9,8 +12,7 @@ > </head> > > <body id="tools_batch_record_modification" class="tools"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -24,6 +26,12 @@ > <a href="#" aria-current="page">Batch record modification</a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -74,6 +82,7 @@ > > <br><br> > >+ <fieldset> > <div id="batch_mod_form" class="toptabs" style="clear:both"> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation" class="active"> >@@ -133,6 +142,7 @@ > </div> > </div> <!-- /.tab-content --> > </div> <!-- /#batch_mod_form --> >+ </fieldset> > > <fieldset class="rows"> > <legend>MARC modification template</legend> >@@ -150,7 +160,7 @@ > </fieldset> > <fieldset class="action"> > <input type="hidden" name="op" value="list" /> >- <input type="submit" value="Continue" class="button" /> >+ <input type="submit" value="Continue" class="button principal" /> > <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> > </fieldset> > </form> <!-- /#record_ids_selection --> >@@ -242,7 +252,7 @@ > <fieldset class="action"> > <input type="hidden" name="op" value="modify" /> > <input type="hidden" name="recordtype" value="[% recordtype | html %]" /> >- <input type="submit" id="mainformsubmit" value="Modify selected records" class="button" /> >+ <input type="submit" id="mainformsubmit" value="Modify selected records" class="button principal" /> > </fieldset> > </form> <!-- /#process --> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >index 05e70eb768..aefe913a7a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >@@ -4,6 +4,9 @@ > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF step == 2 %] >@@ -16,8 +19,7 @@ > </head> > > <body id="tools_cleanborrowers" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -56,6 +58,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -65,9 +73,9 @@ > > [% IF !OnlyMine %] > [% IF current_branch == '*' %] >- <h1>Batch patron deletion and anonymization</h1> >+ <h2>Batch patron deletion and anonymization</h2> > [% ELSE %] >- <h1>Batch patron deletion and anonymization for [% Branches.GetName( current_branch ) | html %]</h1> >+ <h2>Batch patron deletion and anonymization for [% Branches.GetName( current_branch ) | html %]</h2> > [% END %] > [% IF step == 1 %] > <form method="get" action="/cgi-bin/koha/tools/cleanborrowers.pl" id="selectlibrary"> >@@ -85,7 +93,7 @@ > </form> > [% END %] > [% ELSE %] >- <h1>Batch patron deletion and anonymization for [% Branches.GetLoggedInBranchname | html %]</h1> >+ <h2>Batch patron deletion and anonymization for [% Branches.GetLoggedInBranchname | html %]</h2> > [% END %] > > [% IF step == 1 %] >@@ -104,7 +112,7 @@ > <div id="step1"> > <form name="f1" id="delete_patrons_form" action="/cgi-bin/koha/tools/cleanborrowers.pl" method="post"> > <fieldset> >- <legend>Delete patrons</legend> >+ <h3>Delete patrons</h3> > <h3><input id="checkborrower" type="checkbox" name="checkbox" value="borrower" /><label for="checkborrower"> Verify you want to delete patrons</label></h3> > <br /> > <h5>Delete patrons who meet the following criteria:</h5> >@@ -152,7 +160,7 @@ > </fieldset> > > <fieldset> >- <legend>Anonymize checkout history</legend> >+ <h3>Anonymize checkout history</h3> > [% UNLESS Koha.Preference('AnonymousPatron') %] > <div class="dialog message">The AnonymousPatron system preference is not defined. You can use this feature anyway but NULL will be used to update the checkout history.</div> > [% END %] >@@ -170,7 +178,7 @@ > <input type="hidden" name="step" value="2" /> > <input type="hidden" name="branch" value="[% current_branch | html %]" /> > </fieldset> >- <fieldset class="action"><input type="submit" value="Next >>" /></fieldset> >+ <fieldset class="action"><input type="submit" class="principal" value="Next >>" /></fieldset> > </form> > </div> > <!-- step 1 END --> >@@ -191,7 +199,7 @@ > > [% IF patrons_to_delete.size %] > <fieldset> >- <legend>How should patrons be deleted?</legend> >+ <h3>How should patrons be deleted?</h3> > <p> > <input id="delete" type="radio" name="radio" value="delete" /> > <label for="delete">Permanently delete these patrons</label> >@@ -231,7 +239,7 @@ > <input type="hidden" name="borrower_categorycode" value="[% borrower_categorycode | html %]" /> > <input type="hidden" name="patron_list_id" value="[% patron_list_id | html %]" /> > <input type="hidden" name="branch" value="[% current_branch | html %]" /> >- <fieldset class="action"><input type="submit" value="Finish" /> <a class="cancel" href="/cgi-bin/koha/tools/cleanborrowers.pl">Cancel</a></fieldset> >+ <fieldset class="action"><input class="principal" type="submit" value="Finish" /> <a class="cancel" href="/cgi-bin/koha/tools/cleanborrowers.pl">Cancel</a></fieldset> > </form> > </div> > <!-- STEP 2 END --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >index caaec4e2c3..7f8aacd44c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF op == 'add_form' %] >@@ -16,8 +19,7 @@ > </head> > > <body id="tools_csv-profiles" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -50,6 +52,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -260,7 +268,7 @@ > </ol> > </fieldset> > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <a class="cancel" href="/cgi-bin/koha/tools/csv-profiles.pl">Cancel</a> > </fieldset> > </form> >@@ -287,7 +295,9 @@ > [% IF op == 'list' %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newcsvprofile" href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form"><i class="fa fa-plus"></i> New CSV profile</a> >+ <div class="btn-group"> >+ <a class="toolbar-btn" id="newcsvprofile" href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form"><i class="fa fa-plus"></i> New CSV profile</a> >+ </div> > </div> > > <h1>CSV profiles</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >index fe01cf2b1f..7e03fe97a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Export data › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -13,8 +16,7 @@ > </head> > > <body id="tools_export" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -30,6 +32,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -49,6 +57,7 @@ > [% END %] > > <div id="exporttype" class="toptabs"> >+ <fieldset id="searchresults"> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation" class="active"> > <a href="#bibs" aria-controls="bibs" role="tab" data-toggle="tab">Export bibliographic records</a> >@@ -187,7 +196,7 @@ > <input type="hidden" name="op" value="export" /> > <input type="hidden" name="record_type" value="bibs" /> > >- <fieldset class="action"><input type="submit" value="Export bibliographic records" class="button" /></fieldset> >+ <fieldset class="action"><input type="submit" class="principal" value="Export bibliographic records" class="button" /></fieldset> > </form> > </div> > >@@ -248,7 +257,7 @@ > <input type="hidden" name="op" value="export" /> > <input type="hidden" name="record_type" value="auths" /> > >- <fieldset class="action"><input type="submit" value="Export authority records" class="button" /></fieldset> >+ <fieldset class="action"><input type="submit" value="Export authority records" class="button principal" /></fieldset> > </form> > </div> > >@@ -304,6 +313,7 @@ > </div> > [% END %] > </div> <!-- /.tab-content --> >+</fieldset> > </div> > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >index a35f8cbf15..05acd41377 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -2,14 +2,16 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% Branches.GetName( branch ) | html %] calendar › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("css/calendar.css") | $raw %] > </head> > <body id="tools_holidays" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -32,7 +34,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>[% Branches.GetName( branch ) | html %] calendar</h1> >+ <h2>[% Branches.GetName( branch ) | html %] calendar</h2> > > <div class="row"> > <div class="col-sm-6"> >@@ -44,7 +46,7 @@ > <div class="panel" id="showHoliday"> > <form action="/cgi-bin/koha/tools/exceptionHolidays.pl" method="post"> > <input type="hidden" id="showHolidayType" name="showHolidayType" value="" /> >- <fieldset class="brief"> >+ <fieldset> > <h3>Edit this holiday</h3> > <span id="holtype"></span> > <ol> >@@ -129,17 +131,17 @@ > </li> > </ol> > <fieldset class="action"> >- <input type="submit" name="submit" value="Save" /> >+ <input class="principal" type="submit" name="submit" value="Save" /> > <a href="#" class="cancel hidePanel showHoliday">Cancel</a> > </fieldset> >- </fieldset> <!-- /.brief --> >+ </fieldset> > </form> > </div> <!-- /#showHoliday --> > > <!-- Panel to deal with new holidays --> > <div class="panel" id="newHoliday"> > <form action="/cgi-bin/koha/tools/newHolidays.pl" method="post"> >- <fieldset class="brief"> >+ <fieldset> > <h3>Add new holiday</h3> > <ol> > <li> >@@ -216,10 +218,10 @@ > </li> > </ol> > <fieldset class="action"> >- <input type="submit" name="submit" value="Save" /> >+ <input type="submit" class="principal" name="submit" value="Save" /> > <a href="#" class="cancel hidePanel newHoliday">Cancel</a> > </fieldset> >- </fieldset> <!-- /.brief --> >+ </fieldset>Ã… > </form> > </div> <!-- /#newHoliday --> > >@@ -237,7 +239,7 @@ > <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option> > [% END %] > </select> >- <input type="submit" value="Copy" /> >+ <input type="submit" class="principal" value="Copy" /> > </form> > </div> > </div> <!-- /.col-sm-6 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >index 6603e78aa0..3f1e040cc2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >@@ -3,6 +3,9 @@ > [% USE Koha %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( uploadborrowers ) %] >@@ -18,8 +21,8 @@ > </head> > > <body id="tools_import_borrowers" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form= formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -46,6 +49,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > [% INCLUDE 'blocking_errors.inc' %] >@@ -56,7 +65,7 @@ > > <div class="row"> > <div class="col-sm-6"> >-<h1>Import patrons</h1> >+<h2>Import patrons</h2> > [% IF ( uploadborrowers ) %] > <h5>Import results :</h5> > <ul> >@@ -207,7 +216,7 @@ > > <form method="post" action="[% SCRIPT_NAME | html %]" enctype="multipart/form-data"> > <fieldset class="rows"> >- <legend>Import into the borrowers table</legend> >+ <h3>Import into the borrowers table</h3> > > <ol> > <li> >@@ -224,7 +233,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Field to use for record matching</legend> >+ <h3>Field to use for record matching</h3> > <ol> > <li class="radio"> > <select name="matchpoint" id="matchpoint"> >@@ -239,10 +248,10 @@ > </fieldset> > > <fieldset class="rows"> >- <legend> >+ <h3> > <a href="#" class="expand_defaults"><i class="fa fa-plus-square"></i> Enter default values</a> > <a href="#" class="expand_defaults" style="display:none;"><i class="fa fa-minus-square"></i> Hide default value fields</a> >- </legend> >+ </h3> > > <ol class="default_values" style="display:none;"> > [% FOREACH borrower_db_column IN borrower_fields.keys.sort %] >@@ -289,10 +298,10 @@ > </ol> > </fieldset> > <fieldset class="rows"> >- <legend> >+ <h3> > <a href="#" class="expand_preserves"><i class="fa fa-plus-square"></i> Preserve existing values</a> > <a href="#" class="expand_preserves" style="display:none;"><i class="fa fa-minus-square"></i> Hide preserve value fields</a> >- </legend> >+ </h3> > > <ol class="preserve_values" style="display:none;"> > <div class="hint">Selected fields will be preserved from original patron record when overwriting existing patron.</div> >@@ -307,7 +316,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>If matching record is already in the borrowers table:</legend> >+ <h3>If matching record is already in the borrowers table:</h3> > > <ol> > <li class="radio"> >@@ -328,7 +337,7 @@ > > [% IF ( Koha.Preference('ExtendedPatronAttributes') == 1 ) %] > <fieldset class="rows"> >- <legend>Patron attributes</legend> >+ <h3>Patron attributes</h3> > > <ol> > <li class="radio"> >@@ -343,7 +352,7 @@ > [% END %] > > <fieldset class="rows"> >- <legend>Welcome email</legend> >+ <h3>Welcome email</h3> > <ul> > <li> > <input class="welcome_new" type="checkbox" id="welcome_new" name="welcome_new"/> >@@ -355,7 +364,7 @@ > > <fieldset class="action"> > <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" /> >- <input type="submit" value="Import" /> >+ <input class="principal" type="submit" value="Import" /> > </fieldset> > </form> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >index 4f952b5452..ef3a06b3cf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -4,14 +4,16 @@ > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Inventory › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="tools_inventory" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -39,6 +41,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -46,7 +54,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Inventory</h1> >+ <h2>Inventory</h2> > [% IF (moddatecount) %]<div class="dialog message">[% moddatecount | html %] items modified : datelastseen set to [% date | $KohaDates %]</div> > <div class="dialog alert">Number of potential barcodes read: [% LinesRead | html %]</div>[% END %] > [% IF (errorfile) %]<div class="dialog alert">[% errorfile | html %] can't be opened</div>[% END %] >@@ -67,14 +75,14 @@ > > <form method="post" id="inventory_form" action="/cgi-bin/koha/tools/inventory.pl" enctype="multipart/form-data"> > <fieldset class="rows"> >- <legend>Use a barcode file</legend> >+ <h3>Use a barcode file</h3> > <ol> > <li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /> >- <input type="button" id="resetuploadbarcodes" name="resetuploadbarcodes" value="Reset" /></li> >+ <input type="button" id="resetuploadbarcodes" name="resetuploadbarcodes" class="principal" value="Reset" /></li> > </ol> > </fieldset> > <fieldset class="rows"> >- <legend>Or scan items one by one</legend> >+ <h3>Or scan items one by one</h3> > <ol> > <li> > <label for="barcodelist">Barcode list (one barcode per line): </label> >@@ -83,7 +91,7 @@ > </ol> > </fieldset> > <fieldset class="rows"> >- <legend>Parameters</legend> >+ <h3>Parameters</h3> > <ol> > <li><label for="setdate">Set inventory date to:</label> <input type="text" id="setdate" name="setdate" value="[% today | $KohaDates %]" class="flatpickr" /></li> > <li><label for="compareinv2barcd">Compare barcodes list to results: </label><input type="checkbox" name="compareinv2barcd" id="compareinv2barcd" disabled /></li> >@@ -92,7 +100,7 @@ > </ol> > </fieldset> > <fieldset class="rows"> >- <legend>Item location filters</legend> >+ <h3>Item location filters</h3> > <ol><li> > <label for="branch">Location: </label> > <input type="radio" name="branch" value="homebranch"> Home library</input> >@@ -154,13 +162,13 @@ > </fieldset> > > <fieldset class="rows" id="optionalfilters"> >- <legend>Optional filters for inventory list or comparing barcodes</legend> >+ <h3>Optional filters for inventory list or comparing barcodes</h3> > <br/> > <div id="statuses" style="display: block;"> > [% FOREACH status IN statuses %] > [% IF (status.values) %] >- <fieldset style="float: left; padding: 5px; margin: 5px;text-align:right"> >- <legend>[% status.fieldname | html %]</legend> >+ <fieldset style="float: left; padding: 5px; margin: 5px; display:inline-block; position:relative; width:auto; border-right: #696969 double 1px;"> >+ <h3>[% status.fieldname | html %]</h3> > <ul id="statuses-[% fieldname | html %]" style="display: inline;"> > [% FOREACH value IN status.values %] > [% IF (value.lib) %] >@@ -203,7 +211,7 @@ > <li> > <label>Item types: </label> > <div class="branchselector"> >- <p><a href="#" id="checkallitemtypes"> <i class="fa fa-check"></i> Select all</a> | <a href="#" id="checknoneitemtypes"> <i class="fa fa-remove"></i> Clear all</a></p> >+ <p><a id="CheckAll" href="#" id="checkallitemtypes"> <i class="fa fa-check"></i> Select all</a> | <a id="CheckNone" href="#" id="checknoneitemtypes"> <i class="fa fa-remove"></i> Clear all</a></p> > <div class="branchgridrow"> > [% FOREACH itemtype IN itemtypes %] > <div class="branchgriditem"> >@@ -224,7 +232,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Additional options</legend> >+ <h3>Additional options</h3> > <ol> > > <li> >@@ -235,7 +243,7 @@ > </fieldset> > <input type="hidden" name="op" value="do_it" /> > >- <fieldset class="action"><input type="submit" value="Submit" class="button" /></fieldset> >+ <fieldset class="action"><input class="principal" type="submit" value="Submit" class="button" /></fieldset> > </form> > > [% END %] >@@ -252,6 +260,7 @@ > <div><a href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div> > [% END %] > >+<fieldset id="searchresults"> > <table id="inventoryt"> > <thead> > <tr> >@@ -332,12 +341,13 @@ > [% END %] > </tbody> > </table> >+</fieldset> > <div class="spacer"></div> > [% UNLESS uploadedbarcodesflag %] > <div style="padding : .3em 0"><a href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div> >- <input type="submit" id="markseenandquit" value="Mark seen and quit" /> >- <input type="submit" value="Mark seen and continue >>" id="markseenandcontinuebutton" /> >- <input type="submit" value="Continue without marking >>" id="continuewithoutmarkingbutton" class="submit" /> >+ <input type="submit" id="markseenandquit" class="principal" value="Mark seen and quit" /> >+ <input type="submit" class="principal" value="Mark seen and continue >>" id="markseenandcontinuebutton" /> >+ <input class="principal" type="submit" value="Continue without marking >>" id="continuewithoutmarkingbutton" class="submit" /> > [% END %] > </form> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >index 811e6d73ab..34e0e3b0f4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -5,6 +5,9 @@ > [% USE Branches %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'letters-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( add_form or copy_form ) %] >@@ -49,8 +52,7 @@ > </head> > > <body id="tools_letter" class="tools"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'letters-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -145,20 +147,6 @@ > [% END %] > > [% IF ( no_op_set ) %] >- <h1>Notices and slips</h1> >- <form method="get" action="/cgi-bin/koha/tools/letter.pl" id="selectlibrary"> >- <input type="hidden" name="searchfield" value="[% searchfield | html %]" /> >- [% UNLESS independant_branch %] >- <p> >- Select a library: >- <select name="branchcode" id="branch" style="width:20em;"> >- <option value="*">All libraries</option> >- [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %] >- </select> >- </p> >- [% END %] >- </form> <!-- /#selectlibrary --> >- > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> > <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New notice <span class="caret"></span></button> >@@ -179,6 +167,20 @@ > </div> > </div> <!-- /#toolbar --> > >+ <h1>Notices and slips</h1> >+ <form method="get" action="/cgi-bin/koha/tools/letter.pl" id="selectlibrary"> >+ <input type="hidden" name="searchfield" value="[% searchfield | html %]" /> >+ [% UNLESS independant_branch %] >+ <p> >+ Select a library: >+ <select name="branchcode" id="branch" style="width:20em;"> >+ <option value="*">All libraries</option> >+ [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %] >+ </select> >+ </p> >+ [% END %] >+ </form> <!-- /#selectlibrary --> >+ > [% IF ( search ) %] > <p>You searched for <strong>[% searchfield | html %]</strong></p> > [% END %] >@@ -193,6 +195,7 @@ > [% END %] > [% END %] > >+ <fieldset id="searchresults"> > [% IF letter %] > <table id="lettert"> > <thead> >@@ -275,6 +278,7 @@ > </div> > [% END # /IF lette %] > [% END # /IF no_op_set %] >+ </fieldset> > > [% IF add_form or copy_form %] > <h1>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</h1> >@@ -289,7 +293,9 @@ > <li><a id="saveandcontinue" href="#">Save and continue editing</a></li> > </ul> > </div> >- <a class="btn btn-default cancel" href="/cgi-bin/koha/tools/letter.pl"><i class="fa fa-remove"></i> Cancel</a> >+ <div> >+ <a class="btn btn-default cancel" href="/cgi-bin/koha/tools/letter.pl"><i class="fa fa-remove"></i> Cancel</a> >+ </div> > </div> <!-- /#toolbar --> > > <form id="add_notice" name="Aform" method="post" enctype="multipart/form-data" class="validate"> >@@ -489,10 +495,10 @@ > <div id="[% letter.message_transport_type | html %]_[% lang | html %]" class="panel-collapse collapse" role="tabpanel" aria-labelledby="[% letter.message_transport_type | html %]_[% lang | html %]Heading"> > <div class="panel-body"> > [% IF letter.message_transport_type == "sms" and not Koha.Preference("SMSSendDriver") %] >- <fieldset class="rows mtt" disabled="disabled"> >+ <fieldset class="rows mtt" style="box-shadow:none" disabled="disabled"> > <div class="dialog message">You should enable the SMSSendDriver preference to use the SMS templates.</div> > [% ELSE %] >- <fieldset class="rows mtt"> >+ <fieldset class="rows mtt" style="box-shadow:none"> > [% END %] > <ol> > [% IF ( letter.updated_on ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >index 921a3d8e0b..89b126f1ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( import_batch_id ) %] >@@ -18,8 +21,7 @@ > </head> > > <body id="tools_manage-marc-import" class="tools"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -46,17 +48,23 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> >- <h1>Manage staged MARC records >+ <h2>Manage staged MARC records > [% IF ( import_batch_id ) %] > › Batch [% import_batch_id | html %] > [% END %] >- </h1> >+ </h2> > > [% IF ( label_batch_msg ) %] > [% IF ( alert ) %] >@@ -68,7 +76,7 @@ > [% IF ( label_batch_msg == "error" ) %] > <span>Error attempting to create label batch. Please ask your system administrator to check the log for more details.</span> > [% ELSE %] >- <span>Label</span> <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% label_batch_msg | uri %]" >batch #[% label_batch_msg | html %]</a> created. >+ <span>Label</span> <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% label_batch_msg | uri %]" >batch #[% label_batch_msg | html %]</a> created. > [% END %] > </strong></p> > </div> >@@ -86,7 +94,7 @@ > [% UNLESS ( batch_info ) %] > <div class="dialog message"> > <p>No records have been staged.</p> >- <p><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a>.</p> >+ <p><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a>.</p> > </div> > [% END %] > [% END %] >@@ -162,7 +170,7 @@ > [% END %] > [% END %] > </select> >- <span class="change-status">Changed. <a href="#" class="reset" id="reset_new_matcher_id">Reset</a></span> >+ <span class="change-status">Changed. <a href="#" class="reset" id="reset_new_matcher_id">Reset</a></span> > [% ELSE %] > <span class="label">Matching rule applied</span> > [% IF ( current_matcher_id ) %] >@@ -175,7 +183,7 @@ > <li> > [% IF ( can_commit ) %] > <label for="overlay_action">Action if matching record found:</label> >- [% INCLUDE 'tools-overlay-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_overlay_action">Reset</a></span> >+ [% INCLUDE 'tools-overlay-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_overlay_action">Reset</a></span> > [% ELSE %] > <span class="label">Action if matching record found:</span> > [% IF ( overlay_action == 'replace' ) %] >@@ -192,7 +200,7 @@ > <li> > [% IF ( can_commit ) %] > <label for="nomatch_action">Action if no match found:</label> >- [% INCLUDE 'tools-nomatch-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_nomatch_action">Reset</a></span> >+ [% INCLUDE 'tools-nomatch-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_nomatch_action">Reset</a></span> > [% ELSE %] > <span class="label">Action if no match found:</span> > [% IF ( nomatch_action == 'create_new' ) %] >@@ -208,7 +216,7 @@ > <li> > [% IF ( can_commit ) %] > <label for="item_action">Item processing:</label> >- [% INCLUDE 'tools-item-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_item_action">Reset</a></span> >+ [% INCLUDE 'tools-item-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_item_action">Reset</a></span> > [% ELSE %] > <span class="label">Item processing:</span> > [% IF ( item_action == 'always_add' ) %] >@@ -229,7 +237,7 @@ > [% END %] > </ol> > [% IF ( can_commit ) %] >- <fieldset class="action"><input type="submit" value="Apply different matching rules" class="button" /></fieldset> >+ <fieldset class="action"><input type="submit" class="principal" value="Apply different matching rules" class="button" /></fieldset> > </form> > [% END %] > </fieldset> <!-- /#staged-record-matching-rules --> >@@ -252,7 +260,7 @@ > </select> > [% END %] > <br /> >- <input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" /> >+ <input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" /> > </fieldset> > </form> <!-- /#import_batch_form --> > <div id="jobpanel"> >@@ -275,6 +283,8 @@ > [% END # /IF can_revert %] > </div> > >+ <fieldset id="searchresults"> >+ > [% IF ( did_commit ) %] > <div class="dialog message">Completed import of records</div> > <table> >@@ -334,6 +344,8 @@ > </tr> > </table> > [% END # /IF did_revert%] >+ </fieldset> >+ > > [% END # /IF batch_info %] > >@@ -385,7 +397,7 @@ > <td>[% batch_lis.num_records | html %]</td> > <td>[% batch_lis.num_items | html %] > [% IF ( batch_lis.num_items && batch_lis.import_status == 'imported' ) %] >- (<a href="[% batch_lis.script_name | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&op=create_labels">Create label batch</a>) >+ (<a href="[% batch_lis.script_name | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&op=create_labels">Create label batch</a>) > [% END %] > </td> > <td class="actions"> >@@ -393,13 +405,13 @@ > <form method="post" action="[% batch_lis.script_name | html %]" name="clean_batch_[% batch_lis.import_batch_id | html %]" id="clean_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_clean"> > <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id | html %]" /> > <input type="hidden" name="op" value="clean-batch" /> >- <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-eraser"></i> Clean</button> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-eraser"></i> Clean</button> > </form> > [% ELSIF ( batch_lis.import_status == 'cleaned' ) %] > <form method="post" action="/cgi-bin/koha/tools/manage-marc-import.pl" name="delete_batch_[% batch_lis.import_batch_id | html %]" id="delete_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_delete"> > <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id | html %]" /> > <input type="hidden" name="op" value="delete-batch" /> >- <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> > </form> > [% END %] > </td> >@@ -438,12 +450,14 @@ > <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div> > </div> > <div class="modal-footer"> >- <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button class="btn btn-default cancel" data-dismiss="modal" aria-hidden="true">Close</button> > </div> > </div> > </div> > </div> <!-- /#marcPreview --> > [% END # /IF import_batch_id %] >+ >+ </div> > </main> > > </div> <!-- /.col-sm-10.col-sm-push-2 --> >@@ -598,7 +612,7 @@ > '<a class="btn btn-default btn-xs" target="_blank" href="' + record_details_url > + aData['matched'] + '"><i class="fa fa-eye"></i> ' + _("View") + '</a> ' > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] >- + '<a class="btn btn-default btn-xs" target="_blank" href="' + record_edit_url >+ + '<a class="btn btn-default btn-xs" target="_blank" href="' + record_edit_url > + aData['matched'] + '"><i class="fa fa-pencil"></i> ' + _("Edit") + '</a>' > [% END %] > ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >index 03c87cedc4..04a36af5b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >@@ -3,6 +3,9 @@ > [% USE Asset %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>MARC modification templates › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -20,8 +23,7 @@ > </head> > > <body id="tools_marc_modification_templates" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > [% IF ( TemplatesLoop ) %] > [% FOREACH TemplatesLoo IN TemplatesLoop %] >@@ -57,6 +59,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -65,12 +73,13 @@ > <main> > > <div id="toolbar" class="btn-toolbar"> >- <a href="#" data-toggle="modal" data-template_id="" data-target="#createTemplate" id="new_template" class="btn btn-default duplicate_template"><i class="fa fa-plus"></i> New template</a> >+ <div> >+ <a href="#" data-toggle="modal" data-template_id="" data-target="#createTemplate" id="new_template" class="toolbar-btn duplicate_template"><i class="fa fa-plus"></i> New template</a> > [% IF ( template_id != '' ) %] >- <a href="#" id="new_action" class="btn btn-default"><i class="fa fa-plus"></i> New action</a> >- <a class="btn btn-default delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% template_id | html %]&op=delete_template"><i class="fa fa-fw fa-trash"></i> Delete template</a> >+ <a href="#" id="new_action" class="toolbar-btn"><i class="fa fa-plus"></i> New action</a> >+ <a class="toolbar-btn delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% template_id | html %]&op=delete_template"><i class="fa fa-fw fa-trash"></i> Delete template</a> > [% END %] >- </div> >+ </div></div> > > [% IF error %] > [% IF error == 'no_from_field' %] >@@ -84,6 +93,7 @@ > > <h1>MARC modification templates [% template_id | html %]</h1> > >+<fieldset id="searchresults"> > <table id="templatest"> > <thead> > <tr> >@@ -106,13 +116,14 @@ > [% END %] > </tbody> > </table> >+</fieldset> > > [% ELSE %] > > <h1>Actions for <em>[% template_name | html %]</em></h1> > > [% IF ( ActionsLoop ) %] >- >+<fieldset id="searchresults"> > <table id="template_actions" class="template_actions"> > <thead> > <tr> >@@ -195,12 +206,13 @@ > <a class="btn btn-default btn-xs edit_action" href="#modaction" data-mmta_id="[% ActionsLoo.mmta_id | html %]"><i class="fa fa-pencil"></i> Edit</a> > </td> > <td> >- <a class="btn btn-default btn-xs" href="marc_modification_templates.pl?template_id=[% ActionsLoo.template_id | html %]&op=delete_action&mmta_id=[% ActionsLoo.mmta_id | html %]" onclick="return confirmDeleteAction();"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" hhref="marc_modification_templates.pl?template_id=[% ActionsLoo.template_id | html %]&op=delete_action&mmta_id=[% ActionsLoo.mmta_id | html %]" onclick="return confirmDeleteAction();"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END # /FOREACH ActionsLoo %] > </tbody> > </table> >+ </fieldset> > [% ELSE %] > <div class="dialog message template_actions"><p>There are no defined actions for this template.</p></div> > [% END # /IF ActionsLoop %] >@@ -208,7 +220,7 @@ > <form method="post" action="/cgi-bin/koha/tools/marc_modification_templates.pl" id="add_action" > > <a name="modaction"></a> > <fieldset> >- <legend id="modaction_legend">Add a new action</legend> >+ <h3 id="modaction_legend">Add a new action</h3> > <div id="warning_multivalued" style="color:red; display:none;">You have chosen a condition on the same field as the original field. If your records contain multivalued fields it is highly recommended not to do that.</div> > > <div class="action_line"> >@@ -290,7 +302,7 @@ > <input type="hidden" name="template_id" value="[% template_id | html %]" /> > <input type="hidden" name="mmta_id" id="mmta_id" /> > <input type="hidden" name="op" value="add_action" /> >- <input id="action_submit" type="submit" value="Add action" /> >+ <input id="action_submit" class="principal" type="submit" value="Add action" /> > <a href="#modaction" class="cancel" id="cancel_edit" onclick="cancelEditAction();">Cancel</a> > </fieldset> > >@@ -336,8 +348,8 @@ > </fieldset> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Submit</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> >+ <button type="submit" class="btn btn-default principal">Submit</button> >+ <button class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > </form> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >index 4309ae87f7..78af9836bf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -6,14 +6,16 @@ > [% USE Categories %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Batch patron modification › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="tools_modborrowers" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -27,6 +29,12 @@ > <a href="#" aria-current="page">Batch patron modification</a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -35,10 +43,11 @@ > <main> > > [% IF ( op == 'show_form' ) %] >- <h1>Batch patron modification</h1> >+ <h2>Batch patron modification</h2> > <form id="patron_batchmod_form" method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/modborrowers.pl"> > <input type="hidden" name="op" value="show" /> > <div id="batch_patron_options" class="toptabs"> >+ <fieldset> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation" class="active"> > <a href="#usecardnumber" aria-controls="usecardnumber" role="tab" data-toggle="tab">By card number</a> >@@ -54,8 +63,8 @@ > </ul> > <div class="tab-content"> > <div id="usecardnumber" role="tabpanel" class="tab-pane active"> >- <fieldset class="rows"> >- <legend>Use a file of card numbers</legend> >+ <fieldset> >+ <h3>Use a file of card numbers</h3> > <ol> > <li> > <label for="cardnumberuploadfile">File: </label> <input type="file" >@@ -64,8 +73,8 @@ > </li> > </ol> > </fieldset> >- <fieldset class="rows"> >- <legend>Or list card numbers one by one</legend> >+ <fieldset> >+ <h3>Or list card numbers one by one</h3> > <ol> > <li> > <label for="cardnumberlist">Card number list (one card number per line): >@@ -76,13 +85,13 @@ > </ol> > </fieldset> > <fieldset class="action"> >- <input type="submit" value="Continue" class="button" /> >+ <input class="principal" type="submit" value="Continue" class="button" /> > <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> > </fieldset> > </div> > <div id="useborrowernumber" role="tabpanel" class="tab-pane"> >- <fieldset class="rows"> >- <legend>Use a file of borrowernumbers</legend> >+ <fieldset> >+ <h3>Use a file of borrowernumbers</h3> > <ol> > <li> > <label for="borrowernumberuploadfile">File: </label> <input type="file" >@@ -91,8 +100,8 @@ > </li> > </ol> > </fieldset> >- <fieldset class="rows"> >- <legend>List borrowernumbers one by one</legend> >+ <fieldset> >+ <h3>List borrowernumbers one by one</h3> > <ol> > <li> > <label for="borrowernumberlist">Borrowernumber list (one number per line): >@@ -103,14 +112,14 @@ > </ol> > </fieldset> > <fieldset class="action"> >- <input type="submit" value="Continue" class="button" /> >+ <input class="principal" type="submit" value="Continue" class="button" /> > <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> > </fieldset> > </div> > [% IF patron_lists %] > <div id="uselist" role="tabpanel" class="tab-pane"> >- <fieldset class="rows"> >- <legend>Use a patron list</legend> >+ <fieldset> >+ <h3>Use a patron list</h3> > <ol> > <li> > <label for="patron_list_id">Patron list: </label> >@@ -124,12 +133,13 @@ > </ol> > </fieldset> > <fieldset class="action"> >- <input type="submit" value="Continue" class="button" /> >+ <input class="button principal" type="submit" value="Continue" /> > <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> > </fieldset> > </div> > [% END %] > </div> <!-- /.tab-content --> >+ </fieldset> > </div><!-- /#batch_patron_options --> > </form> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >index 4d250ad21d..79e415eac1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >@@ -3,14 +3,16 @@ > [% USE Koha %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Overdue notice/status triggers › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="tools_overduerules" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -26,6 +28,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >index 0a1b131bfa..aae2d320cb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Upload patron images › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -8,8 +11,8 @@ > > <body id="tools_picture-upload" class="tools"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -36,6 +39,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > [% INCLUDE 'blocking_errors.inc' %] >@@ -48,16 +57,16 @@ > [% IF ( ERRORS ) %] > [% IF ( TCOUNTS ) %] > <div class="dialog alert"> >- <h1>Patron image(s) uploaded with some errors</h1> >+ <h2>Patron image(s) uploaded with some errors</h2> > </div> > [% ELSE %] > <div class="dialog alert"> >- <h1>Patron image failed to upload</h1> >+ <h2>Patron image failed to upload</h2> > </div> > [% END %] > [% ELSE %] > <div class="dialog message"> >- <h1>Patron image(s) successfully uploaded</h1> >+ <h2>Patron image(s) successfully uploaded</h2> > </div> > [% END %] > <ul class="data"> >@@ -109,7 +118,7 @@ > <li><a id="doneupload" href="/cgi-bin/koha/tools/tools-home.pl">Return to tools</a></li> > [% END %]</ul> > [% ELSE %] >- <h1>Upload patron images</h1> >+ <h2>Upload patron images</h2> > [% IF ( ERRORS ) %] > <div class="dialog alert"> > [% FOREACH ERROR IN ERRORS %] >@@ -149,11 +158,10 @@ > <span class="required">Required</span> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >+ > <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" /> > <input type="hidden" name="op" value="Upload" /> >- <input type="submit" value="Upload" class="submit" /> >+ <input type="submit" value="Upload" class="principal" /> > <a href="/cgi-bin/koha/tools/tools-home.pl" class="cancel">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt >index 7531c5f750..82b6231b80 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt >@@ -3,6 +3,9 @@ > [% USE Koha %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>OPAC problem reports › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -10,8 +13,7 @@ > > <body id="tools_problem-reports" class="tools"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -27,6 +29,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >index bc17c04a50..feb1260de4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Quote uploader › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -9,8 +12,7 @@ > </head> > > <body id="tools_quotes" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -29,6 +31,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -49,7 +57,7 @@ > > <div id="instructions"> > <fieldset id="file_uploader_help" class="rows"> >- <legend>Instructions</legend> >+ <h3>Instructions</h3> > <div id="file_uploader_inst"> > <ul> > <li>The quote uploader accepts standard csv files with two columns: "source","text"</li> >@@ -67,7 +75,7 @@ > </div> > > <fieldset id="file_uploader" class="rows"> >- <legend>Upload quotes</legend> >+ <h3>Upload quotes</h3> > <div id="file_upload"> > <input type="file" name="file" /> > <button id="cancel_upload" style="display:none">Cancel upload</button> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >index cf6b9afe27..54050d3c8a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Quote editor › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -8,8 +11,7 @@ > </head> > > <body id="tools_quotes" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -25,6 +27,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -54,8 +62,10 @@ > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newquote" href="/cgi-bin/koha/tools/quotes.pl?op=add_form"><i class="fa fa-plus"></i> New quote</a> >- <a class="btn btn-default" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> Import quotes</a> >+ <div> >+ <a class="toolbar-btn" id="newquote" href="/cgi-bin/koha/tools/quotes.pl?op=add_form"><i class="fa fa-plus"></i> New quote</a> >+ <a class="toolbar-btn" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> Import quotes</a> >+ </div> > </div> > [% END %] > >@@ -76,10 +86,9 @@ > <span class="required">Required</span> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >+ > <input type="hidden" name="id" value="[% quote.id | html %]" /> >- <input type="submit" value="Submit" /> >+ <input class="principal" type="submit" value="Submit" /> > <a class="cancel" href="/cgi-bin/koha/tools/quotes.pl">Cancel</a> > </fieldset> > </form> >@@ -102,6 +111,7 @@ > > [% IF op == 'list' %] > <h1>Quotes</h1> >+ <fieldset id="searchresults"> > [% IF quotes_count > 0 %] > <table id="quotes"> > <thead> >@@ -117,6 +127,7 @@ > [% ELSE %] > <div class="dialog message">There are no quotes defined. <a href="/cgi-bin/koha/tools/quotes.pl?op=add_form">Start defining quotes</a>.</div> > [% END %] >+ </fieldset> > > <div id="delete_confirm_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="delete_confirm_modal_label" aria-hidden="true"> > <div class="modal-dialog"> >@@ -129,7 +140,7 @@ > <div id="delete_confirm_dialog"></div> > </div> > <div class="modal-footer"> >- <a href="#" class="btn btn-default" id="delete_confirm_modal_button" role="button" data-toggle="modal">Delete</a> >+ <a href="#" class="btn btn-default principal" id="delete_confirm_modal_button" role="button" data-toggle="modal">Delete</a> > <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> > </div> > </div> <!-- /.modal-content --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >index 918ed0ce56..010c93e4cc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >@@ -1,14 +1,16 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Task scheduler › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="tools_scheduler" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -24,6 +26,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -41,7 +49,7 @@ > <input type="hidden" name="mode" value="job_add" /> > > <fieldset class="rows"> >-<legend>Task scheduler</legend><ol> >+<h3>Task scheduler</h3><ol> > <li><span class="label">Current server time is:</span> > [% time | html %]</li> > <li><label for="starttime">Time:</label> >@@ -74,8 +82,9 @@ > > <input type="text" name="email" id="email" size="50" /> > </li> >-</ol></fieldset> >-<fieldset class="action"><input class="submit-button" type="submit" value="Save" /></fieldset> >+</ol> >+ <fieldset class="action"><input class="submit-button principal" type="submit" value="Save" /> >+</fieldset></fieldset> > </form> > > [% IF ( JOBS ) %]<h2>Jobs already entered</h2> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >index 2b0df0daaf..e592898b6e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >@@ -36,6 +36,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >index 3ab3419d85..21161bd98e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Stage MARC records for import › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -12,8 +15,7 @@ > > </head> > <body id="tools_stage-marc-import" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -41,6 +43,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -56,7 +64,6 @@ > [% END %] > > [% IF ( uploadmarc ) %] >-<h1>MARC staging results</h1> > <ul> > [% SWITCH (record_type) %] > [% CASE 'biblio' %] >@@ -90,14 +97,13 @@ > </p> > [% END %] > [% ELSE %] >-<h1>Stage MARC records for import</h1> > <ul> > <li>Select a MARC file to stage in the import reservoir. It will be parsed, and each valid record staged for later import into the catalog.</li> > <li>You can enter a name for this import. It may be useful, when creating a record, to remember where the suggested MARC data comes from!</li> > </ul> > <form method="post" action="[% SCRIPT_NAME | html %]" id="uploadfile" enctype="multipart/form-data"> > <fieldset class="rows" id="uploadform"> >-<legend>Upload a file to stage</legend> >+<h3>Upload a file to stage</h3> > <ol> > <li> > <div id="fileuploadform"> >@@ -107,7 +113,7 @@ > </li> > </ol> > <fieldset class="action"> >- <button id="fileuploadbutton">Upload file</button> >+ <button class="principal" id="fileuploadbutton">Upload file</button> > <button id="fileuploadcancel">Cancel</button> > </fieldset> > </fieldset> >@@ -123,7 +129,7 @@ > </form> > > <fieldset class="rows" id="profile_fieldset"> >- <legend>Pre-fill values with profile?</legend> >+ <h3>Pre-fill values with profile?</h3> > <ol> > <li> > <label for="profile">Profile: </label> >@@ -146,7 +152,7 @@ > <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" /> > <input type="hidden" name="runinbackground" id="runinbackground" value="" /> > <input type="hidden" name="completedJobID" id="completedJobID" value="" /> >- <legend>Settings</legend> >+ <h3>Settings</h3> > <ol><li> > <label for="comments">Comments about this file: </label> > <input type="text" id="comments" name="comments" /> >@@ -184,7 +190,7 @@ > > [% IF MarcModificationTemplatesLoop %] > <fieldset class="rows"> >- <legend>Modify records using a MARC modification template?</legend> >+ <h3>Modify records using a MARC modification template?</h3> > <ol> > <li> > <label for="comments">Template: </label> >@@ -200,7 +206,7 @@ > [% END %] > > <fieldset class="rows"> >- <legend>Look for existing records in catalog?</legend> >+ <h3>Look for existing records in catalog?</h3> > <ol><li><label for="matcher">Record matching rule:</label> > <select name="matcher" id="matcher"> > <option value="">Do not look for matching records</option> >@@ -219,7 +225,7 @@ > </ol> > </fieldset> > <fieldset class="rows" id="items"> >- <legend>Check for embedded item record data?</legend> >+ <h3>Check for embedded item record data?</h3> > <ol> > <li class="radio"> > <input type="radio" id="parse_itemsyes" name="parse_items" value="1" checked="checked" /> >@@ -239,7 +245,7 @@ > </fieldset> > > <fieldset class="rows" id="save_profile"> >- <legend>Save profile</legend> >+ <h3>Save profile</h3> > <ol> > <li> > <label for="profile_name">Profile name:</label> >@@ -251,7 +257,7 @@ > </fieldset> > > <fieldset class="action"> >- <input type="button" id="mainformsubmit" value="Stage for import" /> >+ <input class="principal" type="button" id="mainformsubmit" value="Stage for import" /> > </fieldset> > > <div id="jobpanel"><div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >index 3082cea4b8..177112afdd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >@@ -5,14 +5,16 @@ > [% USE KohaDates %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Stock rotation › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="tools_stockrotation" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -82,6 +84,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >index 7efa6aba1c..79f70517a7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >@@ -8,7 +8,6 @@ > </head> > <body id="tools_tools-home" class="tools"> > [% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -21,6 +20,14 @@ > </a> > </li> > </ol> >+ >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="container-fluid"> >@@ -28,7 +35,7 @@ > <div class="row"> > <div class="col-sm-4"> > [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons || CAN_user_tools_edit_patrons || CAN_user_tools_batch_extend_due_dates || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %] >-<h3>Patrons and circulation</h3> >+<h2>Patrons and circulation</h2> > [% END %] > <dl> > [% IF (CAN_user_tools_manage_patron_lists) %] >@@ -97,7 +104,7 @@ > > <div class="col-sm-4 col-sm-push-4"> > [% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_additional_contents || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool ) || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %] >-<h3>Additional tools</h3> >+<h2>Additional tools</h2> > [% END %] > <dl> > [% IF ( CAN_user_tools_edit_calendar ) %] >@@ -167,7 +174,7 @@ > </dl> > > [% IF ( Koha.Preference('UseCashRegisters') && ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) ) %] >-<h3>Cash management</h3> >+<h2>Cash management</h2> > <dl> > > <dt><a href="/cgi-bin/koha/pos/registers.pl">Cash summary for [% Branches.GetLoggedInBranchname | html %]</a></dt> >@@ -183,7 +190,7 @@ > > <div class="col-sm-4 col-sm-pull-4"> > [% IF ( CAN_user_tools_items_batchdel || CAN_user_tools_items_batchmod || CAN_user_tools_records_batchdel || CAN_user_tools_records_batchmod || CAN_user_tools_export_catalog || CAN_user_tools_inventory || CAN_user_tools_label_creator || CAN_user_tools_rotating_collections || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) || CAN_user_tools_marc_modification_templates || CAN_user_tools_stage_marc_import || CAN_user_tools_manage_staged_marc || CAN_user_tools_upload_local_cover_images ) %] >-<h3>Catalog</h3> >+<h2>Catalog</h2> > [% END %] > <dl> > [% IF ( CAN_user_tools_items_batchdel ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index 1f9e697009..dea3712627 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > Koha › >@@ -76,8 +79,7 @@ > </head> > > <body id="tools_upload-images" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -122,6 +124,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -260,7 +268,7 @@ > </fieldset> > > <fieldset id="process_images" class="action"> >- <button type="submit" class="btn btn-default btn-sm save_image">Process images</button> >+ <button type="submit" class="btn btn-default btn-sm save_image principal">Process images</button> > [% IF ( biblionumber ) %] > <a class="cancel cancel_image" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Cancel</a> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >index 716f9a6a2b..4afc0dd1d7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >@@ -5,6 +5,9 @@ > [% USE TablesSettings %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% IF plugin %] > <title>Upload plugin</title> >@@ -42,6 +45,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > [% END %] > >@@ -49,7 +58,7 @@ > <form method="post" action="/cgi-bin/koha/tools/upload.pl" id="uploadfile" enctype="multipart/form-data"> > [% PROCESS plugin_pars %] > <fieldset class="rows" id="uploadform"> >- <legend>Upload new files</legend> >+ <h3>Upload new files</h3> > <ol> > <li> > <div id="fileuploadform"> >@@ -96,8 +105,8 @@ > </li> > </ol> > <fieldset class="action"> >- <button id="fileuploadbutton">Upload</button> >- <button id="fileuploadcancel">Cancel</button> >+ <button id="fileuploadbutton" class="principal">Upload</button> >+ <button id="fileuploadcancel" class="cancel">Cancel</button> > </fieldset> > </fieldset> > <div id="fileuploadpanel"> >@@ -134,7 +143,7 @@ > </li> > </ol> > <fieldset class="action"> >- <button id="browsebutton" class="submit">Search</button> >+ <button id="browsebutton" class="submit principal">Search</button> > </fieldset> > </fieldset> > </form> >@@ -146,15 +155,15 @@ > [% PROCESS plugin_pars %] > <input type="hidden" name="op" value="search"/> > <fieldset class="brief"> >- <h4>Search uploads by name or hashvalue</h4> >+ <h3>Search uploads by name or hashvalue</h3> > <ol> > <li> >- <label for="term">Search term: </label> >- <input type="text" id="term" name="term" value=""/> >+ <p for="term">Search term: >+ <input type="text" id="term" name="term" value=""/></p> > </li> > </ol> > <fieldset class="action"> >- <button id="searchbutton" class="submit">Search</button> >+ <button id="searchbutton" class="submit principal">Search</button> > </fieldset> > </fieldset> > </form> >@@ -171,7 +180,7 @@ > > [% BLOCK closer %] > [% IF plugin %] >- <div id="closewindow"><a class="btn btn-default btn-default close" href="#">Close</a></div> >+ <div id="closewindow"><a class="btn btn-default btn-default close cancel" href="#">Close</a></div> > [% END %] > [% END %] > >@@ -179,7 +188,7 @@ > [% IF !plugin %] > <form id="back"> > <fieldset class="action"> >- <button class="submit">Back</button> >+ <button class="submit principal">Back</button> > </fieldset> > </form> > [% END %] >@@ -188,11 +197,11 @@ > [% BLOCK newsearch %] > <form id="newsearch"> > <fieldset class="action"> >- <button id="new_search">New search</button> >+ <button id="new_search" class="cancel">New search</button> > </fieldset> > </form> > [% IF plugin %] >- <div id="closewindow"><a class="btn btn-default btn-default close" href="#">Close</a></div> >+ <div id="closewindow"><a class="btn btn-default btn-default close cancel" href="#">Close</a></div> > [% END %] > [% END %] > >@@ -262,8 +271,7 @@ > <main> > [% ELSE %] > <body id="tools_upload" class="tools"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > [% PROCESS breadcrumbs %] > > <div class="main container-fluid"> >@@ -272,7 +280,7 @@ > <main> > [% END %] > >-<h1>Upload</h1> >+<h2>Upload</h2> > <div class="dialog alert" id="myalerts" style="display:none;"></div> > > [% PROCESS submitter %] >@@ -293,7 +301,7 @@ > [% PROCESS closer %] > [% ELSIF mode == 'report' %] > <div id="toolbar" class="btn-toolbar"> >- <a href="/cgi-bin/koha/tools/upload.pl" class="btn btn-default">Upload file</a> >+ <a href="/cgi-bin/koha/tools/upload.pl" class="btn btn-default principal">Upload file</a> > </div> > [% IF uploads %] > <h3>Your request gave the following results:</h3> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >index 24fc22f669..6270d3a5cb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >@@ -6,6 +6,9 @@ > [% USE KohaDates %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( do_it ) %] >@@ -44,7 +47,7 @@ > ins { > background-color: #e6ffe6; > } >- del { >+ del {bread > background-color: #ffe6e6; > } > #col1 ins, >@@ -60,8 +63,7 @@ > </head> > > <body id="tools_viewlog" class="tools"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > [% BLOCK translate_log_module %] > [% SWITCH module %] >@@ -189,6 +191,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -196,7 +204,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Browse system logs</h1> >+ <h2>Browse system logs</h2> > <form method="post" action="/cgi-bin/koha/tools/viewlog.pl"> > [% IF ( do_it ) %] > <input type="hidden" name="do_it" value="[% do_it | html %]" /> >@@ -288,7 +296,7 @@ > </ol> > </fieldset> > <fieldset class="rows"> >- <legend>Output</legend> >+ <h3>Output</h3> > <ol> > <li> > <label for="screen" >To screen in the browser:</label> <input id="screen" type="radio" checked="checked" name="output" value="screen" /> >@@ -308,7 +316,7 @@ > </ol> > </fieldset> > <fieldset class="action"> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > <input type="hidden" name="do_it" value="1" /> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt >index 785a0d43ba..6782554a18 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt >@@ -109,7 +109,7 @@ > <!-- SAVE --> > <fieldset class="action"> > <input type="hidden" name="sortfield" value="title" /> >- <input type="submit" value="Save" class="submit" /> <a class="close cancel" href="#">Cancel</a> >+ <input type="submit" value="Save" class="principal" /> <a class="close cancel" href="#">Cancel</a> > </fieldset> > </form> > <!-- /SAVE --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt >index 919ff4275b..74b9a6ecb5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt >@@ -7,7 +7,7 @@ > <div class="container">[% IF ( email ) %] > > [% IF ( SENT ) %] >- <h3>Message sent</h3> >+ <h2>Message sent</h2> > <p>The list was sent to: [% email | html %]</p> > <p><a class="close focus" href="#">Close window</a></p> > [% END %] >@@ -19,20 +19,21 @@ > > <form action="/cgi-bin/koha/virtualshelves/sendshelf.pl" method="post"> > >-<fieldset class="rows"> >+<fieldset id="select-libs"> > <legend><h1>Sending your list</h1></legend> >-<ol> <li> >+ <p> > <label for="email">Email address:</label> >- <input type="text" id="email" name="email" size="43" class="focus" /> >- </li> >- <li> >+ <input type="text" id="email" name="email" class="focus" /> >+ </p> >+ <p> > <label for="comment">Comment:</label> >- <textarea id="comment" name="comment" rows="4" cols="40"></textarea> >- </li> >- <li> >+ <textarea id="comment" name="comment" rows="4"></textarea> >+ </p> >+ <p> > <input type="hidden" name="shelfid" value="[% shelfid | html %]" /> >- </li></ol></fieldset> >- <fieldset class="action"> <input type="submit" value="Send" /> <a class="cancel close" href="#">Cancel</a> </fieldset> >+ </p> >+ >+ <input type="submit" value="Send" class="principal" /> <a class="cancel close" href="#">Cancel</a> </fieldset> > </form> > > [% END %]</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index 3fa48ea555..8bb09d7f4c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -43,8 +43,10 @@ > </head> > > <body id="lists_shelves" class="lists"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% form = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] >+[% INCLUDE 'header.inc' form=form %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -117,6 +119,8 @@ > </ol> > </nav> > >+[% INCLUDE 'shortcut.inc' %] >+ > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-1"> >diff --git a/koha-tmpl/intranet-tmpl/prog/img/UIKit/arrow.svg b/koha-tmpl/intranet-tmpl/prog/img/UIKit/arrow.svg >new file mode 100644 >index 0000000000..dfddbe76d2 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/img/UIKit/arrow.svg >@@ -0,0 +1,9 @@ >+<?xml version="1.0" encoding="utf-8"?> >+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> >+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> >+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" >+ width="13.208px" height="8.716px" viewBox="0 0 13.208 8.716" enable-background="new 0 0 13.208 8.716" xml:space="preserve"> >+<path fill="#FFFFFF" d="M8.262,8.473c0.322,0.324,0.85,0.324,1.174,0l3.529-3.527c0.324-0.323,0.324-0.854,0-1.176L9.436,0.242 >+ c-0.324-0.322-0.852-0.322-1.174,0c-0.323,0.324-0.323,0.853,0,1.177l2.118,2.115H0.824C0.354,3.534,0,3.916,0,4.358 >+ C0,4.83,0.381,5.182,0.824,5.182h9.556L8.262,7.298C7.938,7.621,7.938,8.15,8.262,8.473L8.262,8.473z"/> >+</svg> >diff --git a/koha-tmpl/intranet-tmpl/prog/img/UIKit/cart.svg b/koha-tmpl/intranet-tmpl/prog/img/UIKit/cart.svg >new file mode 100644 >index 0000000000..9998e824eb >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/img/UIKit/cart.svg >@@ -0,0 +1,25 @@ >+<?xml version="1.0" encoding="utf-8"?> >+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> >+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> >+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" >+ width="19.268px" height="18.622px" viewBox="0 0 19.268 18.622" enable-background="new 0 0 19.268 18.622" xml:space="preserve"> >+<g> >+ <g> >+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M5.099,12.35c0.213,0,0.346,0,0.482,0 >+ c4.135,0,8.27,0,12.404,0.004c0.207,0,0.477-0.025,0.605,0.088c0.17,0.15,0.334,0.436,0.313,0.645 >+ c-0.02,0.209-0.252,0.412-0.428,0.58c-0.072,0.07-0.238,0.053-0.361,0.053c-4.332,0.002-8.666,0.006-13,0 >+ c-0.852-0.004-1.514-0.656-1.422-1.418c0.037-0.295,0.17-0.598,0.326-0.857c0.375-0.627,0.797-1.227,1.18-1.852 >+ C5.274,9.465,5.306,9.256,5.257,9.12c-0.709-2-1.424-3.996-2.166-5.982C2.933,2.711,2.698,2.301,2.433,1.934 >+ C2.31,1.762,2.038,1.649,1.817,1.612c-0.34-0.053-0.695,0.004-1.041-0.025C0.243,1.543-0.05,1.17,0.007,0.649 >+ c0.037-0.367,0.26-0.611,0.662-0.627c0.695-0.027,1.393-0.031,2.086,0C2.917,0.028,3.124,0.18,3.22,0.325 >+ C3.636,0.94,4.034,1.571,4.407,2.215c0.145,0.25,0.307,0.328,0.588,0.328c4.508-0.008,9.014-0.006,13.521-0.004 >+ c0.148,0,0.305-0.008,0.441,0.035c0.24,0.074,0.373,0.234,0.279,0.508c-0.791,2.285-1.582,4.568-2.371,6.855 >+ c-0.094,0.268-0.291,0.346-0.551,0.344c-0.658-0.004-1.316-0.002-1.975-0.002c-2.521,0-5.041,0.004-7.563-0.006 >+ c-0.254-0.002-0.402,0.076-0.535,0.293C5.89,11.149,5.511,11.713,5.099,12.35z"/> >+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M7.708,16.952c0.004,0.912-0.695,1.662-1.553,1.67 >+ c-0.891,0.008-1.607-0.725-1.613-1.648c-0.004-0.932,0.693-1.662,1.592-1.666C6.999,15.301,7.704,16.04,7.708,16.952z"/> >+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M17.702,16.959c0.002,0.924-0.719,1.672-1.596,1.66 >+ c-0.871-0.01-1.564-0.746-1.564-1.656c0-0.92,0.693-1.654,1.561-1.656C17.001,15.303,17.702,16.028,17.702,16.959z"/> >+ </g> >+</g> >+</svg> >diff --git a/koha-tmpl/intranet-tmpl/prog/img/UIKit/check-green.svg b/koha-tmpl/intranet-tmpl/prog/img/UIKit/check-green.svg >new file mode 100644 >index 0000000000..9d5735e26b >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/img/UIKit/check-green.svg >@@ -0,0 +1,12 @@ >+<?xml version="1.0" encoding="utf-8"?> >+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> >+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> >+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" >+ width="11.644px" height="9.081px" viewBox="0 0 11.644 9.081" enable-background="new 0 0 11.644 9.081" xml:space="preserve"> >+<g> >+ <g> >+ <path fill="#418A40" d="M4.225,9.081L0.344,5.199c-0.459-0.458-0.459-1.2,0-1.658c0.457-0.458,1.199-0.458,1.658,0l2.223,2.223 >+ l5.418-5.421c0.457-0.458,1.199-0.458,1.658,0c0.457,0.458,0.457,1.2,0,1.658L4.225,9.081z"/> >+ </g> >+</g> >+</svg> >diff --git a/koha-tmpl/intranet-tmpl/prog/img/UIKit/cross-green.svg b/koha-tmpl/intranet-tmpl/prog/img/UIKit/cross-green.svg >new file mode 100644 >index 0000000000..a3b0610afa >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/img/UIKit/cross-green.svg >@@ -0,0 +1,16 @@ >+<?xml version="1.0" encoding="utf-8"?> >+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> >+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> >+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" >+ width="9.17px" height="9.175px" viewBox="0 0 9.17 9.175" enable-background="new 0 0 9.17 9.175" xml:space="preserve"> >+<g> >+ <g> >+ <g> >+ <path fill="#418A40" d="M8.825,7.165c0.46,0.46,0.46,1.2,0,1.66c-0.23,0.23-0.53,0.35-0.83,0.35s-0.601-0.12-0.83-0.35 >+ l-2.58-2.58l-2.58,2.58c-0.23,0.23-0.53,0.35-0.83,0.35s-0.6-0.12-0.83-0.35c-0.46-0.46-0.46-1.2,0-1.66l2.58-2.58l-2.58-2.58 >+ c-0.46-0.46-0.46-1.2,0-1.66s1.2-0.46,1.66,0l2.58,2.58l2.58-2.58c0.46-0.46,1.2-0.46,1.66,0s0.46,1.2,0,1.66l-2.58,2.58 >+ L8.825,7.165z"/> >+ </g> >+ </g> >+</g> >+</svg> >diff --git a/koha-tmpl/intranet-tmpl/prog/img/UIKit/cross.svg b/koha-tmpl/intranet-tmpl/prog/img/UIKit/cross.svg >new file mode 100644 >index 0000000000..81cc2ba7ca >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/img/UIKit/cross.svg >@@ -0,0 +1,20 @@ >+<?xml version="1.0" encoding="utf-8"?> >+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> >+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> >+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" >+ width="9.106px" height="9.031px" viewBox="0 0 9.106 9.031" enable-background="new 0 0 9.106 9.031" xml:space="preserve"> >+<g> >+ <g> >+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M4.574,5.681C4.331,5.915,4.113,6.118,3.905,6.329 >+ C3.111,7.129,2.323,7.936,1.528,8.735C1.08,9.187,0.421,9.096,0.11,8.543c-0.148-0.265-0.148-0.54,0.003-0.803 >+ c0.069-0.119,0.165-0.226,0.264-0.324c0.974-0.985,1.952-1.968,2.935-2.957C3.28,4.426,3.239,4.382,3.197,4.34 >+ C2.245,3.387,1.293,2.437,0.341,1.483C0.058,1.2-0.001,0.829,0.169,0.463c0.142-0.304,0.493-0.49,0.869-0.452 >+ C1.252,0.033,1.43,0.135,1.581,0.286C2.52,1.228,3.462,2.167,4.399,3.108c0.045,0.043,0.078,0.097,0.123,0.154 >+ c0.066-0.063,0.11-0.105,0.154-0.148C5.64,2.166,6.6,1.215,7.563,0.266c0.462-0.453,1.178-0.308,1.429,0.285 >+ c0.132,0.315,0.05,0.664-0.226,0.938C7.813,2.432,6.861,3.375,5.907,4.317C5.86,4.364,5.812,4.411,5.726,4.493 >+ C5.784,4.531,5.84,4.559,5.884,4.599c0.964,0.948,1.925,1.899,2.889,2.847C9.058,7.724,9.19,8.05,9.05,8.434 >+ C8.814,9.081,8.065,9.231,7.561,8.741c-0.299-0.289-0.586-0.59-0.877-0.885c-0.67-0.68-1.341-1.357-2.008-2.038 >+ C4.632,5.774,4.602,5.719,4.574,5.681z"/> >+ </g> >+</g> >+</svg> >diff --git a/koha-tmpl/intranet-tmpl/prog/img/UIKit/end-green.svg b/koha-tmpl/intranet-tmpl/prog/img/UIKit/end-green.svg >new file mode 100644 >index 0000000000..0b86eaaf7b >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/img/UIKit/end-green.svg >@@ -0,0 +1,17 @@ >+<?xml version="1.0" encoding="utf-8"?> >+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> >+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> >+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" >+ width="9.271px" height="11.158px" viewBox="0 0 9.271 11.158" enable-background="new 0 0 9.271 11.158" xml:space="preserve"> >+<g> >+ <path fill="#418A40" d="M0.167,1.763C0.056,1.596,0.009,1.406,0.001,1.208c-0.01-0.27,0.117-0.523,0.293-0.714S0.755,0.2,1.009,0.2 >+ s0.523,0.111,0.705,0.293s0.357,0.357,0.539,0.539c0.787,0.778,1.57,1.571,2.355,2.356c0.494,0.492,0.992,0.983,1.484,1.476 >+ C6.188,4.96,6.259,5.071,6.308,5.19c0.023,0.071,0.047,0.127,0.055,0.19c0,0,0,0,0,0.008c0.039,0.183,0.016,0.381-0.047,0.563 >+ c-0.031,0.063-0.064,0.127-0.104,0.19c-0.039,0.056-0.08,0.104-0.119,0.143c-0.023,0.024-0.047,0.048-0.07,0.071 >+ c-0.16,0.159-0.311,0.31-0.469,0.469C4.769,7.61,3.983,8.395,3.198,9.18c-0.494,0.5-0.984,0.992-1.477,1.484 >+ c-0.189,0.19-0.443,0.286-0.713,0.293c-0.262,0.008-0.518-0.119-0.707-0.293C0.11,10.498,0.001,10.196,0.001,9.95 >+ c0-0.246,0.109-0.5,0.277-0.682l0.023-0.024l3.674-3.665L0.208,1.811L0.167,1.763z"/> >+ <path fill="#418A40" d="M8.296,11.158c-0.539,0-0.975-0.437-0.975-0.975V0.976C7.321,0.437,7.757,0,8.296,0l0,0 >+ c0.539,0,0.975,0.437,0.975,0.976v9.208C9.271,10.722,8.835,11.158,8.296,11.158L8.296,11.158z"/> >+</g> >+</svg> >diff --git a/koha-tmpl/intranet-tmpl/prog/img/UIKit/home-green.svg b/koha-tmpl/intranet-tmpl/prog/img/UIKit/home-green.svg >new file mode 100644 >index 0000000000..ff36c60b14 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/img/UIKit/home-green.svg >@@ -0,0 +1,12 @@ >+<?xml version="1.0" encoding="utf-8"?> >+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> >+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> >+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" >+ width="13.578px" height="14.219px" viewBox="0 0 13.578 14.219" enable-background="new 0 0 13.578 14.219" xml:space="preserve"> >+<path fill="#418A40" d="M13.416,6.368L7.225,0.177l0,0C7.109,0.063,6.953,0,6.791,0S6.475,0.063,6.357,0.177L0.166,6.368 >+ C0.061,6.482,0,6.634,0,6.79c0,0.157,0.059,0.308,0.166,0.423c0.107,0.114,0.252,0.185,0.41,0.195H1.33V13.6 >+ c0,0.164,0.066,0.322,0.182,0.438c0.117,0.116,0.273,0.182,0.438,0.182h3.467v-4.154c0-0.164,0.066-0.322,0.182-0.438 >+ c0.117-0.116,0.273-0.182,0.438-0.182h1.5H7.533c0.166,0,0.322,0.065,0.439,0.182c0.115,0.115,0.18,0.273,0.18,0.438v4.148h3.469 >+ c0.164,0,0.32-0.065,0.438-0.182c0.115-0.116,0.182-0.273,0.182-0.438V7.402h0.785c0.152-0.017,0.295-0.089,0.396-0.203 >+ c0.102-0.115,0.158-0.264,0.156-0.417C13.578,6.629,13.52,6.481,13.416,6.368L13.416,6.368z"/> >+</svg> >diff --git a/koha-tmpl/intranet-tmpl/prog/img/UIKit/home.svg b/koha-tmpl/intranet-tmpl/prog/img/UIKit/home.svg >new file mode 100644 >index 0000000000..84381b2748 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/img/UIKit/home.svg >@@ -0,0 +1,12 @@ >+<?xml version="1.0" encoding="utf-8"?> >+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> >+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> >+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" >+ width="13.578px" height="14.219px" viewBox="0 0 13.578 14.219" enable-background="new 0 0 13.578 14.219" xml:space="preserve"> >+<path fill="#FFFFFF" d="M13.416,6.368L7.225,0.177l0,0C7.109,0.063,6.953,0,6.791,0S6.475,0.063,6.357,0.177L0.166,6.368 >+ C0.061,6.482,0,6.634,0,6.79c0,0.157,0.059,0.308,0.166,0.423c0.107,0.114,0.252,0.185,0.41,0.195H1.33V13.6 >+ c0,0.164,0.066,0.322,0.182,0.438c0.117,0.116,0.273,0.182,0.438,0.182h3.467v-4.154c0-0.164,0.066-0.322,0.182-0.438 >+ c0.117-0.116,0.273-0.182,0.438-0.182h1.5H7.533c0.166,0,0.322,0.065,0.439,0.182c0.115,0.115,0.18,0.273,0.18,0.438v4.148h3.469 >+ c0.164,0,0.32-0.065,0.438-0.182c0.115-0.116,0.182-0.273,0.182-0.438V7.402h0.785c0.152-0.017,0.295-0.089,0.396-0.203 >+ c0.102-0.115,0.158-0.264,0.156-0.417C13.578,6.629,13.52,6.481,13.416,6.368L13.416,6.368z"/> >+</svg> >diff --git a/koha-tmpl/intranet-tmpl/prog/img/UIKit/next-green.svg b/koha-tmpl/intranet-tmpl/prog/img/UIKit/next-green.svg >new file mode 100644 >index 0000000000..cdc63cc391 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/img/UIKit/next-green.svg >@@ -0,0 +1,13 @@ >+<?xml version="1.0" encoding="utf-8"?> >+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> >+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> >+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" >+ width="6.382px" height="10.758px" viewBox="0 0 6.382 10.758" enable-background="new 0 0 6.382 10.758" xml:space="preserve"> >+<path fill="#418A40" d="M0.166,1.563C0.055,1.396,0.008,1.206,0,1.007c-0.008-0.27,0.119-0.523,0.293-0.714 >+ C0.469,0.103,0.754,0,1.008,0s0.523,0.111,0.705,0.293C1.896,0.476,2.07,0.65,2.254,0.833C3.039,1.61,3.822,2.404,4.609,3.189 >+ C5.102,3.681,5.6,4.172,6.094,4.665C6.188,4.76,6.26,4.871,6.307,4.99C6.33,5.061,6.355,5.117,6.363,5.18c0,0,0,0,0,0.008 >+ c0.039,0.183,0.016,0.381-0.049,0.563c-0.031,0.063-0.063,0.127-0.102,0.19c-0.041,0.056-0.08,0.104-0.119,0.143 >+ C6.068,6.108,6.045,6.132,6.021,6.156c-0.16,0.159-0.309,0.31-0.467,0.469C4.768,7.41,3.982,8.195,3.197,8.98 >+ c-0.492,0.5-0.984,0.992-1.475,1.484c-0.191,0.19-0.445,0.286-0.715,0.293c-0.262,0.008-0.516-0.119-0.707-0.293 >+ C0.111,10.297,0,9.996,0,9.75c0-0.246,0.111-0.5,0.277-0.682l0.023-0.024l3.674-3.665L0.207,1.61L0.166,1.563z"/> >+</svg> >diff --git a/koha-tmpl/intranet-tmpl/prog/img/UIKit/picto-koha.svg b/koha-tmpl/intranet-tmpl/prog/img/UIKit/picto-koha.svg >new file mode 100644 >index 0000000000..b06bf4868a >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/img/UIKit/picto-koha.svg >@@ -0,0 +1,19 @@ >+<?xml version="1.0" encoding="utf-8"?> >+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> >+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> >+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" >+ width="29.312px" height="35.625px" viewBox="0 0 29.312 35.625" enable-background="new 0 0 29.312 35.625" xml:space="preserve"> >+<g id="g2618_120_"> >+ <linearGradient id="path14_1_" gradientUnits="userSpaceOnUse" x1="0.1895" y1="30.835" x2="29.3993" y2="7.1813"> >+ <stop offset="0.4778" style="stop-color:#418A40"/> >+ <stop offset="1" style="stop-color:#589D43"/> >+ </linearGradient> >+ <path id="path14_111_" fill="url(#path14_1_)" d="M13.295,1.685c1.83-1.016,3.904-1.599,5.992-1.685 >+ c1.102,0.054,2.207,0.178,3.242,0.618c2.041,0.764,3.727,2.326,4.783,4.217c1.168,1.936,1.686,4.185,1.932,6.41 >+ c0.539,7.367-2.189,14.768-6.844,20.431c-1.83,1.829-4.086,3.383-6.674,3.858c-2.141,0.307-4.459-0.151-6.18-1.502 >+ c-1.066-0.807-1.498-2.205-1.406-3.5c0.945,1.336,2.494,2.262,4.146,2.3c1.498,0.071,2.988-0.612,3.994-1.706 >+ c1.695-1.827,1.863-4.91,0.275-6.855c-0.727-0.843-1.572-1.6-2.555-2.134c-0.986-0.582-2.127-0.834-3.252-0.987 >+ c-2.078-0.133-4.232,0.244-6.063,1.268c-1.775,1.004-3.078,2.795-3.486,4.793c-0.416,1.553-0.266,3.177-0.1,4.752 >+ C0.42,30.159,0.146,28.242,0,26.331v-1.395c0.24-6.988,3.15-13.805,7.834-18.972C9.443,4.298,11.238,2.771,13.295,1.685z"/> >+</g> >+</svg> >diff --git a/koha-tmpl/intranet-tmpl/prog/img/UIKit/setting.svg b/koha-tmpl/intranet-tmpl/prog/img/UIKit/setting.svg >new file mode 100644 >index 0000000000..e5d4ac0899 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/img/UIKit/setting.svg >@@ -0,0 +1,27 @@ >+<?xml version="1.0" encoding="utf-8"?> >+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> >+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> >+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" >+ width="18.523px" height="18.453px" viewBox="0 0 18.523 18.453" enable-background="new 0 0 18.523 18.453" xml:space="preserve"> >+<path d="M17.598,8.301H8.169c-0.263-0.716-0.81-1.291-1.51-1.593c-0.7-0.301-1.494-0.301-2.194,0c-0.7,0.302-1.246,0.877-1.51,1.593 >+ H0.927c-0.331,0-0.637,0.176-0.802,0.462c-0.166,0.287-0.166,0.641,0,0.927c0.165,0.286,0.471,0.463,0.802,0.463h2.02 >+ c0.263,0.716,0.809,1.291,1.51,1.592c0.7,0.302,1.493,0.302,2.194,0c0.699-0.301,1.246-0.876,1.51-1.592h9.437 >+ c0.331,0,0.636-0.177,0.802-0.463s0.166-0.64,0-0.927C18.232,8.477,17.928,8.301,17.598,8.301L17.598,8.301z M5.558,10.152 >+ c-0.245,0-0.481-0.098-0.656-0.271c-0.173-0.175-0.271-0.41-0.271-0.655c0-0.246,0.098-0.481,0.271-0.655 >+ c0.175-0.173,0.411-0.271,0.656-0.271c0.246,0,0.481,0.098,0.655,0.271C6.387,8.745,6.484,8.98,6.484,9.227 >+ c0,0.245-0.098,0.48-0.271,0.655C6.039,10.055,5.804,10.152,5.558,10.152z M17.598,14.783h-3.871 >+ c-0.264-0.716-0.811-1.291-1.51-1.593c-0.701-0.3-1.494-0.3-2.194,0c-0.701,0.302-1.247,0.877-1.51,1.593H0.927 >+ c-0.331,0-0.637,0.177-0.802,0.464c-0.166,0.286-0.166,0.639,0,0.925c0.165,0.287,0.471,0.464,0.802,0.464h7.576 >+ c0.264,0.715,0.81,1.291,1.51,1.592s1.493,0.301,2.194,0c0.7-0.301,1.246-0.877,1.51-1.592h3.881c0.33,0,0.636-0.177,0.802-0.464 >+ c0.165-0.286,0.165-0.639,0-0.925C18.233,14.96,17.928,14.783,17.598,14.783L17.598,14.783z M11.114,16.636L11.114,16.636 >+ c-0.245,0-0.481-0.098-0.654-0.271c-0.174-0.174-0.271-0.409-0.271-0.655c0-0.245,0.098-0.481,0.271-0.654 >+ c0.173-0.175,0.409-0.271,0.654-0.271s0.481,0.097,0.655,0.271c0.174,0.173,0.271,0.409,0.271,0.654 >+ c0,0.246-0.098,0.481-0.271,0.655S11.359,16.636,11.114,16.636L11.114,16.636z M0.927,3.67h10.354 >+ c0.264,0.715,0.81,1.291,1.51,1.592s1.494,0.301,2.194,0s1.246-0.877,1.51-1.592h1.103c0.33,0,0.636-0.177,0.802-0.464 >+ c0.165-0.286,0.165-0.639,0-0.926c-0.166-0.286-0.472-0.463-0.802-0.463h-1.094c-0.263-0.716-0.809-1.291-1.51-1.592 >+ c-0.7-0.301-1.493-0.301-2.193,0c-0.701,0.301-1.247,0.876-1.51,1.592H0.927c-0.331,0-0.637,0.177-0.802,0.463 >+ c-0.166,0.287-0.166,0.64,0,0.926C0.29,3.493,0.596,3.67,0.927,3.67L0.927,3.67z M13.893,1.817c0.246,0,0.48,0.098,0.655,0.271 >+ c0.173,0.174,0.271,0.409,0.271,0.655c0,0.245-0.098,0.48-0.271,0.654c-0.175,0.174-0.409,0.271-0.655,0.271 >+ s-0.481-0.098-0.654-0.271c-0.175-0.174-0.272-0.409-0.272-0.654c0-0.246,0.098-0.481,0.272-0.655 >+ C13.411,1.915,13.646,1.817,13.893,1.817z"/> >+</svg> >-- >2.17.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30952
:
136810
|
136812
|
136813
|
136815
|
136816
|
136818
|
136819
|
136820
|
136822
|
136823
|
136825
|
136827
|
136828
|
136830
|
136831
|
136833
|
136834
|
136836
|
136837
|
136839
|
136840
|
136842
|
136844
|
136845
|
136847
|
136848
|
136878
|
136879
|
136880
|
136881
|
136882
|
136883
|
136884
|
136885
|
136886
|
136887
|
136888
|
136889
|
136890
|
136891
|
136892
|
136893
|
136894
|
136895
|
136896
|
136897
|
136898
|
136899
|
136900
|
136901
|
136902
|
136950
|
136951
|
136952
|
136953
|
136954
|
136955
|
136956
|
136957
|
136958
|
136959
|
136960
|
136961
|
136962
|
136963
|
136964
|
136965
|
136966
|
136967
|
136968
|
136969
|
136970
|
136971
|
136972
|
136973
|
136974
|
137408
|
137409
|
137410
|
137411
|
137414
|
137415
|
137416
|
137417
|
137418
|
137419
|
137420
|
137744
|
137767
|
137768
|
137775
|
137776
|
137994
|
138091
|
138092
|
138093
|
138094
|
138095
|
138096
|
138097
|
138098
|
138099
|
138100
|
138101
|
138102
|
138103
|
138245
|
138246
|
138247
|
138293
|
138299
|
138300
|
138302
|
140117
|
140118
|
140119
|
140120
|
140121
|
140122
|
140123
|
140124
|
140125
|
140126
|
140127
|
140128
|
140129
|
140130
|
140131
|
140132
|
140133
|
140134
|
140135
|
140136
|
140137
|
140138
|
140139
|
140140
|
140141
|
140142
|
140143
|
140371
|
140372
|
140373
|
140374
|
140433
|
140435
|
140459
|
140460
|
140512
|
140513
|
140514
|
140515
|
140516
|
140517
|
140519
|
140520
|
140521
|
140522
|
140523
|
140524
|
140525
|
140526
|
140527
|
140528
|
140529
|
140530
|
140531
|
140532
|
140533
|
140534
|
140535
|
140536
|
140537
|
140538
|
140539
|
140540
|
140541
|
140542
|
140543
|
140544
|
140545
|
140546
|
140547
|
140548
|
140549
|
140550
|
140551
|
140552
|
140553
|
140554
|
140555
|
140556
|
140557
|
140558
|
140559
|
140560
|
140566
|
140567
|
140570
|
140571
|
140575
|
140576
|
140577
|
140588
|
140613
|
140617
|
140618
|
140619
|
140620
|
140628
|
140629
|
140635
|
140649
|
140650
|
140651
|
140652
|
140653
|
140654
|
140658
|
140687
|
140976
|
140977
|
141020
|
141024
|
141026
|
141027
|
141041
|
141043
|
141044
|
141047
|
141052
|
141053
|
141054
|
141055
|
141056
|
141057
|
141064
|
141074
|
141075
|
141631
|
141632
|
141633
|
141634
|
141635
|
141636
|
141637
|
141638
|
141639
|
141640
|
141641
|
141642
|
141643
|
141644
|
141645
|
141646
|
141647
|
141648
|
141649
|
141650
|
141651
|
141652
|
141653
|
141654
|
141655
|
141656
|
141657
|
141658
|
141659
|
141660
|
141661
|
141662
|
141663
|
141664
|
141665
|
141666
|
141667
|
141668
|
141669
|
141670
|
141671
|
141672
|
141673
|
141674
|
141675
|
141676
|
141677
|
141678
|
141679
|
141680
|
141681
|
141682
|
141683
|
141684
|
141685
|
141686
|
141687
|
141688
|
141689
|
141690
|
141691
|
141692
|
141693
|
141694
|
141695
|
141696
|
141697
|
141698
|
141699
|
141700
|
141701
|
141702
|
141703
|
141704
|
141705
|
141706
|
141707
|
141708
|
141709
|
141710
|
141711
|
141712
|
141713
|
142604
|
142605