Bugzilla – Attachment 136895 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: Search bar
Bug-30952-Search-bar.patch (text/plain), 1.07 MB, created by
Solene D
on 2022-07-01 12:46:04 UTC
(
hide
)
Description:
Bug 30952: Search bar
Filename:
MIME Type:
Creator:
Solene D
Created:
2022-07-01 12:46:04 UTC
Size:
1.07 MB
patch
obsolete
>From 6286b96c62642d24f283dc3203ea9260f53f94b7 Mon Sep 17 00:00:00 2001 >From: Solene Desvaux <sdesvaux@biblibre.com> >Date: Mon, 13 Jun 2022 14:06:38 +0200 >Subject: [PATCH] Bug 30952: Search bar > >--- > .../intranet-tmpl/prog/css/src/_tables.scss | 23 +- > .../intranet-tmpl/prog/css/src/calendar.scss | 23 +- > .../prog/css/src/staff-global.scss | 1309 ++++++++++++++--- > .../prog/en/includes/acquisitions-search.inc | 83 +- > .../prog/en/includes/adv-search.inc | 142 +- > .../prog/en/includes/authorities-search.inc | 5 +- > .../prog/en/includes/authorities-toolbar.inc | 8 +- > .../prog/en/includes/biblio-view-menu.inc | 6 +- > .../prog/en/includes/borrower_debarments.inc | 4 +- > .../prog/en/includes/branch-selector.inc | 2 +- > .../prog/en/includes/budgets-admin-search.inc | 63 +- > .../en/includes/budgets-admin-toolbar.inc | 8 +- > .../prog/en/includes/cat-toolbar.inc | 28 +- > .../prog/en/includes/cataloging-search.inc | 34 +- > .../prog/en/includes/catalogue-search-box.inc | 6 +- > .../prog/en/includes/checkin-search.inc | 93 +- > .../prog/en/includes/checkouts-table.inc | 6 +- > .../prog/en/includes/circ-menu.inc | 21 +- > .../prog/en/includes/circ-nav.inc | 8 +- > .../prog/en/includes/circ-search.inc | 106 +- > .../prog/en/includes/cities-admin-search.inc | 28 +- > .../en/includes/contracts-admin-search.inc | 21 +- > .../en/includes/currencies-admin-search.inc | 27 +- > .../intranet-tmpl/prog/en/includes/facets.inc | 2 +- > .../prog/en/includes/guided-reports-view.inc | 40 +- > .../intranet-tmpl/prog/en/includes/header.inc | 285 ++-- > .../prog/en/includes/home-search.inc | 114 +- > .../prog/en/includes/labels-toolbar.inc | 4 +- > .../prog/en/includes/letters-search.inc | 40 +- > .../prog/en/includes/lis-search.inc | 140 ++ > .../en/includes/member-alt-address-style.inc | 2 +- > .../en/includes/member-alt-contact-style.inc | 2 +- > .../en/includes/member-main-address-style.inc | 2 +- > .../prog/en/includes/members-toolbar.inc | 2 +- > .../prog/en/includes/patron-age.inc | 2 +- > .../prog/en/includes/patron-search-box.inc | 28 +- > .../prog/en/includes/patron-search.inc | 122 ++ > .../prog/en/includes/patron-toolbar.inc | 10 +- > .../prog/en/includes/patron_messages.inc | 12 +- > .../prog/en/includes/patroncards-toolbar.inc | 4 +- > .../prog/en/includes/patrons-admin-search.inc | 31 +- > .../prog/en/includes/prefs-admin-search.inc | 22 +- > .../prog/en/includes/prefs-menu.inc | 6 +- > .../prog/en/includes/reports-toolbar.inc | 24 +- > .../prog/en/includes/serials-search.inc | 50 +- > .../prog/en/includes/tools-menu.inc | 271 ++-- > .../prog/en/includes/z3950-admin-search.inc | 27 +- > .../intranet-tmpl/prog/en/modules/about.tt | 6 + > .../prog/en/modules/acqui/acqui-home.tt | 10 +- > .../prog/en/modules/acqui/addorderiso2709.tt | 12 +- > .../prog/en/modules/acqui/basket.tt | 12 +- > .../prog/en/modules/acqui/basketgroup.tt | 15 +- > .../prog/en/modules/acqui/basketheader.tt | 12 +- > .../prog/en/modules/acqui/booksellers.tt | 12 +- > .../prog/en/modules/acqui/cancelorder.tt | 6 + > .../prog/en/modules/acqui/duplicate_orders.tt | 12 +- > .../prog/en/modules/acqui/edi_ean.tt | 13 +- > .../prog/en/modules/acqui/edimsg.tt | 13 +- > .../prog/en/modules/acqui/histsearch.tt | 44 +- > .../prog/en/modules/acqui/invoice-files.tt | 12 +- > .../prog/en/modules/acqui/invoice.tt | 6 + > .../prog/en/modules/acqui/invoices.tt | 173 ++- > .../prog/en/modules/acqui/lateorders.tt | 27 +- > .../prog/en/modules/acqui/modordernotes.tt | 6 + > .../prog/en/modules/acqui/neworderempty.tt | 12 +- > .../modules/acqui/neworderempty_duplicate.tt | 14 +- > .../en/modules/acqui/newordersubscription.tt | 12 +- > .../en/modules/acqui/newordersuggestion.tt | 12 +- > .../prog/en/modules/acqui/ordered.tt | 12 +- > .../prog/en/modules/acqui/orderreceive.tt | 12 +- > .../prog/en/modules/acqui/parcel.tt | 12 +- > .../prog/en/modules/acqui/parcels.tt | 12 +- > .../prog/en/modules/acqui/spent.tt | 12 +- > .../prog/en/modules/acqui/supplier.tt | 12 +- > .../prog/en/modules/acqui/uncertainprice.tt | 12 +- > .../prog/en/modules/acqui/z3950_search.tt | 12 +- > .../en/modules/admin/additional-fields.tt | 21 +- > .../prog/en/modules/admin/admin-home.tt | 7 +- > .../en/modules/admin/adveditorshortcuts.tt | 12 +- > .../prog/en/modules/admin/aqbudgetperiods.tt | 134 +- > .../prog/en/modules/admin/aqbudgets.tt | 134 +- > .../prog/en/modules/admin/aqcontract.tt | 12 +- > .../prog/en/modules/admin/aqplan.tt | 44 +- > .../prog/en/modules/admin/audio_alerts.tt | 33 +- > .../modules/admin/auth_subfields_structure.tt | 12 +- > .../en/modules/admin/auth_tag_structure.tt | 12 +- > .../en/modules/admin/authorised_values.tt | 45 +- > .../prog/en/modules/admin/authtypes.tt | 31 +- > .../prog/en/modules/admin/background_jobs.tt | 20 +- > .../prog/en/modules/admin/biblio_framework.tt | 31 +- > .../modules/admin/branch_transfer_limits.tt | 21 +- > .../prog/en/modules/admin/branches.tt | 27 +- > .../prog/en/modules/admin/cash_registers.tt | 12 +- > .../prog/en/modules/admin/categories.tt | 36 +- > .../prog/en/modules/admin/checkmarc.tt | 14 +- > .../prog/en/modules/admin/cities.tt | 31 +- > .../prog/en/modules/admin/classsources.tt | 61 +- > .../prog/en/modules/admin/clone-rules.tt | 14 +- > .../prog/en/modules/admin/columns_settings.tt | 14 +- > .../prog/en/modules/admin/credit_types.tt | 31 +- > .../prog/en/modules/admin/currency.tt | 50 +- > .../prog/en/modules/admin/debit_types.tt | 31 +- > .../prog/en/modules/admin/desks.tt | 12 +- > .../prog/en/modules/admin/didyoumean.tt | 12 +- > .../prog/en/modules/admin/edi_accounts.tt | 50 +- > .../prog/en/modules/admin/edi_ean_accounts.tt | 50 +- > .../modules/admin/item_circulation_alerts.tt | 19 +- > .../en/modules/admin/items_search_field.tt | 12 +- > .../en/modules/admin/items_search_fields.tt | 30 +- > .../prog/en/modules/admin/itemtypes.tt | 42 +- > .../prog/en/modules/admin/koha2marclinks.tt | 20 +- > .../prog/en/modules/admin/library_groups.tt | 12 +- > .../en/modules/admin/marc-overlay-rules.tt | 12 +- > .../modules/admin/marc_subfields_structure.tt | 12 +- > .../prog/en/modules/admin/marctagstructure.tt | 28 +- > .../prog/en/modules/admin/matching-rules.tt | 113 +- > .../prog/en/modules/admin/oai_set_mappings.tt | 12 +- > .../prog/en/modules/admin/oai_sets.tt | 29 +- > .../prog/en/modules/admin/overdrive.tt | 12 +- > .../en/modules/admin/patron-attr-types.tt | 28 +- > .../prog/en/modules/admin/preferences.tt | 16 +- > .../searchengine/elasticsearch/mappings.tt | 61 +- > .../prog/en/modules/admin/share_content.tt | 12 +- > .../prog/en/modules/admin/smart-rules.tt | 62 +- > .../prog/en/modules/admin/sms_providers.tt | 12 +- > .../prog/en/modules/admin/smtp_servers.tt | 28 +- > .../en/modules/admin/systempreferences.tt | 41 +- > .../prog/en/modules/admin/transfer_limits.tt | 22 +- > .../en/modules/admin/transport-cost-matrix.tt | 22 +- > .../prog/en/modules/admin/usage_statistics.tt | 12 +- > .../prog/en/modules/admin/z3950servers.tt | 31 +- > .../modules/authorities/authorities-home.tt | 11 +- > .../en/modules/authorities/authorities.tt | 612 ++++---- > .../prog/en/modules/authorities/detail.tt | 12 +- > .../prog/en/modules/authorities/merge.tt | 12 +- > .../modules/authorities/searchresultlist.tt | 12 +- > .../prog/en/modules/basket/basket.tt | 16 +- > .../prog/en/modules/catalogue/ISBDdetail.tt | 11 +- > .../prog/en/modules/catalogue/MARCdetail.tt | 11 +- > .../prog/en/modules/catalogue/detail.tt | 17 +- > .../prog/en/modules/catalogue/imageviewer.tt | 11 +- > .../prog/en/modules/catalogue/issuehistory.tt | 11 +- > .../en/modules/catalogue/labeledMARCdetail.tt | 11 +- > .../prog/en/modules/catalogue/moredetail.tt | 33 +- > .../prog/en/modules/catalogue/results.tt | 31 +- > .../en/modules/catalogue/search-history.tt | 11 +- > .../en/modules/catalogue/stockrotation.tt | 11 +- > .../prog/en/modules/cataloguing/addbiblio.tt | 31 +- > .../prog/en/modules/cataloguing/addbooks.tt | 9 +- > .../prog/en/modules/cataloguing/additem.tt | 11 +- > .../prog/en/modules/cataloguing/editor.tt | 8 +- > .../prog/en/modules/cataloguing/linkitem.tt | 12 +- > .../prog/en/modules/cataloguing/merge.tt | 11 +- > .../prog/en/modules/cataloguing/moveitem.tt | 11 +- > .../modules/cataloguing/z3950_auth_search.tt | 6 +- > .../en/modules/cataloguing/z3950_search.tt | 6 +- > .../prog/en/modules/circ/article-requests.tt | 11 +- > .../prog/en/modules/circ/bookcount.tt | 11 +- > .../prog/en/modules/circ/checkout-notes.tt | 11 +- > .../prog/en/modules/circ/circulation-home.tt | 51 +- > .../prog/en/modules/circ/circulation.tt | 29 +- > .../circ/circulation_batch_checkouts.tt | 11 +- > .../prog/en/modules/circ/offline.tt | 11 +- > .../prog/en/modules/circ/on-site_checkouts.tt | 11 +- > .../prog/en/modules/circ/overdue.tt | 2 +- > .../prog/en/modules/circ/request-article.tt | 11 +- > .../prog/en/modules/clubs/club-enrollments.tt | 12 +- > .../prog/en/modules/clubs/clubs-add-modify.tt | 12 +- > .../prog/en/modules/clubs/clubs.tt | 12 +- > .../en/modules/clubs/templates-add-modify.tt | 12 +- > .../prog/en/modules/common/patron_search.tt | 312 ++++ > .../course_reserves/add_items-step1.tt | 12 +- > .../course_reserves/add_items-step2.tt | 12 +- > .../course_reserves/batch_add_items.tt | 12 +- > .../modules/course_reserves/batch_rm_items.tt | 12 +- > .../modules/course_reserves/course-details.tt | 12 +- > .../course_reserves/course-reserves.tt | 12 +- > .../prog/en/modules/course_reserves/course.tt | 12 +- > .../modules/course_reserves/invalid-course.tt | 14 +- > .../prog/en/modules/errors/errorpage.tt | 13 +- > .../prog/en/modules/ill/ill-requests.tt | 12 +- > .../prog/en/modules/intranet-main.tt | 72 +- > .../en/modules/labels/label-edit-batch.tt | 11 +- > .../en/modules/labels/label-edit-layout.tt | 11 +- > .../en/modules/labels/label-edit-profile.tt | 11 +- > .../en/modules/labels/label-edit-range.tt | 11 +- > .../en/modules/labels/label-edit-template.tt | 11 +- > .../prog/en/modules/labels/label-home.tt | 11 +- > .../prog/en/modules/labels/label-manage.tt | 15 +- > .../prog/en/modules/labels/spinelabel-home.tt | 13 +- > .../en/modules/members/accountline-details.tt | 10 +- > .../prog/en/modules/members/apikeys.tt | 8 +- > .../prog/en/modules/members/boraccount.tt | 30 +- > .../prog/en/modules/members/deletemem.tt | 8 +- > .../prog/en/modules/members/discharge.tt | 8 +- > .../prog/en/modules/members/discharges.tt | 13 + > .../prog/en/modules/members/files.tt | 18 +- > .../prog/en/modules/members/holdshistory.tt | 14 +- > .../prog/en/modules/members/housebound.tt | 10 +- > .../prog/en/modules/members/ill-requests.tt | 10 +- > .../prog/en/modules/members/mancredit.tt | 18 +- > .../prog/en/modules/members/maninvoice.tt | 22 +- > .../prog/en/modules/members/member-flags.tt | 18 +- > .../en/modules/members/member-password.tt | 20 +- > .../prog/en/modules/members/member.tt | 6 - > .../prog/en/modules/members/memberentrygen.tt | 81 +- > .../prog/en/modules/members/members-update.tt | 8 +- > .../prog/en/modules/members/merge-patrons.tt | 18 +- > .../prog/en/modules/members/moremember.tt | 111 +- > .../prog/en/modules/members/notices.tt | 14 +- > .../prog/en/modules/members/pay.tt | 10 +- > .../prog/en/modules/members/paycollect.tt | 10 +- > .../modules/members/purchase-suggestions.tt | 17 +- > .../prog/en/modules/members/readingrec.tt | 12 +- > .../prog/en/modules/members/routing-lists.tt | 12 +- > .../prog/en/modules/members/statistics.tt | 14 +- > .../en/modules/offline_circ/enqueue_koc.tt | 12 +- > .../prog/en/modules/offline_circ/list.tt | 12 +- > .../en/modules/offline_circ/process_koc.tt | 18 +- > .../en/modules/patron_lists/add-modify.tt | 32 +- > .../prog/en/modules/patron_lists/list.tt | 39 +- > .../prog/en/modules/patron_lists/lists.tt | 23 +- > .../prog/en/modules/patroncards/edit-batch.tt | 25 +- > .../en/modules/patroncards/edit-layout.tt | 17 +- > .../en/modules/patroncards/edit-profile.tt | 21 +- > .../en/modules/patroncards/edit-template.tt | 14 +- > .../prog/en/modules/patroncards/home.tt | 12 +- > .../en/modules/patroncards/image-manage.tt | 13 +- > .../prog/en/modules/patroncards/manage.tt | 15 +- > .../en/modules/plugins/plugins-disabled.tt | 13 +- > .../prog/en/modules/plugins/plugins-upload.tt | 17 +- > .../intranet-tmpl/prog/en/modules/pos/pay.tt | 12 +- > .../prog/en/modules/pos/register.tt | 12 +- > .../prog/en/modules/pos/registers.tt | 12 +- > .../en/modules/reports/acquisitions_stats.tt | 9 +- > .../prog/en/modules/reports/bor_issues_top.tt | 8 +- > .../prog/en/modules/reports/borrowers_out.tt | 15 +- > .../en/modules/reports/borrowers_stats.tt | 7 +- > .../en/modules/reports/cash_register_stats.tt | 8 +- > .../prog/en/modules/reports/cat_issues_top.tt | 10 +- > .../prog/en/modules/reports/catalogue_out.tt | 14 +- > .../en/modules/reports/catalogue_stats.tt | 9 +- > .../prog/en/modules/reports/dictionary.tt | 51 +- > .../modules/reports/guided_reports_start.tt | 155 +- > .../en/modules/reports/issues_avg_stats.tt | 12 +- > .../prog/en/modules/reports/issues_stats.tt | 9 +- > .../prog/en/modules/reports/itemslost.tt | 9 +- > .../prog/en/modules/reports/itemtypes.tt | 11 +- > .../en/modules/reports/orders_by_budget.tt | 16 +- > .../prog/en/modules/reports/reports-home.tt | 15 +- > .../prog/en/modules/reports/reserves_stats.tt | 9 +- > .../prog/en/modules/reports/serials_stats.tt | 6 +- > .../prog/en/modules/reserve/request.tt | 73 +- > .../prog/en/modules/reviews/reviewswaiting.tt | 12 +- > .../modules/rotating_collections/addItems.tt | 12 +- > .../rotating_collections/editCollections.tt | 12 +- > .../rotatingCollections.tt | 12 +- > .../transferCollection.tt | 12 +- > .../en/modules/serials/checkexpiration.tt | 11 +- > .../prog/en/modules/serials/claims.tt | 11 +- > .../en/modules/serials/routing-preview.tt | 12 +- > .../prog/en/modules/serials/routing.tt | 12 +- > .../en/modules/serials/serials-collection.tt | 12 +- > .../prog/en/modules/serials/serials-edit.tt | 13 +- > .../prog/en/modules/serials/serials-home.tt | 5 +- > .../prog/en/modules/serials/serials-search.tt | 52 +- > .../en/modules/serials/subscription-add.tt | 12 +- > .../modules/serials/subscription-batchedit.tt | 13 +- > .../en/modules/serials/subscription-detail.tt | 12 +- > .../serials/subscription-frequencies.tt | 15 +- > .../modules/serials/subscription-history.tt | 12 +- > .../serials/subscription-numberpatterns.tt | 28 +- > .../prog/en/modules/serials/viewalerts.tt | 13 +- > .../prog/en/modules/suggestion/suggestion.tt | 461 +++--- > .../prog/en/modules/tags/list.tt | 14 +- > .../prog/en/modules/tags/review.tt | 12 +- > .../prog/en/modules/tools/access_files.tt | 13 +- > .../en/modules/tools/additional-contents.tt | 104 +- > .../automatic_item_modification_by_age.tt | 37 +- > .../prog/en/modules/tools/batchMod-del.tt | 13 +- > .../prog/en/modules/tools/batchMod-edit.tt | 11 +- > .../prog/en/modules/tools/batchMod.tt | 21 +- > .../en/modules/tools/batch_delete_records.tt | 26 +- > .../modules/tools/batch_extend_due_dates.tt | 21 +- > .../tools/batch_record_modification.tt | 43 +- > .../prog/en/modules/tools/cleanborrowers.tt | 27 +- > .../prog/en/modules/tools/csv-profiles.tt | 21 +- > .../prog/en/modules/tools/export.tt | 370 +++-- > .../prog/en/modules/tools/holidays.tt | 23 +- > .../prog/en/modules/tools/import_borrowers.tt | 28 +- > .../prog/en/modules/tools/inventory.tt | 45 +- > .../prog/en/modules/tools/letter.tt | 52 +- > .../en/modules/tools/manage-marc-import.tt | 26 +- > .../tools/marc_modification_templates.tt | 43 +- > .../prog/en/modules/tools/modborrowers.tt | 18 +- > .../prog/en/modules/tools/overduerules.tt | 11 +- > .../prog/en/modules/tools/picture-upload.tt | 10 +- > .../prog/en/modules/tools/problem-reports.tt | 11 +- > .../prog/en/modules/tools/quotes-upload.tt | 15 +- > .../prog/en/modules/tools/quotes.tt | 25 +- > .../prog/en/modules/tools/scheduler.tt | 18 +- > .../prog/en/modules/tools/showdiffmarc.tt | 6 + > .../en/modules/tools/stage-marc-import.tt | 30 +- > .../prog/en/modules/tools/stockrotation.tt | 11 +- > .../prog/en/modules/tools/upload-images.tt | 19 +- > .../prog/en/modules/tools/upload.tt | 27 +- > .../prog/en/modules/tools/viewlog.tt | 19 +- > .../prog/en/modules/virtualshelves/shelves.tt | 4 +- > 308 files changed, 7235 insertions(+), 3271 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss >index c3b2df4a41..5741c60254 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss >@@ -132,7 +132,6 @@ table { > } > > tbody { >- > border-top: 2px solid #A19B9E; > > td { >@@ -144,8 +143,21 @@ table { > display: none; > } > } >- } > >+ .dropdown-menu{ >+ background-color: #F3F4F4; >+ >+ a{ >+ color: #000; >+ >+ &:hover, >+ &:focus{ >+ background-image: none; >+ background-color: #F3F4F4; >+ } >+ } >+ } >+ } > } > > /* Row grouping */ >@@ -174,13 +186,14 @@ table { > td, > th { > //border-bottom: 1px solid $table-border-color; >- border-left: 1px solid $table-border-color; >- padding: .2em .3em; >+ //border-left: 1px solid $table-border-color; >+ padding: .2em .9em; > } > > td { > background-color: #FFFFFF; > vertical-align: top; >+ text-align: center; > > &.actions { > white-space: nowrap; >@@ -393,7 +406,7 @@ tbody { > .dataTables_wrapper { > .dataTables_processing { > background-color: #F4F8F9; >- border: 2px solid #82B4BE; >+ border: 2px solid #538200; > border-radius: 3px; > box-shadow: 2px 2px 3px 1px rgba(0, 0, 0, .2); > color: #333; >diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss b/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss >index fdf972ea51..e53a1b9bd8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss >@@ -94,13 +94,26 @@ $selected: #B9DB88; > } > > .panel { >- border: 1px solid #B9D8D9; >- border-radius: 4px; >- box-shadow: none; >- padding: 0; >+ //border: 1px solid #B9D8D9; >+ //border-radius: 4px; >+ //box-shadow: none; >+ //padding: 0; > display: none; >- margin: 1em 0; >+ //margin: 1em 0; > z-index: 1; >+ >+ >+ height: 100%; >+ width: 100%; >+ background-color: #FFF; >+ position: relative; >+ color: #696969; >+ left: 0px; >+ top: 0px; >+ margin: 0em 1em 1em 0em; >+ padding: 1em; >+ box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); >+ //display: inline-block; > } > > fieldset.brief { >diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >index 2eb7c59d44..ef2bcd2e5c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -17,7 +17,7 @@ a { > &:hover, > &:active { > color: #000; >- text-decoration: underline; //marche pour le menu raccourci mais pas le reste ? >+ text-decoration: underline; > } > > &:hover { >@@ -38,7 +38,7 @@ a { > &:link, > &:visited { > color: #71B443; >- padding: 0 25px; >+ padding: 6px 25px; > } > > &.btn-link { >@@ -60,12 +60,12 @@ a { > background-color: transparent; > color: #696969; > border: #696969 double 1px; >+ margin: 5px; > > //font-family: $font-main; > font-family: 'Poppins', sans-serif; > //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%); > display: inline-block; >- margin-bottom: 0; > font-weight: normal; > text-align: center; > white-space: nowrap; >@@ -98,6 +98,7 @@ a { > &.clear_date { > color: #418940; > font-size: 130%; >+ vertical-align: middle; > > &:hover { > color: #71B443; >@@ -184,7 +185,7 @@ a { > background-image: none; > padding: 6px 12px; > font-size: 12px; >- line-height: 1.42857143; >+ //line-height: 1.42857143; > border-radius: 4px; > -webkit-user-select: none; > -moz-user-select: none; >@@ -194,19 +195,22 @@ a { > background-color: transparent; > border: none; > display: inline-block; >- margin: 0 10px; >+ margin: 5px 10px; > color: #696969; > > &:hover{ >- text-decoration: underline; >+ text-decoration: none; > } > > &:active{ > border: none; > } > } >+} > >- >+#addauth{ >+ color: #fff; >+ background-color: #71B443; > } > > #resetZ3950Search{ >@@ -242,13 +246,44 @@ aside { > margin: .5em 0; > } > >+ .radio, .checkbox { >+ margin: 0; >+ } >+ >+ p{ >+ margin: 0; >+ } >+ > fieldset { > &.brief { > padding: 1.4em 1.7em; >- height: 100%; >+ //height: auto; > width: 100%; > left: 0px; > >+ overflow: auto; >+ //white-space: nowrap; >+ height: auto; >+ max-height: 500px; >+ >+ >+ &::-webkit-scrollbar { >+ width: 12px; >+ } >+ >+ &::-webkit-scrollbar-track { >+ background: #eeeeee; >+ //border-color: #696969; >+ //border-radius: 20px; >+ >+ } >+ >+ &::-webkit-scrollbar-thumb { >+ background: #696969; >+ border-radius: 20px; >+ border: 3px solid #eeeeee; >+ } >+ > button + button, > input + input { > margin-left: 5px; >@@ -263,6 +298,7 @@ aside { > legend { > font-size: 95%; > margin: 0; >+ border-bottom: none; > } > > &.action { >@@ -277,6 +313,7 @@ aside { > > label { > margin: .5em 0 0 0; >+ border-top : 1px inset #999999; > } > > li { >@@ -300,7 +337,7 @@ aside { > } > > &.radio { >- padding: .7em 0; >+ padding: .3em 0; > > input { > padding: .3em 0; >@@ -344,6 +381,64 @@ aside { > div { > display: block; > >+ &.menuspe{ >+ display: inline; >+ //align-items: center; >+ //justify-content: center; >+ } >+ >+ >+ &.menuspebas{ >+ ///display: inline; >+ display: flex; >+ //-webkit-box-align: center; >+ //-ms-flex-align: center; >+ align-items: center; >+ //-webkit-box-pack: center; >+ //-ms-flex-pack: center; >+ justify-content: center; >+ } >+ >+ &.vert{ >+ display: block; >+ float: right; >+ top: 0px; >+ right: 0; >+ position: absolute; >+ width: 160px; >+ margin-right: 100px; >+ >+ li{ >+ list-style-type: none; >+ height: 150px; >+ margin-right: auto; >+ margin-left: auto; >+ } >+ } >+ >+ &.bas{ >+ background: transparent url(../img/koha-logo-medium.png) no-repeat center; >+ width: 150px; >+ background-size: 70%; >+ height: 50px; >+ margin: 25px; >+ // position: inherit; >+ bottom: 0px; >+ text-align: center; >+ display: flex; >+ align-items: center; >+ justify-content: center; >+ position: fixed; >+ //right: 0; >+ //left: 0; >+ z-index: 1030; >+ >+ a{ >+ width: 100%; >+ height: 100%; >+ } >+ } >+ > /* &.plus{ > display: block; > background-color: #352C2E; >@@ -509,7 +604,7 @@ h4 { > > h5 { > font-size: 100%; >- font-weight: bold; >+ //font-weight: bold; > } > > h6 { >@@ -521,7 +616,7 @@ h7 { > font-size: 93%; > font-weight: bold; > text-align: center; >- padding: 5px; >+ //padding: 5px; > position: relative; > left: 0px; > bottom: 0px; >@@ -544,7 +639,7 @@ hr { > } > > p { >- margin: .5em 0; >+ margin: .7em 0; > } > > strong { >@@ -597,7 +692,8 @@ input { > white-space: nowrap; > vertical-align: middle; > touch-action: manipulation; >- width: 90px; >+ min-width: 90px; >+ width: auto; > cursor: pointer; > background-image: none; > padding: 6px 12px; >@@ -616,7 +712,8 @@ input { > display: inline-block; > font-size: inherit; > line-height: 1.42857143; >- padding: .3em .8em; >+ //padding: .3em .8em; >+ margin: 5px; > text-align: center; > text-shadow: 0 1px 0 #fff; > vertical-align: middle; >@@ -698,7 +795,7 @@ label, > } > > .col-sm-3 { >- width: 20%; >+ width: 25%; > } > > #area-news{ >@@ -714,94 +811,202 @@ label, > } > > .col-sm-9 { >- width: 80%; >+ width: 75%; > } > > > .biglinks-list{ > padding: 0px; >- margin: 10px; >+ margin: 10px 30px; > align-items: center; >+ height: 150px; > > li{ > list-style-type: none; >- display: table; >+ display: flex; > float: left; > text-align: center; >- margin: 10px; >- padding: 5px; >+ margin-bottom: 5px; >+ padding: 10px; > //display: flex; > align-items: center; > justify-content: center; > flex-wrap: wrap; >+ width: 150px; >+ height: 150px; >+ margin-right: auto; >+ margin-left: auto; > } > } > > .accueil{ > text-align: center; > //display: block; >- display: table; >- -webkit-box-sizing: content-box; >- box-sizing: content-box; >- width: 25px; >- height: 25px; >- margin: 0 1em 5px 1em; >- padding: 5px; >- border: solid 3px #71B443; >- border-radius: 50%; > text-decoration: none; > font-family: verdana, arial; >- font-weight: bold; >- font-size: large; >- background-color: #F3f4F4; >- align-items: center; >- justify-content: center; >+ >+ h1 { >+ font-size: 150%; >+ font-weight: normal; >+ } > > i{ > text-align: center; >- max-height: 100%; >- max-width: 100%; >+ //max-height: 100%; >+ //max-width: 100%; >+ color: #fff; >+ border: solid 3px #71B443; >+ border-radius: 50%; >+ background-color: #71B443; >+ width: 40px; >+ height: 40px; >+ margin-bottom: 5px; >+ margin-left: auto; >+ margin-right: auto; >+ padding: 5px; >+ align-items: center; >+ justify-content: center; >+ -webkit-box-sizing: content-box; >+ box-sizing: content-box; >+ //font-weight: bold; >+ //font-size: large; >+ display: flex; >+ > } > > &:hover{ > color: #418940; >- border-color: #418940; >+ //border-color: #418940; >+ text-decoration: none; >+ //font-weight: bold; >+ >+ i{ >+ background-color: #418940; >+ border-color: #418940; >+ } >+ >+ h1{ >+ font-weight: bold; >+ } > } > } > >+#reglages{ >+ i, img{ >+ text-align: center; >+ //max-height: 100%; >+ //max-width: 100%; >+ color: #71B443; >+ border: solid 3px #71B443; >+ border-radius: 50%; >+ background-color: transparent; >+ width: 40px; >+ height: 40px; >+ margin-bottom: 5px; >+ margin-left: auto; >+ margin-right: auto; >+ padding: 5px; >+ align-items: center; >+ justify-content: center; >+ -webkit-box-sizing: content-box; >+ box-sizing: content-box; >+ //font-weight: bold; >+ //font-size: large; >+ display: flex; >+ >+ } >+ >+ &:hover{ >+ color: #418940; >+ //border-color: #418940; >+ text-decoration: none; >+ font-weight: bold; > >+ i, img{ >+ border-color: #418940; >+ color: #418940; >+ } > >+ } > >+ img{ >+ max-width: 30px; >+ height: auto; >+ padding: 10px; >+ } >+} > > > > #navmenulist { > background-color: #e6e6e6; >- width: 20.1em; >+ width: 100%; >+ overflow: auto; >+ //white-space: nowrap; > display: block; > position: absolute; > left: 0px; >- height: 500px; >+ max-height: 700px; >+ height: auto; >+ >+ &::-webkit-scrollbar { >+ width: 12px; >+ } >+ >+ &::-webkit-scrollbar-track { >+ background: #eeeeee; >+ //border-color: #696969; >+ //border-radius: 20px; >+ >+ } >+ >+ &::-webkit-scrollbar-thumb { >+ background: #696969; >+ border-radius: 20px; >+ border: 3px solid #eeeeee; >+ } >+ >+ >+ > > ul { > margin-bottom: 8.5px; > margin-left: 0; > margin-right: 0; > padding-left: 0px; >- position: relative; >- top: 30px; >- >+ // position: relative; >+ // top: 30px; >+ > h5{ > padding-left: 0.5em; >- font-size: 110%; >+ padding-bottom: 0.5em; >+ font-size: 120%; > margin-top: 15px; > margin-left: 0; > margin-right: 0; > margin-bottom: 5px; >+ color: #696969; >+ >+ border-bottom: 1px solid #696969; > //position: absolute; > //top: 0px; > } > >+ &.sousmenu{ >+ margin-bottom: 13px; >+ margin-left: 0; >+ margin-right: 0; >+ padding-left: 0px; >+ position: relative; >+ top: 0px; >+ >+ li{ >+ a{ >+ font-size: 75%; >+ } >+ } >+ } >+ > li { > //border-bottom: 1px solid #352C2E; > list-style: $nav-menu-bullet; >@@ -813,10 +1018,11 @@ label, > left: 0px; > flex-direction: row; > width: 100%; >- height: 2.1em; >+ //height: 2.1em; > > > >+ height: auto; > > a { > //text-decoration: none; >@@ -828,36 +1034,37 @@ label, > text-decoration: none; > padding: 0.5em 0.3em 0.5em 1.2em; > >- >- >- &.current, &.hover { >+ &.current, &:hover { > background-color: #F3F4F4; > color: #418940; > border-left: solid 5px #418940; > font-weight: bold; > } >+ >+ &.titre{ >+ width: 100%; >+ font-size: 146.5%; >+ font-weight: bold; >+ text-align: center; >+ color: #000; >+ >+ &:hover, &.current{ >+ background-color: #e6e6e6; >+ color: #000; >+ border-left: none; >+ font-weight: bold; >+ } >+ } > } > } > } > } > >-#titre{ >- width: 100%; >- font-size: 146.5%; >- font-weight: bold; >- margin-top: 0; >- margin-bottom: 0; >- padding: 0.5em 2.6em 0.5em 2.6em; >- color: #000; >- position: absolute; >- top: 0px; >- left: 0px; >-} > > .main { > margin-bottom: $language-footer-min-height * 1.5; >- display: block; >- //margin-top: 1em; >+ //display: block; >+ margin-top: 1em; > } > > #login_controls { >@@ -900,6 +1107,13 @@ ul { > } > } > >+ &.nav-tabs { >+ border-bottom: 1px solid transparent; >+ padding: .2em 1.4em 0 1.4em; >+ } >+ >+ >+ > &.budget_hierarchy { > margin-left: 0; > padding-left: 0; >@@ -977,6 +1191,9 @@ ol { > font-weight: bold; > } > >+ >+ >+ > .strong { > font-weight: bold; > } >@@ -1089,7 +1306,7 @@ fieldset { > ol, > li { > list-style-type: none; >- margin-bottom: 1.9em; >+ //margin-bottom: 1.9em; > } > > span { >@@ -1106,14 +1323,19 @@ fieldset { > } > } > >+ ol{ >+ li{ >+ list-style-type: none; >+ padding: .3em 0; >+ } >+ } >+ > &.rows { > border: none; > box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); > clear: left; > float: left; > font-size: 90%; >- margin: .9em 0 0; >- padding: 0; > width: 100%; > > fieldset { >@@ -1187,7 +1409,8 @@ fieldset { > font-weight: bold; > margin-right: 1rem; > text-align: right; >- width: 9rem; >+ width: auto; >+ min-width: 9rem; > > &.error { > float: none; >@@ -1254,7 +1477,7 @@ fieldset { > } > > fieldset { >- margin-left: 10em; >+ //margin-left: 10em; > > label { > width: 6em; >@@ -1477,6 +1700,7 @@ div { > > .renew_formfield { > margin-bottom: 1em; >+ //itemtype > } > > .circmessage { >@@ -1680,6 +1904,8 @@ div { > } > } > >+ >+/* > #header_search { > //position : relative; > //right : - 500px; >@@ -1727,7 +1953,7 @@ div { > //top: 0; > > //position: absolute; >- line-height: 40px; >+ // line-height: 40px; > top: 0; > left: 0; > display: flex; >@@ -1812,9 +2038,11 @@ div { > } > } > >+*/ >+ > #reserves, > #checkouts { >- border: 1px solid #B9D8D9; >+ //border-top: 3px solid #418910; > padding: 1em; > } > >@@ -1847,7 +2075,7 @@ dd { > > #toolbar, > .btn-toolbar { >- background-color: transparent; >+ background-color: #f3F4F4; > border: none; > border-radius: 5px 5px 0 0; > margin: 0; >@@ -1862,27 +2090,104 @@ dd { > height: 100%; > > .dropdown-menu { >- border-top-width: 1px; >+ /*border-top-width: 1px; > font-size: 13px; >+ background-color: #F3F4F4; >+ border: none; >+ box-shadow: none; >+ position: absolute;*/ >+ //right: 10px; >+ //top: 30px; >+ >+ border-top-width: 1px; >+ text-align: center; >+ padding: 0; >+ width: auto; >+ font-size: 12px; >+ line-height: 1.42857143; >+ border-radius: 0px; >+ border: 0.5px solid lightgray; >+ font-size: 100%; >+ background-color: #fff; >+ margin: 0; >+ box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5); >+ position: absolute; >+ text-decoration: none; >+ top: 30px; >+ >+ >+ left: auto; >+ right: 0; >+ >+ a{ >+ //color: #696969; >+ //float: right; >+ //padding: .2em .5em; >+ //border-bottom: 1px solid #000; >+ color: #000; >+ display: block; >+ padding: 3px 20px; >+ clear: both; >+ font-weight: normal; >+ line-height: 1.42857143; >+ white-space: nowrap; >+ border-bottom: none; >+ float: left; >+ >+ &:hover, >+ &:focus{ >+ //text-decoration: none; >+ //background-color: #F3F4F4; >+ //background-image: none; >+ //font-weight: bold; >+ //border: 1px solid #696969; >+ //border-radius: 4px; >+ >+ >+ >+ text-decoration: none; >+ font-weight: bold; >+ background-color: #fff; >+ background-image: none; >+ >+ } >+ } > } > > #patdrop{ >+ border-top-width: 1px; > text-align: center; > padding: 0; >+ width: auto; > font-size: 12px; > line-height: 1.42857143; >- border-radius: 4px; >- border: 1px solid #000; >- font-size: 105%; >- background-color: transparent; >+ border-radius: 0px; >+ border: 0.5px solid lightgray; >+ font-size: 100%; >+ background-color: #fff; > margin: 0; >- box-shadow: none; >+ box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5); > position: absolute; >+ text-decoration: none; > top: 30px; >+ left: -20px; >+ right: auto; > > a{ >- color: #696969; >- padding: 0; >+ color: #000; >+ display: block; >+ padding: 3px 20px; >+ clear: both; >+ font-weight: normal; >+ line-height: 1.42857143; >+ white-space: nowrap; >+ border-bottom: none; >+ float: left; >+ >+ &:hover{ >+ font-weight: bold; >+ background-color: #fff; >+ } > } > > } >@@ -1942,35 +2247,45 @@ dd { > .patroninfo { > //margin-top: -.5em; > margin-right: .5em; >- padding-bottom: 2em; >+ //padding-bottom: 2em; > padding-top: 1em; > background-color: #e6e6e6; > //position: absolute; > left: -10px; >+ width: 100%; >+ padding-bottom: 25px; > > h5 { >- border-right: 1px solid #B9D8D9; >+ //border-right: 1px solid #B9D8D9; > margin-bottom: 0; >- padding-bottom: .5em; >- padding-left: 0em; >- padding-top: .5em; >+ padding: .5em .9em; >+ font-weight: bold; >+ color: #000; > > &:empty { > border-right: 0; > } >+ >+ li{ >+ &.patrondateofbirth{ >+ font-size: 75%; >+ font-weight: normal; >+ list-style-type: none; >+ //display: table; >+ text-align: center; >+ } >+ } > } > > ul { > border: 0; >- border-bottom: 0; >- border-right: 1px solid #B9D8D9; >- border-top: 0; > margin: 0; >- padding: 0; >+ padding: 0 .9em; > > li { > list-style-type: none; > margin: 0; >+ > } > } > >@@ -1979,13 +2294,13 @@ dd { > } > > > div { >- border-right: 1px solid #B9D8D9; >+ //border-right: 1px solid #B9D8D9; > width: 100%; > } > > &.is-staff { > h5 { >- background-color: #EEE; >+ //background-color: #EEE; > } > } > } >@@ -2000,7 +2315,7 @@ dd { > } > > .patroninfo-heading { >- background-color: rgba(237, 244, 246, .4); >+ // background-color: rgba(237, 244, 246, .4); > padding: .5em; > margin-bottom: .3em; > clear: both; >@@ -2087,6 +2402,7 @@ dd { > li { > list-style-type: none; > } >+ > } > > .btn-toolbar { >@@ -2217,7 +2533,9 @@ i { > margin-top: .5em; > display: inline; > background: transparent url("../img/UIKit/setting.svg") no-repeat scroll 0%; >+ background-size: 100%; > position: relative; >+ margin: 3px; > align-items: center; > right: 25px; > opacity: 0.3; >@@ -2225,6 +2543,14 @@ i { > &:hover{ > opacity: 1; > } >+ >+ a{ >+ width: 100%; >+ >+ &:hover{ >+ text-decoration: none; >+ } >+ } > } > > .checkin-active-setting { >@@ -2313,7 +2639,7 @@ i { > background-color: #FFFFFF; > //border: 1px solid #BCBCBC; > margin: .4em; >- padding: .4em .4em .4em 25px; >+ padding: .4em; > > &:hover { > background-color: #FFC; >@@ -2321,16 +2647,65 @@ i { > > &[type="submit"] { > background: #FFF none; >- } > >- &.flatpickr-input { >- padding: 3px 3px 3px 20px; >- } >- } >+ &.approve{ >+ background-color: #FEC32C; >+ color: #000; >+ text-shadow: 0 1px 0 #fff; >+ border: none; >+ background-image: none; >+ margin-top: 5px; > >- li { >- list-style-position: inside; >- } >+ &:hover, >+ &:active, >+ &:focus{ >+ background-color: #fec22c9f; >+ } >+ } >+ >+ &.deny{ >+ background-color: transparent; >+ color: #696969; >+ border: #696969 double 1px; >+ margin-top: 5px; >+ margin-left: 5px; >+ >+ //font-family: $font-main; >+ font-family: 'Poppins', sans-serif; >+ //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%); >+ display: inline-block; >+ margin-bottom: 0; >+ font-weight: normal; >+ text-align: center; >+ white-space: nowrap; >+ vertical-align: middle; >+ touch-action: manipulation; >+ //width: 90px; >+ cursor: pointer; >+ background-image: none; >+ padding: 6px 12px; >+ font-size: 12px; >+ line-height: 1.42857143; >+ border-radius: 4px; >+ user-select: none; >+ >+ &:hover{ >+ font-weight: bold; >+ background-color: #f1f1f1; >+ border: #696969 double 1px; >+ text-decoration: none; >+ } >+ } >+ } >+ >+ &.flatpickr-input { >+ padding: 3px 3px 3px 20px; >+ } >+ } >+ >+ li { >+ list-style-position: inside; >+ } > > p { > margin-top: 0; >@@ -2397,6 +2772,7 @@ i { > > .approve, > .success { >+ background-color: #FEC32C; > i { > &.fa { > color: #418940; >@@ -2524,6 +2900,7 @@ i { > //border: none; > padding-left: 5px; > padding-right: 30px; >+ border-radius: 0; > } > > .petit-barcode{ >@@ -2534,6 +2911,7 @@ i { > border-width: 1px; > padding: 5px; > font-style: italic; >+ border-radius: 0; > > font-size: 90%; > vertical-align: middle; >@@ -2609,15 +2987,20 @@ li { > } > } > >+#catalogue_stats_wrapper, #tbl_cash_register_stats_wrapper, #resulttable_wrapper, #numberpatternst_wrapper{ >+ background-color: #fff; >+ margin-top: 20px; >+ box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); >+ padding: 20px; >+} >+ > #searchresults { > background-color: #fff; > margin-top: 20px; > box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); >- padding-left: 20px; >- padding-right: 20px; >+ padding: 20px; > > h3{ >- padding-top: 2.0em; > padding-bottom: .7em; > margin: 0; > color: #696969; >@@ -2632,6 +3015,10 @@ li { > font-size: 90%; > list-style: url("../img/item-bullet.svg"); > padding: .2em 0; >+ background-color: #fff; >+ box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); >+ color: #000; >+ top: 100%; > > &.result_itype_image { > list-style: none; >@@ -2689,6 +3076,25 @@ li { > } > } > } >+ >+ .dropdown-menu { >+ //position: absolute; >+ //top: 50px; >+ background-color: #fff; >+ color: #000; >+ top: 100%; >+ >+ a{ >+ color: #000; >+ >+ &:hover{ >+ background-image: none; >+ color: #000; >+ text-decoration: underline; >+ background-color: #fff; >+ } >+ } >+ } > } > > .searchheader { >@@ -2698,6 +3104,7 @@ li { > font-size: 80%; > margin-top: .5em; > margin-bottom: .5em; >+ padding: 5px; > width: 100%; > //padding: .4em 1em .4em 1em; > color: #696969; >@@ -2706,7 +3113,6 @@ li { > &.floating { > border-radius: 0; > margin-top: 0; >- > } > > .btn-group { >@@ -2743,14 +3149,15 @@ li { > > > #search-facets { >- border: 1px solid #B9D8D9; >- border-radius: 5px 5px 0 0; >+ //border: 3px solid #71B443; >+ //border-radius: 4px; > > h4 { >- background-color: #E6F0F2; >- border-bottom: 1px solid #B9D8D9; >- border-radius: 5px 5px 0 0; >+ background-color: #71B443; >+ border-bottom: 1px solid #71B443; >+ border-radius: 4px 4px 0 0; > font-size: 90%; >+ color: #fff; > margin: 0; > padding: .4em .2em; > text-align: center; >@@ -2760,6 +3167,10 @@ li { > margin: 0; > padding: .3em; > >+ &.cadre{ >+ border: 3px solid #71B443; >+ } >+ > li { > font-weight: bold; > list-style-type: none; >@@ -2847,17 +3258,35 @@ td { > } > } > >-#lientype{ >+#lientype, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #addauth, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #z3950submit, #add_manual_restriction{ >+ color: #71B443; >+ padding: .3em; >+ border: none; >+ background-color: transparent; >+ border: none; >+ box-shadow: none; >+ font-size: 100%; >+ >+ &:hover{ >+ text-decoration: underline; >+ } >+} >+ >+.highlight_toggle{ > color: #71B443; > padding: .3em; > border: none; > background-color: transparent; >+ border: none; >+ box-shadow: none; >+ font-size: 100%; > > &:hover{ > text-decoration: underline; > } > } > >+ > .cover-image { > display: none; > >@@ -3175,7 +3604,7 @@ td { > .advsearch { > //margin: 0; > //box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); >- margin: 0em 1em 1em 0em >+ margin: 0em 1em 1em 0em; > > table { > border-collapse: separate; >@@ -3293,7 +3722,8 @@ td { > // Override core jQueryUI widgets > .ui-widget-content { > background: #FFFFFF none; >- border: 1px solid #B9D8D9; >+ border-radius: 4px; >+ border: 3px solid #538200; > color: #222222; > } > >@@ -3307,7 +3737,7 @@ td { > .ui-state-default, > .ui-widget-content .ui-state-default, > .ui-widget-header .ui-state-default { >- background: #F4F8F9 none; >+ // background: #F4F8F9 none; > border: 1px solid #B9D8D9; > color: #555555; > font-weight: normal; >@@ -3411,21 +3841,31 @@ td { > &.ui-widget-header { > background: none; > border: 0; >- padding: .2em 1.4em; >+ padding: .2em .9em 0 .9em; > } > } > > .ui-tabs { >+ .ui-tabs-panel { >+ background: #FFF none; >+ border-radius: 4px; >+ border: 3px solid #538200; >+ >+ fieldset{ >+ box-shadow: none; >+ } >+ } > .ui-tabs-nav { > li { >- background: #71B443 none; >+ background: #71B443; > border: none; > margin-right: .4em; >- top: 1px; >- border-radius: 4px; >+ //top: 1px; >+ border-radius: 4px 4px 0 0; > > &.ui-tabs-active, &.ui-state-hover { > background-color: #418910; >+ border-radius: 4px 4px 0 0; > border: none; > border-bottom-width: 0; > padding-bottom: 0; >@@ -3437,11 +3877,9 @@ td { > > > } >- > } > } > >- > &.ui-widget-content { > background: transparent none; > border: 0; >@@ -3485,13 +3923,63 @@ td { > } > > .statictabs { >+ >+ background-color: #fff; >+ margin-top: 20px; >+ box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); >+ padding: 20px; >+ >+ h3{ >+ padding-bottom: .7em; >+ margin: 0; >+ color: #696969; >+ } >+ >+ td { >+ border: none; >+ >+ ul { >+ li { >+ clear: left; >+ font-size: 90%; >+ list-style: url("../img/item-bullet.svg"); >+ padding: .2em 0; >+ >+ &.result_itype_image { >+ list-style: none; >+ list-style-type: none; >+ } >+ >+ img { >+ float: left; >+ margin: 3px 5px 3px -5px; >+ max-width: 25px; >+ } >+ } >+ } >+ } >+ >+ span { >+ &.status { >+ clear: left; >+ color: #900; >+ display: block; >+ } >+ >+ &.unavailable { >+ clear: left; >+ display: block; >+ } >+ } >+ >+ > > ul { > background: none repeat scroll 0 0 transparent; > border: 0 none; >- border-bottom-left-radius: 4px; >- border-bottom-right-radius: 4px; >- border-top-left-radius: 4px; >- border-top-right-radius: 4px; >+ // border-bottom-left-radius: 4px; >+ // border-bottom-right-radius: 4px; >+ //border-top-left-radius: 4px; >+ // border-top-right-radius: 4px; > color: #222222; > font-size: 100%; > font-weight: bold; >@@ -3513,12 +4001,15 @@ td { > } > > li { >- background: none repeat scroll 0 0 #E6F0F2; >- border: 1px solid #B9D8D9; >- border-bottom: 0 none; >+ //background: none repeat scroll 0 0 #E6F0F2; >+ //border: 1px solid #B9D8D9; >+ // border-bottom: 0 none; > border-top-left-radius: 4px; > border-top-right-radius: 4px; >- color: #555555; >+ border-bottom-right-radius: 0; >+ border-bottom-left-radius: 0; >+ // border-radius: 0; >+ //color: #555555; > float: left; > font-weight: normal; > list-style: none outside none; >@@ -3529,34 +4020,45 @@ td { > top: 1px; > white-space: nowrap; > >- &.active { >- background-color: #FFFFFF; >- color: #212121; >+ background: #71B443; >+ // border: none; >+ //margin-right: .4em; >+ //top: 1px; >+ // border-radius: 4px; >+ >+ &.active, &:hover { >+ //background-color: #FFFFFF; >+ //color: #212121; > font-weight: normal; > padding-bottom: 1px; > >+ background-color: #418910; >+ border: none; >+ border-bottom-width: 0; >+ //padding-bottom: 0; >+ > a { > background: none repeat scroll 0 0 transparent; >- color: #000000; >+ color: #fff; > cursor: text; >- font-weight: bold; >+ //font-weight: bold; > outline: 0 none; > top: 1px; > } > } > > a { >- color: #004D99; >+ color: #fff; > cursor: pointer; > float: left; > padding: .5em 1em; > text-decoration: none; > > &:hover { >- background-color: #EDF4F5; >+ //background-color: #EDF4F5; > border-top-left-radius: 4px; > border-top-right-radius: 4px; >- color: #538200; >+ //color: #538200; > } > } > } >@@ -3564,9 +4066,8 @@ td { > > .tabs-container { > background: none repeat scroll 0 0 transparent; >- border: 1px solid #B9D8D9; >- border-bottom-left-radius: 4px; >- border-bottom-right-radius: 4px; >+ border: 3px solid #418910; >+ border-radius: 4px; > color: #222222; > display: block; > padding: 1em 1.4em; >@@ -3577,6 +4078,12 @@ td { > margin-top: 5px; > .ui-tabs-panel { > background: #FFF none; >+ border-radius: 4px; >+ border: 3px solid #538200; >+ >+ fieldset{ >+ box-shadow: none; >+ } > } > } > >@@ -3774,21 +4281,41 @@ nav { > } > } > >-.navbar-header{ >- //background-image: linear-gradient(to right, #352C2E , #3A4F2A); >+.navbar{ > background-color: #352C2E; >+ //display: inline-block; >+ // float: left; >+ width: 100%; >+ // overflow: hidden; >+} >+ >+.navbar-header, .collapse{ >+ /* //background-image: linear-gradient(to right, #352C2E , #3A4F2A); >+ //background-color: #352C2E; > box-shadow: none; > height: 50px; >- width: 100%; >+ // width: 100%;*/ > padding-left: 10px; > padding-right: 10px; >+ /*display: inline-block;*/ >+ float: left; > >- span{ >- display: inline; >- //float: left; >+ a{ >+ color: #fff; >+ // display: inline-block; >+ line-height: 40px; > } > } > >+.navbar-head{ >+ // top: 0px; >+ //position: absolute; >+ //right: 5px; >+ overflow-x: hidden; >+ display: block !important; >+ height: auto !important; >+} >+ > #logo { > background: transparent url("../img/UIKit/picto-koha.svg") no-repeat scroll 0%; > margin: .75em 0em .75em 0em; >@@ -3829,11 +4356,17 @@ nav { > .residentsearch { > border: 0; > //border-bottom: 1px solid #85CA11; >+ cursor: text; > padding: 0 0 .2em; >+ background-color: transparent; >+ } >+ >+ .inactive{ >+ display: none; > } > >- #buttonssearch,#containersearch{ >- padding: 10px 20px; >+ #buttonssearch,#header_search{ >+ padding: 10px; > border-radius: 28px; > //height: 2.2em; > height: 30px; >@@ -3841,52 +4374,165 @@ nav { > z-index: 1; > } > >- #containersearch{ >+ /* #containersearch{ > position: relative; > top : 10px; >+ left: 0px;*/ >+ >+ #header_search{ >+ //position: relative; >+ //top : 10px; >+ //left: 0px; >+ >+ position: relative; > left: 0px; >+ top: 0px; >+ //line-height: 40px; >+ overflow: hidden; >+ display: block; >+ margin: 10px 0; > } > >- #submitsearch{ >+ #submit, #autocsubmit{ > background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%; > position: absolute; >- right : 0px; >+ // right : 0px; >+ right : -65px; > top: 0px; > width: 25px; > height: 30px; > border: none; > padding-left: 5px; > padding-right: 5px; >+ margin: 0; >+ display: inline; > } > > #containersearch, > #containersearch:not(.fold) #buttonssearch{ > width: 500px; >- > } > >- #buttonssearch{ >+ >+ .ui-tabs-nav { >+ background-image: linear-gradient(to right, #418940, #71B443); >+ border-radius: 28px; > position: absolute; > top: 0; > left: 0; >+ height: 100%; > display: flex; > justify-content: space-around; > align-items: center; > color: white; > box-shadow: 0px 0px 3px 0px #0000004d; >+ >+ li { >+ background: transparent; >+ border: none; >+ // margin-right: .4em; >+ //top: 1px; >+ border-radius: 0; >+ >+ &.ui-tabs-active, &.ui-state-hover { >+ background-color: transparent; >+ border-radius: 4px 4px 0 0; >+ border: none; >+ border-bottom-width: 0; >+ padding-bottom: 0; >+ >+ a { >+ color: #FFF; >+ //font-weight: bold; >+ cursor: pointer; >+ padding: 3px; >+ font-size: .9em; >+ } >+ >+ >+ } >+ } >+ } >+ >+ &.ui-widget-content { >+ background: transparent none; >+ border: 0; >+ } >+ >+ .ui-state-default {//le menu de la barre de recherche du haut >+ a { >+ color: #fff; >+ cursor: pointer; >+ padding: 3px; >+ font-size: .9em; >+ >+ &:link, >+ &:visited { >+ color: #fff; >+ padding: 3px; >+ background-color: transparent; >+ } >+ } >+ } >+ >+ .ui-state-hover, .ui-state-active { >+ a { >+ font-size: 1em; >+ // box-shadow: inset 0px 0px 8px 0px rgba(0, 0, 0, 0.10); >+ cursor: pointer; >+ padding: 3px; >+ font-size: .9em; >+ background-color: transparent; >+ >+ i{ >+ border-bottom: 2px solid #fff; >+ padding-bottom: 2px; >+ } >+ } > } > >+ >+ .ui-widget { >+ font-family: inherit; >+ font-size: inherit; >+ >+ input, >+ select, >+ textarea, >+ button { >+ font-family: inherit; >+ font-size: inherit; >+ } >+ } >+ >+ >+ >+ >+ >+ >+ >+ >+ >+ > .buttonsearch{ >+ display: none; >+ } >+ >+ .buttonsearch:hover, >+ .buttonsearch.active{ >+ // border-bottom: 2px solid white; >+ margin-right: 0; > font-size: 0.85em; >- cursor: pointer; >+ cursor: text; > padding: 0.25em; > //border-bottom: 2px solid transparent; >- margin: 0 1em; >- transition: 0.25s; >+ margin: 0; >+ // transition: 0.25s; >+ display: inline-block; > overflow: hidden; > opacity: 1; > } >- >+/* > .buttonsearch:hover, > .buttonsearch.active{ > border-bottom: 2px solid white; >@@ -3924,7 +4570,63 @@ nav { > //width: 1000px; > } > >- #containersearch.fold .buttonsearch:not(.active){ >+ #containersearch.fold .buttonsearch:not(.active){*/ >+ >+ input{ >+ display: none; >+ } >+ >+ input{ >+ >+ >+ &.focus{ >+ outline-offset: 0px; >+ outline: 1px black; >+ float: right; >+ // width: calc(301px); >+ >+ >+ // width: 0%; >+ height: 30px; >+ border-radius: 17px; >+ padding-left: 2em; >+ padding-right: 1.5em; >+ border: none ; >+ margin-left: 0px; >+ // transition: 0.5s; >+ >+ position:absolute; >+ top: 0px; >+ right: 30px; >+ z-index : -2; >+ display: inline-block; >+ >+ letter-spacing: normal; >+ word-spacing: normal; >+ text-transform: none; >+ text-indent: 0px; >+ text-shadow: none; >+ text-align: start; >+ cursor: text; >+ font: 400 13.3333px Arial; >+ >+ &::placeholder{ >+ font-size: 85%; >+ } >+ } >+ >+ &.titre{ >+ float: none; >+ position: relative; >+ width: 170px; >+ bottom: 15px; >+ right: -115px; >+ } >+ >+ } >+ >+ >+ #header_search.fold .buttonsearch:not(.active){ > width: 0px; > opacity: 0; > margin: 0; >@@ -3934,12 +4636,34 @@ nav { > #backsearch{ > display: none; > font-size: 1em; >+ > } > >- #containersearch.fold #backsearch{ >+ /* .iconsearch{ >+ display: none; >+ font-size: 1em; >+ }*/ >+ >+ #header_search.fold #backsearch{ > display: inline-block; > cursor: pointer; > } >+ >+ /* .iconsearch{ >+ display: inline-block; >+ cursor: pointer; >+ padding: 3px; >+ font-size: .9em; >+ >+ &:hover{ >+ font-size: 1em; >+ box-shadow: inset 0px 0px 8px 0px rgba(0, 0, 0, 0.10); >+ // border: 1px solid #fff; >+ // border-radius: 50%; >+ >+ } >+ }*/ >+ > .description{ > opacity: 0.6; > max-width: 50em; >@@ -3953,13 +4677,17 @@ nav { > &.open { > li { > background-color: #352C2E; >- padding: 2px; >+ //padding: 2px; > > a { > font-weight: normal; >- >- &:hover{ >+ padding: 0 15px; >+ font-size: 13px; >+ >+ &:hover, >+ &:focus{ > background-color: #352C2E; >+ background-image: none; > text-decoration: underline; > } > } >@@ -3967,7 +4695,7 @@ nav { > } > > a { >- font-weight: bold; >+ //font-weight: bold; > //padding-bottom: .4em; > //padding-top: .4em; > line-height: 40px; >@@ -3991,7 +4719,7 @@ nav { > left: 0px; > top: 0px; > //white-space: pre; >- //§§flex-direction: column; >+ //flex-direction: column; > height: 50px; > //display: block; > >@@ -4099,6 +4827,41 @@ button, > &.btn-link { > border: 0; > } >+ >+ &.cancel { >+ >+ background-color: transparent; >+ color: #696969; >+ border: #696969 double 1px; >+ margin-top: 5px; >+ margin-left: 5px; >+ >+ //font-family: $font-main; >+ font-family: 'Poppins', sans-serif; >+ //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%); >+ display: inline-block; >+ margin-bottom: 0; >+ font-weight: normal; >+ text-align: center; >+ white-space: nowrap; >+ vertical-align: middle; >+ touch-action: manipulation; >+ width: 90px; >+ cursor: pointer; >+ background-image: none; >+ padding: 6px 12px; >+ font-size: 12px; >+ line-height: 1.42857143; >+ border-radius: 4px; >+ user-select: none; >+ >+ &:hover{ >+ font-weight: bold; >+ background-color: #f1f1f1; >+ border: #696969 double 1px; >+ text-decoration: none; >+ } >+ } > } > #merge-patrons{ > padding: 0 25px; >@@ -4110,7 +4873,7 @@ button, > } > > .pat{ >- background-color: transparent; >+ /* background-color: transparent; > border: none; > display: inline-block; > margin: 0 10px; >@@ -4119,7 +4882,48 @@ button, > font-size: 105%; > > &:hover{ >- text-decoration: underline; >+ //text-decoration: underline; >+ background-color: #d8d8d8; >+ } >+ >+ &:active{ >+ border: none; >+ } >+ >+ >+ &:focus{ >+ background-color: #d8d8d8; >+ }*/ >+ >+ >+ >+ font-family: 'Poppins', sans-serif; >+ font-weight: normal; >+ text-align: center; >+ white-space: nowrap; >+ vertical-align: middle; >+ -ms-touch-action: manipulation; >+ touch-action: manipulation; >+ cursor: pointer; >+ box-shadow: none; >+ background-image: none; >+ padding: 6px 12px; >+ font-size: 12px; >+ //line-height: 1.42857143; >+ border-radius: 4px; >+ -webkit-user-select: none; >+ -moz-user-select: none; >+ -ms-user-select: none; >+ user-select: none; >+ font-size: 105%; >+ background-color: transparent; >+ border: none; >+ display: inline-block; >+ margin: 5px 10px; >+ color: #696969; >+ >+ &:hover, &:focus{ >+ background-color: #d8d8d8; > } > > &:active{ >@@ -4129,12 +4933,12 @@ button, > > .mot{ > margin-right: 0; >- padding-right: 0; >+ //padding-right: 0; > } > > .fleche{ > margin-left: 0; >- border: 1px solid #000; >+ //border: 1px solid #000; > border-radius: 4px; > padding: 0 5px 0 3px; > >@@ -4151,6 +4955,8 @@ button, > color: #000; > text-shadow: 0 1px 0 #fff; > border: none; >+ background-image: none; >+ margin: 5px; > > &:hover, > &:active, >@@ -4164,6 +4970,8 @@ button, > color: #000; > text-shadow: 0 1px 0 #fff; > border: none; >+ background-image: none; >+ margin: 5px; > > &:hover, > &:active, >@@ -4484,25 +5292,32 @@ code { > } > > .tab-content { >- background-color: #FFF; >+ /* background-color: #FFF; > border: 1px solid #B9D8D9; >- border-top-width: 0; >+ border-top-width: 0;*/ >+ border: 3px solid #538200; >+ border-radius: 4px; >+ //border-top-width: 0; > padding: 1em; > } > > .nav-tabs { > > li { > > a { >- background-color: #e6f0f2; >- border: 1px solid #b9d8d9; >- border-radius: 4px 4px 0 0; >+ background-color: #71B443; >+ //border: none; >+ // border-radius: 4px; >+ color: #fff; > line-height: 1.42857143; > margin-right: .4em; > padding: .5em 1em; > > &:hover { >- background-color: #EEF4F5; >- border-color: #b9d8d9; >+ background-color: #538200; >+ border-radius: 4px 4px 0 0; >+ border: 1px solid #538200; >+ text-decoration: none; >+ color: #fff; > } > } > >@@ -4510,10 +5325,12 @@ code { > a, > a:hover, > a:focus { >- background-color: #fff; >- border: 1px solid #b9d8d9; >- border-bottom-color: transparent; >- color: #000; >+ background-color: #538200; >+ border-radius: 4px 4px 0 0; >+ color: #fff; >+ //border: none; >+ //border-bottom-color: transparent; >+ //color: #000; > cursor: default; > font-weight: bold; > } >@@ -4941,7 +5758,6 @@ input.renew { > > label{ > color: #fff; >- font-weight: bold; > } > } > >@@ -5224,15 +6040,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 { >@@ -5270,7 +6088,7 @@ input.renew { > cursor: pointer; > float: right; > margin: .0em .4em .0em .4em; >- padding: .1em .5em .1em .5em;; >+ padding: .1em .5em .1em .5em; > } > > #lastborrower-window { >@@ -5293,67 +6111,63 @@ input.renew { > /* ==== MODULE LINKS - Start ==== */ > .buttons-list { > // List containing the module links >- margin-bottom: 30px; >+ margin: 30px 0; > padding: 0; >+ margin-left: 15px; > > li { > // Standard attributes for the list elements >+ height: 60px; > list-style-type: none; >- height: 50px; >+ display: table; >+ margin-bottom: 15px; > > a { >- &.circ-button { >- text-align: center; >- display: inline; >- -webkit-box-sizing: content-box; >- box-sizing: content-box; >- width: 30px; >- height: 30px; >- margin: 0 5px 14px 1em; >- padding: 5px; >- border: solid 3px #71B443; >- border-radius: 50%; >- text-decoration: none; >- font-family: verdana, arial; >- font-weight: bold; >- font-size: large; >- color: #000000; >- background-color: #F3f4F4; >- align-items: center; >- justify-content: center; >+ &.menucirc{ >+ display: block; >+ height: 60px; >+ margin: 5px; >+ //font-size: 150%; > > i{ >- text-align: center; >- max-height: 100%; >- max-width: 100%; >+ &.fa{ >+ color: #fff; >+ border-radius: 50%; >+ background-color: #71B443; >+ width: 40px; >+ height: 40px; >+ margin: 5px; >+ padding: 10px; >+ -webkit-box-sizing: content-box; >+ box-sizing: content-box; >+ align-items: center; >+ justify-content: center; >+ display: inline; >+ border: solid 3px #71B443; >+ } >+ >+ } >+ >+ h1 { >+ font-size: 150%; >+ font-weight: normal; >+ display: inline; > } > > &:hover{ > color: #418940; >- border-color: #418940; >- >+ text-decoration: none; > >-/* >- // Class used for each module link >- background-color: #F4F8F9; >- background-position: 5px 3px; >- background-repeat: no-repeat; >- border: 2px solid #B9D8D9; >- border-radius: 6px; >- box-sizing: content-box; >- color: #000000; >- display: block; >- font-size: 110%; >- font-weight: bold; >- margin: .5em 0; >- max-width: 260px; >- padding: 8px; >- text-decoration: none; >+ i{ >+ &.fa{ >+ background-color: #418940; >+ border: solid 3px #418940; >+ } >+ } > >- &:hover { >- // Class used for each module link hover state >- border-color: #538200; >- color: #538200;*/ >+ h1{ >+ font-weight: bold; >+ } > } > } > } >@@ -5489,9 +6303,9 @@ input.renew { > } > > .header-menu-link { >- background-color: #352C2E; >+ // background-color: #352C2E; > display: none; >- font-weight: bold; >+ // font-weight: bold; > padding: .4em .6em; > } > >@@ -5499,9 +6313,20 @@ input.renew { > //position: absolute; > //right: 5px; > //top: 0; >- position: relative; >- left: 0px; >+ // position: relative; >+ //left: 0px; > top: 0px; >+ position: absolute; >+ right: 5px; >+ >+ //background-color: #352C2E; >+ // box-shadow: none; >+ // height: 50px; >+ // width: 100%; >+ // padding-left: 10px; >+ //padding-right: 10px; >+ // display: inline-block; >+ //float: left; > } > > div#makechart ol li { >@@ -5642,7 +6467,7 @@ div .suggestion_note { > > #header { > background-color: #352C2E; >- border: 1px solid #352C2E; >+ // border: 1px solid #352C2E; > margin-bottom: 1em; > > a { >@@ -5652,6 +6477,8 @@ div .suggestion_note { > &:hover { > text-decoration: underline; > color: #FFF; >+ background-color: #352C2E; >+ background-image: none; > } > } > >@@ -5660,25 +6487,24 @@ div .suggestion_note { > box-shadow: unset; > float: none; > left: auto; >- position: relative; >+ position: initial; > right: auto; > > &.dropdown-menu { > display: block; >- background-color : #352C2E; >+ // background-color : #352C2E; > } > } > >- .dropdown-menu { >+ .dropdown-menu-brown { > li { >- background-color: #352C2E; >+ // background-color: #352C2E; > > a { > //color: #fff; > &:hover { > color: #FFF; > text-decoration: underline; >- > } > } > } >@@ -5710,8 +6536,8 @@ div .suggestion_note { > #user-menu { > .open { > .dropdown-menu { >- background-color: #FFF; >- border: 1px solid #ccc; >+ background-color: #352c35; >+ // border: 1px solid #ccc; > position: absolute; > } > } >@@ -5760,7 +6586,14 @@ div .suggestion_note { > > > #helper { >- i { >+ i {background-color: #352C2E; >+ box-shadow: none; >+ height: 50px; >+ // width: 100%; >+ padding-left: 10px; >+ padding-right: 10px; >+ display: inline-block; >+ float: left; > display: none; > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >index ce47d80f8e..8da5376457 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >@@ -3,45 +3,47 @@ > [% PROCESS 'patronfields.inc' %] > <!-- Begin Acquisitions Resident Search Box --> > >-<div id="containersearch"> >+<div id="header_search" class="fold"> > <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="inputsearch" class="focus" placeholder="Search vendors: " /> >- <input type="submit" id="submitsearch" value="" /> >+ <input type="text" name="supplier" id="supplier" class="focus" 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"> >- <input type="text" id="inputsearch" name="title" size="15" value="[% title | html %]" placeholder="Title" /> >- <input type="text" id="inputsearch" name="name" size="15" value="[% name | html %]" placeholder="Vendor" /> >+ <input type="text" id="title" name="title" class="focus" value="[% title | html %]" placeholder="Title" /> >+ <input type="text" id="title" name="name" class="focus" value="[% name | html %]" placeholder="Vendor" /> > <input type="hidden" id="do_search" name="do_search" value="do" /> > <span class="filteraction" id="filteraction_off" style="display:none"> <a id="plus" href="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span> > <span class="filteraction" id="filteraction_on"> <a id="plus" href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span> >- <input value="" id="submitsearch" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a> >- >- <div id="filters" class="plus" style="display:none"> >+ <input value="" id="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a> >+ >+ <p id="filters" class="plus" style="display:none"> > <input type="text" name="basket" id="basket" placeholder="Basket" /> > <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" placeholder="Invoice number" /> >- </div> >+ </p> > </form> > </div> > > <ul> >- <span id="buttonssearch"> >- <span id="backsearch" onclick="toggle()">â</span> >- <span id="button_1" onclick="toggle(this)" class="buttonsearch" href="#supplier_search">Vendor search</span> >- <span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#orders_search">Orders search</span> >- </span> >+ <li><a id="button_1" title="Vendor search" onclick="clique(this)" class="iconsearch" href="#supplier_search"><i class="fa fa-upload"></i></a></li> >+ <li><a id="button_2" title="Orders search" onclick="clique(this)" class="iconsearch" href="#orders_search"><i class="fa fa-download"></i></a></li> >+ >+ <span id="button_1" class="buttonsearch active">Vendor search</span> >+ <span id="button_2" class="buttonsearch">Orders search</span> > </ul> > </div> > >+ >+ > <script type="text/javascript"> > function focusInput(){ >- document.getElementById('inputsearch').focus(); >+ document.getElementsByClassName('head-searchbox').focus(); > } > >- function toggle(elem){ >+ function toggle(elem){style="width: calc(301px);" > var buttonssearch = document.getElementsByClassName('active'); > for (var i = buttonssearch.length - 1; i >= 0; i--) { > buttonssearch[i].classList.remove('active'); >@@ -52,25 +54,60 @@ > fold(); > }else{//Back > document.getElementById('button_1').classList.add('active'); >- document.getElementById('containersearch').classList.remove('fold'); >- document.getElementById('inputsearch').style = ''; >+ document.getElementById('header_search').classList.remove('fold'); >+ document.getElementsByClassName('head-searchbox').style = ''; > } > > focusInput(); > } > >- function fold(){ >+ function clique(elem){ >+ var buttonssearch = document.getElementsByClassName('buttonsearch'); >+ var iconssearch = document.getElementsByClassName('iconsearch'); >+ var inputssearch = document.getElementsByClassName('head-searchbox'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ if (elem == iconssearch[i]){ >+ buttonssearch[i].classList.add('active'); >+ } >+ } >+ >+ for (var i = inputssearch.length - 1; i >= 0; i--) { >+ inputssearch[i].classList.remove('focus'); >+ >+ if (elem == iconssearch[i]){ >+ inputssearch[i].classList.add('focus'); > >- document.getElementById('containersearch').classList.add('fold'); >- // document.getElementById('inputsearch').style = "width:calc(500px - 100px)"; >+ var offsetWidth = buttonssearch[i].offsetWidth +5; >+ inputssearch[i].style = "width:calc(355px - "+offsetWidth+"px)"; >+ } >+ } >+ >+ focusInput(); >+ fold(); >+ } >+ >+ function fold(){ >+ document.getElementById('header_search').classList.add('fold'); >+ // document.getElementsByClassName('head-searchbox').style = "width:calc(355px - 100px)"; > setTimeout( > function(){ >- var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5; >- document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)"; >+ var offsetWidth = document.getElementsByClassName('buttonsearch').offsetWidth +5; >+ document.getElementsByClassName('head-searchbox').style = "width:calc(355px - "+offsetWidth+"px)"; > } > , 250); > } > >+ $('.btn').click(function(){ >+ if($(this).hasClass('active')){ >+ $(this).removeClass('active') >+ } else { >+ $(this).addClass('active') >+ } >+}); >+ >+ >+ > </script> > > <!-- /header_search --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc >index 4d1d3f2391..4b4227ba20 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc >@@ -1,47 +1,123 @@ > > <div id="header_search"> > [% INCLUDE 'patron-search-box.inc' %] >+ >+ [% IF (CAN_user_circulate_circulate_remaining_permissions) %] >+ <div id="checkout_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/circ/circulation.pl" method="post"> >+ <input id="inputsearch" class="inpu focus" type="text" autocomplete="off" placeholder="Enter patron card number or partial name" /> >+ <input type="hidden" name="quicksearch" value="1" /> >+ <input value="" type="submit" id="submitsearch" /> >+ </form> >+ </div> > >- [% 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 type="text" name="barcode" class="head-searchbox" id="ret_barcode" accesskey="r" placeholder="Scan a barcode to check in:" /> >- <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"> >- <input type="text" class="head-searchbox" name="barcode" id="ren_barcode" placeholder="Scan a barcode to renew:" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >- </div> >+ <div id="checkin_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >+ <input name="barcode" id="inputsearch" class="inpu" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> >+ <input value="" type="submit" id="submitsearch" /> >+ </form> >+ </div> >+ >+ <div id="renew_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >+ <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Scan a barcode to renew" /> >+ <input value="" type="submit" id="submitsearch" /> >+ </form> >+ </div> > [% END %] > > [% 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" id="searchmember" type="text" placeholder="Enter patron card number or partial name:" /> >- <input type="hidden" name="quicksearch" value="1" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >- </div> >+ <div id="patron_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/members/member.pl" method="post"> >+ <input name="searchmember" class="head-searchbox" id="inputsearch" class="inpu" type="text" placeholder="Enter patron card number or partial name" /> >+ <input type="hidden" name="quicksearch" value="1" /> >+ <input value="" id="submitsearch" 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_borrowers_edit_borrowers %] >- <li><a class="keep_text" href="#patron_search">Search patrons</a></li> >- [% END %] >+ <span id="buttonssearch"> >+ <span id="button_1" title="Check out" onclick="clique(this)" class="iconsearch"><i class="fa fa-upload"></i></span> <span id="button_2" title="Check in" onclick="clique(this)" class="iconsearch"><i class="fa fa-download"></i></span> <span id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch"><i class="fa fa-retweet"></i></span> <span id="icon_4" title="Search patrons" onclick="clique(this)" class="iconsearch"><i class="fa fa-fw fa-id-card-o"></i></span> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch active" href="#circ_search">Check-out</span>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#checkin_search">Check-in</span>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %] >+ [% IF ( CAN_user_borrowers_edit_borrowers ) %]<span id="button_4" onclick="toggle(this)" class="buttonsearch" href="#patron_search">Search patrons</span>[% END %] >+ </span> > </ul> >+</div> >+ >+<script type="text/javascript"> >+ function focusInput(){ >+ document.getElementById('inputsearch').focus(); >+ } >+ >+ function toggle(elem){ >+ var buttonssearch = document.getElementsByClassName('active'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ } >+ >+ if(elem){ >+ elem.classList.add('active'); >+ fold(); >+ }else{//Back >+ document.getElementById('button_1').classList.add('active'); >+ document.getElementById('containersearch').classList.remove('fold'); >+ document.getElementById('inputsearch').style = ''; >+ } >+ >+ focusInput(); >+ } >+ >+ function clique(elem){ >+ var buttonssearch = document.getElementsByClassName('buttonsearch'); >+ var iconssearch = document.getElementsByClassName('iconsearch'); >+ var inputssearch = document.getElementsByClassName('inpu'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ if (elem == iconssearch[i]){ >+ buttonssearch[i].classList.add('active'); >+ } >+ } >+ >+ for (var i = inputssearch.length - 1; i >= 0; i--) { >+ inputssearch[i].classList.remove('focus'); >+ >+ if (elem == iconssearch[i]){ >+ inputssearch[i].classList.add('focus'); >+ } >+ } >+ >+ focusInput(); >+ fold(elem); >+ } >+ >+ function fold(elem){ >+ document.getElementById('containersearch').classList.add('fold'); >+ // document.getElementById('inputsearch').style = "width:calc(500px - 100px)"; >+ setTimeout( >+ function(){ >+ var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5; >+ document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ , 250); >+ } >+ >+ >+ >+ >+ $('.btn').click(function(){ >+ if($(this).hasClass('active')){ >+ $(this).removeClass('active') >+ } else { >+ $(this).addClass('active') >+ } >+}); >+</script> >+ >+<!-- /header_search --> >+<!-- End Main page Resident Search Box --> > > </div><!-- /#header_search --> > <!-- End advanced search page resident search box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >index 1611429e61..4bb44b205a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >@@ -1,7 +1,6 @@ >-<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" class="residentsearch fold"> > <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> >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..95cd9bb103 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="pat mot" 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="pat mot" 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="pat mot" 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"> >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..f4b12b5dae 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,8 +2,10 @@ > [% USE Biblio %] > [% SET biblio_object_id = object || biblionumber || biblio.biblionumber %] > >-<div id="menu"> >-<ul> >+<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> > >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..0519084585 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >@@ -41,7 +41,7 @@ > <td>[% d.created | $KohaDates %]</td> > [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %] > <td> >- <a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% patron.borrowernumber | html %]&borrower_debarment_id=[% d.borrower_debarment_id | html %]&action=del"> >+ <a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% patron.borrowernumber | html %]&borrower_debarment_id=[% d.borrower_debarment_id | html %]&action=del" id="lientype"> > <i class="fa fa-trash"></i> Remove > </a> > </td> >@@ -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..632ed7099b 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,38 @@ > [% 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" class="fold"> > >- <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" type="text" name="filter_budgetname" id="filter_budgetname" value="[% filter_budgetname | html %]" placeholder="Fund code: " /> >+ >+ <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;"> >+ <option value="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" name="filter" value="" /> >+ </form> >+ </div> > >- [% INCLUDE 'patron-search-box.inc' %] >- [% INCLUDE 'catalogue-search-box.inc' %] >+ [% INCLUDE 'patron-search-box.inc' %] > >- <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> >+ [% INCLUDE 'catalogue-search-box.inc' %] >+ >+ <ul> >+ <li><a id="icon_1" title="Search funds" onclick="clique(this)" class="iconsearch" href="#budgets_search"><i class="fa fa-upload"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="buttonsearch active">Search funds</span> >+ <span class="buttonsearch">Check out</span> >+ <span class="buttonsearch" href="#catalog_search">Search the catalog</span> >+ </ul> > </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..35fdcb33ac 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="pat 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="pat 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="pat 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="pat" 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-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >index 1f352ab3ae..f6bfe7310b 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="pat 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="pat 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="pat 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="pat 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="pat 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="pat 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="pat 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="pat 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="pat"><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="pat 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="pat" 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="pat" 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="pat" 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,7 +232,7 @@ > </fieldset> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Export</button> >+ <button type="submit" class="pat">Export</button> > <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > <input type="hidden" name="op" value="export" /> >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 f915fb0473..16a20ff4c0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >@@ -3,12 +3,13 @@ > [% PROCESS 'patronfields.inc' %] > <!-- Begin Patrons Resident Search Box --> > >-<div id="containersearch"> >+<div id="header_search" class="fold"> > > <div> > <div id="addbooks_search" class="residentsearch"> >- <input class="head-searchbox" type="text" name="q" id="inputsearch" size="40" placeholder="Search the catalog and the reservoir" /> >- <input type="submit" id="submitsearch" value="" /> >+ <form name="search" action="addbooks.pl"> >+ <input class="head-searchbox" type="text" name="q" id="cat_search" placeholder="Search the catalog and the reservoir" /> >+ <input type="submit" id="submit" value="" /> > </form> > </div> > >@@ -17,15 +18,15 @@ > [% 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="inputsearch" size="40" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> >- <input value="" type="submit" id="submitsearch" /> >+ <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 name="barcode" id="inputsearch" size="40" type="text" placeholder="Scan a barcode to renew" /> >- <input value="" type="submit" id="submitsearch" /> >+ <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 %] >@@ -33,14 +34,17 @@ > [% INCLUDE 'catalogue-search-box.inc' %] > > <ul> >- <span id="buttonssearch"> >- <span id="backsearch" onclick="toggle()">â</span> >- <span id="button_1" onclick="toggle(this)" class="buttonsearch" href="#addbooks_search">Cataloging search</span> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#circ_search">Check-out</span>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#checkin_search">Check-in</span>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_4" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %] >- <span id="button_5" onclick="toggle(this)" class="buttonsearch" href="#catalog_search">Search the catalog</span> >- </span> >+ <li><a id="icon_1" title="Search patrons" onclick="clique(this)" 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 id="button_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="button_3" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_4" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ <li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch">Cataloging search</span> >+ <span id="button_2" class="buttonsearch active">Check-out</span> >+ <span id="button_3" class="buttonsearch">Check-in</span> >+ <span id="button_4" class="buttonsearch">Renew</span> >+ <span id="button_5" class="buttonsearch">Search catalog</span> > </ul> > </div> > >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 20f61370cd..6668dac77e 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,9 +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"> > [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] > [% INCLUDE 'search_indexes.inc' %] > [% END %] >- <input type="text" name="q" id="inputsearch" size="40" 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="submitsearch" /> >+ <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 focus" placeholder='Enter search keywords' /> >+ <input value="" type="submit" id="submit" /> > </form> >+ </div> > [% END %] >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 e34fad9aba..0f5565bc21 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc >@@ -1,45 +1,39 @@ > [% USE Koha %] > <!-- Begin Main page Resident Search Box --> > >-<div id="containersearch"> >+<div id="header_search" class="fold"> >+ > [% 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 name="barcode" id="inputsearch" size="40" type="text" placeholder="Scan a barcode to renew" /> >- <input value="" type="submit" id="submitsearch" /> >+ <input class="head-searchbox focus" type="text" name="barcode" id="ren_barcode" placeholder="Scan a barcode to renew:" /> >+ <input value="Submit" id="submit" type="submit" /> > </form> > </div> > [% END %] > >- [% IF ( CAN_user_catalogue ) %] >- <div id="renew_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/catalogue/search.pl" autocomplete="off" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- [% INCLUDE 'search_indexes.inc' %] >- [% END %] >- <input name="barcode" id="inputsearch" size="40" type="text" placeholder="Enter serch keyords" /> >- <input value="" type="submit" id="submitsearch" /> >- </form> >- </div> >- [% END %] >+ [% INCLUDE 'catalogue-search-box.inc' %] >+ >+ <ul id="taille"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >- <ul> >- <span id="buttonssearch"> >- <span id="backsearch" onclick="toggle()">â</span> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch" href="#circ_search">Check-out</span>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %] >- [% IF ( CAN_user_catalogue ) %]<span id="button_5" onclick="toggle(this)" class="buttonsearch" href="#catalog_search">Search the catalog</span>[% END %] >- </span> >+ <span id="button_1" class="buttonsearch active">Check-out</span> >+ <span id="button_2" class="buttonsearch">Renew</span> >+ <span id="button_3" class="buttonsearch">Search catalog</span> > </ul> > </div> > >+ > <script type="text/javascript"> > function focusInput(){ >- document.getElementById('inputsearch').focus(); >+ document.getElementsByClassName('head-searchbox').focus(); > } > >- function toggle(elem){ >+ function toggle(elem){style="width: calc(301px);" > var buttonssearch = document.getElementsByClassName('active'); > for (var i = buttonssearch.length - 1; i >= 0; i--) { > buttonssearch[i].classList.remove('active'); >@@ -50,25 +44,64 @@ > fold(); > }else{//Back > document.getElementById('button_1').classList.add('active'); >- document.getElementById('containersearch').classList.remove('fold'); >- document.getElementById('inputsearch').style = ''; >+ document.getElementById('header_search').classList.remove('fold'); >+ document.getElementsByClassName('head-searchbox').style = ''; > } > > focusInput(); > } > >- function fold(){ >+ function clique(elem){ >+ var buttonssearch = document.getElementsByClassName('buttonsearch'); >+ var iconssearch = document.getElementsByClassName('iconsearch'); >+ var inputssearch = document.getElementsByClassName('head-searchbox'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ if (elem == iconssearch[i]){ >+ buttonssearch[i].classList.add('active'); >+ } >+ } >+ >+ for (var i = inputssearch.length - 1; i >= 0; i--) { >+ inputssearch[i].classList.remove('focus'); >+ >+ if (elem == iconssearch[i]){ >+ inputssearch[i].classList.add('focus'); > >- document.getElementById('containersearch').classList.add('fold'); >- // document.getElementById('inputsearch').style = "width:calc(500px - 100px)"; >+ taille(inputssearch[i]) >+ } >+ } >+ >+ focusInput(); >+ fold(); >+ } >+ >+ function fold(){ >+ document.getElementById('header_search').classList.add('fold'); >+ // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)"; > setTimeout( > function(){ >- var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5; >- document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)"; >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)"; > } > , 250); > } > >+ function taille(el){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ el.style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ >+ $('.btn').click(function(){ >+ if($(this).hasClass('active')){ >+ $(this).removeClass('active') >+ } else { >+ $(this).addClass('active') >+ } >+}); >+ >+ >+ > </script> > > <!-- /header_search --> >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..59646ddd7e 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" id="RenewCheckinChecked" id="lientype"><i class="fa fa-check"></i> Renew or check in selected items</button> >+ <button class="btn btn-default" id="RenewAll" id="lientype"><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> >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 b1d6f0453e..cc8c598dcc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >@@ -11,13 +11,14 @@ > [% patron_type_class = 'is-staff' %] > [% END %] > >- >+<div id="filters"> > <div class="patroninfo [% patron_type_class | html %]"> > [% IF ( patronimages ) %] > <h5 class="text-center"> > [% ELSE %] > <h5> > [% END %] >+ > [% IF ( patron_is_staff ) %] > <i class="fa fa-shield fa-fw" title="Staff patron"></i> > [% END %] >@@ -27,6 +28,13 @@ > [% END %] > > [% INCLUDE 'patron-title.inc' %] >+ >+ [% IF ( patron.dateofbirth ) %] >+ <li class="patrondateofbirth"> >+ [% INCLUDE 'patron-age.inc' %] >+ </li> >+ [% END %] >+ > </h5> > > [% IF Koha.Preference('showLastPatron') %] >@@ -79,12 +87,7 @@ > [% 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> >@@ -133,7 +136,7 @@ > </ul> > </div> > >-<div id="menu-side"> >+<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> >@@ -190,7 +193,7 @@ > [% IF Koha.Preference('UseRecalls') && CAN_user_recalls %] > [% 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> >+</ul></div></div> > > [% IF patronimages && CAN_user_tools_batch_upload_patron_images %] > <!-- Modal --> >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 ff2a4b3902..20993dd62d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >@@ -3,8 +3,12 @@ > <div id="navmenu"> > <div id="navmenulist"> > >- <a id="titre" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation home</a> >- >+ <ul> >+ <li> >+ <a class="titre" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation home</a> >+ </li> >+ </ul> >+ > <ul> > <h5>Circulation</h5> > <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</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 826eabf624..b449bc66bf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >@@ -1,53 +1,49 @@ > [% USE Koha %] > <!-- Begin Main page Resident Search Box --> > >-<div id="containersearch"> >+<div id="header_search" class="fold"> >+ > [% INCLUDE 'patron-search-box.inc' %] > [% INCLUDE 'catalogue-search-box.inc' %] > >- <div id="renew_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <input name="barcode" id="inputsearch" size="40" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> >- <input value="" type="submit" id="submitsearch" /> >+ [% 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 focus" 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 name="barcode" id="inputsearch" size="40" type="text" placeholder="Scan a barcode to renew" /> >- <input value="" type="submit" id="submitsearch" /> >+ <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 %] > >- [% IF ( CAN_user_catalogue ) %] >- <div id="renew_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/catalogue/search.pl" autocomplete="off" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- [% INCLUDE 'search_indexes.inc' %] >- [% END %] >- <input name="barcode" id="inputsearch" size="40" type="text" placeholder="Enter serch keyords" /> >- <input value="" type="submit" id="submitsearch" /> >- </form> >- </div> >- [% END %] >+ [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <span id="buttonssearch"> >- <span id="backsearch" onclick="toggle()">â</span> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch" href="#circ_search">Check-out</span>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#checkin_search">Check-in</span>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %] >- [% IF ( CAN_user_catalogue ) %]<span id="button_5" onclick="toggle(this)" class="buttonsearch" href="#catalog_search">Search the catalog</span>[% END %] >- </span> >+ <ul id="taille"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="button_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="button_2" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch active">Check-out</span> >+ <span id="button_2" class="buttonsearch">Check-in</span> >+ <span id="button_3" class="buttonsearch">Renew</span> >+ <span id="button_4" class="buttonsearch">Search catalog</span> > </ul> > </div> > >+ > <script type="text/javascript"> > function focusInput(){ >- document.getElementById('inputsearch').focus(); >+ document.getElementsByClassName('head-searchbox').focus(); > } > >- function toggle(elem){ >+ function toggle(elem){style="width: calc(301px);" > var buttonssearch = document.getElementsByClassName('active'); > for (var i = buttonssearch.length - 1; i >= 0; i--) { > buttonssearch[i].classList.remove('active'); >@@ -58,14 +54,40 @@ > fold(); > }else{//Back > document.getElementById('button_1').classList.add('active'); >- document.getElementById('containersearch').classList.remove('fold'); >- document.getElementById('inputsearch').style = ''; >+ document.getElementById('header_search').classList.remove('fold'); >+ document.getElementsByClassName('head-searchbox').style = ''; >+ } >+ >+ focusInput(); >+ } >+ >+ function clique(elem){ >+ var buttonssearch = document.getElementsByClassName('buttonsearch'); >+ var iconssearch = document.getElementsByClassName('iconsearch'); >+ var inputssearch = document.getElementsByClassName('head-searchbox'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ if (elem == iconssearch[i]){ >+ buttonssearch[i].classList.add('active'); >+ } >+ } >+ >+ for (var i = inputssearch.length - 1; i >= 0; i--) { >+ inputssearch[i].classList.remove('focus'); >+ >+ if (elem == iconssearch[i]){ >+ inputssearch[i].classList.add('focus'); >+ >+ taille(inputssearch[i]) >+ } > } > > focusInput(); >+ fold(); > } > > function fold(){ >+<<<<<<< HEAD > > document.getElementById('containersearch').classList.add('fold'); > // document.getElementById('inputsearch').style = "width:calc(500px - 100px)"; >@@ -73,11 +95,35 @@ > function(){ > var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5; > document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)"; >+======= >+ document.getElementById('header_search').classList.add('fold'); >+ // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)"; >+ setTimeout( >+ function(){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)"; >+>>>>>>> Bug 30952: Search bar > } > , 250); > } > >+ function taille(el){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ el.style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ >+ $('.btn').click(function(){ >+ if($(this).hasClass('active')){ >+ $(this).removeClass('active') >+ } else { >+ $(this).addClass('active') >+ } >+}); >+ >+ >+ > </script> > >+ > <!-- /header_search --> > <!-- 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..1d30abea14 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,23 @@ > [% 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="header_search" class="fold"> > <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 focus" 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> >+ <li><a id="icon_1" title="Search cities" onclick="clique(this)" class="iconsearch" href="#city_search"><i class="fa fa-upload"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="keep_text">Search cities</span> >+ <span class="keep_text">Check out</span> >+ <span class="keep_text">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..0b222f0cb8 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,13 +1,10 @@ > [% 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="header_search" class="fold"> > <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" name="search" value="" /> > </form> > </div> > >@@ -15,10 +12,14 @@ > [% 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 %] >+ <li><a id="icon_1" title="Search contracts" onclick="clique(this)" class="iconsearch" href="#contract_description_search"><i class="fa fa-upload"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span class="keep_text">Search contracts</span> >+ <span class="keep_text">Check out</span> >+ <span class="keep_text" href="#catalog_search">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..c1c7c60f27 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,24 @@ > [% 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="header_search" class="fold"> > <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> >+ <li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#currency_search"><i class="fa fa-upload"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Check out" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ >+ <span class="keep_text">Search currencies</span> >+ <span class="keep_text">Check out</span> >+ <span class="keep_text">Search the catalog</span> >+ </ul> > </div> >-</div><!-- /gradient --> > <!-- End Currencies 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..fc97f79fa1 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"> >- >-<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> >+ <div id="navmenulist"> >+ <ul> >+ [% IF ( CAN_user_reports_execute_reports ) %]<h5>Run reports</h5><li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a></li>[% END %] >+ </ul> >+ <ul> >+ <h5>Reports dictionary</h5> >+ <li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li> >+ </ul> >+ <ul> >+ <h5>Useful resources</h5> >+ <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 6ba4594832..cdb43efa1a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >@@ -5,17 +5,18 @@ > [% USE Koha %] > > >-<nav class="navbar-header"> >- <span> >+ >+<nav class="navbar"> >+ >+ <div class="navbar-header"> > <ul id="logo"> > <a href="/cgi-bin/koha/mainpage.pl"></a> > </ul> >- </span> >+ <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> > >- <span> >+ <div id="header" class="navbar-collapse collapse"> > <ul id="toplevelmenu" class="nav navbar-nav"> >- <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> >- > [% 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 %] >@@ -66,9 +67,12 @@ > <li><a href="/cgi-bin/koha/about.pl">About Koha</a></li> > </ul> > </li> >+ <li>[% Koha.Preference('IntranetNav') | $raw %]</li> >+ </ul> >+ </div> > >- [% Koha.Preference('IntranetNav') | $raw %] >- >+ <div class="navbar-head"> >+ <ul id="toplevelmenu" class="nav navbar-nav"> > <li> > [% form %] > </li> >@@ -79,154 +83,153 @@ > </li> > [% END %] > </ul> >- </span> >+ </div> > >- <span> >- <ul id="user-menu" class="nav navbar-nav navbar-right"> >- [% IF ( loggedinusername ) %] >+ <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> >- >- [% 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 %] >- <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> >- </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="dropdown"> >+ <a href="#" id="logged-in-menu" role="button" class="dropdown-toggle" data-toggle="dropdown"> > >- <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> >+ <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> >+ <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 %] >- [% IF EnableSearchHistory %] >- <li> >- <a class="toplinks" href="/cgi-bin/koha/catalogue/search-history.pl">Search history</a> >+ </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> >- [% 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> >+ <li class="toplinks-mycheckouts"> >+ <a class="toplinks" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% loggedinusernumber | html %]">My checkouts</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> >- <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> >- </span> >+ [% 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('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 499b239df4..f2a00434fa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc >@@ -1,60 +1,61 @@ > [% USE Koha %] > <!-- Begin Main page Resident Search Box --> > >-<div id="containersearch"> >- [% IF (CAN_user_borrowers) %] >- <div id="patron_search" class="residentsearch"> >- <form action="/cgi-bin/koha/circ/circulation.pl" method="post"> >- <input id="inputsearch" size="40" type="text" autocomplete="off" placeholder="Enter patron card number or partial name" /> >- <input type="hidden" name="quicksearch" value="1" /> >- <input value="" type="submit" id="submitsearch" /> >- </form> >- </div> >- [% END %] >+<div id="header_search" class="fold"> >+ >+ [% 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"> >- <input name="barcode" id="inputsearch" size="40" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> >- <input value="" type="submit" id="submitsearch" /> >+ <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="inputsearch" size="40" type="text" placeholder="Scan a barcode to renew" /> >- <input value="" type="submit" id="submitsearch" /> >+ <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_catalogue ) %] >- <div id="search_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/search.pl" autocomplete="off"> >- <input name="barcode" id="inputsearch" size="40" type="text" placeholder="Enter serch keyords" /> >- <input value="" type="submit" id="submitsearch" /> >+ [% 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 %] > >- <ul> >- <span id="buttonssearch"> >- <span id="backsearch" onclick="toggle()">â</span> >- [% IF ( CAN_user_borrowers ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch">Check-out</span>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch">Check-in</span>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch">Renew</span>[% END %] >- [% IF ( CAN_user_borrowers ) %]<span id="button_4" onclick="toggle(this)" class="buttonsearch">Search patrons</span>[% END %] >- [% IF ( CAN_user_catalogue ) %]<span id="button_5" onclick="toggle(this)" class="buttonsearch">Search the catalog</span>[% END %] >- </span> >+ [% INCLUDE 'catalogue-search-box.inc' %] >+ >+ <ul id="taille"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a id="icon_4" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch active">Check-out</span> >+ <span id="button_2" class="buttonsearch">Check-in</span> >+ <span id="button_3" class="buttonsearch">Renew</span> >+ <span id="button_4" class="buttonsearch">Search patrons</span> >+ <span id="button_5" class="buttonsearch">Search catalog</span> > </ul> > </div> > >+ >+ > <script type="text/javascript"> > function focusInput(){ >- document.getElementById('inputsearch').focus(); >+ document.getElementsByClassName('head-searchbox').focus(); > } > >- function toggle(elem){ >+ function toggle(elem){style="width: calc(301px);" > var buttonssearch = document.getElementsByClassName('active'); > for (var i = buttonssearch.length - 1; i >= 0; i--) { > buttonssearch[i].classList.remove('active'); >@@ -65,25 +66,64 @@ > fold(); > }else{//Back > document.getElementById('button_1').classList.add('active'); >- document.getElementById('containersearch').classList.remove('fold'); >- document.getElementById('inputsearch').style = ''; >+ document.getElementById('header_search').classList.remove('fold'); >+ document.getElementsByClassName('head-searchbox').style = ''; > } > > focusInput(); > } > >- function fold(){ >+ function clique(elem){ >+ var buttonssearch = document.getElementsByClassName('buttonsearch'); >+ var iconssearch = document.getElementsByClassName('iconsearch'); >+ var inputssearch = document.getElementsByClassName('head-searchbox'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ if (elem == iconssearch[i]){ >+ buttonssearch[i].classList.add('active'); >+ } >+ } >+ >+ for (var i = inputssearch.length - 1; i >= 0; i--) { >+ inputssearch[i].classList.remove('focus'); >+ >+ if (elem == iconssearch[i]){ >+ inputssearch[i].classList.add('focus'); >+ >+ taille(inputssearch[i]) >+ } >+ } >+ >+ focusInput(); >+ fold(); >+ } > >- document.getElementById('containersearch').classList.add('fold'); >- // document.getElementById('inputsearch').style = "width:calc(500px - 100px)"; >+ function fold(){ >+ document.getElementById('header_search').classList.add('fold'); >+ // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)"; > setTimeout( > function(){ >- var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5; >- document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)"; >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)"; > } > , 250); > } > >+ function taille(el){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ el.style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ >+ $('.btn').click(function(){ >+ if($(this).hasClass('active')){ >+ $(this).removeClass('active') >+ } else { >+ $(this).addClass('active') >+ } >+}); >+ >+ >+ > </script> > > <!-- /header_search --> >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..b7fcc2c4a0 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="pat" 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="pat" 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/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >index 5a0dd0f28d..094800e248 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="header_search" class="fold"> >+ <div id="notices_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/tools/letter.pl" method="post"> >+ <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="" placeholder="Search existing notices:"/> >+ <input type="submit" class="submit" name="search" value="" /> >+ </form> >+ </div> >+ >+ [% INCLUDE 'patron-search-box.inc' %] >+ >+ [% INCLUDE 'catalogue-search-box.inc' %] >+ >+ <ul> >+ <li><a id="icon_1" title="Search notices" onclick="clique(this)" class="iconsearch" href="#notices_search"><i class="fa fa-upload"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch active" >Search notices</span> >+ <span id="button_2" class="buttonsearch">Check out</span> >+ <span id="button_3" class="buttonsearch">Search the catalog</span> >+ </ul> > </div> >-</div><!-- /gradient --> > <!-- End Notices Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc >new file mode 100644 >index 0000000000..d1f6acbcf9 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc >@@ -0,0 +1,140 @@ >+[% USE Koha %] >+<!-- Begin Main page Resident Search Box --> >+ >+<div id="containersearch" class="fold"> >+ [% IF (CAN_user_borrowers) %] >+ <div id="checkout_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post"> >+ <input id="inputsearch" class="inpu" type="text" autocomplete="off" placeholder="Enter patron card number or partial name" /> >+ <input type="hidden" name="quicksearch" value="1" /> >+ <input value="" type="submit" id="submitsearch" /> >+ </form> >+ </div> >+ [% END %] >+ >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >+ <div id="checkin_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/members/member.pl" id="patronsearch" method="post"> >+ [% IF ( PatronAutoComplete ) %] >+ <div class="autocomplete"> >+ <input autocomplete="off" class="inpu" id="inputsearch" name="findborrower" class="head-searchbox" type="text" placeholder="Scan a barcode to check in" /> >+ <input value="" id="submitsearch" type="submit"/> >+ >+ [% IF ( stickyduedate ) %] >+ <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" /> >+ <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" /> >+ [% END %] >+ </div> >+ >+ [% ELSE %] >+ <input id="inputsearch" name="findborrower" class="inpu head-searchbox" type="text" autocomplete="off" placeholder=Scan a barcode to check in" /> >+ [% IF ( stickyduedate ) %] >+ <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" /> >+ <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" /> >+ [% END %] >+ <input value="" id="submitsearch" type="submit" /> >+ [% END %] >+ </form> >+ </div> >+ >+ <div id="renew_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >+ <input name="barcode" id="inputsearch" class="inpu" accesskey="r" type="text" placeholder="Scan a barcode to renew" /> >+ <input value="" type="submit" id="submitsearch" /> >+ </form> >+ </div> >+ <div id="search_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >+ <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Enter search keyords" /> >+ <input value="" type="submit" id="submitsearch" /> >+ </form> >+ </div> >+ [% END %] >+ >+ [% IF ( CAN_user_catalogue ) %] >+ <div id="search_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/catalogue/search.pl" autocomplete="off" method="get" id="cat-search-block"> >+ [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >+ [% INCLUDE 'search_indexes.inc' %] >+ [% END %] >+ <input name="barcode" class="inpu" id="inputsearch focus" type="text" placeholder="Enter search keyords" /> >+ <input value="" type="submit" id="submitsearch" /> >+ </form> >+ </div> >+ [% END %] >+ >+ <ul> >+ <span id="buttonssearch"> >+ <span id="button_1" title="Check out" onclick="clique(this)" class="iconsearch"><i class="fa fa-upload"></i></span> <span id="button_2" title="Check in" onclick="clique(this)" class="iconsearch"><i class="fa fa-download"></i></span> <span id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch"><i class="fa fa-retweet"></i></span> <span id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch"><i class="fa fa-fw fa-search"></i></span> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch" href="#circ_search">Check-out</span>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#checkin_search">Check-in</span>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<span id="button_5" onclick="toggle(this)" class="buttonsearch active" href="#catalog_search">Search catalog</span>[% END %] >+ </span> >+ </ul> >+</div> >+ >+<script type="text/javascript"> >+ function focusInput(){ >+ document.getElementById('inputsearch').focus(); >+ } >+ >+ function toggle(elem){ >+ var buttonssearch = document.getElementsByClassName('active'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ } >+ >+ if(elem){ >+ elem.classList.add('active'); >+ fold(); >+ }else{//Back >+ document.getElementById('button_1').classList.add('active'); >+ document.getElementById('containersearch').classList.remove('fold'); >+ document.getElementById('inputsearch').style = ''; >+ } >+ >+ focusInput(); >+ } >+ >+ >+ function clique(elem){ >+ var buttonssearch = document.getElementsByClassName('buttonsearch'); >+ var iconssearch = document.getElementsByClassName('iconsearch'); >+ var inputssearch = document.getElementsByClassName('inpu'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ if (elem == iconssearch[i]){ >+ buttonssearch[i].classList.add('active'); >+ } >+ } >+ >+ for (var i = inputssearch.length - 1; i >= 0; i--) { >+ inputssearch[i].classList.remove('focus'); >+ >+ if (elem == iconssearch[i]){ >+ inputssearch[i].classList.add('focus'); >+ } >+ } >+ >+ fold(); >+ focusInput(); >+ } >+ >+ function fold(){ >+ >+ document.getElementById('containersearch').classList.add('fold'); >+ // document.getElementById('inputsearch').style = "width:calc(500px - 100px)"; >+ setTimeout( >+ function(){ >+ var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5; >+ document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ , 250); >+ } >+ >+ >+</script> >+ >+<!-- /header_search --> >+<!-- End Main page 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 206b402822..4263814d40 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >@@ -98,7 +98,7 @@ > <a id="searchtohold" class="pat" href="#"><i class="fa fa-search"></i> Search to hold</a> > [% END %] > >- <a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal" class="pat"><i class="fa fa-comment-o"></i> Add message</a> >+ <a href="#add_message_form" data-toggle="modal" class="pat"><i class="fa fa-comment-o"></i> Add message</a> > > </div> > </div> >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 cfccf3dc9b..18056ed6a5 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,10 +1,11 @@ > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <form action="/cgi-bin/koha/members/member.pl" id="patronsearch" method="post"> >+ <div id="circ_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post"> > [% IF ( PatronAutoComplete ) %] > <div class="autocomplete"> >- <input autocomplete="off" id="inputsearch" name="findborrower" size="40" class="head-searchbox focus" type="text" placeholder="Enter patron card number or partial name" /> >- <input value="" id="submitsearch" type="submit"/> >- >+ <input autocomplete="off" id="findborrower" style="width: calc(291px);" name="findborrower" class="head-searchbox focus" 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 %]" /> >@@ -12,22 +13,13 @@ > </div> > > [% ELSE %] >- <input id="inputsearch" name="findborrower" size="40" class="head-searchbox focus" type="text" autocomplete="off" placeholder="Enter patron card number or partial name" /> >+ <input id="findborrower" name="findborrower" class="head-searchbox focus" 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="" id="submitsearch" 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 %]" /> >+ <input value="" class="submit" type="submit" /> > [% 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.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >index 7dddb52339..55417bdf7b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >@@ -4,6 +4,21 @@ > [% USE raw %] > [% USE Asset %] > [% USE To %] >+[% PROCESS 'html_helpers.inc' %] >+[% PROCESS 'patronfields.inc' %] >+<!-- Begin Patrons Resident Search Box --> >+ >+<div id="header_search" class="fold"> >+ >+ <div id="patron_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/members/member.pl" method="post"> >+ <div class="autocomplete"> >+ <input name="barcode" id="searchmember" class="head-searchbox focus" type="text" placeholder="Enter patron card number or partial name"> >+ <span class="filteraction" id="filteraction_off"> <a id="plus" href="#">[-]</a></span> >+ <span class="filteraction" id="filteraction_on"> <a id="plus" href="#">[+]</a></span></input> >+ <input value="" id="submitsearch" type="submit" /> >+ <input type="hidden" name="quicksearch" value="1" /> >+ </div> > > [%# Display a simple form %] > [% BLOCK patron_search_filters_simple %] >@@ -167,6 +182,21 @@ > </thead> > <tbody></tbody> > </table> >+ [% 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"> >+ <input name="barcode" id="ret_barcode" class="head-searchbox focus" 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 focus"type="text" placeholder="Scan a barcode to renew" /> >+ <input value="" type="submit" id="submit" /> >+ </form> > </div> > > <!-- Patron preview modal --> >@@ -804,13 +834,105 @@ > > if ( setstate ) { > history.pushState( null, null, "?firstletter=" + letter ); >+ [% INCLUDE 'catalogue-search-box.inc' %] >+ >+ <ul id="taille"> >+ <li><a id="icon_1" title="Search patrons" onclick="clique(this)" 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 id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_4" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch active">Search patrons</span> >+ <span id="button_2" class="buttonsearch">Check-out</span> >+ <span id="button_3" class="buttonsearch">Check-in</span> >+ <span id="button_4" class="buttonsearch">Renew</span> >+ <span id="button_5" class="buttonsearch">Search catalog</span> >+ </ul> >+</div> >+ >+ >+<script type="text/javascript"> >+ function focusInput(){ >+ document.getElementsByClassName('head-searchbox').focus(); >+ } >+ >+ function toggle(elem){style="width: calc(301px);" >+ var buttonssearch = document.getElementsByClassName('active'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ } >+ >+ if(elem){ >+ elem.classList.add('active'); >+ fold(); >+ }else{//Back >+ document.getElementById('button_1').classList.add('active'); >+ document.getElementById('header_search').classList.remove('fold'); >+ document.getElementsByClassName('head-searchbox').style = ''; >+ } >+ >+ focusInput(); >+ } >+ >+ function clique(elem){ >+ var buttonssearch = document.getElementsByClassName('buttonsearch'); >+ var iconssearch = document.getElementsByClassName('iconsearch'); >+ var inputssearch = document.getElementsByClassName('head-searchbox'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ if (elem == iconssearch[i]){ >+ buttonssearch[i].classList.add('active'); >+ } >+ } >+ >+ for (var i = inputssearch.length - 1; i >= 0; i--) { >+ inputssearch[i].classList.remove('focus'); >+ >+ if (elem == iconssearch[i]){ >+ inputssearch[i].classList.add('focus'); >+ >+ taille(inputssearch[i]) > } >+ } > >+ focusInput(); >+ fold(); >+ } >+ >+ function fold(){ >+ document.getElementById('header_search').classList.add('fold'); >+ // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)"; >+ setTimeout( >+ function(){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ >+<<<<<<< HEAD > patrons_table.DataTable().draw(); > [% IF display_search_description %] > update_search_description(); > [% END %] > } >+======= >+ function taille(el){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ el.style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ >+ $('.btn').click(function(){ >+ if($(this).hasClass('active')){ >+ $(this).removeClass('active') >+ } else { >+ $(this).addClass('active') >+ } >+}); >+ >+ >+ >+</script> >+>>>>>>> Bug 30952: Search bar > > // modify parent window owner element > function add_user(borrowernumber, borrowername) { >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 5e5f68e81a..7279848825 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc >@@ -5,20 +5,24 @@ > > [% UNLESS ( no_add ) %] > <div id="toolbar" class="btn-toolbar"> >- <div> >+ <div class="btn-group"> > <button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button> >- <ul id="patdrop" class="dropdown-menu"> >+ <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') %] > <button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button> >- <ul id="patdrop" class="dropdown-menu"> >+ <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="pat" href="/cgi-bin/koha/patron_lists/lists.pl"><i class="fa fa-edit"></i> Patron lists</a> > [% 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..aabbd996d3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >@@ -37,7 +37,7 @@ > [% IF ( expiry ) %] > <span>Patron's card expired on [% expiry | $KohaDates %]</span> > [% END %] >- <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber | html %]">Edit details</a> >+ <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&destination=circ&reregistration=y" id="lientype">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a> > </li> > [% END %] > >@@ -71,11 +71,11 @@ > [% END %] > </em><br/> > [% END %] >- <a class="btn btn-xs btn-default" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a> >+ <a class="btn btn-xs btn-default" href="#reldebarments" onclick="$('#debarments-tab-link').click()" id="lientype"><i class="fa fa-ban"></i> View restrictions</a> > > [% IF (noissues && CAN_user_circulate_force_checkout) %] > <span class="override_debarment"> >- <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-xs btn-default">Override restriction temporarily</a> >+ <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-xs btn-default" id="lientype">Override restriction temporarily</a> > </span> > [% END %] > </li> <!-- /.blocker --> >@@ -83,7 +83,7 @@ > > [% IF ( odues ) %] > <li class="odues blocker"> >- <span class="circ-hlt">Overdues:</span> Patron has ITEMS OVERDUE <a href="#checkouts">See highlighted items below</a> >+ <span class="circ-hlt">Overdues:</span> Patron has ITEMS OVERDUE <a href="#checkouts" id="lientype">See highlighted items below</a> > </li> > [% END %] > >@@ -203,7 +203,7 @@ > > [% IF ( patron_messages ) %] > <div id="messages" class="circmessage"> >- <h4>Messages</h4> >+ <h3>Messages</h3> > <ul> > [% FOREACH patron_message IN patron_messages %] > <li> >@@ -220,7 +220,7 @@ > <em>"[% patron_message.message | html %]"</em> > </span> > [% IF patron_message.branchcode == Branches.GetLoggedInBranchcode OR Koha.Preference('AllowAllMessageDeletion') %] >- <a class="btn btn-link" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% patron_message.message_id | html %]&borrowernumber=[% patron_message.borrowernumber | html %]&from=moremember" onclick='return confirm(_("Are you sure you want to delete this message? This cannot be undone."));'><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-link" id="lientype" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% patron_message.message_id | html %]&borrowernumber=[% patron_message.borrowernumber | html %]&from=moremember" onclick='return confirm(_("Are you sure you want to delete this message? This cannot be undone."));'><i class="fa fa-trash"></i> Delete</a> > [% END %] > </li> > [% END %] >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..98d1f5bf59 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="pat" 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="pat" 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/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc >index 81ba508518..b034003474 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,15 +1,15 @@ > [% 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="header_search" class="fold"> >+ > <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 focus" type="text" name="description" value="[% searchfield | html %]" placeholder="Search by patron category name:" /> >+ <input type="submit" class="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"> >@@ -20,15 +20,18 @@ > <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" /> >+ <input type="submit" value="" 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> >+ <li><a id="icon_1" title="Search patron categories" onclick="clique(this)" class="iconsearch" href="#patron_category_search"><i class="fa fa-upload"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch active">Search patron categories</span> >+ <span id="button_2" class="buttonsearch">Check out</span> >+ <span id="button_3" class="buttonsearch">Search the catalog</span> >+ </ul> > </div> > <!-- End Patrons Admin Resident Search Box --> >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 6392c7a81d..39de69167a 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,24 +1,28 @@ > [% USE Koha %] > >-<div id="containersearch"> >+<div id="header_search" class="fold"> >+ > <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" size="40" name="searchfield" id="inputsearch" value="" placeholder="System preference search"> >- <input type="submit" id="submitsearch" value="" /> >+ <input class="head-searchbox focus" 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> >- <span id="buttonssearch"> >- <span id="backsearch" onclick="toggle()">â</span> >- <span id="button_1" onclick="toggle(this)" class="buttonsearch" href="#syspref_search">Search system preferences</span> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#circ_search">Check-out</span>[% END %] >- [% IF ( CAN_user_catalogue ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#catalog_search">Search the catalog</span>[% END %] >- </span> >+ <li><a id="icon_1" title="Search system preferences" onclick="clique(this)" class="iconsearch" href="#syspref_search"><i class="fa fa-upload"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch active">Search system preferences</span> >+ <span id="button_2" class="buttonsearch">Check-out</span> >+ <span id="button_3" class="buttonsearch">Search the catalog</span> > </ul> > </div> > >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..7662044a9d 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="sousmenu"> > [% 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-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >index eaecee422f..a13d70d33e 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="pat" 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> >@@ -17,13 +17,13 @@ > [% IF ( CAN_user_reports_create_reports ) %] > [% UNLESS ( editsql ) # Do not show edit button on edit page %] > <div class="btn-group"> >- <a id="editreport" class="btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Edit%20SQL"> >+ <a id="editreport" class="pat" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Edit%20SQL"> > <i class="fa fa-pencil"></i> Edit > </a> > </div> > [% END %] > <div class="btn-group"> >- <a class="btn btn-default" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from existing&report_id=[% id | uri %]"> >+ <a class="pat" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from existing&report_id=[% id | uri %]"> > <i class="fa fa-copy"></i> Duplicate > </a> > </div> >@@ -31,7 +31,7 @@ > > [% IF ( CAN_user_reports_delete_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="pat" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | html %]&phase=Delete%20Saved"> > <i class="fa fa-trash"></i> Delete > </a> > </div> >@@ -39,12 +39,12 @@ > > [% 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="pat" 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="pat" href="/cgi-bin/koha/tools/scheduler.pl?id=[% id | html %]"> > <i class="fa fa-clock-o"></i> Schedule > </a> > </div> >@@ -52,7 +52,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="pat" 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 %]"> >@@ -92,7 +92,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="pat" 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> >@@ -110,10 +110,10 @@ > </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="pat" 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="pat" href="#" data-toggle="modal" data-target="#chartModal"><i class="fa fa-bar-chart"></i> Create chart</a> >+ <a class="pat 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> >@@ -152,7 +152,7 @@ > </div> > </div> > <div class="modal-footer"> >- <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> >+ <button type="button" class="pat" data-dismiss="modal">Cancel</button> > </div> > </div> > </form> >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..91bfb19522 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,38 @@ > [% 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"> >+ >+ <div id="header_search" class="fold"> >+ > <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 %]" /> >- >- [% 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> >+ <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 %]" /> >+ >+ [% 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> > </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 %] >+ <li><a id="icon_1" title="Search subscriptions" onclick="clique(this)" class="iconsearch" href="#subscription_search"><i class="fa fa-upload"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch active">Search subscriptions</span> >+ <span id="button_2" class="buttonsearch">Check out</span> >+ <span id="button_3" class="buttonsearch">Search the catalog</span> > </ul> >+ > </div><!-- /header_search --> >-</div><!-- /gradient --> > <!-- End Serials 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 7ec650be1c..9968ec9a5b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >@@ -1,134 +1,143 @@ > [% USE Koha %] > > <div id="navmenu"> >-<div id="navmenulist"> >-<ul> >- <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a></li> >-</ul> >-[% 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> >-<ul> >- [% IF ( CAN_user_tools_manage_patron_lists ) %] >- <li><a href="/cgi-bin/koha/patron_lists/lists.pl">Patron lists</a></li> >- [% END %] >- [% IF (CAN_user_clubs) %] >- <li><a href="/cgi-bin/koha/clubs/clubs.pl">Patron clubs</a></li> >- [% END %] >- [% IF ( CAN_user_tools_moderate_comments ) %] >- <li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a></li> >- [% END %] >- [% IF ( CAN_user_tools_import_patrons ) %] >- <li><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></li> >- [% END %] >- [% IF ( CAN_user_tools_edit_notices ) %] >- <li><a href="/cgi-bin/koha/tools/letter.pl">Notices & slips</a></li> >- [% END %] >- [% IF ( CAN_user_tools_edit_notice_status_triggers ) %] >- <li><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue notice/status triggers</a></li> >- [% END %] >- [% IF ( CAN_user_tools_label_creator ) %] >- <li><a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a></li> >- [% END %] >- [% IF ( CAN_user_tools_delete_anonymize_patrons ) %] >- <li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Batch patron deletion and anonymization</a></li> >- [% END %] >- [% IF ( CAN_user_tools_edit_patrons ) %] >- <li><a href="/cgi-bin/koha/tools/modborrowers.pl">Batch patron modification</a></li> >- [% END %] >- [% IF ( CAN_user_tools_batch_extend_due_dates ) %] >- <li><a href="/cgi-bin/koha/tools/batch_extend_due_dates.pl">Batch extend due dates</a></li> >- [% END %] >- [% IF ( CAN_user_tools_moderate_tags ) %] >- <li><a href="/cgi-bin/koha/tags/review.pl">Tag moderation</a></li> >- [% END %] >- [% IF ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) %] >- <li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></li> >- [% END %] >-</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> >-<ul> >- [% IF ( CAN_user_tools_items_batchdel ) %] >- <li><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a></li> >- [% END %] >- [% IF ( CAN_user_tools_items_batchmod ) %] >- <li><a href="/cgi-bin/koha/tools/batchMod.pl">Batch item modification</a></li> >- [% END %] >- [% IF CAN_user_tools_records_batchdel %] >- <li><a href="/cgi-bin/koha/tools/batch_delete_records.pl">Batch record deletion</a></li> >- [% END %] >- [% IF CAN_user_tools_records_batchmod %] >- <li><a href="/cgi-bin/koha/tools/batch_record_modification.pl">Batch record modification</a></li> >- [% END %] >- [% IF CAN_user_tools_items_batchmod %] >- <li><a href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">Automatic item modifications by age</a></li> >- [% END %] >- [% IF ( CAN_user_tools_export_catalog ) %] >- <li><a href="/cgi-bin/koha/tools/export.pl">Export data</a></li> >- [% END %] >- [% IF ( CAN_user_tools_inventory ) %] >- <li><a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a></li> >- [% END %] >- [% IF ( CAN_user_tools_label_creator ) %] >- <li><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></li> >- <li><a href="/cgi-bin/koha/labels/spinelabel-home.pl">Quick spine label creator</a></li> >- <li><a href="/cgi-bin/koha/labels/barcode-print.pl">Barcode image generator</a></li> >- [% END %] >- [% IF ( CAN_user_tools_rotating_collections ) %] >- <li><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></li> >- [% END %] >- [% IF ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) %] >- <li><a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a></li> >- [% END %] >- [% IF ( CAN_user_tools_marc_modification_templates ) %] >- <li><a href="/cgi-bin/koha/tools/marc_modification_templates.pl">Manage MARC modification templates</a></li> >- [% END %] >- [% IF ( CAN_user_tools_stage_marc_import ) %] >- <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC for import</a></li> >- [% END %] >- [% IF ( CAN_user_tools_manage_staged_marc ) %] >- <li><a href="/cgi-bin/koha/tools/manage-marc-import.pl">Staged MARC management</a></li> >- [% END %] >- [% IF ( CAN_user_tools_upload_local_cover_images ) %] >- <li><a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a></li> >- [% END %] >-</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> >-<ul> >- [% IF ( CAN_user_tools_edit_calendar ) %] >- <li><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></li> >- [% END %] >- [% IF ( CAN_user_tools_manage_csv_profiles ) %] >- <li><a href="/cgi-bin/koha/tools/csv-profiles.pl">CSV profiles</a></li> >- [% END %] >- [% IF ( CAN_user_tools_view_system_logs ) %] >- <li><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></li> >- [% END %] >- [% IF ( CAN_user_tools_edit_additional_contents ) %] >- <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a></li> >- <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a></li> >- [% END %] >- [% IF ( CAN_user_tools_schedule_tasks ) %] >- <li><a href="/cgi-bin/koha/tools/scheduler.pl">Task scheduler</a></li> >- [% END %] >- [% IF ( CAN_user_tools_edit_quotes ) %] >- <li><a href="/cgi-bin/koha/tools/quotes.pl">Quote editor</a></li> >- [% END %] >- [% IF ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool ) %] >- <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=tool">Tool plugins</a></li> >- [% END %] >- [% IF ( CAN_user_tools_upload_general_files ) %] >- <li><a href="/cgi-bin/koha/tools/upload.pl">Upload any file</a></li> >- [% END %] >- [% IF ( CAN_user_tools_access_files ) %] >- <li><a href="/cgi-bin/koha/tools/access_files.pl">Access files</a></li> >- [% END %] >- [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %] >- <li><a href="/cgi-bin/koha/tools/problem-reports.pl">OPAC problem reports</a></li> >- [% END %] >-</ul> >-[% END %] >-</div></div> >+ <div id="navmenulist"> >+ >+ <ul> >+ <li> >+ <a class="titre" href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a> >+ </li> >+ </ul> >+ >+ [% 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') ) ) %] >+ <ul> >+ <h5>Patrons and circulation</h5> >+ >+ [% IF ( CAN_user_tools_manage_patron_lists ) %] >+ <li><a href="/cgi-bin/koha/patron_lists/lists.pl">Patron lists</a></li> >+ [% END %] >+ [% IF (CAN_user_clubs) %] >+ <li><a href="/cgi-bin/koha/clubs/clubs.pl">Patron clubs</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_moderate_comments ) %] >+ <li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_import_patrons ) %] >+ <li><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_edit_notices ) %] >+ <li><a href="/cgi-bin/koha/tools/letter.pl">Notices & slips</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_edit_notice_status_triggers ) %] >+ <li><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue notice/status triggers</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_label_creator ) %] >+ <li><a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_delete_anonymize_patrons ) %] >+ <li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Batch patron deletion and anonymization</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_edit_patrons ) %] >+ <li><a href="/cgi-bin/koha/tools/modborrowers.pl">Batch patron modification</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_batch_extend_due_dates ) %] >+ <li><a href="/cgi-bin/koha/tools/batch_extend_due_dates.pl">Batch extend due dates</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_moderate_tags ) %] >+ <li><a href="/cgi-bin/koha/tags/review.pl">Tag moderation</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) %] >+ <li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></li> >+ [% END %] >+ </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 ) %] >+ >+ <ul> >+ <h5>Catalog</h5> >+ >+ [% IF ( CAN_user_tools_items_batchdel ) %] >+ <li><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_items_batchmod ) %] >+ <li><a href="/cgi-bin/koha/tools/batchMod.pl">Batch item modification</a></li> >+ [% END %] >+ [% IF CAN_user_tools_records_batchdel %] >+ <li><a href="/cgi-bin/koha/tools/batch_delete_records.pl">Batch record deletion</a></li> >+ [% END %] >+ [% IF CAN_user_tools_records_batchmod %] >+ <li><a href="/cgi-bin/koha/tools/batch_record_modification.pl">Batch record modification</a></li> >+ [% END %] >+ [% IF CAN_user_tools_items_batchmod %] >+ <li><a href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">Automatic item modifications by age</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_export_catalog ) %] >+ <li><a href="/cgi-bin/koha/tools/export.pl">Export data</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_inventory ) %] >+ <li><a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_label_creator ) %] >+ <li><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></li> >+ <li><a href="/cgi-bin/koha/labels/spinelabel-home.pl">Quick spine label creator</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_rotating_collections ) %] >+ <li><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></li> >+ [% END %] >+ [% IF ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) %] >+ <li><a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_marc_modification_templates ) %] >+ <li><a href="/cgi-bin/koha/tools/marc_modification_templates.pl">Manage MARC modification templates</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_stage_marc_import ) %] >+ <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC for import</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_manage_staged_marc ) %] >+ <li><a href="/cgi-bin/koha/tools/manage-marc-import.pl">Staged MARC management</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_upload_local_cover_images ) %] >+ <li><a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a></li> >+ [% END %] >+ </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 ) %] >+ >+ <ul> >+ <h5>Additional tools</h5> >+ >+ [% IF ( CAN_user_tools_edit_calendar ) %] >+ <li><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_manage_csv_profiles ) %] >+ <li><a href="/cgi-bin/koha/tools/csv-profiles.pl">CSV profiles</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_view_system_logs ) %] >+ <li><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_edit_additional_contents ) %] >+ <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a></li> >+ <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_schedule_tasks ) %] >+ <li><a href="/cgi-bin/koha/tools/scheduler.pl">Task scheduler</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_edit_quotes ) %] >+ <li><a href="/cgi-bin/koha/tools/quotes.pl">Quote editor</a></li> >+ [% END %] >+ [% IF ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool ) %] >+ <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=tool">Tool plugins</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_upload_general_files ) %] >+ <li><a href="/cgi-bin/koha/tools/upload.pl">Upload any file</a></li> >+ [% END %] >+ [% IF ( CAN_user_tools_access_files ) %] >+ <li><a href="/cgi-bin/koha/tools/access_files.pl">Access files</a></li> >+ [% END %] >+ [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %] >+ <li><a href="/cgi-bin/koha/tools/problem-reports.pl">OPAC problem reports</a></li> >+ [% END %] >+ </ul> >+ [% END %] >+ </div> >+</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..f2c337afb2 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="header_search" class="fold"> >+ > <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 %]" /> >+ <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post"> >+ <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Z39.50/SRU server search:" /> > <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="#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> >+ <li><li><a id="icon_1" title="Search Z39.50/SRU servers" onclick="clique(this)" class="iconsearch" href="#z3950_search"><i class="fa fa-upload"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ >+ <span id="button_1" class="buttonsearch active">Search Z39.50/SRU servers</span> >+ <span id="button_2" class="buttonsearch">Check out</span> >+ <span id="button_3" class="buttonsearch">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 c0b5549b32..0a884e3583 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 >@@ -42,7 +42,7 @@ > > [% INCLUDE 'acquisitions-toolbar.inc' %] > >-<h1>Acquisitions</h1> >+<h2>Acquisitions</h2> > [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] > [% UNLESS ( loop_budget ) %] > [% IF ( CAN_user_acquisition_period_manage ) %] >@@ -59,7 +59,7 @@ > [% END %] > <div id="acqui_acqui_home_order"> > <fieldset class="brief"> >- <h2>Manage orders</h2> >+ <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" /> >@@ -96,10 +96,12 @@ > > [% IF ( loop_budget ) %] > >+ <div 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> | >@@ -206,7 +208,7 @@ > [% END %] > </tbody> > </table> >- </div> >+ </div></div> > [% 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 44eb33ae7a..ef3c426b70 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,8 +25,7 @@ > </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> >@@ -43,6 +45,12 @@ > <a href="#" aria-current="page">Add orders from MARC file</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"> >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 e1ae56b631..e8f31718b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -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,8 +34,7 @@ > </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> >@@ -62,6 +64,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/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index 8ca0b82a5d..16b39c69cb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -86,8 +86,7 @@ > > </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> >@@ -111,6 +110,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> > > [% ELSE %] >@@ -123,6 +128,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 %] > >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..b5ad801e4f 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,8 +18,7 @@ > </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> >@@ -45,6 +47,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/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index c1e5fc8af0..be19e9debd 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,8 +17,7 @@ > </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> >@@ -31,6 +33,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/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >index 7c70c1200e..1c9be22269 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >@@ -23,6 +23,12 @@ > <a href="#" aria-current="page">Cancel order</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/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >index 8bb5e07d85..a7b5b2ab2d 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,8 +21,7 @@ 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> >@@ -43,6 +45,12 @@ Acquisitions › 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"> >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..cdeeda3d78 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,11 +1,14 @@ >+ >+[% 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> >@@ -19,6 +22,12 @@ > <a href="#" aria-current="page">Basket ([% basketno | html %])</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/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt >index 4af2fb2a2e..7bb54d021c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt >@@ -1,10 +1,13 @@ >+ >+[% 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"> >@@ -19,6 +22,12 @@ > <a href="#" aria-current="page">EDIFACT messages</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/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index 8f0436a5c5..f702182b0e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -4,14 +4,16 @@ > [% 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> >@@ -22,22 +24,28 @@ > <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> >+ <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> > >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..f9f68b609e 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,14 +2,16 @@ > [% 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"> >@@ -30,6 +32,12 @@ > <a href="#" aria-current="page">Files</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/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index 0c42bec5cc..4aca420959 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -36,6 +36,12 @@ > <a href="#" aria-current="page">[% invoicenumber | html %]</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/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index 2600ed07f3..9dbe84713c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -45,12 +45,72 @@ > > [% INCLUDE 'blocking_errors.inc' %] > >- <h1>Invoices</h1> >- [% IF ( do_search ) %] >- [% IF invoices %] >- [% BLOCK invoices_table %] >- [% IF closed %] >- [% SET tab = 'closed' %] >+ <h2>Invoices</h2> >+ [% IF ( do_search ) %] >+ [% IF invoices %] >+ [% BLOCK invoices_table %] >+ [% IF closed %] >+ [% SET tab = 'closed' %] >+ [% ELSE %] >+ [% SET tab = 'opened' %] >+ [% END %] >+ <input type="checkbox" style="vertical-align: middle;" id="show_only_subscription_[% tab | html %]" class="show_only_subscription" data-tableid="[% tab | html %]resultst"/> >+ <label for="show_only_subscription_[% tab | html %]"> >+ Show only subscriptions >+ </label> >+ <table id="[% tab | html %]resultst" class="result"> >+ <thead> >+ <tr> >+ [% IF CAN_user_acquisition_merge_invoices %] >+ <th> </th> >+ [% END %] >+ <th> </th> >+ <th>Invoice number</th> >+ <th>Vendor</th> >+ <th>Shipment date</th> >+ <th>Billing date</th> >+ <th>Received bibliographic records</th> >+ <th>Received items</th> >+ <th>Status</th> >+ <th> </th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH invoice IN invoices %] >+ <tr data-invoiceid="[% invoice.invoiceid | html %]" data-booksellerid="[% invoice.booksellerid | html %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost | html %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid | html %]" data-closedate="[% invoice.closedate | $KohaDates %]"> >+ [% IF CAN_user_acquisition_merge_invoices %] >+ <td>[% invoice.is_linked_to_subscriptions | html %]</td> >+ [% END %] >+ <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td> >+ <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td> >+ <td data-order="[% invoice.shipmentdate | html %]"> >+ [% invoice.shipmentdate | $KohaDates %] >+ </td> >+ <td data-order="[% invoice.billingdate | html %]"> >+ [% invoice.billingdate | $KohaDates %] >+ </td> >+ <td>[% invoice.receivedbiblios | html %]</td> >+ <td>[% invoice.receiveditems | html %]</td> >+ <td> >+ [% IF invoice.closedate %] >+ Closed on [% invoice.closedate | $KohaDates %] >+ [% ELSE %] >+ Open >+ [% END %] >+ </td> >+ <td> >+ >+ <div class="btn-group dropup"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="invoiceactions[% invoice.invoiceid | html %]" role="button" data-toggle="dropdown" href="#"> >+ Actions <b class="caret"></b> >+ </a> >+ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid | html %]"> >+ <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]"><i class="fa fa-search"></i> Details</a></li> >+ [% IF invoice.closedate %] >+ [% IF CAN_user_acquisition_reopen_closed_invoices %] >+ <li><a href="invoice.pl?op=reopen&invoiceid=[% invoice.invoiceid | uri %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen</a></li> >+ [% END %] > [% ELSE %] > [% SET tab = 'opened' %] > [% END %] >@@ -207,6 +267,7 @@ > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > >+<<<<<<< HEAD > <li> > <label for="merge_shipmentcost">Shipment cost:</label> > <input type="text" size="10" id="merge_shipmentcost" name="shipmentcost" value="" /> >@@ -403,6 +464,106 @@ > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >+======= >+<div class="col-sm-2 col-sm-pull-10"> >+<aside> >+<div id="filters"> >+ <form action="" method="get"> >+ <fieldset class="sidebar brief"> >+ <h4>Search filters</h4> >+ <ol> >+ <li> >+ <p for="invoicenumber">Invoice number >+ <input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber | html %]" class="focus" /></p> >+ </li> >+ <li> >+ <p for="supplier">Vendor: >+ <select id="supplier" name="supplierid"> >+ <option value="">All</option> >+ [% FOREACH supplier IN suppliers_loop %] >+ [% IF ( supplier.selected ) %] >+ <option selected="selected" value="[% supplier.booksellerid | html %]">[% supplier.suppliername | html %]</option> >+ [% ELSE %] >+ <option value="[% supplier.booksellerid | html %]">[% supplier.suppliername | html %]</option> >+ [% END %] >+ [% END %] >+ </select></p> >+ </li> >+ <li> >+ <fieldset> >+ <label>Shipment date</label> >+ <ol> >+ <li> >+ <p for="shipmentdatefrom">From: >+ <input type="text" id="shipmentdatefrom" name="shipmentdatefrom" size="10" value="[% shipmentdatefrom | $KohaDates %]" class="flatpickr" data-date_to="shipmentdateto" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> >+ </li> >+ <li> >+ <p for="shipmentdateto">To: >+ <input type="text" id="shipmentdateto" name="shipmentdateto" size="10" value="[% shipmentdateto | $KohaDates %]" class="flatpickr" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> >+ </li> >+ </ol> >+ </fieldset> >+ </li> >+ <li> >+ <fieldset> >+ <label>Billing date</label> >+ <ol> >+ <li> >+ <p for="billingdatefrom">From: >+ <input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom | $KohaDates %]" class="flatpickr" data-date_to="billingdateto" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> >+ </li> >+ <li> >+ <p for="billingdateto">To: >+ <input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto | $KohaDates %]" class="flatpickr" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> >+ </li> >+ </ol> >+ </fieldset> >+ </li> >+ <li> >+ <p for="isbneanissn">ISBN / EAN / ISSN: >+ <input type="text" id="isbneanissn" name="isbneanissn" value="[% isbneanissn | html %]" /></p> >+ </li> >+ <li> >+ <p for="title">Title: >+ <input type="text" id="title" name="title" value="[% title | html %]" /></p> >+ </li> >+ <li> >+ <p for="author">Author: >+ <input type="text" id="author" name="author" value="[% author | html %]" /></p> >+ </li> >+ <li> >+ <p for="publisher">Publisher: >+ <input type="text" id="publisher" name="publisher" value="[% publisher | html %]" /></p> >+ </li> >+ <li> >+ <p for="publicationyear">Publication year: >+ <input type="text" id="publicationyear" name="publicationyear" value="[% publicationyear | html %]" /></p> >+ </li> >+ <li> >+ <p for="branch">Library: >+ <select id="branch" name="branch"> >+ <option value="">All</option> >+ [%# FIXME Should not we filter the libraries %] >+ [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %] >+ </select></p> >+ </li> >+ </ol> >+ <fieldset class="action"> >+ <input type="submit" class="principal" value="Search" /> >+ </fieldset> >+ </fieldset> >+ <input type="hidden" name="op" id="op" value="do_search" /> >+ </form> >+ [% INCLUDE 'acquisitions-menu.inc' %] >+ </div> >+ </aside> >+</div> <!-- /.col-sm-2.col-sm-pull-10 --> >+</div> <!-- /.row --> >+>>>>>>> Bug 30952: Search bar > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >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 1c3209a778..94e1d9afce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -29,6 +29,12 @@ > <a href="#" aria-current="page">Late orders</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 +42,7 @@ > <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 %] >@@ -225,6 +231,7 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >+ <div id="filters"> > <form action="lateorders.pl" method="get"> > <fieldset class="brief"> > <h4>Filter results:</h4> >@@ -232,17 +239,17 @@ > [% 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 %] > <ol> >- <li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay | html %]" /> days ago</li> >- <li><label for="from">Estimated delivery date from: </label> >+ <li><p for="delay">Order date:<input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay | html %]" /> days ago</p></li> >+ <li><p for="from">Estimated delivery date from: > <input type="text" size="10" id="from" name="estimateddeliverydatefrom" value="[% estimateddeliverydatefrom | html %]" class="flatpickr" data-date_to="to"/> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> > </li> >- <li><label for="to">To: </label> >+ <li><p for="to">To: > <input type="text" size="10" id="to" name="estimateddeliverydateto" value="[% estimateddeliverydateto | html %]" class="flatpickr" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> > </li> > >- <li><label for="booksellerid">Vendor:</label> >+ <li><p for="booksellerid">Vendor: > <select id="booksellerid" tabindex="" name="booksellerid"> > <option value=""></option> > [% FOREACH bookseller IN booksellers %] >@@ -252,12 +259,14 @@ > <option value="[% bookseller.id | html %]">[% bookseller.name | html %]</option> > [% END %] > [% END %] >- </select> >+ </select></p> >+ </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' %] >+</div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> >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..26f496be01 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >@@ -32,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"> >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 8f95f312bc..0b12a4b6a1 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,8 +15,7 @@ > > <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> >@@ -44,6 +46,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > [% INCLUDE 'blocking_errors.inc' %] >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..b1f64d4892 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,11 +1,15 @@ >+ >+[% 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"> >@@ -25,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/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >index 2986089b95..6c4708a858 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -5,14 +5,16 @@ > [% 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> >@@ -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"> >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 0946308afb..047199afb7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >@@ -4,14 +4,16 @@ > [% 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> >@@ -33,6 +35,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/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >index f115cbd76c..4100b42250 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >@@ -5,14 +5,16 @@ > [% 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"> >@@ -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"> >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..5dce98c516 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -7,14 +7,16 @@ > [% 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> >@@ -35,6 +37,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/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index d34b5e70b2..3359822cdd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -6,6 +6,9 @@ > [% USE currency = format('%.2f') -%] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( invoiceclosedate ) %] >@@ -19,8 +22,7 @@ > </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> >@@ -46,6 +48,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> > > >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..08273dbe21 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -2,14 +2,16 @@ > [% 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> >@@ -28,6 +30,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/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >index 5eca17fe30..1541c55234 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -5,14 +5,16 @@ > [% 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"> >@@ -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"> >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..9f00ccc907 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -88,14 +88,16 @@ > [% 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> >@@ -130,6 +132,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/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >index 1243a06d13..1e90d95185 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -3,14 +3,16 @@ > [% 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> >@@ -37,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> > > <div class="main container-fluid"> >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..e010db3dce 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,8 +43,7 @@ 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> >@@ -74,6 +76,12 @@ tr.selected td { > </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/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >index cb4bf3a810..14feae4f8f 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,7 +17,7 @@ > [% show_marcfield = marcfield_tables.grep('^' _ tablename _ '$').size ? 1 : 0 %] > > <body id="ser_add_fields" class="ser"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -111,7 +114,7 @@ > > [% IF op == 'list_tables' %] > [% IF CAN_user_acquisitions_order_manage || CAN_user_serials_edit_subscription %] >- <h1>Additional fields</h1> >+ <h2>Additional fields</h2> > <p>Select a table:</p> > [% BLOCK table_option %] > <li><a href="?tablename=[% value | uri %]">[% content | html %] (<span class="ex">[% value | html %]</span>)</a></li> >@@ -128,7 +131,7 @@ > Additional permissions in the acquisitions or serials modules are required for editing additional fields > [% END %] > [% ELSIF op == 'list' %] >- <h1>Additional fields for '[% tablename | html %]'</h1> >+ <h2>Additional fields for '[% tablename | html %]'</h2> > [% IF fields %] > <table id="fieldst"> > <thead> >@@ -154,8 +157,8 @@ > [% IF field.searchable %]Yes[% ELSE %]No[% END %] > </td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="?op=add_form&field_id=[% field.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="confirmdelete btn btn-default btn-xs" href="?op=delete&field_id=[% field.id | uri %]&tablename=[% tablename | uri %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" id="lientype" href="?op=add_form&field_id=[% field.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="confirmdelete btn btn-default btn-xs" id="lientype" href="?op=delete&field_id=[% field.id | uri %]&tablename=[% tablename | uri %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -166,9 +169,9 @@ > [% END %] > [% ELSIF op == 'add_form' %] > [% IF field %] >- <h1>Modify field</h1> >+ <h2>Modify field</h2> > [% ELSE %] >- <h1>Add field</h1> >+ <h2>Add field</h2> > [% END %] > <form action="" name="add_form" id="add_field" method="post"> > <fieldset class="rows"> >@@ -200,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 34957a8c30..5fd09c9a22 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,11 +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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -45,7 +48,7 @@ > [% IF ( Koha.Preference('Mana') == 2 ) %] > <div class="dialog message"> > <h4>Share content with Mana KB?</h4> >- <p> You haven't decided if you want to activate Mana Knowledge Base. <a href=/cgi-bin/koha/admin/share_content.pl>Change your Mana KB settings</a>.</p> >+ <p> You haven't decided if you want to activate Mana Knowledge Base. <a href=/cgi-bin/koha/admin/share_content.pl id="lientype">Change your Mana KB settings</a>.</p> > </div> > [% END %] > [% END %] >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..015ac38ae4 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,8 +75,7 @@ > > <body id="admin_aqbudgetperiods" class="admin"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'budgets-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <!-- ################################################################################# --> > <!-- BREADCRUMBS --> >@@ -167,6 +169,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,12 +238,12 @@ > </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/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">Cancel</a> > </fieldset> >+ </fieldset> >+ > > </form> > >@@ -302,18 +310,18 @@ > [% 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" class="principal" value="Save" /> > [% IF ( budget_period_id ) %] > <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]" class="cancel">Cancel</a> > [% ELSE %] > <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a> > [% END %] > </fieldset> >+ </fieldset> >+ > > </form> > >@@ -364,6 +372,7 @@ > <span>There are no unreceived orders for this budget.</span> > <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a> > [% ELSE %] >+ <div id="searchresults"> > <h3>The unreceived orders from the following funds will be moved</h3> > Fund list of budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">[% budget_period_description | html %]</a>: > <table id="budgeth"> >@@ -386,6 +395,7 @@ > [% END %] > </tbody> > </table> >+ </div> > <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post" id="move_form"> > <fieldset class="rows"> > <ol> >@@ -403,17 +413,19 @@ > <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> >+ </fieldset> > </form> > [% END %] > [% ELSIF closed %] >- <h1>Budget [% budget_period_description | html %] closed</h1> >+ <h2>Budget [% budget_period_description | html %] closed</h2> >+ <div id="searchresults"> >+ > <h3>Report after moving unreceived orders from budget [% from_budget_period.budget_period_description | html %] ([% from_budget_period.budget_period_startdate | $KohaDates %] - [% from_budget_period.budget_period_enddate | $KohaDates %]) to [% to_budget_period.budget_period_description | html %] ([% to_budget_period.budget_period_startdate | $KohaDates %] - [% to_budget_period.budget_period_enddate | $KohaDates%])</h3> > > <table id="closed_report"> >@@ -459,6 +471,7 @@ > [% END %] > </tbody> > </table> >+ </div> > <a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a> > [% END %] > >@@ -472,6 +485,7 @@ > > [% INCLUDE 'budgets-active-currency.inc' %] > >+ <div id="searchresults"> > <div id="budgetsTabs" class="toptabs"> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation" class="active"> >@@ -494,64 +508,46 @@ > <th>Total</th> > <th class="noExport">Actions</th> > </tr> >- </thead> >- <tbody> >- [% FOREACH period_active IN period_active_loop %] >- <tr> >- <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id | uri %]" title="View funds for [% period_active.budget_period_description | html %]">[% period_active.budget_period_description | html %]</a></td> >- <td data-order="[% period_active.budget_period_startdate | html %]">[% period_active.budget_period_startdate | $KohaDates %]</td> >- <td data-order="[% period_active.budget_period_enddate | html %]">[% period_active.budget_period_enddate | $KohaDates %]</td> >- <td> >- [% IF ( period_active.budget_period_locked ) %] >- <i class="fa fa-lock"></i> Locked</span> >- [% END %] >- </td> >- <td class="data">[% period_active.budget_period_total | $Price %]</td> >- <td> >- [% PROCESS action_menu block_budget=period_active %] >- </td> >- </tr> >- [% END %] >- </tbody> >- </table> >- [% ELSE %] >- No active budgets >- [% END %] >- </div> >- <div id="inactive" role="tabpanel" class="tab-pane"> >- [% IF ( period_inactive_loop ) %] >- <table id="inactiveperiodst"> >- <thead> >- <tr> >- <th>Budget name</th> >- <th>Start date</th> >- <th>End date</th> >- <th>Locked</th> >- <th>Total</th> >- <th class="noExport">Actions</th> >- </tr> >- </thead> >- <tbody> >- [% FOREACH period_loo IN period_inactive_loop %] >- <tr> >- <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id | uri %]" title="View funds for [% period_loo.budget_period_description | html %]">[% period_loo.budget_period_description | html %]</a></td> >- <td data-order="[% period_loo.budget_period_startdate | html %]">[% period_loo.budget_period_startdate | $KohaDates %]</td> >- <td data-order="[% period_loo.budget_period_enddate | html %]">[% period_loo.budget_period_enddate | $KohaDates %]</td> >- <td>[% IF ( period_loo.budget_period_locked ) %]<i class="fa fa-lock"></i> Locked[% END %]</td> >- <td class="data">[% period_loo.budget_period_total | $Price %]</td> >- <td> >- [% PROCESS action_menu block_budget=period_loo %] >- </td> >- </tr> >- [% END %] >- </tbody> >- </table> >- [% ELSE %] >- No inactive budgets >- [% END %] >- </div> >- </div> <!-- /.tab-content --> >- </div> >+ [% END %] >+ </tbody> >+ </table> >+ [% ELSE %] >+ No active budgets >+ [% END %] >+ </div> >+ <div id="inactive"> >+ [% IF ( period_inactive_loop ) %] >+ <table id="inactiveperiodst"> >+ <thead> >+ <tr> >+ <th>Budget name</th> >+ <th>Start date</th> >+ <th>End date</th> >+ <th>Locked</th> >+ <th>Total</th> >+ <th class="noExport">Actions</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH period_loo IN period_inactive_loop %] >+ <tr> >+ <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id | uri %]" title="View funds for [% period_loo.budget_period_description | html %]">[% period_loo.budget_period_description | html %]</a></td> >+ <td data-order="[% period_loo.budget_period_startdate | html %]">[% period_loo.budget_period_startdate | $KohaDates %]</td> >+ <td data-order="[% period_loo.budget_period_enddate | html %]">[% period_loo.budget_period_enddate | $KohaDates %]</td> >+ <td>[% IF ( period_loo.budget_period_locked ) %]<i class="fa fa-lock"></i> Locked[% END %]</td> >+ <td class="data">[% period_loo.budget_period_total | $Price %]</td> >+ <td> >+ [% PROCESS action_menu block_budget=period_loo %] >+ </td> >+ </tr> >+ [% END %] >+ </tbody> >+ </table> >+ [% ELSE %] >+ No inactive budgets >+ [% END %] >+ </div> >+ </div></div> > [% 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 bb1b9ff600..11253ad36b 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,68 +15,73 @@ > </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> >- <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> >- </li> >+ <li> >+ <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ </li> >+ <li> >+ <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> >+ </li> >+ <li> >+ <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> >+ </li> > >- [% IF op == 'list' %] >- [% IF budget_period_id %] >- <li> >- <a href="#" aria-current="page"> >- Funds for '[% budget_period_description | html %]' >- </a> >- </li> >- [% ELSE %] >+ [% IF op == 'list' %] >+ [% IF budget_period_id %] >+ <li> >+ <a href="#" aria-current="page"> >+ Funds for '[% budget_period_description | html %]' >+ </a> >+ </li> >+ [% ELSE %] >+ <li> >+ <a href="#" aria-current="page"> >+ All funds >+ </a> >+ </li> >+ [% END %] >+ [% END %] >+ >+ [% IF op == 'add_form' %] > <li> >- <a href="#" aria-current="page"> >- All funds >- </a> >+ <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a> > </li> >+ [% IF ( budget_id ) %] >+ <li> >+ <a href="#" aria-current="page"> >+ Modify fund >+ [% IF ( budget_name ) %] '[% budget_name | html %]'[% END %] >+ </a> >+ </li> >+ [% ELSE %] >+ <li> >+ <a href="#" aria-current="page"> >+ Add fund >+ </a> >+ </li> >+ [% END %] > [% END %] >- [% END %] > >- [% IF op == 'add_form' %] >- <li> >- <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a> >- </li> >- [% IF ( budget_id ) %] >+ [% IF op == 'delete_confirm' %] > <li> >- <a href="#" aria-current="page"> >- Modify fund >- [% IF ( budget_name ) %] '[% budget_name | html %]'[% END %] >- </a> >+ <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a> > </li> >- [% ELSE %] > <li> > <a href="#" aria-current="page"> >- Add fund >+ Delete fund? > </a> > </li> > [% END %] >- [% END %] >- >- [% IF op == 'delete_confirm' %] >- <li> >- <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Delete fund? >- </a> >- </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"> >@@ -91,13 +99,13 @@ > > [% IF op == 'list' %] > >-<h1> >+<h2> > [% IF budget_period_id %] > Funds for '[% budget_period_description | html %]' > [% ELSE %] > All funds > [% END %] >-</h1> >+</h2> > > [% INCLUDE 'budgets-active-currency.inc' %] > >@@ -113,7 +121,7 @@ > </span> > </div> > [% END %] >- >+<div id=="searchresults"> > <table id="budgeth" class="group"> > <thead> > <tr> >@@ -231,6 +239,7 @@ > [% END %] > </tbody> > </table> >+</div> > > [% ELSE %] > <p>No fund found</p> >@@ -243,12 +252,11 @@ > [% IF op == 'add_form' && !error_not_authorised_to_modify %] > <form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post"> > <fieldset class="rows"> >- <legend><h1>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund >+ <h3>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund > [% IF ( budget_period_description ) %] > [% budget_name | html %] for Budget '[% budget_period_description | html %]' > [% END %] >- </h1> >- </legend> >+ </h3> > > <input type="hidden" name="op" value="add_validate" /> > <input type="hidden" name="checked" value="0" /> >@@ -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 --> >@@ -438,6 +446,7 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >+ <div id="filters"> > > [% IF op == 'list' %] > <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get"> >@@ -446,25 +455,25 @@ > <h4>Fund filters</h4> > <ol> > <li> >- <label for="filter_budgetbranch2">Library: </label> >+ <p for="filter_budgetbranch2">Library: > <select name="filter_budgetbranch" id="filter_budgetbranch2"> > <option value=""></option> > [% PROCESS options_for_libraries libraries => Branches.all( selected => selected_branchcode, unfiltered => 1 ) %] >- </select> >+ </select></p> > </li> > <li class="radio"> > >- <label for="show_mine">Show my funds only:</label> >+ <p for="show_mine">Show my funds only: > [% 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 %] >+ [% END %]</p> > </li> > > [% IF periods %] > <li> >- <label for="periods">Budget:</label> >+ <p for="periods">Budget: > <select id="periods" name="budget_period_id"> > <option value="">All budgets</option> > [% FOR period IN periods %] >@@ -474,17 +483,18 @@ > <option value="[% period.budget_period_id | html %]">[% period.budget_period_description | html %]</option> > [% END %] > [% END %] >- </select> >+ </select></p> > </li> > [% END %] > </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 %] > > [% INCLUDE 'acquisitions-menu.inc' %] >+ </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >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..0070a73e54 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"> >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..6fae38b743 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"> >@@ -164,9 +172,9 @@ > > <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" /> >+ <input type="hidden" name="op" class="principal" value="save" /> > <fieldset class="action"><input type="submit" value="Save"/></fieldset> > [% END %] > >@@ -197,6 +205,7 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >+ <div id="filters"> > > <form method="post" action="/cgi-bin/koha/admin/aqplan.pl"> > <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> >@@ -212,7 +221,7 @@ > [% END %] > <ol> > <li> >- <label for="authcat"> Select planning type:</label> >+ <p for="authcat"> Select planning type: > <select name="authcat" id="authcat"> > [% FOREACH value IN authcat_dropbox.values %] > [% IF ( value == authcat_dropbox.default ) %] >@@ -221,38 +230,38 @@ > <option value="[% value | html %]">[% PROCESS planning_types type=value %]</option> > [% END %] > [% END %] >- </select> >+ </select></p> > </li> >- <li class="radio"> >+ <li class="radio"><p 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</p> > </li> > >- <li class="radio"> >+ <li class="radio"><p 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</p> > </li> > > >- <li class="radio"> >+ <li class="radio"><p 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</p> > </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> >@@ -262,8 +271,8 @@ > <fieldset class="brief"> > <h4>Export</h4> > <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> >+ <li><p for="basename">Output to a file named: <input type="text" name="basename" id="basename" value="Export" /></p></li> >+ <li><p class="inline" for="MIME">Into an application > <select name="MIME" id="MIME"> > [% FOREACH value IN CGIextChoice %] > <option value="[% value | html %]">[% value | html %]</option> >@@ -273,10 +282,10 @@ > [% FOREACH value IN CGIsepChoice %] > <option value="[% value | html %]">[% value | html %]</option> > [% END %] >- </select> >+ </select></p> > </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> >@@ -287,6 +296,7 @@ > [% END %] > > [% INCLUDE 'acquisitions-menu.inc' %] >+ </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >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..2905ad1198 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,13 +40,14 @@ > <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="pat" 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"> > <legend><h1><span class="create-alert">Add new alert</span><span class="edit-alert">Edit alert</span></h1></legend> >+ <h3><span class="create-alert">Add new alert</span><span class="edit-alert">Edit alert</span></h3> > > <input id="id" name="id" type="hidden" value="" /> > <ol> >@@ -78,15 +87,15 @@ > </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"> >- <h1>Audio alerts</h1> >+ <h2>Audio alerts</h2> > [%IF !( Koha.Preference('AudioAlerts') ) %] > <div class="dialog alert"> > <h3>Audio alerts are disabled</h3> >@@ -97,6 +106,7 @@ > [% END %] > </div> > [% END %] >+ <div id="searchresults"> > <table id="audio-alerts-table"> > <thead id="audio-alerts-table-head"> > <tr> >@@ -134,16 +144,17 @@ > <td>[% a.selector | html %]</td> > <td>[% a.sound | html %]</td> > <td> >- <a class="btn btn-default btn-xs edit" data-soundid="[% a.id | html %]" data-precedence="[% a.precedence | html %]" data-selector="[% a.selector | html %]" data-sound="[% a.sound | html %]"><i class="fa fa-pencil"></i> Edit</a></td> >+ <a class="btn btn-default btn-xs edit" data-soundid="[% a.id | html %]" data-precedence="[% a.precedence | html %]" data-selector="[% a.selector | html %]" data-sound="[% a.sound | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a></td> > </tr> > [% END %] > </tbody> > </table> >+ </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> >+ </div> > </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 67222253cc..027f22f961 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 04c7c87731..342881a859 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"> >@@ -102,11 +110,11 @@ > <main> > > [% IF op == 'add_form' %] >- <h1> >+ <h2> > [% IF ( action_modify ) %]Modify authorized value[% END %] > [% IF ( action_add_value ) %]New authorized value[% END %] > [% IF ( action_add_category ) %]New category[% END %] >- </h1> >+ </h2> > > [% IF ( action_modify ) %] > <div class="note"> >@@ -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="pat" 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="pat" 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 ) %] >@@ -303,8 +312,8 @@ > </div> > [% END # /FOR m IN messages %] > >+ <div id="searchresults"> > [% IF ( searchfield ) %] >- > <form action="/cgi-bin/koha/admin/authorised_values.pl" method="get" id="category"> > <p> > <label for="category_search">Show category: </label> >@@ -360,8 +369,8 @@ > No limitation > [% END # /IF loo.branches.size > 0 %] > </td> >- <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&id=[% loo.id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/authorised_values.pl?op=delete&searchfield=[% searchfield | uri %]&id=[% loo.id | uri %]"><i class="fa fa-trash"></i> Delete</a></td> >+ <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&id=[% loo.id | uri %]" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/authorised_values.pl?op=delete&searchfield=[% searchfield | uri %]&id=[% loo.id | uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a></td> > </tr> > [% END # /FOREACH loop %] > </tbody> >@@ -372,13 +381,13 @@ > <form action="/cgi-bin/koha/admin/authorised_values.pl" method="get"> > <input type="hidden" name="op" value="add_form" /> > <input type="hidden" name="category" value="[% category.category_name | html %]" /> >- <button type="submit"><i class="fa fa-plus"></i> Add a new authorized value</button> >+ <button type="submit" id="lientype"><i class="fa fa-plus"></i> Add a new authorized value</button> > </form> > [% UNLESS category.is_system %] > <form id="delete_category" action="/cgi-bin/koha/admin/authorised_values.pl" method="post"> > <input type="hidden" name="op" value="delete_category" /> > <input type="hidden" name="category_name" value="[% category.category_name | html %]" /> >- <button type="submit"><i class="fa fa-plus"></i> Delete category '[% category.category_name | html %]' </button> >+ <button type="submit" id="lientype"><i class="fa fa-plus"></i> Delete category '[% category.category_name | html %]' </button> > </form> > [% END %] > </div> >@@ -408,7 +417,7 @@ > [% END # /FOR c %] > </tbody> > </table> <!-- /#categoriest --> >- >+ </div> > [% 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 bb4e979402..f432f29a84 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"> >@@ -91,15 +99,13 @@ Authority types › Administration › Koha > [% IF op == 'add_form' %] > <form action="/cgi-bin/koha/admin/authtypes.pl" name="Aform" method="post" class="validated"> > <fieldset class="rows"> >- <legend> >- <h1> >+ <h3> > [% IF authority_type.authtypecode.defined %] > Modify authority type > [% ELSE %] > New authority type > [% END %] >- </h1> >- </legend> >+ </h3> > <ol> > <li> > [% IF authority_type.authtypecode.defined %] >@@ -133,11 +139,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 +169,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="pat" 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> >+ <div id="searchresults"> > <table id="authtypes"> > <thead> > <tr> >@@ -254,6 +262,7 @@ Authority types › Administration › Koha > [% END %] > <tbody> > </table> >+ </div> > [% 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..00365caf94 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" %] > >@@ -157,6 +165,7 @@ > <h1>Background jobs</h1> > > [% IF jobs.count %] >+ <div id="searchresults"> > <table id="table_background_jobs"> > <thead> > <tr> >@@ -185,15 +194,16 @@ > <td>[% job.started_on| $KohaDates with_hours = 1 %]</td> > <td>[% job.ended_on| $KohaDates with_hours = 1 %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job.id | html %]"><i class="fa fa-eye"></i> View</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job.id | html %]" id="lientype"><i class="fa fa-eye"></i> View</a> > [% IF job.status == 'new' || job.status == 'started' %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=cancel&id=[% job.id | html %]"><i class="fa fa-trash"></i> Cancel</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=cancel&id=[% job.id | html %]" id="lientype"><i class="fa fa-trash"></i> Cancel</a> > [% END %] > </td> > </tr> > [% END %] > </tbody> > </table> >+ </div> > [% ELSE %] > <div class="dialog message"> > There are no background jobs yet. >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..093680ba74 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="pat" 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> > >+<div id="searchresults"> > <table id="table_biblio_frameworks"> > <thead> > <tr> >@@ -174,7 +184,7 @@ MARC frameworks › Administration › Koha > <td>Default framework</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" id="frameworkactions[% loo.frameworkcode | html %]" role="button" data-toggle="dropdown" href="#" id=""lientype"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode | html %]"> >@@ -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" id="lientype" 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 %]"> >@@ -308,6 +318,7 @@ MARC frameworks › Administration › Koha > > [% END %] > </table> >+</div> > > [% 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..fa3874fdd6 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,8 +13,7 @@ > </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> >@@ -26,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"> >@@ -33,7 +42,7 @@ > <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,13 +51,14 @@ > </form> > > <p class="help">Check the boxes for the libraries you allow your items to be transferred to.</p> >+<div id="searchresults"> > <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> > | > <a id="UncheckAll" href="#"><i class="fa fa-remove"></i> Clear all</a> > | >- <a href="/cgi-bin/koha/admin/transfer_limits.pl">Switch to advanced editor</a> >+ <a href="/cgi-bin/koha/admin/transfer_limits.pl" id="lientype">Switch to advanced editor</a> > </fieldset> > > >@@ -99,10 +109,11 @@ > <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> >+ </div> > </div> > > </main> >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 eb3b8f92a3..228dd3c874 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,8 +21,7 @@ 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> >@@ -66,6 +68,12 @@ Libraries › 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"> >@@ -119,14 +127,16 @@ Libraries › Administration › Koha > > [% IF op == 'list' %] > <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> >- </div> >+ <div> >+ <a class="pat" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> New library</a> >+ </div></div> > [% END %] > >+<div id="searchresults"> > [% IF op == 'add_form' %] > <h1>[% IF library %]Modify library[% ELSE %]New library[% END %]</h1> > <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" /> >@@ -155,7 +165,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> >@@ -171,7 +181,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> >@@ -280,7 +290,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> >@@ -323,6 +333,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 %] >+</div> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >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..1ed17ec8ca 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,8 +21,7 @@ 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> >@@ -65,6 +67,12 @@ Cash registers › 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"> >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 ca6ba5c44c..cfe66cde2b 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,8 +18,7 @@ > </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> >@@ -84,6 +86,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"> >@@ -119,9 +127,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 +151,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> >@@ -410,7 +417,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"> >@@ -419,9 +425,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 %] > >@@ -509,10 +516,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="pat" 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> >+ <h2>Patron categories</h2> >+ <div id="searchresults"> > [% IF searchfield %] > You searched for [% searchfield | html %]</span> > [% END %] >@@ -673,8 +682,8 @@ > [% END %] > </td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=add_form&categorycode=[% category.categorycode |uri %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&categorycode=[% category.categorycode |uri %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=add_form&categorycode=[% category.categorycode |uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&categorycode=[% category.categorycode |uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -683,6 +692,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 %] >+ </div> > [% 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..758c4c813a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.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>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> >@@ -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"> >@@ -36,7 +44,7 @@ > <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 feea946e9e..a4013d50ea 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,8 +22,7 @@ > </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> >@@ -63,6 +65,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"> >@@ -95,9 +103,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 +134,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,8 +177,9 @@ > [% 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="pat" 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 %] >@@ -178,6 +187,7 @@ > [% END %] > > [% IF cities_count > 0 %] >+ <div id="searchresults"> > <div class="table_cities_table_controls"></div> > <table id="table_cities"> > <thead> >@@ -191,9 +201,10 @@ > </tr> > </thead> > </table> >+ </div> > [% ELSE %] > <div class="dialog message"> >- There are no cities defined. <a href="/cgi-bin/koha/admin/cities.pl?op=add_form">Create a new city</a>. >+ There are no cities defined. <a href="/cgi-bin/koha/admin/cities.pl?op=add_form" id="lientype">Create a new city</a>. > </div> > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >index b2fbe881bd..8c84441293 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,8 +36,7 @@ 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> >@@ -96,6 +98,12 @@ Classification sources › Administration › Koha > [% 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"> >@@ -205,11 +213,11 @@ 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 %] > >@@ -251,10 +259,10 @@ Classification sources › Administration › Koha > <span class="required">Required</span> > </li> > </ol> >- </fieldset> > <fieldset class="action"> >- <input type="submit" value="Save" /> >- <a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a> >+ <input type="submit" class="principal" value="Save" /> >+ <a class="c >+ </fieldset>ancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a> > </fieldset> > </form> > [% END %] >@@ -325,23 +333,25 @@ 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> >-</div> >-<h1>Classification configuration</h1> >-<h2>Classification sources</h2> >+<div> >+ <a class="pat" id="newsource" href="[% script_name | url %]?op=add_source"><i class="fa fa-plus"></i> New classification source</a> >+ <a class="pat" id="newrule" href="[% script_name | url %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a> >+ <a class="pat" id="newrule" href="[% script_name | url %]?op=add_split_rule"><i class="fa fa-plus"></i> New splitting rule</a> >+</div></div> >+<h2>Classification configuration</h2> >+<div id="searchresults"> >+<h3>Classification sources</h3> > <table> > <tr> > <th>Code</th> >@@ -359,14 +369,16 @@ Classification sources › Administration › Koha > <td>[% class_source.class_sort_rule | html %]</td> > <td>[% class_source.class_split_rule | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=add_source&cn_source=[% class_source.cn_source | uri %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs delete_class_source" href="[% script_name | url %]?op=delete_source_confirmed&cn_source=[% class_source.cn_source | uri%]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=add_source&cn_source=[% class_source.cn_source | uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete_class_source" href="[% script_name | url %]?op=delete_source_confirmed&cn_source=[% class_source.cn_source | uri%]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >+</div> > >-<h2>Classification filing rules</h2> >+<div id="searchresults"> >+<h3>Classification filing rules</h3> > <table> > <tr> > <th>Code</th> >@@ -380,14 +392,16 @@ Classification sources › Administration › Koha > <td>[% rule.description |html | html %]</td> > <td>[% rule.sort_routine | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% script_name | html %]?op=add_sort_rule&class_sort_rule=[% rule.class_sort_rule |url %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs delete_sort_rule" href="[% script_name | html %]?op=delete_sort_rule&class_sort_rule=[% rule.class_sort_rule |url %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% script_name | html %]?op=add_sort_rule&class_sort_rule=[% rule.class_sort_rule |url %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete_sort_rule" href="[% script_name | html %]?op=delete_sort_rule&class_sort_rule=[% rule.class_sort_rule |url %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >+</div> > >-<h2>Classification splitting rules</h2> >+<div id="searchresults"> >+<h3>Classification splitting rules</h3> > <table> > <tr> > <th>Code</th> >@@ -401,12 +415,13 @@ Classification sources › Administration › Koha > <td>[% rule.description | html %]</td> > <td>[% rule.split_routine | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=add_split_rule&class_split_rule=[% rule.class_split_rule | uri %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs delete_split_rule" href="[% script_name | url %]?op=delete_split_rule&class_split_rule=[% rule.class_split_rule | uri %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=add_split_rule&class_split_rule=[% rule.class_split_rule | uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete_split_rule" href="[% script_name | url %]?op=delete_split_rule&class_split_rule=[% rule.class_split_rule | uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >+</div> > > > [% 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 fa260548e2..0274eb6377 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,13 +2,15 @@ > [% 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> >@@ -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"> >@@ -45,7 +53,7 @@ > [% ELSE %] > <div class="dialog message"><p>The rules have been cloned.</p></div> > [% END %] >- <a href="/cgi-bin/koha/admin/smart-rules.pl">Return to circulation and fine rules</a> >+ <a href="/cgi-bin/koha/admin/smart-rules.pl" id="lientype">Return to circulation and fine rules</a> > [% ELSE %] > > <p class="help">Use carefully! If the destination library already has circulation and fine rules, they will be deleted without warning!</p> >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 0b4d54ecaa..7672c01452 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,8 +180,7 @@ > > <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> >@@ -193,6 +195,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/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >index 6bdcb18ea4..90bd8fe4a4 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,8 +22,7 @@ > </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> >@@ -53,6 +55,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"> >@@ -143,22 +151,24 @@ > [% 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="pat" 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> > [% IF credit_types.count %] >+ <div id="searchresults"> > <table id="table_credit_types"> > <thead> > <th>Archived</th> >@@ -198,20 +208,21 @@ > </td> > <td class="actions"> > [% IF !credit_type.archived %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form&code=[% credit_type.code | uri %]&type=credit"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form&code=[% credit_type.code | uri %]&type=credit" id="lientype"><i class="fa fa-pencil"></i> Edit</a> > [% END %] > [% IF !credit_type.is_system && !credit_type.archived %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=archive&code=[% credit_type.code | uri %]"><i class="fa fa-archive"></i> Archive</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=archive&code=[% credit_type.code | uri %]" id="lientype"><i class="fa fa-archive"></i> Archive</a> > [% END %] > > [% IF !credit_type.is_system && credit_type.archived %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=unarchive&code=[% credit_type.code | uri %]"><i class="fa fa-undo"></i> Restore</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=unarchive&code=[% credit_type.code | uri %]" id="lientype"><i class="fa fa-undo"></i> Restore</a> > [% END %] > </td> > </tr> > [% END %] > </tbody> > </table> >+ </div> > [% ELSE %] > <div class="dialog message"> > There are no account credit types defined. >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..04e6b0656e 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,8 +16,7 @@ > </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> >@@ -55,6 +57,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"> >@@ -64,8 +72,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="pat" 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 %] >@@ -96,15 +105,13 @@ > <form action="/cgi-bin/koha/admin/currency.pl" name="Aform" method="post" class="validated"> > <input type="hidden" name="op" value="add_validate" /> > <fieldset class="rows"> >- <legend> >- <h1> >- [% IF currency %] >- <span>Modify currency</span> >- [% ELSE %] >- <span>New currency</span> >- [% END %] >- </h1> >- </legend> >+ <h3> >+ [% IF currency %] >+ Modify currency >+ [% ELSE %] >+ New currency >+ [% END %] >+ </h3> > <ol> > <li> > [% IF currency %] >@@ -149,12 +156,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 %] >@@ -177,7 +184,8 @@ > </div> > [% ELSE %] > <div class="dialog alert"> >- <h1>Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</h1> >+ >+ <h3>Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</h3> > <table> > <tr><th>Currency</th> > <td>[% currency.currency | html %]</td> >@@ -186,6 +194,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 %]" /> >@@ -210,6 +219,8 @@ > You searched for [% searchfield | html %]</span> > [% END %] > >+ <div id="searchresults"> >+ > <table id='currencies-table'> > <thead> > <tr> >@@ -234,13 +245,14 @@ > <td style="color:green;">[% IF currency.active %]â[% END %]</td> > <td>[% IF currency.archived %]Yes[% END %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=add_form&currency_code=[% currency.currency | html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=delete_confirm&currency_code=[% currency.currency | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=add_form&currency_code=[% currency.currency | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=delete_confirm&currency_code=[% currency.currency | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </tbody> > </table> >+ </div> > > <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 2b3e3fc7ba..0e6eb5b52c 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,8 +20,7 @@ > </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> >@@ -51,6 +53,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"> >@@ -134,22 +142,24 @@ > <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="pat" 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> > [% IF debit_types.count %] >+ <div id="searchresults"> > <table id="table_debit_types"> > <thead> > <th>Archived</th> >@@ -199,16 +209,17 @@ > </td> > <td class="actions"> > [% IF !debit_type.is_system && !debit_type.archived %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form&code=[% debit_type.code | uri %]&type=debit"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=archive&code=[% debit_type.code | uri %]"><i class="fa fa-archive"></i> Archive</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form&code=[% debit_type.code | uri %]&type=debit" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=archive&code=[% debit_type.code | uri %]" id="lientype"><i class="fa fa-archive"></i> Archive</a> > [% ELSIF debit_type.archived %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=unarchive&code=[% debit_type.code | uri %]"><i class="fa fa-undo"></i> Restore</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=unarchive&code=[% debit_type.code | uri %]" id="lientype"><i class="fa fa-undo"></i> Restore</a> > [% END %] > </td> > </tr> > [% END %] > </tbody> > </table> >+ </div> > [% ELSE %] > <div class="dialog message"> > There are no account debit types defined. <a href="/cgi-bin/koha/admin/debit_types.pl?op=add_form">Create new debit type</a> >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..45a9254c25 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,8 +22,7 @@ > </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> >@@ -63,6 +65,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/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >index 0d48c25b8b..e9789bd530 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% BLOCK pluginlist %] > <div class="pluginlist"> > [% FOREACH plugin IN plugins %] >@@ -28,8 +31,7 @@ > </head> > > <body id="admin_didyoumean" class="admin"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'prefs-admin-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -45,6 +47,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/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >index 4e37967413..f7b0222253 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,8 +20,7 @@ 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> >@@ -65,6 +67,12 @@ EDI accounts › 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"> >@@ -80,12 +88,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="pat" 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 %] >@@ -95,15 +100,13 @@ EDI accounts › Administration › Koha > <input type="hidden" name="id" value="[% account.id | html %]" /> > [% END %] > <fieldset class="rows"> >- <legend> >- <h1> >- [% IF account %] >- Modify account >- [% ELSE %] >- New account >- [% END %] >- </h1> >- </legend> >+ <h3> >+ [% IF account %] >+ Modify account >+ [% ELSE %] >+ New account >+ [% END %] >+ </h3> > > <ol> > <li> >@@ -260,11 +263,11 @@ EDI accounts › Administration › Koha > </div> > </li> > </ol> >- </fieldset> >- > <fieldset class="action"> >- <input type="submit" value="Submit" /> >- <a href="/cgi-bin/koha/admin/edi_accounts.pl" class="cancel">Cancel</a> >+ <input type="submit" class="principal" value="Submit" /> >+ <a href="/ >+ </fieldset> >+cgi-bin/koha/admin/edi_accounts.pl" class="cancel">Cancel</a> > </fieldset> > </form> > >@@ -302,6 +305,8 @@ EDI accounts › Administration › Koha > [% IF ( ediaccounts ) %] > <h1>Vendor EDI accounts</h1> > >+<div id="searchresults"> >+ > <table> > <tr> > <th>ID</th> >@@ -370,11 +375,12 @@ EDI accounts › Administration › Koha > <td>No</td> > [% END %] > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form&id=[% account.id | html %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=delete_confirm&id=[% account.id | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form&id=[% account.id | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=delete_confirm&id=[% account.id | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >+ </div> > [% ELSE %] > <div class="dialog message"> > There are no EDI accounts. >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..00dcb55878 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,8 +19,7 @@ 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> >@@ -60,6 +62,12 @@ Library EANs › 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"> >@@ -68,12 +76,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="pat" 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 %] >@@ -85,15 +90,13 @@ Library EANs › Administration › Koha > [% END %] > > <fieldset class="rows"> >- <legend> >- <h1> >- [% IF ean %] >- Modify EAN >- [% ELSE %] >- New EAN >- [% END %] >- </h1> >- </legend> >+ <h3> >+ [% IF ean %] >+ Modify EAN >+ [% ELSE %] >+ New EAN >+ [% END %] >+ </h3> > > <ol> > <li> >@@ -134,12 +137,12 @@ 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 %] > >@@ -160,6 +163,8 @@ Library EANs › Administration › Koha > [% IF display %] > <h1>Library EANs</h1> > [% IF ( eans ) %] >+ <h2>Library EANs</h2> >+ <div id="searchresults"> > <table> > <tr> > <th>Library</th> >@@ -185,12 +190,13 @@ Library EANs › Administration › Koha > [% END %] > </td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&id=[% ean.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&id=[% ean.id | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&id=[% ean.id | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&id=[% ean.id | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >+ </div> > [% ELSE %] > <div class="dialog message"> > There are no library EANs. >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..f1cd92fbab 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,8 +48,7 @@ > </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> >@@ -62,6 +64,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"> >@@ -70,7 +78,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 +115,8 @@ > </div> <!-- /.col-sm-6 --> > </div> <!-- /.row --> > >- <h2>Circulation alerts for [% Branches.GetName( branch ) || 'Default' | html %]</h2> >+ <div id="searchresults"> >+ <h3>Circulation alerts for [% Branches.GetName( branch ) || 'Default' | html %]</h3> > <p>Click on the grid to toggle the settings.</p> > > >@@ -168,7 +177,7 @@ > </div> > </div> <!-- /.tab-content --> > >- </div> <!-- /#alerttabs --> >+ </div> <!-- /#alerttabs --></div> > > > </main> >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..b0287ba711 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,14 +1,16 @@ > [% 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> >@@ -37,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> > > <div class="main container-fluid"> >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..1d4fafbff5 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,8 +11,7 @@ > </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> >@@ -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"> >@@ -33,8 +41,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="pat" 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"> >@@ -68,6 +77,8 @@ > <div id="search_fields_list"> > <h1>Item search fields</h1> > >+ <div id="searchresults"> >+ > <table id="search_fields_table"> > <thead> > <tr> >@@ -88,14 +99,14 @@ > <td>[% field.tagsubfield | html %]</td> > <td>[% field.authorised_values_category | html %]</td> > <td> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_field.pl?name=[% field.name | html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="field-delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_field.pl?name=[% field.name | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="field-delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </tbody> > </table> >- </div> >+ </div></div> > [% ELSE %] > <h1>Item search fields</h1> > <div class="dialog message"> >@@ -106,12 +117,15 @@ > <form id="add_field_form" action="/cgi-bin/koha/admin/items_search_fields.pl" method="POST"> > <fieldset class="rows"> > <legend><h1>Add a new field</h1></legend> >+ <h3>Add a new field</h3> > [% 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" /> > <a href="#" class="cancel hide_form">Cancel</a> >+ <input type="submit" class="principal" value="Submit" /> >+ <a href="#" class="cancel">Cancel</a> >+ </fieldset> > </fieldset> > </form> > >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 79763e85e3..e6723f9835 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,8 +50,7 @@ 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> >@@ -116,6 +118,12 @@ Item 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"> >@@ -124,8 +132,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="pat" 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,12 +161,11 @@ Item types › Administration › Koha > </div> > [% END %] > >- > [% IF op == 'add_form' %] > [% IF itemtype %] >- <h1>Modify item type</h1> >+ <h2>Modify item type</h2> > [% ELSE %] >- <h1>Add item type</h1> >+ <h2>Add item type</h2> > [% END %] > <form action="/cgi-bin/koha/admin/itemtypes.pl" name="Aform" method="post" id="itemtypeentry"> > <input type="hidden" name="op" value="add_validate" /> >@@ -426,18 +434,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> >+ <div id="searchresults"> >+ <h3>Delete item type '[% itemtype.itemtype | html %]'?</h3> > <table> > <tr> > <th scope="row">Item type</th> >@@ -462,12 +472,13 @@ Item types › Administration › Koha > <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> >+ </div></div> > [% END %] > > [% IF op == 'list' %] > <h1>Item types administration</h1> > [% IF itemtypes %] >+<div id="searchresults"> > <table id="table_item_type"> > <thead> > [% UNLESS Koha.Preference('noItemTypeImages') && Koha.Preference('OpacNoItemTypeImages') %]<th class="noExport">Image</th>[% END %] >@@ -585,12 +596,13 @@ Item types › Administration › Koha > </td> > <td>[% IF ( itemtype.automatic_checkin ) %]Yes[% ELSE %] [% END %]</td> > <td class="actions"> >- <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&itemtype=[% itemtype.itemtype | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >+ <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype | uri %]" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&itemtype=[% itemtype.itemtype | uri %]" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >+ </div> > [% ELSE %] > <div class="dialog message">There are no itemtypes defined</div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >index c3aa75586e..e403278594 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.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>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> >@@ -22,6 +24,12 @@ > <a href="#" aria-current="page">Koha to MARC mapping</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"> >@@ -29,7 +37,7 @@ > <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 +46,7 @@ > <div class="dialog alert">Failed to add mapping for [% error_info | html %]</div> > [% END %] > >+<div id="searchresults"> > <table id="kohafields"> > <thead><tr> > <th>Koha field</th> >@@ -55,8 +64,8 @@ > <td>[% loo.liblibrarian | html %]</td> > <td class="actions"> > [% IF !loo.readonly %] >- <a onclick="AddFld('[% loo.kohafield | html %]');" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</a> >- [% IF loo.tagfield %] <a onclick="RemFld('[% loo.tagfield | html %]','[% loo.tagsubfield | html %]');" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Remove</a> [% END %] >+ <a onclick="AddFld('[% loo.kohafield | html %]');" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> Add</a> >+ [% IF loo.tagfield %] <a onclick="RemFld('[% loo.tagfield | html %]','[% loo.tagsubfield | html %]');" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-remove"></i> Remove</a> [% END %] > [% END %] > </td> > </td> >@@ -64,6 +73,7 @@ > [% END %] > </tbody> > </table> >+</div> > > <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..69a9392ec4 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,8 +12,7 @@ > </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> >@@ -24,6 +26,12 @@ > <a href="#" aria-current="page">Library groups</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> > > [% FOR m IN messages %] >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..3a3211677b 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,8 +18,7 @@ > > </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> >@@ -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"> >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 7970d63051..079d3fa919 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,8 +39,7 @@ > </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> >@@ -103,6 +105,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> <!-- /#breadcrumbs --> > > <div class="main container-fluid"> >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 e73c986d33..175352399b 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,8 +25,7 @@ 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> >@@ -101,6 +103,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"> >@@ -109,11 +117,11 @@ 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="pat" 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 ) %] > >@@ -178,7 +186,7 @@ MARC frameworks › Administration › Koha > (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" /> >+ <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 +229,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 +251,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" /> >@@ -290,7 +298,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" id="lientype" 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> >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..4714a5cc69 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 >@@ -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 ( matching_rule_form ) %] >@@ -59,8 +62,7 @@ > </style> > </head> > <body id="admin_matching-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> >@@ -103,6 +105,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> <!-- /#breadcrumbs --> > > <div class="main container-fluid"> >@@ -154,8 +162,8 @@ > </ol> > </fieldset> <!-- /.rows --> > >- <fieldset class="rows" id="match_points"> >- <h4>Match points</h4> >+ <fieldset class="rows" id="match_points"> >+ <h3>Match points</h3> > [% IF ( edit_matching_rule ) %] > [% IF ( matchpoints ) %] > <p id="addMatchPoint" style="display:none;"> >@@ -173,8 +181,8 @@ > [% IF ( edit_matching_rule ) %] > [% FOREACH matchpoint IN matchpoints %] > <div id="mp_[% matchpoint.mp_num | html %]" class="matchgroup"> >- <fieldset class="rows"> >- <legend>Match point [% matchpoint.mp_num | html %] | <a href="#" class="button" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num | html %]', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend> >+ <fieldset> >+ <h3>Match point [% matchpoint.mp_num | html %] | <a href="#" class="button" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num | html %]', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></h3> > <ol> > <li> > <label for="mp_[% matchpoint.mp_num | html %]_search_index">Search index: </label> >@@ -186,8 +194,8 @@ > </li> > </ol> > [% FOREACH component IN matchpoint.components %] >- <fieldset class="rows" id="mp_[% matchpoint.mp_num | html %]_c_[% component.comp_num | html %]"> >- <legend>Matchpoint components</legend> >+ <fieldset id="mp_[% matchpoint.mp_num | html %]_c_[% component.comp_num | html %]"> >+ <h3>Matchpoint components</h3> > <ol> > <li> > <label for="mp_[% matchpoint.mp_num | html %]_c_[% component.comp_num | html %]_tag">Tag: </label> >@@ -224,8 +232,8 @@ > [% END # /FOREACH matchpoint %] > [% ELSE # IF ( edit_matching_rule ) %] > <div id="mp_1" class="matchgroup"> >- <fieldset class="rows"> >- <legend>Match point 1 | <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend> >+ <fieldset> >+ <h3>Match point 1 | <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></h3> > <ol> > <li> > <label for="mp_1_search_index">Search index: </label> >@@ -236,8 +244,8 @@ > <input type ="text" id="mp_1_score" name="mp_1_score" size="5" maxlength="5" /> > </li> > </ol> >- <fieldset class="rows" id="mp_1_c_1"> >- <legend>Matchpoint components</legend> >+ <fieldset id="mp_1_c_1"> >+ <h3>Matchpoint components</h3> > <ol> > <li> > <label for="mp_1_c_1_tag">Tag: </label> >@@ -261,34 +269,34 @@ > </li> > </ol> > </fieldset> <!-- /#mp_1_c_1 --> >- </fieldset> <!-- /.rows --> >+ </fieldset> > <br style="clear:both;" /> > </div> <!-- /#mp_1 --> > [% END # /IF ( edit_matching_rule ) %] > </fieldset> <!-- /#match_points --> > >- <fieldset class="rows" id="match_checks"> >- <h4>Required match checks</h4> >+ <fieldset class="rows" id="match_checks"> >+ <h3>Required match checks</h3> > [% IF ( edit_matching_rule ) %] > [% IF ( matchchecks ) %] > <p id="addMatchCheck" style="display:none;"> > [% ELSE %] > <p id="addMatchCheck"> > [% END %] >- <a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a></p> >+ <a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"> Add match check</a></p> > [% ELSE %] >- <p id="addMatchCheck" style="display:none;"><a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a></p> >+ <p id="addMatchCheck" style="display:none;"><a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"> Add match check</a></p> > [% END %] > > [% IF ( edit_matching_rule ) %] > [% FOREACH matchcheck IN matchchecks %] > <div id="mc_[% matchcheck.mc_num | html %]" class="matchgroup"> >- <fieldset class="rows"> >- <legend>Match check [% matchcheck.mc_num | html %]<a href="#" class="button" onclick="InsertMatchcheck('mc_[% matchcheck.mc_num | html %]', 'mc_template'); return false;">Add match check</a> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></legend> >+ <fieldset> >+ <h3>Match check [% matchcheck.mc_num | html %]<a href="#" class="button" onclick="InsertMatchcheck('mc_[% matchcheck.mc_num | html %]', 'mc_template'); return false;"> Add match check</a> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></h3> > <input type="hidden" id="mc_[% matchcheck.mc_num | html %]_id" name="mc_[% matchcheck.mc_num | html %]_id" value="1" /> > [% FOREACH src_component IN matchcheck.src_components %] >- <fieldset class="rows" id="mc_[% src_component.mc_num | html %]_src_c_[% src_component.comp_num | html %]"> >- <legend>Source (incoming) record check field</legend> >+ <fieldset id="mc_[% src_component.mc_num | html %]_src_c_[% src_component.comp_num | html %]"> >+ <h3>Source (incoming) record check field</h3> > <ol> > <li> > <label for="mc_[% src_component.mc_num | html %]_src_c_[% src_component.comp_num | html %]_tag">Tag: </label> >@@ -318,8 +326,8 @@ > [% END # /FOREACH src_component %] > > [% FOREACH tgt_component IN matchcheck.tgt_components %] >- <fieldset class="rows" id="mc_[% matchcheck.mc_num | html %]_tgt_c_[% tgt_component.comp_num | html %]"> >- <legend>Target (database) record check field</legend> >+ <fieldset id="mc_[% matchcheck.mc_num | html %]_tgt_c_[% tgt_component.comp_num | html %]"> >+ <h3>Target (database) record check field</h3> > <ol> > <li> > <label for="mc_[% matchcheck.mc_num | html %]_tgt_c_[% tgt_component.comp_num | html %]_tag">Tag: </label> >@@ -347,17 +355,17 @@ > </ol> > </fieldset> <!-- /#mc_[% matchcheck.mc_num | html %]_tgt_c_[% tgt_component.comp_num | html %] --> > [% END # /FOREACH tgt_component %] >- </fieldset> <!-- /.rows --> >+ </fieldset> > <br style="clear:both;" /> > </div> <!-- /#mc_[% matchcheck.mc_num | html %] --> > [% END # /FOREACH matchcheck %] > [% ELSE # IF ( edit_matching_rule ) %] > <div id="mc_1" class="matchgroup"> >- <fieldset class="rows"> >- <legend>Match check 1 | <a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></legend> >+ <fieldset> >+ <h3>Match check 1 | <a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></h3> > <input type="hidden" id="mc_1_id" name="mc_1_id" value="1" /> >- <fieldset class="rows" id="mc_1_src_c_1"> >- <legend>Source (incoming) record check field</legend> >+ <fieldset id="mc_1_src_c_1"> >+ <h3>Source (incoming) record check field</h3> > <ol> > <li> > <label for="mc_1_src_c_1_tag">Tag: </label> >@@ -382,8 +390,8 @@ > </ol> > </fieldset> > >- <fieldset class="rows" id="mc_1_tgt_c_1"> >- <legend>Target (database) record check field</legend> >+ <fieldset id="mc_1_tgt_c_1"> >+ <h3>Target (database) record check field</h3> > <ol> > <li> > <label for="mc_1_tgt_c_1_tag">Tag: </label> >@@ -407,19 +415,19 @@ > </li> > </ol> > </fieldset> <!-- /#mc_1_tgt_c_1 --> >- </fieldset> <!-- /.rows --> >+ </fieldset> > <br style="clear:both;" /> > </div> <!-- /#mc_1 --> >- [% END # /IF ( edit_matching_rule ) %] >- </fieldset> > <fieldset class="action"> > [% IF ( edit_matching_rule ) %] >- <input type="button" value="Save" onclick="CheckMatchingRuleForm(this.form)" /> >+ <input type="button" class="principal" value="Save" onclick="CheckMatchingRuleForm(this.form)" /> > [% ELSE %] >- <input type="button" value="Save" onclick="CheckMatchingRuleForm(this.form)" /> >+ <input type="button" class="principal" value="Save" onclick="CheckMatchingRuleForm(this.form)" /> > [% END %] > <a class="cancel" href="/cgi-bin/koha/admin/matching-rules.pl">Cancel</a> > </fieldset> <!-- /.action --> >+ [% END # /IF ( edit_matching_rule ) %] >+ </fieldset> <!-- /.rows --> > </form> > [% END # /IF ( matching_rule_form ) %] > >@@ -440,8 +448,9 @@ > [% IF ( display_list ) %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newrule" href="[% script_name | url %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a> >- </div> >+ <div> >+ <a class="pat" id="newrule" href="[% script_name | url %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a> >+ </div></div> > > <h1>Record matching rules</h1> > >@@ -455,6 +464,7 @@ > <div class="dialog message">Deleted record matching rule "[% deleted_matching_rule | html %]"</div> > [% END %] > [% IF ( available_matching_rules ) %] >+ <div id="searchresults"> > <table> > <tr> > <th>#</th> >@@ -468,12 +478,13 @@ > <td>[% available_matching_rule.code | html %]</td> > <td>[% available_matching_rule.description | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=edit_matching_rule&matcher_id=[% available_matching_rule.matcher_id | uri %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=delete_matching_rule&matcher_id=[% available_matching_rule.matcher_id | uri %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=edit_matching_rule&matcher_id=[% available_matching_rule.matcher_id | uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=delete_matching_rule&matcher_id=[% available_matching_rule.matcher_id | uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >+ </div> > [% ELSE %] > <p>There are no saved matching rules.</p> > [% END # /IF ( available_matching_rules ) %] >@@ -483,8 +494,8 @@ > > [% IF ( matching_rule_form ) %] > <div id="mp_template" class="matchgroup" style="display:none;"> >- <fieldset class="rows"> >- <legend>Match point <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend> >+ <fieldset> >+ <h3>Match point <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></h3> > <ol> > <li> > <label for="mp_num_search_index">Search index: </label> >@@ -495,8 +506,8 @@ > <input type ="text" id="mp_num_score" name="mp_num_score" size="5" maxlength="5" /> > </li> > </ol> >- <fieldset id="mp_num_c_1" class="rows"> >- <legend>Matchpoint components</legend> >+ <fieldset id="mp_num_c_1"> >+ <h3>Matchpoint components</h3> > <ol> > <li> > <label for="mp_num_c_1_tag">Tag: </label> >@@ -520,16 +531,16 @@ > </li> > </ol> > </fieldset> <!-- /#mp_num_c_1 --> >- </fieldset> <!-- /.rows --> >+ </fieldset> > <br style="clear:both;" /> > </div> <!-- /#mp_template --> > > <div id="mc_template" class="matchgroup" style="display:none"> >- <fieldset class="rows"> >- <legend>Match check <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></legend> >+ <fieldset> >+ <h3>Match check <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></h3> > <input type="hidden" id="mc_num_id" name="mc_num_id" value="1" /> >- <fieldset class="rows" id="mc_num_src_c_1"> >- <legend>Source (incoming) record check field</legend> >+ <fieldset id="mc_num_src_c_1"> >+ <h3>Source (incoming) record check field</h3> > <ol> > <li> > <label for="mc_num_src_c_1_tag">Tag: </label> >@@ -553,8 +564,8 @@ > </li> > </ol> > </fieldset> <!-- /#mc_num_src_c_1 --> >- <fieldset class="rows" id="mc_num_tgt_c_1"> >- <legend>Target (database) record check field</legend> >+ <fieldset id="mc_num_tgt_c_1"> >+ <h3>Target (database) record check field</h3> > <ol> > <li> > <label for="mc_num_tgt_c_1_tag">Tag: </label> >@@ -578,7 +589,7 @@ > </li> > </ol> > </fieldset> <!-- #mc_num_tgt_c_1 --> >- </fieldset> <!-- /.rows --> >+ </fieldset> > <br style="clear:both;" /> > </div> <!-- /#mc_template --> > [% END # /IF ( matching_rule_form ) %] >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..3058e960ed 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,14 +1,16 @@ > [% 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> >@@ -25,6 +27,12 @@ > <a href="#" aria-current="page">OAI set mappings</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/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >index 657284fd2e..a4e1e3cee7 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,8 +14,7 @@ > </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> >@@ -51,6 +53,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"> >@@ -90,19 +98,21 @@ > <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="pat" 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> > [% IF sets_loop %] >+ <div id="searchresults"> > <table> > <thead> > <tr> >@@ -133,9 +143,9 @@ > <a class="btn btn-default btn-xs dropdown-toggle" id="oaisetsactions[% set.id | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="oaisetsactions[% set.id | html %]"> >- <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&id=[% set.id | uri %]"><i class="fa fa-fw fa-pencil"></i> Edit</a></li> >- <li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&id=[% set.id | html %]"><i class="fa fa-fw fa-trash"></i> Delete</a></li> >- <li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id | uri %]"><i class="fa fa-fw fa-info"></i> Define mappings</a></li> >+ <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&id=[% set.id | uri %]" id="lientype"><i class="fa fa-fw fa-pencil"></i> Edit</a></li> >+ <li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&id=[% set.id | html %]" id="lientype"><i class="fa fa-fw fa-trash"></i> Delete</a></li> >+ <li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id | uri %]" id="lientype"><i class="fa fa-fw fa-info"></i> Define mappings</a></li> > </ul> > </div> > </td> >@@ -143,6 +153,7 @@ > [% END %] > </tbody> > </table> >+ </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..1a35ab0f9d 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,8 +13,7 @@ > > <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> >@@ -25,6 +27,12 @@ > <a href="#" aria-current="page">OverDrive library authnames</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/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >index 4535f1a351..92397df504 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,8 +25,7 @@ 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> >@@ -66,6 +68,12 @@ Patron attribute 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"> >@@ -241,11 +249,11 @@ 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 %] > >@@ -266,8 +274,10 @@ 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="pat" 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> > [% IF ( added_attribute_type ) %] >@@ -288,6 +298,7 @@ Patron attribute types › Administration › Koha > — it was already absent from the database.</div> > [% END %] > [% IF ( available_attribute_types ) %] >+<div id="searchresults"> > [% FOREACH attribute IN available_attribute_types %] > [% IF attribute.class %] > <h4>[% attribute.lib | html %]</h4> >@@ -340,8 +351,8 @@ Patron attribute types › Administration › Koha > [% END %] > </td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=edit_attribute_type&code=[% item.code | uri %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=delete_attribute_type&code=[% item.code | uri %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=edit_attribute_type&code=[% item.code | uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=delete_attribute_type&code=[% item.code | uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -350,6 +361,7 @@ Patron attribute types › Administration › Koha > [% END %] > [% ELSE %] > <p>There are no saved patron attribute types.</p> >+</div> > [% 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..301df49bd5 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,8 +17,7 @@ > [% 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> >@@ -31,6 +33,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"> >@@ -55,7 +63,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 +205,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 edfe3ec66f..30500f7e03 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 >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > [% PROCESS 'i18n.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Search engine configuration (Elasticsearch) › Administration › Koha</title> >@@ -13,8 +16,7 @@ a.add, a.delete { > </head> > > <body id="admin_searchengine_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> >@@ -30,6 +32,12 @@ a.add, a.delete { > </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> > > [% INCLUDE 'blocking_errors.inc' %] >@@ -69,7 +77,7 @@ a.add, a.delete { > </div> > [% END %] > >- <h1>Search engine configuration (Elasticsearch)</h1> >+ <h2>Search engine configuration (Elasticsearch)</h2> > > [% IF errors %] > <div class="dialog alert"> >@@ -114,12 +122,11 @@ a.add, a.delete { > </ol> > </div> > >- <form id="es_mappings" method="post"> >- <div id="tabs" class="toptabs"> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a href="#search_fields" data-tab="search_fields" aria-controls="search_fields" role="tab" data-toggle="tab" >Search fields</a> >- </li> >+ <form method="post"> >+ <div id=searchresults> >+ <div id="tabs" class="toptabs ui-tabs" style="clear:both"> >+ <ul> >+ <li><a href="#search_fields">Search fields</a></li> > [% FOREACH index IN indexes %] > [% SWITCH index.index_name %] > [% CASE 'biblios' %] >@@ -363,8 +370,17 @@ a.add, a.delete { > [% ELSE %] > <td><a class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td> > [% END %] >- </tr> >+ </select> >+ </td> >+ <td> >+ <input name="mapping_marc_field" type="text" value="[% mapping.marc_field | html %]" /> >+ </td> >+ [% IF mapping.search_field_mandatory %] >+ <td><a class="btn btn-default btn-xs delete mandatory" data-field_name="[% mapping.search_field_name | html %]" style="cursor: pointer;" id="lientype"><i class="fa fa-trash"></i> Delete</a></td> >+ [% ELSE %] >+ <td><a class="btn btn-default btn-xs delete" style="cursor: pointer;" id="lientype"><i class="fa fa-trash"></i> Delete</a></td> > [% END %] >+ </tr> > [% END %] > </tbody> > <tfoot> >@@ -423,11 +439,21 @@ a.add, a.delete { > </tfoot> > </table> > >- [% IF index.index_name == 'biblios' %] >- <h3>Facet order</h3> >- <div id="facet_[% index.index_name | html %]" class="ui-tabs-panel"> >- <table> >- <thead> >+ >+ [% IF index.index_name == 'biblios' %] >+ >+ <h3>Facet order</h3> >+ <div id="facet_[% index.index_name | html %]" class="ui-tabs-panel"> >+ <table> >+ <thead> >+ <tr> >+ <th>Search field</th> >+ <th>Label</th> >+ <th>Display</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH f IN facetable_fields %] > <tr> > <th>Search field</th> > <th>Label</th> >@@ -473,9 +499,10 @@ a.add, a.delete { > </div> <!-- /.tab-content --> > </div> <!-- /#tabs --> > <fieldset class="action"> >- <button class="btn btn-default" type="submit" name="op" value="edit"><i class="fa fa-hdd-o" aria-hidden="true"></i> Save</button> >- <button class="btn btn-default" type="submit" name="op" value="reset_confirm"><i class="fa fa-refresh" aria-hidden="true"></i> Reset mappings</button> >+ <button class="btn btn-default" type="submit" name="op" value="edit" id="lientype"><i class="fa fa-hdd-o" aria-hidden="true"></i> Save</button> >+ <button class="btn btn-default" type="submit" name="op" value="reset_confirm" id="lientype"><i class="fa fa-refresh" aria-hidden="true"></i> Reset mappings</button> > </fieldset> >+ </div> > </form> > > </main> >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..f7b352aecf 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,8 +11,7 @@ > </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> >@@ -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"> >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 62e2f5639a..2b73810ef0 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 >@@ -7,6 +7,9 @@ > [% USE ItemTypes %] > [% USE CirculationRules %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'prefs-admin-search.inc' %] >+[% END %] > > [% SET branchcode = humanbranch || undef %] > >@@ -28,8 +31,7 @@ > </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> >@@ -45,6 +47,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"> >@@ -52,13 +60,13 @@ > <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> >@@ -93,12 +101,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"> >+ <div id="searchresults"> > <input type="hidden" name="op" value="add" /> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> > <table id="default-circulation-rules"> >@@ -219,8 +228,8 @@ > [% END %] > </td> > <td class="actions"> >- <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% i || '*' | html %]&categorycode=[% c || '*' | html %]&branch=[% current_branch | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a href="#" class="editrule btn btn-default btn-xs" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% i || '*' | html %]&categorycode=[% c || '*' | html %]&branch=[% current_branch | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > <td> > [% IF note.defined && note != '' %] >@@ -373,8 +382,8 @@ > <td>[% recall_shelf_time | html %]</td> > [% END %] > <td class="actions"> >- <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% i || '*' | uri %]&categorycode=[% c || '*' | uri %]&branch=[% current_branch | uri %]"><i class="fa fa-trash"></i> Delete</a> >+ <a href="#" class="editrule btn btn-default btn-xs" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% i || '*' | uri %]&categorycode=[% c || '*' | uri %]&branch=[% current_branch | uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -412,8 +421,8 @@ > </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 name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button> >+ <button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-save"></i> Save</button> >+ <button name="cancel" class="clear_edit btn btn-default btn-xs" id="lientype"><i class="fa fa-undo"></i> Clear</button> > </td> > <td><input type="text" name="note" id="note" size="15" value="" maxlength="100"></td> > <td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td> >@@ -516,7 +525,7 @@ > [% END %] > <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" id="lientype"><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> > </tr> >@@ -573,9 +582,11 @@ > </tfoot> > </tbody> > </table> >+ </div> > </form> > </div> > <div id="defaults-for-this-library" class="container"> >+ <div id=searchresults> > <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"> >@@ -746,7 +757,7 @@ > </select> > </td> > <td class="actions"> >- <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" id="lientype"><i class="fa fa-save"></i> Save</button> > [% IF ( default_checkout_hold_and_return_policy ) %] > <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&categorycode=*&branch=[% current_branch | html %]" id="unset"><i class="fa fa-undo"></i> Unset</a> > [% END %] >@@ -754,9 +765,10 @@ > </tr> > </table> > </form> >- </div> >+ </div></div> > [% IF ( show_branch_cat_rule_form ) %] > <div id="holds-policy-by-patron-category" class="container"> >+ <div id=searchresults> > <h3>[% IF humanbranch %]Checkout, hold policy by patron category for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default checkout, hold policy by patron category[% END %]</h3> > <p>For this library, you can specify the maximum number of loans that > a patron of a given category can make, regardless of the item type. >@@ -829,15 +841,16 @@ > <td><input name="patron_maxissueqty" size="3" type="text" /></td> > <td><input name="patron_maxonsiteissueqty" size="3" type="text" /></td> > <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> >+ <td class="actions"><button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> Add</td> > </tr> > </table> > </form> >- </div> >+ </div></div> > [% END %] > > [% IF Koha.Preference('ArticleRequests') %] > <div id="open-article-requests-limit-patron-category" class="container"> >+ <div id=searchresults> > [% IF humanbranch %] > <h3>Daily open article requests limit for [% Branches.GetName( humanbranch ) | html %]</h3> > [% ELSE %] >@@ -889,8 +902,9 @@ > </tr> > </table> > </form> >- </div> >+ </div></div> > <div id="article-request-fee-category" class="container"> >+ <div id=searchresults> > [% IF humanbranch %] > <h3>Article request fees for [% Branches.GetName( humanbranch ) | html %]</h3> > [% ELSE %] >@@ -943,15 +957,16 @@ > </select> > </td> > <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> >+ <td class="actions"><button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> Add</td> > </tr> > </table> > </form> >- </div> >+ </div></div> > > [% END %] > > <div id="refund-lost-item-fee-on-return" class="container"> >+ <div id=searchresults> > [% IF current_branch == '*' %] > <h3>Default lost item fee refund on return policy</h3> > [% ELSE %] >@@ -1047,15 +1062,16 @@ > </select> > </td> > <td class="actions"> >- <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" id="lientype"><i class="fa fa-save"></i> Save</button> > </td> > </td> > </tr> > </table> > </form> >- </div> >+ </div></div> > > <div id="holds-policy-by-item-type" class="container"> >+ <div id=searchresults> > <h3>[% IF humanbranch %]Holds policy by item type for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default holds policy by item type[% END %]</h3> > <p> > For this library, you can edit rules for given itemtypes, regardless >@@ -1181,11 +1197,11 @@ > <option value="noreturn">Item floats</option> > </select> > </td> >- <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</button></td> >+ <td class="actions"><button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> Add</button></td> > </tr> > </table> > </form> >- </div> >+ </div></div> > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> > >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..321b400223 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,14 +1,16 @@ > [% 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> >@@ -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"> >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 7a39d63ed1..5acbac5ad7 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,8 +16,7 @@ > </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> >@@ -53,6 +55,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"> >@@ -135,11 +143,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 +225,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="pat" 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 +254,7 @@ > </div> > > [% IF servers_count > 0 %] >+ <div id="searchresults"> > <table id="smtp_servers"> > <thead> > <tr> >@@ -259,6 +268,7 @@ > </tr> > </thead> > </table> >+ </div> > [% 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..38f7fe5937 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,8 +29,7 @@ > </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> >@@ -97,6 +99,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"> >@@ -110,13 +118,10 @@ > [% ELSE %] > <form action="[% script_name | html %]" name="Aform" method="post"> > [% END %] >- <fieldset class="rows"><legend> >- <h1> >+ <fieldset class="rows"><h3> > [% IF ( modify ) %]Modify > [% ELSE %]Add >- [% END %] a system preference >- </h1> >- </legend><ol> >+ [% END %] a system preference</h3><ol> > <li><label for="explanation">Explanation: </label><input type="text" name="explanation" id="explanation" size="60" value="[% explanation | html %]" /><input type="hidden" name="op" value="add_validate" /></li> > <li>[% IF ( searchfield ) %]<span class="label">Variable: </span>[% searchfield | html %]<input type="hidden" name="variable" value="[% searchfield | html %]" /> > [% ELSE %]<label for="variable">Variable: </label><input type="text" name="variable" id="variable" size="60" />[% END %]</li> >@@ -207,17 +212,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 +327,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="pat" 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> >+ <div id="searchresults"> > <table> > [% ELSE %] >- <h1>Local use preferences</h1> >+ <h2>Local use preferences</h2> >+ <div id="searchresults"> > <table width="80%" id="sysprefst"> > <thead><tr> > <th>Preference</th> >@@ -337,6 +346,7 @@ > <th>Value</th> > <th class="noExport">Actions</th> > </tr></thead> >+ > [% END %] > <tbody>[% FOREACH loo IN loop %] > <tr> >@@ -446,14 +456,15 @@ > <input type="hidden" name="prefoptions" value="[% loo.prefoptions | html %]" /> > <input type="hidden" name="preftype" value="[% loo.type | html %]" /> > <input type="hidden" name="explanation" value="[% loo.explanation | 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" id="lientype"><i class="fa fa-save"></i> Save</button> > </form> > </td> > >- <td class="actions"><a class="btn btn-default btn-xs" href="[% loo.edit | url %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.delete | url %]"><i class="fa fa-trash"></i> Delete</a></td> >+ <td class="actions"><a class="btn btn-default btn-xs" href="[% loo.edit | url %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.delete | url %]" id="lientype"><i class="fa fa-trash"></i> Delete</a></td> > </tr> > [% END %]</tbody> > </table> >+ </div> > > [% 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..960614a9fa 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,8 +19,7 @@ > [% 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> >@@ -32,13 +34,19 @@ > </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"> > <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" %] >@@ -84,8 +92,8 @@ > <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 uncheck-all-col limit-action" data-to="[% to.branchcode | html %]" href="#"><i class="fa fa-remove"></i> Uncheck</a></p> >+ <p><a class="btn btn-default btn-xs check-all-col limit-action" data-to="[% to.branchcode | html %]" href="#" id="lientype"<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="#" id="lientype"><i class="fa fa-remove"></i> Uncheck</a></p> > </td> > [% END %] > </tr> >@@ -103,8 +111,8 @@ > [% FOREACH from IN branches %] > <tr> > <td> >- <p><a class="btn btn-default btn-xs check-all-row limit-action" data-from="[% from.branchcode | html %]" href="#"><i class="fa fa-check"></i> Check</a></p> >- <p><a class="btn btn-default btn-xs uncheck-all-row limit-action" data-from="[% from.branchcode | html %]" href="#"><i class="fa fa-remove"></i> Uncheck</a></p> >+ <p><a class="btn btn-default btn-xs check-all-row limit-action" data-from="[% from.branchcode | html %]" href="#" id="lientype"><i class="fa fa-check"></i> Check</a></p> >+ <p><a class="btn btn-default btn-xs uncheck-all-row limit-action" data-from="[% from.branchcode | html %]" href="#" id="lientype"><i class="fa fa-remove"></i> Uncheck</a></p> > </td> > <th>[% from.branchname | html %]</th> > [% FOREACH to IN branches %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >index 4d3a813fc2..ccaff55fa8 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,8 +16,7 @@ > </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> >@@ -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"> >@@ -37,11 +45,11 @@ > <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> >+<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" id="lientype">UseTransportCostMatrix</a> system preference if you wish to enable this feature.</div> > [% END %] > > [% IF ( errors ) %]<div class="dialog alert"> >@@ -94,9 +102,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..b4b9bc549d 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,8 +14,7 @@ > </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> >@@ -28,6 +30,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/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index 8e783b298a..c5e5c496e4 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,8 +27,7 @@ > </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> >@@ -65,6 +67,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> > > <div class="main container-fluid"> >@@ -86,13 +94,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,23 +204,25 @@ > </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> >- </div> >- <h1>Z39.50/SRU servers administration</h1> >+ <div> >+ <a id="newserver" class="pat" 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="pat" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="fa fa-plus"></i> New SRU server</a> >+ </div></div> >+ <h2>Z39.50/SRU servers administration</h2> > [% IF id %] > You searched for record [% id | html %] > [% ELSIF searchfield %] > You searched for [% searchfield | html %] > [% END %] >+ <div 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 +255,7 @@ > [% END %] > </tbody> > </table> >+ </div> > [% END %] > > </main> >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 54ae05c970..094ab17c10 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,11 +1,14 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -26,6 +29,12 @@ > <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> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >index 548b841aa1..1fda69af78 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -260,353 +260,313 @@ > <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> > </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-md-10 col-md-offset-1"> >+ >+[% IF ( authid ) %] >+<h1>Modify authority #[% authid | html %] [% authtypetext | html %]</h1> >+[% ELSE %] >+<h1>Adding authority [% authtypetext | html %]</h1> >+[% END %] >+ >+[% IF ( duplicateauthid ) %] >+ <div class="dialog alert"> >+ <h3>Duplicate record suspected</h3> >+ <p>Is this a duplicate of <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | uri %]" class="popup" onclick="openWindow('/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | html %]&popup=1', 'DuplicateAuthority','800','600'); return false;" class="button">[% duplicateauthvalue | html %]</a> ?</p> >+ >+ <form action="authorities.pl" method="get"> >+ <input type="hidden" name="authid" value="[% duplicateauthid | html %]" /> >+ <button type="submit" class="new"><i class="fa fa-pencil"></i> Yes: Edit existing authority</button> >+ </form> >+ <form action="authorities.pl" method="get"> >+ <button class="new" onclick="confirmnotdup('items'); return false;"><i class="fa fa-save"></i> No: Save as new authority</button> >+ </form> >+ </div> >+[% END %] >+ >+<form method="post" name="f" action="/cgi-bin/koha/authorities/authorities.pl"> >+ <input type="hidden" name="op" value="add" /> >+ <input type="hidden" name="addfield_field" value="" /> >+ <input type="hidden" name="repeat_field" value="" /> >+ <input type="hidden" name="authtypecode" value="[% authtypecode | html%]" /> >+ <input type="hidden" name="authid" value="[% authid | html %]" /> >+ <input type="hidden" name="index" value="[% index | html %]" /> >+ <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="#" class="btn btn-default" id="principal" accesskey="w"><i class="fa fa-save"></i> Save</a></div> >+ <div class="btn-group"> > [% IF ( authid ) %] >- <li> >- <a href="#" aria-current="page"> >- Modify authority #[% authid | html %] ([% authtypetext | html %]) >- </a> >- </li> >- >+ <a class="cancel" class="btn btn-default" id="cancel" href="/cgi-bin/koha/authorities/detail.pl?authid=[% authid | url %]">Cancel</a> > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Adding authority [% authtypetext | html %] >- </a> >- </li> >- >+ <a class="cancel" class="btn btn-default" id="cancel" href="/cgi-bin/koha/authorities/authorities-home.pl">Cancel</a> > [% END %] >- </ol> >- </nav> <!-- /#breadcrumbs --> >+ </div> >+ <div class="btn-group"> >+ [% IF ( authid ) %] >+ <a class="pat" class="btn btn-default" href="#"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a> >+ [% ELSE %] >+ <a class="pat" class="btn btn-default" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a> >+ [% END %] >+ </div> >+ </div> > >- <div class="main container-fluid"> >- <div class="row"> >- <div class="col-md-10 col-md-offset-1"> >+ <fieldset class="select-libs"> >+ <div id="authoritytabs" class="toptabs numbered"> >+ <ul> >+ [% FOREACH BIG_LOO IN BIG_LOOP %] >+ <li><a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a></li> >+ [% END %] >+ </ul> >+ >+ [% FOREACH BIG_LOO IN BIG_LOOP %] >+ <div id="tab[% BIG_LOO.number | html %]XX"> >+ [% previous = "" %] >+ [% FOREACH innerloo IN BIG_LOO.innerloop %] >+ [% IF ( innerloo.tag ) %] >+ [% IF innerloo.tag != previous %] >+ [% IF previous != "" %] >+ </ul> >+ [% END %] >+ [% previous = innerloo.tag %] >+ [% IF ( innerloo.repeatable ) %] >+ <ul class="sortable_field"> >+ [% ELSE %] >+ <ul> >+ [% END %] >+ [% END %] >+ [% IF ( innerloo.repeatable ) %] >+ <li class="tag sortable_tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> >+ [% ELSE %] >+ <li class="tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> >+ [% END %] > >- [% IF ( authid ) %] >- <h1>Modify authority #[% authid | html %] [% authtypetext | html %]</h1> >+ <div class="tag_title" id="div_indicator_tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> >+ [% UNLESS hide_marc %] >+ [% IF advancedMARCEditor %] >+ <a href="#" tabindex="1" class="tagnum" title="[% innerloo.tag_lib | html %] - Click to Expand this Tag" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;">[% innerloo.tag | html %]</a> > [% ELSE %] >- <h1>Adding authority [% authtypetext | html %]</h1> >+ <span class="tagnum" title="[% innerloo.tag_lib | html %]">[% innerloo.tag | html %]</span> > [% END %] > >- [% IF ( duplicateauthid ) %] >- <div class="dialog alert"> >- <h3>Duplicate record suspected</h3> >- <p>Is this a duplicate of <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | uri %]" class="popup" onclick="openWindow('/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | html %]&popup=1', 'DuplicateAuthority','800','600'); return false;" class="button">[% duplicateauthvalue | html %]</a> ?</p> >- >- <form action="authorities.pl" method="get"> >- <input type="hidden" name="authid" value="[% duplicateauthid | html %]" /> >- <button type="submit" class="new"><i class="fa fa-pencil"></i> Yes: Edit existing authority</button> >- </form> >- <form action="authorities.pl" method="get"> >- <button class="new" onclick="confirmnotdup('items'); return false;"><i class="fa fa-save"></i> No: Save as new authority</button> >- </form> >+ [% IF ( innerloo.fixedfield ) %] >+ <input type="text" >+ tabindex="1" >+ class="indicator flat" >+ style="display:none;" >+ name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]" >+ size="1" >+ maxlength="1" >+ value="[% innerloo.indicator1 | html %]" /> >+ <input type="text" >+ tabindex="1" >+ class="indicator flat" >+ style="display:none;" >+ name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]" >+ size="1" >+ maxlength="1" >+ value="[% innerloo.indicator2 | html %]" /> >+ [% ELSE %] >+ <input type="text" >+ tabindex="1" >+ class="indicator flat" >+ name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]" >+ size="1" >+ maxlength="1" >+ value="[% innerloo.indicator1 | html %]" /> >+ <input type="text" >+ tabindex="1" >+ class="indicator flat" >+ name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]" >+ size="1" >+ maxlength="1" >+ value="[% innerloo.indicator2 | html %]" /> >+ [% END %] - >+ [% ELSE %] >+ [% IF ( innerloo.fixedfield ) %] >+ <input type="hidden" >+ tabindex="1" >+ name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]" >+ value="[% innerloo.indicator1 | html %]" /> >+ <input type="hidden" >+ tabindex="1" >+ name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]" >+ value="[% innerloo.indicator2 | html %]" /> >+ [% ELSE %] >+ <input type="hidden" >+ tabindex="1" >+ name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]" >+ value="[% innerloo.indicator1 | html %]" /> >+ <input type="hidden" >+ tabindex="1" >+ name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]" >+ value="[% innerloo.indicator2 | html %]" /> >+ [% END %] >+ [% END %] >+ >+ [% UNLESS advancedMARCEditor %] >+ <a href="#" tabindex="1" class="expandfield" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Click to Expand this Tag">[% innerloo.tag_lib | html %]</a> >+ [% END %] >+ <span class="field_controls"> >+ [% IF ( innerloo.repeatable ) %] >+ <a href="#" tabindex="1" class="buttonPlus" onclick="CloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]','[% hide_marc | html %]','[% advancedMARCEditor | html %]'); return false;" title="Repeat this Tag"> >+ <img src="[% interface | html %]/[% theme | html %]/img/repeat-tag.png" alt="Repeat this Tag" /> >+ </a> >+ [% END %] >+ <a href="#" tabindex="1" class="buttonMinus" onclick="UnCloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Delete this Tag"> >+ <img src="[% interface | html %]/[% theme | html %]/img/delete-tag.png" alt="Delete this Tag" /> >+ </a> >+ </span> <!-- /.field_controls --> >+ >+ </div> <!-- /div.tag_title --> >+ >+ <ul class="sortable_subfield"> >+ [% FOREACH subfield_loo IN innerloo.subfield_loop %] >+ <!-- One line on the marc editor --> >+ <li class="subfield_line" style="[% subfield_loo.visibility | html %]" id="subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]"> >+ >+ [% UNLESS hide_marc %] >+ <div class="subfieldcode"> >+ <input type="text" >+ title="[% subfield_loo.marc_lib | $raw %]" >+ style=" [% IF ( subfield_loo.fixedfield ) %]display:none; [% END %]border:0;" >+ name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" >+ value="[% subfield_loo.subfield | html %]" >+ size="1" >+ maxlength="1" >+ class="flat" >+ tabindex="0" /> > </div> >- [% END # /IF duplicateauthid %] >- >- <form method="post" name="f" action="/cgi-bin/koha/authorities/authorities.pl"> >- <input type="hidden" name="op" value="add" /> >- <input type="hidden" name="addfield_field" value="" /> >- <input type="hidden" name="repeat_field" value="" /> >- <input type="hidden" name="authtypecode" value="[% authtypecode | html%]" /> >- <input type="hidden" name="authid" value="[% authid | html %]" /> >- <input type="hidden" name="index" value="[% index | html %]" /> >- <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"> >- [% IF ( authid ) %] >- <a class="btn btn-default" id="z3950submit" href="#"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a> >+ [% ELSE %] >+ <input type="hidden" >+ name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" >+ value="[% subfield_loo.subfield | html %]" /> >+ [% END %] >+ >+ [% UNLESS advancedMARCEditor %] >+ [% IF ( subfield_loo.mandatory ) %] >+ <div class="subfield subfield_mandatory"> >+ [% ELSE %] >+ <div class="subfield"> >+ [% END %] >+ [% IF ( subfield_loo.fixedfield ) %] >+ <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" style="display:none;" class="labelsubfield"> > [% ELSE %] >- <a class="btn btn-default" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a> >+ <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" class="labelsubfield"> > [% END %] >+ [% subfield_loo.marc_lib | $raw %] >+ </label> > </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> >+ [% END %] >+ >+ [% SET mv = subfield_loo.marc_value %] >+ <div id="field_marceditor[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]" class="field_marceditor"> >+ [% IF ( mv.type == 'select' ) %] >+ [% IF mv.category AND CAN_user_parameters_manage_auth_values %] >+ <select name="[%- mv.name | html -%]" tabindex="1" class="input_marceditor" id="[%- mv.id | html -%]" data-category="[% mv.category | html %]"> >+ [% ELSE %] >+ <select name="[%- mv.name | html -%]" tabindex="1" class="input_marceditor select2" id="[%- mv.id | html -%]"> >+ [% END %] >+ >+ [% FOREACH aval IN mv.values %] >+ [% IF aval == mv.default %] >+ <option value="[%- aval | html -%]" selected="selected">[%- mv.labels.$aval | html -%]</option> > [% ELSE %] >- <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/authorities/authorities-home.pl">Cancel</a> >+ <option value="[%- aval | html -%]">[%- mv.labels.$aval | html -%]</option> > [% END %] >+ [% END %] >+ </select> >+ [% ELSIF ( mv.type == 'text1' ) %] >+ <input type="text" id="[%- mv.id | html -%]" name="[%- mv.id | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" /> >+ [% ELSIF ( mv.type == 'text2' ) %] >+ <input type="text" id="[%- mv.id | html -%]" size="67" maxlength="[%- mv.maxlength | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" /> >+ [% ELSIF ( mv.type == 'text' ) %] >+ <input type="text" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" size="67" maxlength="[%- mv.maxlength | html -%]" /> >+ [% ELSIF ( mv.type == 'textarea' ) %] >+ <textarea cols="70" rows="4" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" class="input_marceditor" tabindex="1" size="67" maxlength="[%- mv.maxlength | html -%]">[%- mv.value | html -%]</textarea> >+ [% ELSIF ( mv.type == 'hidden' ) %] >+ <input tabindex="1" type="hidden" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" size="67" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" /> >+ [% ELSIF ( mv.type == 'hidden_simple' ) %] >+ <input type="hidden" name="[%- mv.name | html -%]" /> >+ [% END %] >+ </div> >+ [% IF ( subfield_loo.mandatory ) %] >+ <div class="subfield_loop_mandatory"> >+ <span class="required">Required</span> > </div> >- <div class="toolbar-tabs-container"> >- [% IF ( BIG_LOOP && BIG_LOOP.size > 1 ) %] >- <ul class="toolbar-tabs"> >- [%- FOREACH BIG_LOO IN BIG_LOOP -%] >- [% IF loop.first %] >- <li class="selected"> >- [% ELSE %] >- <li> >- [% END %] >- <a data-tabid="[% BIG_LOO.number | html %]" href="#tab[% BIG_LOO.number | html %]XX">[% BIG_LOO.number | html %]</a> >- </li> >- [%- END -%] >- </ul> >+ [% END %] >+ <div class="subfield_controls"> >+ [% IF ( mv.type == 'text1' ) %] >+ <a href="#" class="buttonDot tag_editor" onclick="openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id,'[%- mv.authtypecode | html -%]','auth'); return false;" tabindex="1" title="Tag editor">Tag editor</a> >+ [% ELSIF ( mv.type == 'text2' ) %] >+ [% IF mv.noclick %] >+ <a href="#" class="buttonDot tag_editor disabled" tabindex="-1" title="No popup">...</a> >+ [% ELSE %] >+ <a href="#" id="buttonDot_[% mv.id | html %]" class="buttonDot tag_editor" title="Tag editor">...</a> > [% END %] >- <ul class="tag_anchors_list"> >- [% FOREACH BIG_LOO IN BIG_LOOP %] >- [% IF loop.first %][% SET tab_selected = "tab_selected" %][% ELSE %][% SET tab_selected = "" %][% END %] >- [% FOREACH innerloo IN BIG_LOO.innerloop %] >- [% IF ( innerloo.tag ) %] >- <li class="tag_anchors tag_anchors_[% BIG_LOO.number | html %] [% tab_selected | html %]"> >- <a class="tag_anchor" id="tag_anchor_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]" title="tag_anchor_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]" href="#div_indicator_tag_[% innerloo.tag | uri %]_[% innerloo.index | uri %][% innerloo.random | uri %]">[% innerloo.tag | uri %]</a> >- </li> >- [% END %] >- [% END %] >- [% END %] >- </ul> >- </div> >- </div> <!-- /#toolbar --> >- <div id="action"> >- [% IF count %] >- Used in <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&op=do_search&q=an:[% authid | uri %]">[% count | html %] record(s)</a> >- [% ELSE %] >- This authority is not used in any records. >+ [% mv.javascript | $raw %] >+ [% END %] >+ [% IF ( subfield_loo.repeatable ) %] >+ <a href="#" class="buttonPlus" tabindex="1" onclick="CloneSubfield('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]','[% advancedMARCEditor | html %]'); return false;"> >+ <img src="[% interface | html %]/[% theme | html %]/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /> >+ </a> >+ <a href="#" class="buttonMinus" tabindex="1" onclick="UnCloneField('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]'); return false;"> >+ <img src="[% interface | html %]/[% theme | html %]/img/delete-subfield.png" alt="Delete" title="Delete this subfield" /> >+ </a> > [% END %] > </div> >- <div id="authoritytabs" class="toptabs numbered"> >- <ul> >- [% FOREACH BIG_LOO IN BIG_LOOP %] >- <li><a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a></li> >- [% END %] >- </ul> >- >- [% FOREACH BIG_LOO IN BIG_LOOP %] >- <div id="tab[% BIG_LOO.number | html %]XX"> >- [% IF ( BIG_LOOP.size > 1 ) %] >- <h2>Section [% BIG_LOO.number | html %]</h2> >+ </li> >+ <!-- End of the line --> > [% END %] >- [% previous = "" %] >- [% FOREACH innerloo IN BIG_LOO.innerloop %] >- [% IF ( innerloo.tag ) %] >- [% IF innerloo.tag != previous %] >- [% IF previous != "" %] >- </ul> >- [% END %] >- [% previous = innerloo.tag %] >- [% IF ( innerloo.repeatable ) %] >- <ul class="sortable_field"> >- [% ELSE %] >- <ul> >- [% END %] >- [% END %] >- >- [% IF ( innerloo.repeatable ) %] >- <li class="tag sortable_tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> >- [% ELSE %] >- <li class="tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> >- [% END %] >- >- <div class="tag_title" id="div_indicator_tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> >- [% UNLESS hide_marc %] >- [% IF advancedMARCEditor %] >- <a href="#" tabindex="1" class="tagnum" title="[% innerloo.tag_lib | html %] - Click to Expand this Tag" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;">[% innerloo.tag | html %]</a> >- [% ELSE %] >- <span class="tagnum" title="[% innerloo.tag_lib | html %]">[% innerloo.tag | html %]</span> >- [% END %] >- [% IF ( innerloo.fixedfield ) %] >- <input type="text" >- tabindex="1" >- class="indicator flat" >- style="display:none;" >- name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]" >- size="1" >- maxlength="1" >- value="[% innerloo.indicator1 | html %]" /> >- <input type="text" >- tabindex="1" >- class="indicator flat" >- style="display:none;" >- name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]" >- size="1" >- maxlength="1" >- value="[% innerloo.indicator2 | html %]" /> >- [% ELSE %] >- <input type="text" >- tabindex="1" >- class="indicator flat" >- name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]" >- size="1" >- maxlength="1" >- value="[% innerloo.indicator1 | html %]" /> >- <input type="text" >- tabindex="1" >- class="indicator flat" >- name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]" >- size="1" >- maxlength="1" >- value="[% innerloo.indicator2 | html %]" /> >- [% END # /IF ( innerloo.fixedfield ) %] - >- [% ELSE %] >- [% IF ( innerloo.fixedfield ) %] >- <input type="hidden" >- tabindex="1" >- name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]" >- value="[% innerloo.indicator1 | html %]" /> >- <input type="hidden" >- tabindex="1" >- name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]" >- value="[% innerloo.indicator2 | html %]" /> >- [% ELSE %] >- <input type="hidden" >- tabindex="1" >- name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]" >- value="[% innerloo.indicator1 | html %]" /> >- <input type="hidden" >- tabindex="1" >- name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]" >- value="[% innerloo.indicator2 | html %]" /> >- [% END # /IF ( innerloo.fixedfield ) %] >- [% END # /UNLESS hide_marc %] >- >- [% UNLESS advancedMARCEditor %] >- <a href="#" tabindex="1" class="expandfield" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Click to Expand this Tag">[% innerloo.tag_lib | html %]</a> >- [% END %] >- <span class="field_controls"> >- [% IF ( innerloo.repeatable ) %] >- <a href="#" tabindex="1" class="buttonPlus" onclick="CloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]','[% hide_marc | html %]','[% advancedMARCEditor | html %]'); return false;" title="Repeat this Tag"> >- <img src="[% interface | html %]/[% theme | html %]/img/repeat-tag.png" alt="Repeat this Tag" /> >- </a> >- [% END %] >- <a href="#" tabindex="1" class="buttonMinus" onclick="UnCloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Delete this Tag"> >- <img src="[% interface | html %]/[% theme | html %]/img/delete-tag.png" alt="Delete this Tag" /> >- </a> >- </span> <!-- /.field_controls --> >- </div> <!-- /div.tag_title --> >- >- <ul class="sortable_subfield"> >- [% FOREACH subfield_loo IN innerloo.subfield_loop %] >- <!-- One line on the marc editor --> >- <li class="subfield_line" style="[% subfield_loo.visibility | html %]" id="subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]"> >- >- [% UNLESS hide_marc %] >- <div class="subfieldcode"> >- <input type="text" >- title="[% subfield_loo.marc_lib | $raw %]" >- style=" [% IF ( subfield_loo.fixedfield ) %]display:none; [% END %]border:0;" >- name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" >- value="[% subfield_loo.subfield | html %]" >- size="1" >- maxlength="1" >- class="flat" >- tabindex="0" /> >- </div> >- [% ELSE %] >- <input type="hidden" >- name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" >- value="[% subfield_loo.subfield | html %]" /> >- [% END # /UNLESS hide_marc %] >- >- [% UNLESS advancedMARCEditor %] >- [% IF ( subfield_loo.mandatory ) %] >- <div class="subfield subfield_mandatory"> >- [% ELSE %] >- <div class="subfield"> >- [% END %] >- [% IF ( subfield_loo.fixedfield ) %] >- <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" style="display:none;" class="labelsubfield"> >- [% ELSE %] >- <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" class="labelsubfield"> >- [% END %] >- [% subfield_loo.marc_lib | $raw %] >- </label> >- </div> <!-- /.subfield --> >- [% END # UNLESS advancedMARCEditor %] >- >- [% SET mv = subfield_loo.marc_value %] >- <div id="field_marceditor[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]" class="field_marceditor"> >- [% IF ( mv.type == 'select' ) %] >- [% IF mv.category AND CAN_user_parameters_manage_auth_values %] >- <select name="[%- mv.name | html -%]" tabindex="1" class="input_marceditor" id="[%- mv.id | html -%]" data-category="[% mv.category | html %]"> >- [% ELSE %] >- <select name="[%- mv.name | html -%]" tabindex="1" class="input_marceditor select2" id="[%- mv.id | html -%]"> >- [% END %] >- [% FOREACH aval IN mv.values %] >- [% IF aval == mv.default %] >- <option value="[%- aval | html -%]" selected="selected">[%- mv.labels.$aval | html -%]</option> >- [% ELSE %] >- <option value="[%- aval | html -%]">[%- mv.labels.$aval | html -%]</option> >- [% END %] >- [% END %] >- </select> >- [% ELSIF ( mv.type == 'text1' ) %] >- <input type="text" id="[%- mv.id | html -%]" name="[%- mv.id | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" /> >- [% ELSIF ( mv.type == 'text2' ) %] >- <input type="text" id="[%- mv.id | html -%]" size="67" maxlength="[%- mv.maxlength | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" /> >- [% ELSIF ( mv.type == 'text' ) %] >- <input type="text" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" size="67" maxlength="[%- mv.maxlength | html -%]" /> >- [% ELSIF ( mv.type == 'textarea' ) %] >- <textarea cols="70" rows="4" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" class="input_marceditor" tabindex="1" size="67" maxlength="[%- mv.maxlength | html -%]">[%- mv.value | html -%]</textarea> >- [% ELSIF ( mv.type == 'hidden' ) %] >- <input tabindex="1" type="hidden" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" size="67" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" /> >- [% ELSIF ( mv.type == 'hidden_simple' ) %] >- <input type="hidden" name="[%- mv.name | html -%]" /> >- [% END # /IF mv.type %] >- </div> <!-- /.field_marceditor --> >- >- [% IF ( subfield_loo.mandatory ) %] >- <div class="subfield_loop_mandatory"> >- <span class="required">Required</span> >- </div> >- [% END %] >- >- <div class="subfield_controls"> >- [% IF ( mv.type == 'text1' ) %] >- <a href="#" class="buttonDot tag_editor" onclick="openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id,'[%- mv.authtypecode | html -%]','auth'); return false;" tabindex="1" title="Tag editor">Tag editor</a> >- [% ELSIF ( mv.type == 'text2' ) %] >- [% IF mv.noclick %] >- <a href="#" class="buttonDot tag_editor disabled" tabindex="-1" title="No popup">...</a> >- [% ELSE %] >- <a href="#" id="buttonDot_[% mv.id | html %]" class="buttonDot tag_editor" title="Tag editor">...</a> >- [% END %] >- [% mv.javascript | $raw %] >- [% END #/IF ( mv.type == 'text1' ) %] >- [% IF ( subfield_loo.repeatable ) %] >- <a href="#" class="buttonPlus" tabindex="1" onclick="CloneSubfield('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]','[% advancedMARCEditor | html %]'); return false;"> >- <img src="[% interface | html %]/[% theme | html %]/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /> >- </a> >- <a href="#" class="buttonMinus" tabindex="1" onclick="UnCloneField('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]'); return false;"> >- <img src="[% interface | html %]/[% theme | html %]/img/delete-subfield.png" alt="Delete" title="Delete this subfield" /> >- </a> >- [% END # /IF ( subfield_loo.repeatable ) %] >- </div> <!-- /.subfield_controls --> >- </li> <!-- /.subfield_line --> >- [% END # /FOREACH subfield_loo %] >- </ul> <!-- /.sortable_subfield --> >- </li> <!-- /.tag --> >- [% END # /IF ( innerloo.tag ) %] >- [% END # /FOREACH innerloo %] >- </ul> <!-- /.sortable_field --> >- </div> <!-- /#tab[% BIG_LOO.number | html %]XX --> >- [% END #/FOREACH BIG_LOO %] >- </div> <!-- /#authoritytabs --> >- >- <div name="hidden" id="hidden" class="tab"> >- [% FOREACH hidden_loo IN hidden_loop %] >- <input type="hidden" name="tag" value="[% hidden_loo.tag | html %]" /> >- <input type="hidden" name="subfield" value="[% hidden_loo.subfield | html %]" /> >- <input type="hidden" name="mandatory" value="[% hidden_loo.mandatory | html %]" /> >- <input type="hidden" name="kohafield" value="[% hidden_loo.kohafield | html %]" /> >- <input type="hidden" name="tag_mandatory" value="[% hidden_loo.tag_mandatory | html %]" /> >- [% END %] >- </div> <!-- /.tab --> >- [% IF ( oldauthnumtagfield ) %] >- <input type="hidden" name="tag" value="[% oldauthnumtagfield | html %]" /> >- <input type="hidden" name="subfield" value="[% oldauthnumtagsubfield | html %]" /> >- <input type="hidden" name="field_value" value="[% authid | html %]" /> >- <input type="hidden" name="mandatory" value="0" /> >- <input type="hidden" name="kohafield" value="[% kohafield | html %]" /> >- <input type="hidden" name="tag_mandatory" value="[% tag_mandatory | html %]" /> >- <input type="hidden" name="tag" value="[% oldauthtypetagfield | html %]" /> >- <input type="hidden" name="subfield" value="[% oldauthtypetagsubfield | html %]" /> >- <input type="hidden" name="field_value" value="[% authtypecode | html %]" /> >- [% END %] >+ </ul> <!-- /.sortable_subfield --> >+ </li> >+ [% END %]<!-- if innerloo.tag --> >+ [% END %]<!-- BIG_LOO.innerloop --> >+ </ul> <!-- /.sortable_field --> >+ </div> >+ [% END %]<!-- BIG_LOOP --> >+ </div><!-- tabs --> >+ >+ <div name="hidden" id="hidden" class="tab"> >+ [% FOREACH hidden_loo IN hidden_loop %] >+ <input type="hidden" name="tag" value="[% hidden_loo.tag | html %]" /> >+ <input type="hidden" name="subfield" value="[% hidden_loo.subfield | html %]" /> >+ <input type="hidden" name="mandatory" value="[% hidden_loo.mandatory | html %]" /> >+ <input type="hidden" name="kohafield" value="[% hidden_loo.kohafield | html %]" /> >+ <input type="hidden" name="tag_mandatory" value="[% hidden_loo.tag_mandatory | html %]" /> >+ [% END %] >+ </div> > >- </form> >+ [% IF ( oldauthnumtagfield ) %] >+ <input type="hidden" name="tag" value="[% oldauthnumtagfield | html %]" /> >+ <input type="hidden" name="subfield" value="[% oldauthnumtagsubfield | html %]" /> >+ <input type="hidden" name="field_value" value="[% authid | html %]" /> >+ <input type="hidden" name="mandatory" value="0" /> >+ <input type="hidden" name="kohafield" value="[% kohafield | html %]" /> >+ <input type="hidden" name="tag_mandatory" value="[% tag_mandatory | html %]" /> >+ <input type="hidden" name="tag" value="[% oldauthtypetagfield | html %]" /> >+ <input type="hidden" name="subfield" value="[% oldauthtypetagsubfield | html %]" /> >+ <input type="hidden" name="field_value" value="[% authtypecode | html %]" /> >+ [% END %] > >- [% INCLUDE 'modals/cataloguing_create_av.inc' %] >+ </form> > >- </div> >- </div> >- </div> >+[% INCLUDE 'modals/cataloguing_create_av.inc' %] >+ >+</div> >+</fieldset> >+</div> >+</div> > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >index 8b18746d6f..3a952b1020 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>[% IF ( unknownauthid ) %] >@@ -17,8 +20,7 @@ > </head> > > <body id="auth_detail" class="auth"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'authorities-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -39,6 +41,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >index 60d60e5026..439563de24 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,8 +16,7 @@ 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> >@@ -30,6 +32,12 @@ div#result { margin-top: 1em; } > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >index c61235dde1..a9e8659049 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'authorities-search.inc' %] >+[% END %] > [% PROCESS 'authorities-search-results.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Authority search results › Authorities › Koha</title> >@@ -19,8 +22,7 @@ > </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> >@@ -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"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >index 5c62dad4f1..b31d736acd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >@@ -40,15 +40,16 @@ > <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="pat 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="pat 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="pat" 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="pat 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="pat" href="basket.pl" id="print_cart"><i class="fa fa-print"></i> Print</a> >+ <a class="pat" href="basket.pl" id="empty_cart"><i class="fa fa-trash"></i> Empty and close</a> >+ <a class="pat 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 4f8fd1070f..4d1ab0fb48 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >@@ -2,6 +2,9 @@ > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( unknownbiblionumber ) %] >@@ -14,7 +17,7 @@ > </head> > <body id="catalog_ISBDdetail" class="catalog"> > >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -42,6 +45,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >index b07e646029..765fbd20de 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >@@ -2,6 +2,9 @@ > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( unknownbiblionumber ) %] >@@ -15,7 +18,7 @@ > > <body id="catalog_MARCdetail" class="catalog"> > >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -43,6 +46,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 20106f8278..ac0d2dfa5e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -32,6 +32,9 @@ > [% SET plugins_intranet_catalog_biblio_tabs = KohaPlugins.get_plugins_intranet_catalog_biblio_tab({ biblio => biblio, biblio_id => biblionumber }) %] > > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( unknownbiblionumber ) %] >@@ -46,7 +49,7 @@ > > <body id="catalog_detail" class="catalog"> > >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -74,6 +77,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -603,13 +612,13 @@ Note that permanent location is a code, and location may be an authval. > [% UNLESS item.cannot_be_edited %] > [% IF Koha.Preference('LocalCoverImages') OR Koha.Preference('OPACLocalCoverImages') %] > <div class="btn-group"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]#edititem"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]#edititem" id="lientype"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="lientype"><span class="caret"></span></a> > <ul class="dropdown-menu pull-right"> > <li><a href="/cgi-bin/koha/tools/upload-cover-image.pl?itemnumber=[% item.itemnumber | uri %]&filetype=image"><i class="fa fa-upload"></i> Upload image</a></li> > </ul> > </div> > [% ELSE %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]#edititem"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]#edititem" id="lientype"><i class="fa fa-pencil"></i> Edit</a> > [% END %] > [% END %] > </td> >@@ -966,7 +975,7 @@ Note that permanent location is a code, and location may be an authval. > <span class="noimagesuploaded">No images have been uploaded for this bibliographic record yet.</span> > [% END %] > [% IF ( CAN_user_tools_upload_local_cover_images ) %] >- <p>Upload an image file: <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber | uri %]&filetype=image"><i class="fa fa-upload" aria-hidden="true"></i> Upload</a> >+ <p>Upload an image file: <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber | uri %]&filetype=image" id="lientype"><i class="fa fa-upload" aria-hidden="true"></i> Upload</a> > </p> > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >index 6fde26b1ef..d0a029836e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Images › [% INCLUDE 'biblio-title-head.inc' %] › Catalog › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -24,7 +27,7 @@ > > <body id="catalog_imageviewer" class="catalog"> > >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -43,6 +46,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index 685e0824fc..4b13c5df62 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -5,6 +5,9 @@ > [% USE Branches %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Checkout history for [% INCLUDE 'biblio-title-head.inc' %] › Catalog › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -12,7 +15,7 @@ > > <body id="catalog_issuehistory" class="catalog"> > >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -31,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"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >index 7b03e227e6..4ad723cda5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >@@ -2,6 +2,9 @@ > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > > <title> >@@ -16,7 +19,7 @@ > </head> > > <body id="catlaog_labeledMARCdetail" class="catalog"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -36,6 +39,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index 1d170fdb8e..fef471ce20 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,7 +15,7 @@ > </head> > <body id="catalog_moredetail" class="catalog"> > [% USE KohaDates %] >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -31,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"> >@@ -63,7 +72,7 @@ > <li><span class="label">Physical details:</span> [% pages | html %] [% illus | html %] [% size | html %] </li> > [% IF ( bnotes ) %]<li><span class="label">Notes:</span> [% bnotes | html %]</li>[% END %] > <li><span class="label">No. of items:</span> [% count | html %] [% IF ( hiddencount ) %]total ([% showncount | html %] shown / [% hiddencount | html %] hidden) >-<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&showallitems=1">Show all items</a>[% END %]</li> >+<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&showallitems=1" id="lientype">Show all items</a>[% END %]</li> > </ol> > </div> > </div> >@@ -73,7 +82,7 @@ > [% END %] > > [% IF ( ONLY_ONE ) %] >- <div class="dialog message">You are only viewing one item. <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&bi=[% biblioitemnumber | uri %]#item[% itemnumber | uri %]">View all</a></div> >+ <div class="dialog message">You are only viewing one item. <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&bi=[% biblioitemnumber | uri %]#item[% itemnumber | uri %]" id="lientype">View all</a></div> > [% END %] > > [% IF updated_exclude_from_local_holds_priority.defined %] >@@ -92,7 +101,7 @@ > > <h4>Item information [% UNLESS ( ITEM_DAT.nomod ) %] > [% IF ( CAN_user_editcatalogue_edit_items ) %] >- <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% ITEM_DAT.biblionumber | uri %]&itemnumber=[% ITEM_DAT.itemnumber | uri %]"><i class="fa fa-pencil"></i> Edit item</a> >+ <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% ITEM_DAT.biblionumber | uri %]&itemnumber=[% ITEM_DAT.itemnumber | uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit item</a> > [% END %] > [% END %]</h4> > <div class="rows"> >@@ -160,11 +169,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 %] >@@ -198,7 +207,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 ) %] >@@ -231,7 +240,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 %] >@@ -267,7 +276,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> >@@ -305,7 +314,7 @@ > </li> > [% END %] > >- <li><span class="label">Total checkouts:</span>[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues | html %][% ELSE %]0[% END %] (<a href="/cgi-bin/koha/circ/bookcount.pl?&biblionumber=[% ITEM_DAT.biblionumber | uri %]&itm=[% ITEM_DAT.itemnumber | uri %]">View item's checkout history</a>)</li> >+ <li><span class="label">Total checkouts:</span>[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues | html %][% ELSE %]0[% END %] (<a href="/cgi-bin/koha/circ/bookcount.pl?&biblionumber=[% ITEM_DAT.biblionumber | uri %]&itm=[% ITEM_DAT.itemnumber | uri %]" id="lientype">View item's checkout history</a>)</li> > > <li><span class="label">Last seen:</span>[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen | $KohaDates %] [%END %] </li> > <li><span class="label">Last borrowed:</span>[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %] </li> >@@ -325,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 %] >@@ -339,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 7947be0877..da481dcd8b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -6,6 +6,9 @@ > [% USE KohaDates %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > >@@ -14,7 +17,7 @@ > </head> > > <body id="catalog_results" class="catalog"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > [% IntranetCoce = Koha.Preference('IntranetCoce') %] > [% CoceProviders = Koha.Preference('CoceProviders') %] >@@ -36,6 +39,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -62,8 +71,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> >@@ -71,9 +80,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> >@@ -89,7 +97,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" id="lientype"> > <i class="fa fa-list"></i> Add to list <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -135,7 +143,7 @@ > [% 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 placehold" id="lientype"><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> >@@ -155,14 +163,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="#" id="lientype"><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="#" id="lientype"><i class="fa fa-sticky-note-o"></i> Browse selected records</a> > </div> > [% END %] > >@@ -200,7 +208,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" id="lientype"> > Sort <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -336,6 +344,7 @@ > </div> > [% END # /IF total %] > >+ > [% IF ( query_error ) %] > <div class="dialog alert"><p><strong>Error:</strong> [% query_error | html %]</p></div> > [% END %] >@@ -410,7 +419,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"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >index 37fffc407e..e91665c797 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% USE Koha %] > [% USE KohaDates %] >@@ -10,7 +13,7 @@ > > <body id="catalogue_search-history" class="catalogue"> > >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -26,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="container-fluid"> >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 404e2fadbb..44ffc9670b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >@@ -3,13 +3,16 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -28,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"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >index cb6a16f905..709b98aebb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -806,6 +806,12 @@ function PopupMARCFieldDoc(field) { > </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"> >@@ -814,13 +820,13 @@ function PopupMARCFieldDoc(field) { > > <div id="check_errors"></div> > >- <h1> >+ <h2> > [% IF ( biblionumber ) %] > Editing <em>[% title | html %]</em> (Record number [% biblionumber | html %]) > [% ELSE %] > Add MARC record [% IF (circborrowernumber) %]<em>(fast cataloging)</em>[% END %] > [% END %] >- </h1> >+ </h2> > > [% UNLESS ( number ) %] > <!-- show duplicate warning on tab 0 only --> >@@ -864,15 +870,16 @@ function PopupMARCFieldDoc(field) { > [% END %] > > <div id="toolbar" class="btn-toolbar"> >+ <div> > [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] > [% IF (circborrowernumber) %][%# fast cataloging must lead to items %] > <!-- Action is under fast cataloging - Save button redirecting to items --> >- <div class="btn-group"><a href="#" id="saveanditems" class="btn btn-default"><i class="fa fa-save"></i> Save</a></div> >+ <div class="btn-group"><a href="#" id="saveanditems" class="principal"><i class="fa fa-save"></i> Save</a></div> > [% ELSE %] > <!-- Not using fast cataloging - Display split menu --> > <div class="btn-group"> >- <button class="btn btn-default" id="saverecord"><i class="fa fa-save"></i> Save</button> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> >+ <button class="principal" id="saverecord"><i class="fa fa-save"></i> Save</button> >+ <button class="dropdown-toggle pat" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -884,22 +891,22 @@ function PopupMARCFieldDoc(field) { > [% END %] > [% ELSE %] > <!-- User cannot edit items - single button redirecting to view --> >- <div class="btn-group"><a href="#" id="saveandview" class="btn btn-default"><i class="fa fa-save"></i> Save</a></div> >+ <div class="btn-group"><a href="#" id="saveandview" class="principal"><i class="fa fa-save"></i> Save</a></div> > [% END # /IF CAN_user_editcatalogue_edit_items %] > > [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %] > [% IF biblionumber %] >- <div class="btn-group"><a class="btn btn-default" href="#" id="z3950search"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a></div> >+ <div class="btn-group"><a class="pat" href="#" id="z3950search"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a></div> > [% ELSE %] >- <div class="btn-group"><a class="btn btn-default" href="#" id="z3950search"><i class="fa fa-search"></i> Z39.50/SRU search</a></div> >+ <div class="btn-group"><a class="pat" href="#" id="z3950search"><i class="fa fa-search"></i> Z39.50/SRU search</a></div> > [% END %] > [% IF ( CAN_user_editauthorities ) %] >- <div class="btn-group"><a class="btn btn-default" href="#" id="linkerbutton"><i class="fa fa-refresh"></i> Link authorities automatically</a></div> >+ <div class="btn-group"><a class="pat" href="#" id="linkerbutton"><i class="fa fa-refresh"></i> Link authorities automatically</a></div> > [% END %] > [% END %] > > <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="pat dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button> > <ul id="settings-menu" class="dropdown-menu"> > [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %] > <li><a href="#" id="switcheditor">Switch to advanced editor</a></li> >@@ -943,7 +950,7 @@ function PopupMARCFieldDoc(field) { > </div> > [% ELSE %] > <div class="btn-group"> >- <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a> >+ <a class="cancel" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a> > </div> > [% END %] > <div id="show-errors" class="btn-group"></div> >@@ -975,7 +982,7 @@ function PopupMARCFieldDoc(field) { > [% END %] > </ul> > </div> >- </div> <!-- /#toolbar.btn-toolbar --> >+ </div></div> <!-- /#toolbar.btn-toolbar --> > > [% IF bib_doesnt_exist %] > <div class="dialog alert"> >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 e47a2906d2..b4e65023e9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -3,16 +3,13 @@ > [% USE KohaDates %] > [% USE TablesSettings %] > [% SET footerjs = 1 %] >-[% formulaire = BLOCK %] >- [% INCLUDE 'cataloging-search.inc' %] >-[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <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' form=formulaire %] >+ [% INCLUDE 'header.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -61,9 +58,7 @@ > <a id="useadvanced" href="/cgi-bin/koha/cataloguing/editor.pl" class="pat"><i class="fa fa-pencil"></i> Advanced editor</a> > [% END %] > <div class="btn-group"> >- <button class="pat mot"><i class="fa fa-plus"></i> New record</button> >- <button class="pat fleche" data-toggle="dropdown"> >- <span class="caret"></span> >+ <button class="pat" 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> >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 75b4ab13bf..115fb4a488 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 'cataloging-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> >@@ -26,7 +29,7 @@ > </head> > > <body id="cat_additem" class="cat"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -45,6 +48,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/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >index ba6b88b95b..1bd2aee1f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -15,7 +15,7 @@ > <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"> >@@ -32,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"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >index 9bf940cf38..0b640072de 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >@@ -1,9 +1,13 @@ >+ >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Link to host record › Cataloging › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="catalog_linkitem" class="catalog"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -19,6 +23,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="container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >index 7d682f78f5..2fbc65fbb1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cataloging-search.inc' %] >+[% END %] > [% PROCESS 'merge-record.inc' %] > > [% INCLUDE 'doc-head-open.inc' %] >@@ -15,7 +18,7 @@ div#result { margin-top: 1em; } > </head> > > <body id="cat_merge" class="cat"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -31,6 +34,12 @@ div#result { margin-top: 1em; } > </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/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >index 742fb77fa9..07fa7b79dc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >@@ -1,10 +1,13 @@ > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -23,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"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >index 8c039990af..a9232e202e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >@@ -43,7 +43,7 @@ > <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" id="principal" class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset> > </div> > </nav> > </form> >@@ -90,7 +90,7 @@ > <td>[% breeding_loo.heading_code | html %]</td> > <td class="actions"> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs z3950actions" href="#">MARC</a><button class="btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> >+ <a class="btn btn-default btn-xs z3950actions" id="lientype" href="#">MARC</a><button class="btn-xs dropdown-toggle" id="lientype" data-toggle="dropdown"><span class="caret"></span></button> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]"> > <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa fa-eye"></i> MARC preview</a></li> > <li><a href="/cgi-bin/koha/authorities/authorities.pl?breedingid=[% breeding_loo.breedingid | uri %]&authtypecode=[% breeding_loo.heading_code | uri %]&authid=[% breeding_loo.authid | uri %]&index=[% index | uri %]" class="chosen" title="Import" data-action="import"><i class="fa fa-download"></i> Import</a></li> >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 120e4ac03f..2bcf7eba60 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 >@@ -188,7 +188,7 @@ > [% END %] > <td class="actions"> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs z3950actions" href="#">MARC</a><button class="btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> >+ <a class="btn btn-default btn-xs z3950actions" id="lientype" href="#">MARC</a><button class="btn-xs dropdown-toggle" id="lientype" data-toggle="dropdown"><span class="caret"></span></button> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]"> > <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa fa-eye"></i> MARC preview</a></li> > <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData" data-action="show_card"><i class="fa fa-eye"></i> Card preview</a></li> >@@ -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 c4586446b4..4415c33cf9 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 >@@ -5,6 +5,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' %] >@@ -128,7 +131,7 @@ > [% END %] > > <body id="circ_article-requests" class="circ"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -143,6 +146,12 @@ > <a href="#" aria-current="page">Article requests</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 starthidden"> >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 6df2a3e4c0..215027dff9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >@@ -2,13 +2,16 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -34,6 +37,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/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt >index 498eff8133..add59ce72e 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,7 +14,7 @@ > > <body id="circ_checkout-notes" class="circ"> > >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -28,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"> >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 7f498333cd..ead534a622 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,7 +1,6 @@ > [% USE raw %] > [% USE Koha %] > [% USE Branches %] >-[% SET footerjs = 1 %] > [% formulaire = BLOCK %] > [% INCLUDE 'circ-search.inc' %] > [% END %] >@@ -39,43 +38,43 @@ > > <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></a> Check out</li> >- <li><a class="circ-button" href="/cgi-bin/koha/circ/returns.pl"><i class="fa fa-download"></i></a> Check in</li> >- <li><a class="circ-button" href="/cgi-bin/koha/circ/renew.pl"><i class="fa fa-retweet"></i></a> Renew</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></a> Set library and desk >+ <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></a> Set library >+ <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></a> Fast cataloging</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></a> Checkout notes</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></a> Pending on-site checkouts</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></a> Holds queue</li> >- <li><a class="circ-button" href="/cgi-bin/koha/circ/pendingreserves.pl"><i class="fa fa-hand-grab-o"></i></a> Holds to pull</li> >- <li><a class="circ-button" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa fa-calendar"></i></a> Holds awaiting pickup</li> >- <li><a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i></a> Hold ratios</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 %] >@@ -96,38 +95,38 @@ > > <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</a>> Article requests</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></a> Transfer</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></a> Transfers to send</li> >- <li><a class="circ-button" href="/cgi-bin/koha/circ/transferstoreceive.pl"><i class="fa fa-sign-in"></i></a> Transfers to receive</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></a> Overdues >+ ><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></a> Overdues with fines >+ ><i class="fa fa-clock-o fa-2x"></i><h1> Overdues with fines</h1></a> > </li> > </ul> > </div> >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 3314172917..2b5aa413a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -9,6 +9,7 @@ > [% USE ItemTypes %] > [% USE Price %] > [% USE AuthorisedValues %] >+[% SET footerjs = 1 %] > [% formulaire = BLOCK %] > [% INCLUDE 'circ-search.inc' %] > [% END %] >@@ -641,11 +642,11 @@ > <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" /> > [% END %] > >- <button class="submit" id="principal" type="submit">Check out</button> >- > <div id="show-circ-settings"> >- <a href="#"><i class="fa fa-caret-right circ-settings-icon"></i></a> >+ <a href="#"><i class="fa-sign-out"></i></a> > </div> >+ <button class="submit" id="principal" type="submit">Check out</button> >+ > > <div class="circ-settings"> > >@@ -766,10 +767,10 @@ > > [% IF ( noissues ) %] > [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %] >- <fieldset> >+ <fieldset id="searchresults"> > [% ELSE %] >- <h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4> >- <fieldset> >+ <h2>Checking out to [% INCLUDE 'patron-title.inc' %]</h2> >+ <fieldset id="searchresults"> > [% END %] > <h3> > Cannot check out! >@@ -778,7 +779,7 @@ > [% END %] > </h3> > [% ELSE %] >- <fieldset> >+ <fieldset id="searchresults"> > [% END %] > > [% INCLUDE 'patron_messages.inc' %] >@@ -847,8 +848,8 @@ > <a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.count || 0 | html %])</a> > </li> > >- [% SET enrollments = patron.get_club_enrollments %] >- [% SET enrollable = patron.get_enrollable_clubs(0) %] <!-- 0 => not OPAC --> >+ [% SET enrollments = patron.get_club_enrollments(1) %] >+ [% SET enrollable = patron.get_enrollable_clubs(0,1) %] > [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %] > <li> > <a id="clubs-tab-link" href="#clubs-tab"> >@@ -882,7 +883,6 @@ > <th>Hold date</th> > <th>Title</th> > <th>Call number</th> >- <th>Item type</th> > <th>Barcode</th> > <th>Pickup at</th> > <th>Expiration</th> >@@ -981,10 +981,6 @@ > </div> <!-- /.row --> > </main> > >- [% IF Koha.Preference('ClaimReturnedLostValue') %] >- [% INCLUDE 'modals/resolve_return_claim.inc' %] >- [% END %] >- > <!-- Modal --> > <div id="barcodeSubmittedModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="barcodeSubmittedModalLabel" aria-hidden="true"> > <div class="modal-dialog"> >@@ -1000,6 +996,7 @@ > </div> <!-- /#barcodeSubmittedModal --> > > [% MACRO jsinclude BLOCK %] >+ [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'select2.inc' %] >@@ -1029,11 +1026,7 @@ > </script> > [% Asset.js("js/pages/circulation.js") | $raw %] > [% Asset.js("js/checkouts.js") | $raw %] >- [% IF Koha.Preference('ClaimReturnedLostValue') %] >- [% Asset.js("js/resolve_claim_modal.js") | $raw %] >- [% END %] > [% Asset.js("js/holds.js") | $raw %] >- [% INCLUDE 'calendar.inc' %] > <script> > table_settings_issues_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %] > table_settings_borrowers_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %] >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 9a1bc2483e..b5d0e6579b 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,7 +23,7 @@ > > <body id="circ_circulation_batch_checkouts" class="circ"> > >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -48,6 +51,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/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >index 1767ad1840..f1e5e8656a 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,7 +19,7 @@ > </head> > > <body id="circ_offline" class="circ"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form = formulaire %] > <div class="loading-overlay" style="display: none;"> > <div>Downloading records, please wait...</div> > </div> >@@ -31,6 +34,12 @@ > <a id="go-to-home" href="#offline-home" aria-current="page">Offline circulation</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/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >index 7e45bbd708..9e787097d4 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,13 +5,16 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -27,6 +30,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/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index 9d9cd0295f..aabc6835f2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -153,7 +153,7 @@ > <fieldset class="brief"> > <h4>Filter on</h4> > >- <fieldset><legend>Date due:</legend> >+ <fieldset><label>Date due:</label> > <li class="radio"> > <p for="showall">Show any items currently checked out: > [% IF ( showall ) %] >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 fbcd5873ef..9094562c33 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,7 +62,7 @@ > [% END %] > > <body id="circ_request-article" class="circ"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -83,6 +86,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' %] >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..28a2f9c384 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,14 +4,16 @@ > [% 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> >@@ -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"> >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..20f1f7a0d2 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,8 +18,7 @@ > </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> >@@ -39,6 +41,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/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >index b55a054fc4..74e8fcf7bb 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,8 +14,7 @@ > </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> >@@ -28,6 +30,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/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt >index c74f614aad..b479bb2728 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,8 +22,7 @@ > </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> >@@ -43,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> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >new file mode 100644 >index 0000000000..bafd3b127c >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >@@ -0,0 +1,312 @@ >+[% USE raw %] >+[% USE Asset %] >+[% USE Koha %] >+[% USE Branches %] >+[% SET footerjs = 1 %] >+[% INCLUDE 'doc-head-open.inc' %] >+<title>Patron search › Koha</title> >+[% INCLUDE 'doc-head-close.inc' %] >+<style> .modal-body .close { display: none; } </style> >+</head> >+ >+<body id="common_patron_search" class="common"> >+<div id="patron_search" class="yui-t7"> >+ <div class="container-fluid"> >+ >+ <form id="searchform"> >+ <fieldset class="brief"> >+ <h3>Search for patron</h3> >+ <ol> >+ <li> >+ <label for="searchmember_filter">Search:</label> >+ <input type="text" id="searchmember_filter" value="[% searchmember | html %]" class="focus" /> >+ </li> >+ <li> >+ <label for="categorycode_filter">Category:</label> >+ <select id="categorycode_filter"> >+ <option value="">Any</option> >+ [% FOREACH category IN categories %] >+ <option value="[% category.categorycode | html %]">[% category.description | html %]</option> >+ [% END %] >+ </select> >+ </li> >+ <li> >+ <label for="branchcode_filter">Library:</label> >+ <select id="branchcode_filter"> >+ [% SET libraries = Branches.all( only_from_group => 1 ) %] >+ [% IF libraries.size != 1 %] >+ <option value="">Any</option> >+ [% END %] >+ [% FOREACH l IN libraries %] >+ <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option> >+ [% END %] >+ </select> >+ </li> >+ </ol> >+ <fieldset class="action"> >+ <input class="principal" type="submit" value="Search" /> >+ </fieldset> >+ </fieldset> >+ </form> >+ >+ [% IF patrons_with_acq_perm_only %] >+ <div class="hint">Only staff with superlibrarian or acquisitions permissions (or order_manage permission if granular permissions are enabled) are returned in the search results</div> >+ [% END %] >+ >+ [% IF patrons_with_suggestion_perm_only %] >+ <div class="hint">Only staff with superlibrarian or suggestions_manage permissions are returned in the search results</div> >+ [% END %] >+ >+ <div class="browse"> >+ Browse by last name: >+ [% FOREACH letter IN alphabet.split(' ') %] >+ <a href="#" class="filterByLetter">[% letter | html %]</a> >+ [% END %] >+ </div> >+ >+ <div id="info" class="dialog message"></div> >+ <div id="error" class="dialog alert"></div> >+ >+ <input type="hidden" id="firstletter_filter" value="" /> >+ <div id="searchresults"> >+ <table id="memberresultst"> >+ <thead> >+ <tr> >+ [% FOR column IN columns %] >+ [% SWITCH column %] >+ [% CASE 'cardnumber' %]<th>Card</th> >+ [% CASE 'dateofbirth' %]<th>Date of birth</th> >+ [% CASE 'address' %]<th>Address</th> >+ [% CASE 'name' %]<th>Name</th> >+ [% CASE 'branch' %]<th>Library</th> >+ [% CASE 'category' %]<th>Category</th> >+ [% CASE 'dateexpiry' %]<th>Expires on</td> >+ [% CASE 'borrowernotes' %]<th>Notes</th> >+ [% CASE 'action' %]<th> </th> >+ [% END %] >+ [% END %] >+ </tr> >+ </thead> >+ <tbody></tbody> >+ </table> >+ </div> >+ >+<div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div> >+ >+<!-- Patron preview modal --> >+<div class="modal" id="patronPreview" tabindex="-1" role="dialog" aria-labelledby="patronPreviewLabel"> >+ <div class="modal-dialog" role="document"> >+ <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="patronPreviewLabel"></h4> >+ </div> >+ <div class="modal-body"> >+ <div id="loading"> >+ <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading >+ </div> >+ </div> >+ <div class="modal-footer"> >+ <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> >+ </div> >+ </div> >+ </div> >+</div> >+ >+</div> >+</div> >+ >+[% MACRO jsinclude BLOCK %] >+ [% INCLUDE 'datatables.inc' %] >+ >+ <script> >+ var search = 1; >+ $(document).ready(function(){ >+ $("#info").hide(); >+ $("#error").hide(); >+ >+ [% IF view != "show_results" %] >+ $("#searchresults").hide(); >+ search = 0; >+ [% END %] >+ >+ // Apply DataTables on the results table >+ dtMemberResults = $("#memberresultst").dataTable($.extend(true, {}, dataTablesDefaults, { >+ 'bServerSide': true, >+ 'sAjaxSource': "/cgi-bin/koha/svc/members/search", >+ 'fnServerData': function(sSource, aoData, fnCallback) { >+ if ( ! search ) { >+ return; >+ } >+ aoData.push({ >+ 'name': 'searchmember', >+ 'value': $("#searchmember_filter").val() >+ },{ >+ 'name': 'firstletter', >+ 'value': $("#firstletter_filter").val() >+ },{ >+ 'name': 'categorycode', >+ 'value': $("#categorycode_filter").val() >+ },{ >+ 'name': 'branchcode', >+ 'value': $("#branchcode_filter").val() >+ },{ >+ 'name': 'name_sorton', >+ 'value': 'borrowers.surname borrowers.firstname' >+ },{ >+ 'name': 'cardnumber_sorton', >+ 'value': 'borrowers.cardnumber', >+ },{ >+ 'name': 'dateofbirth_sorton', >+ 'value': 'borrowers.dateofbirth', >+ },{ >+ 'name': 'dateexpiry_sorton', >+ 'value': 'borrowers.dateexpiry', >+ },{ >+ 'name': 'category_sorton', >+ 'value': 'categories.description', >+ },{ >+ 'name': 'branch_sorton', >+ 'value': 'branches.branchname' >+ },{ >+ 'name': 'borrowernotes_sorton', >+ 'value': 'borrowers.borrowernotes' >+ },{ >+ 'name': 'template_path', >+ 'value': '[% json_template | html %]', >+ },{ >+ 'name': 'selection_type', >+ 'value': '[% selection_type | html %]', >+ } >+ [% IF patrons_with_acq_perm_only %] >+ ,{ >+ 'name': 'has_permission', >+ 'value': 'acquisition.order_manage', >+ } >+ [% ELSIF patrons_with_suggestion_perm_only %] >+ ,{ >+ 'name': 'has_permission', >+ 'value': 'suggestions.suggestions_manage', >+ } >+ [% END %] >+ ); >+ $.ajax({ >+ 'dataType': 'json', >+ 'type': 'POST', >+ 'url': sSource, >+ 'data': aoData, >+ 'success': function(json){ >+ fnCallback(json); >+ } >+ }); >+ }, >+ 'aoColumns':[ >+ [% FOR column IN columns %] >+ [% IF column == 'action' %] >+ { 'mDataProp': 'dt_action', 'bSortable': false, 'sClass': 'actions' } >+ [% ELSIF column == 'address' %] >+ { 'mDataProp': 'dt_address', 'bSortable': false } >+ [% ELSE %] >+ { 'mDataProp': 'dt_[% column | html %]' } >+ [% END %] >+ [% UNLESS loop.last %],[% END %] >+ [% END %] >+ ], >+ 'bAutoWidth': false, >+ 'sPaginationType': 'full_numbers', >+ "iDisplayLength": [% Koha.Preference('PatronsPerPage') | html %], >+ 'aaSorting': [[[% aaSorting || 0 | html %], 'asc']], >+ 'bFilter': false, >+ 'bProcessing': true, >+ })); >+ >+ $("#searchform").on('submit', filter); >+ $(".filterByLetter").on("click",function(e){ >+ e.preventDefault(); >+ filterByFirstLetterSurname($(this).text()); >+ }); >+ $("body").on("click",".add_user",function(e){ >+ e.preventDefault(); >+ var borrowernumber = $(this).data("borrowernumber"); >+ var firstname = $(this).data("firstname"); >+ var surname = $(this).data("surname"); >+ add_user( borrowernumber, firstname + " " + surname ); >+ }); >+ >+ $("body").on("click",".select_user",function(e){ >+ e.preventDefault(); >+ var borrowernumber = $(this).data("borrowernumber"); >+ var borrower_data = $("#borrower_data"+borrowernumber).val(); >+ select_user( borrowernumber, JSON.parse(borrower_data) ); >+ }); >+ >+ $("body").on("click",".patron_preview", function( e ){ >+ e.preventDefault(); >+ var borrowernumber = $(this).data("borrowernumber"); >+ var page = "/cgi-bin/koha/members/moremember.pl?print=brief&borrowernumber=" + borrowernumber; >+ $("#patronPreview .modal-body").load( page + " div.container-fluid" ); >+ $('#patronPreview').modal({show:true}); >+ }); >+ >+ $("#patronPreview").on('hidden.bs.modal', function (e) { >+ $("#patronPreview .modal-body").html("<img src=\"[% interface | html %]/[% theme | html %]/img/spinner-small.gif\" alt=\"\" /> Loading"); >+ }); >+ >+ }); >+ >+ function filter() { >+ search = 1; >+ $("#firstletter_filter").val(''); >+ $("#searchresults").show(); >+ dtMemberResults.fnDraw(); >+ return false; >+ } >+ >+ // User has clicked on a letter >+ function filterByFirstLetterSurname(letter) { >+ $("#firstletter_filter").val(letter); >+ search = 1; >+ $("#searchresults").show(); >+ dtMemberResults.fnDraw(); >+ } >+ >+ // modify parent window owner element >+ [% IF selection_type == 'add' %] >+ function add_user(borrowernumber, borrowername) { >+ var p = window.opener; >+ // In one place (serials/routing.tt), the page is reload on every add >+ // We have to wait for the page to be there >+ function wait_for_opener () { >+ if ( ! $(opener.document).find('body').size() ) { >+ setTimeout(wait_for_opener, 500); >+ } else { >+ [%# Note that add_user could sent data instead of borrowername too %] >+ $("#info").hide(); >+ $("#error").hide(); >+ if ( p.add_user(borrowernumber, borrowername) < 0 ) { >+ $("#error").html(_("Patron '%s' is already in the list.").format(borrowername)); >+ $("#error").show(); >+ } else { >+ $("#info").html(_("Patron '%s' added.").format(borrowername)); >+ $("#info").show(); >+ } >+ } >+ } >+ wait_for_opener(); >+ } >+ [% ELSIF selection_type == 'select' %] >+ function select_user(borrowernumber, data) { >+ var p = window.opener; >+ [% IF callback %] >+ p.[% callback | html %](borrowernumber, data); >+ [% ELSE %] >+ p.select_user(borrowernumber, data); >+ [% END %] >+ window.close(); >+ } >+ [% END %] >+ </script> >+[% END %] >+ >+[% SET popup_window = 1 %] >+[% INCLUDE 'intranet-bottom.inc' %] >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 89d42663dd..8cd005ccf7 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,12 +1,14 @@ > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Add items › 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> >@@ -22,6 +24,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/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >index d9fb79eb53..ccbfceb402 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 item[% ELSE %]Add items[% END %] › Course reserves › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -7,8 +10,7 @@ > > <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> >@@ -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"> >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 0acb573fe9..823f236720 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 items › Course reserves › Koha</title> >@@ -10,8 +13,7 @@ > </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> >@@ -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/course_reserves/batch_rm_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt >index 87db994454..5384ef1e42 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,8 +10,7 @@ > </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> >@@ -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"> >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 fbd03d48fa..45c1f8e37c 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' %] >@@ -22,8 +25,7 @@ > > <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> >@@ -39,6 +41,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/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >index fba0d9f573..bce35d3d2b 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,8 +15,7 @@ > > <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> >@@ -24,6 +26,12 @@ > <a href="#" aria-current="page">Course reserves</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/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >index ca5e55fee5..800d31011c 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,8 +18,7 @@ > > <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> >@@ -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> > > [% 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..fc945f3cba 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,10 +1,14 @@ >+ >+[% 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> >@@ -17,6 +21,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/errors/errorpage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt >index e93e70890c..0f8c698f12 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt >@@ -1,11 +1,14 @@ >+ >+[% 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> >@@ -18,6 +21,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/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index d5774b7331..e83e40542c 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,8 +17,7 @@ > </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> >@@ -49,6 +51,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/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >index 43b12c3f9f..39b23e77a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -65,86 +65,74 @@ > </div> <!-- /.col-sm-2 --> > <div class="col-sm-9"> > <div class="row"> >- <ul class="biglinks-list"> >+ <div class="menuspe"><ul class="biglinks-list"> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li><a class="accueil" href="/cgi-bin/koha/circ/circulation-home.pl"><i class="fa fa-fw fa-exchange"></i></a><h7>Circulation</h7></li> >+ <li><a class="accueil" 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="accueil" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-fw fa-id-card-o"></i></a><h7>Patrons</h7></li> >+ <li><a class="accueil" 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="menuspe"><ul class="biglinks-list"> >+ > [% IF ( CAN_user_catalogue ) %] >- <li> >- <a class="accueil" 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> >- </a> >- <h7> >- Advanced search >- </h7> >- </li> >- <li> >- <a class="accueil" 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> >- </a> >- <h7> >- Item search >- </h7> >- </li> >+ <li><a class="accueil" 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="accueil" 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="accueil" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt"></i></a><h7>Lists</h7></li> > >+ <li><a class="accueil" 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="accueil" href="/cgi-bin/koha/course_reserves/course-reserves.pl"><i class="fa fa-fw fa-book"></i></a><h7>Course reserves</h7></li> >+ <li><a class="accueil" 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 %] > > <li><a class="accueil" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-fw fa-link"></i></a><h7>Authorities</h7></li> > >+ </ul></div> >+ <div class="menuspe"><ul class="biglinks-list"> >+ >+ <li><a class="accueil" 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="accueil" href="/cgi-bin/koha/ill/ill-requests.pl"><i class="fa fa-fw fa-retweet"></i></a><h7>ILL requests</h7></li> >+ <li><a class="accueil" 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="accueil" href="/cgi-bin/koha/pos/pay.pl"><i class="fa fa-fw fa-shopping-cart"></i></a><h7>Point of sale</h7></li> >+ <li><a class="accueil" 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="accueil" href="/cgi-bin/koha/cataloguing/addbooks.pl"><i class="fa fa-fw fa-tag"></i></a><h7>Cataloging</h7></li> >+ <li><a class="accueil" 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="accueil" href="/cgi-bin/koha/serials/serials-home.pl"><i class="fa fa-fw fa-newspaper-o"></i></a><span class="biglink"></span><h7>Serials</h7> >- </li> >+ <li><a class="accueil" 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="accueil" href="/cgi-bin/koha/acqui/acqui-home.pl"><i class="fa fa-fw fa-gift"></i></a><span class="biglink"></span><h7>Acquisitions</h7> >- </li> >+ <li><a class="accueil" 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 class="vert"><ul class="biglinks-list"> > [% IF ( CAN_user_reports ) %] >- <li><a class="accueil" href="/cgi-bin/koha/reports/reports-home.pl"><i class="fa fa-fw fa-pie-chart"></i></a><h7>Reports</h7></li> >+ <li><a class="accueil" id="reglages" 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="accueil" href="/cgi-bin/koha/tools/tools-home.pl"><i class="fa fa-fw fa-wrench"></i></a><h7>Tools</h7></li> >+ <li><a class="accueil" id="reglages" 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="accueil" href="/cgi-bin/koha/admin/admin-home.pl"><i class="fa fa-fw fa-cogs"></i></a><h7>Koha administration</h7></li> >+ <li><a class="accueil" id="reglages" 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> >- </ul> >+ >+ <li><a class="accueil" id="reglages" 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> >+ </div> >+ </ul></div> > </div> <!-- /.row --> > <div class="row"> > <div class="col-sm-12"> >@@ -242,10 +230,12 @@ > </div> > </div> > [% END %] >+ > </div> <!-- /.col-sm-9 --> > > </div> <!-- /.row --> > </div> <!-- /.container-fluid --> >+ <div class="menuspebas"><div class="bas"><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/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >index 01fcc2489d..af86823123 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,13 +2,16 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -47,6 +50,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/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >index 567720be1b..a9ce9df5c8 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> >@@ -22,7 +25,7 @@ > [% END %] > [% END %] > <body id="labels_label-edit-layout" class="tools labels"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc'' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -53,6 +56,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/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >index 92f43ee5d9..96bf2f1e27 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,12 +1,15 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -33,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/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >index 508c24b65f..ce08d1acbd 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,11 +1,14 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -24,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"> >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 1e118bec06..afa4140905 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,12 +1,15 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -32,6 +35,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/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >index ade64c9983..2e78cb3bef 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,12 +1,15 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -22,6 +25,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/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index d28f4585dc..b58e40fe4f 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,7 +23,7 @@ > </head> > > <body id="labels_label-manage" class="tools labels"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -39,6 +42,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -98,8 +107,8 @@ > [% FOREACH text_field IN table_loo.text_fields %] > [% IF ( text_field.select_field ) %] > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/labels/label-edit-[% label_element |url %].pl?op=edit&element_id=[% text_field.field_value |url %]"><i class="fa fa-edit"></i> Edit</a> >- <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/labels/label-manage.pl?op=delete&label_element=[% label_element | html %]&element_id=[% text_field.field_value |url %]"><i class="fa fa-trash"></i> Delete</a> >+ <a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/labels/label-edit-[% label_element |url %].pl?op=edit&element_id=[% text_field.field_value |url %]"><i class="fa fa-edit"></i> Edit</a> >+ <a id="lientype" class="btn btn-default btn-xs delete" href="/cgi-bin/koha/labels/label-manage.pl?op=delete&label_element=[% label_element | html %]&element_id=[% text_field.field_value |url %]"><i class="fa fa-trash"></i> Delete</a> > </td> > [% IF label_element == 'batch' %] <td><input type="checkbox" name="action" value="[% text_field.field_value | html %]" /></td>[% END %] > [% ELSIF ( text_field.field_value ) %] >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 010ad19448..67ff57b65f 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,12 +1,15 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -22,6 +25,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"> >@@ -37,7 +46,7 @@ > <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 3ae299e22f..26b8956f63 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 >@@ -14,7 +14,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > >-<body id="pat_accountline_details" class="pat"> >+<body id="pat_accountline_details"> > [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -55,6 +55,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"> >@@ -147,7 +153,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 a20e3660d5..f7c69e4cf9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >@@ -3,7 +3,7 @@ > [% USE Asset %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>API Keys › Patrons › Koha</title> >@@ -26,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"> >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 3aefaed7b5..eae9bbdd6c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -10,7 +10,7 @@ > [% USE Registers %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% SET registers = Registers.all( filters => { current_branch => 1 } ) %] > >@@ -21,7 +21,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > >-<body id="pat_borraccount" class="pat"> >+<body id="pat_borraccount"> > [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -38,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"> >@@ -108,16 +114,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" id="lientype"><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" id="lientype"><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" id="lientype"><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" id="lientype"><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"> >@@ -131,7 +137,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" id="lientype"><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> >@@ -150,7 +156,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" id="lientype"><i class="fa fa-money"></i> Payout amount</button> > [% END %] > </td> > [% ELSE %] >@@ -183,7 +189,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 ) %] >@@ -191,7 +197,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> >@@ -219,8 +225,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 11e07b1b17..a22f731871 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >@@ -4,7 +4,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Delete patron [% patron.firstname | html %] [% patron.surname | html %] › Koha</title> >@@ -27,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"> >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 878070b794..db00e2b406 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >@@ -5,7 +5,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.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> >@@ -37,6 +37,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/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >index 1fb5ebda8d..006db4ab28 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >@@ -3,16 +3,23 @@ > [% USE Branches %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search.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"> >+<<<<<<< HEAD > [% INCLUDE 'header.inc' %] > <<<<<<< HEAD > [% INCLUDE 'patron-search-header.inc' %] > ======= > >>>>>>> Bug 30952: Patrons Module >+======= >+[% INCLUDE 'header.inc' form=formulaire %] >+>>>>>>> Bug 30952: Search bar > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -28,6 +35,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/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >index 5e9c68ed4b..27c521a0e8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >@@ -5,14 +5,14 @@ > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.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"> >+<body id="pat_files"> > [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -29,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"> >@@ -38,7 +44,7 @@ > > [% INCLUDE 'members-toolbar.inc' %] > >- <h1>Files</h1> >+ <h2>Files</h2> > > [% IF errors %] > <div class="dialog alert"> >@@ -66,7 +72,7 @@ > <td>[% f.file_type | html %]</td> > <td>[% f.file_description | html %]</td> > <td>[% f.date_uploaded | $KohaDates %]</td> >- [% IF CAN_user_borrowers_edit_borrowers %]<td><a class="btn btn-default btn-xs confirmdelete" href="?borrowernumber=[% patron.borrowernumber | html %]&op=delete&file_id=[% f.file_id | html %]"><i class="fa fa-trash"></i> Delete</a></td>[% END %] >+ [% IF CAN_user_borrowers_edit_borrowers %]<td><a class="btn btn-default btn-xs confirmdelete" href="?borrowernumber=[% patron.borrowernumber | html %]&op=delete&file_id=[% f.file_id | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a></td>[% END %] > </tr> > [% END %] > </tbody> >@@ -79,7 +85,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 %]" /> >@@ -91,7 +97,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 9c3323ce88..cf41682f8c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >@@ -8,15 +8,15 @@ > [% USE ItemTypes %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc.inc' %] >+ [% INCLUDE 'patron-search.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' form= formulaire %] >+<body id="pat_holdshistory"> >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -32,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"> >@@ -40,7 +46,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> >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 034cf29b60..7b1e0e6450 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >@@ -6,7 +6,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] › Housebound › Koha</title> >@@ -14,7 +14,7 @@ > </head> > > <body id="housebound-home" class="housebound"> >-[% INCLUDE 'header.inc' form= formulaire %] >+[% INCLUDE 'header.inc' form=formulaire %] > > [% BLOCK 'homebound-details' %] > <div class="rows"> >@@ -74,6 +74,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/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >index ba724d494f..e90a46d564 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 >@@ -5,7 +5,7 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% USE AuthorisedValues %] > [% USE TablesSettings %] >@@ -16,7 +16,7 @@ > </head> > > <body id="pat_illrequestshistory" class="pat"> >- [% INCLUDE 'header.inc' form= formulaire %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -32,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"> >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 a75237dba4..091c88ff71 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >@@ -4,7 +4,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > > [% PROCESS 'accounts.inc' %] >@@ -14,8 +14,8 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > >-<body id="pat_mancredit" class="pat"> >-[% INCLUDE 'header.inc' form= formulaire %] >+<body id="pat_mancredit"> >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -31,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"> >@@ -56,8 +62,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> >@@ -74,7 +80,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 742b92d3a2..5ae766ea71 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >@@ -5,7 +5,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > > [% PROCESS 'accounts.inc' %] >@@ -15,8 +15,8 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > >-<body id="pat_maninvoice" class="pat"> >-[% INCLUDE 'header.inc' form= formulaire %] >+<body id="pat_maninvoice"> >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -32,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"> >@@ -66,8 +72,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> >@@ -88,9 +94,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 0362b22852..70c90859d0 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 >@@ -3,7 +3,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% PROCESS 'permissions.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -13,7 +13,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > >-<body id="pat_member-flags" class="pat"> >+<body id="pat_member-flags"> > [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -30,6 +30,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,12 +49,12 @@ > <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" /> > <input type="hidden" name="member" id="borrowernumber" value="[% patron.borrowernumber | html %]" /> > <input type="hidden" name="newflags" value="1" /> >- <h1>Set permissions for [% INCLUDE 'patron-title.inc' no_html = 1 %]</h1> >+ <h2>Set permissions for [% INCLUDE 'patron-title.inc' no_html = 1 %]</h2> > > <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> >+ <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> > <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="#"> >@@ -89,7 +95,7 @@ > [% IF ( loo.flag == "superlibrarian" ) %]<div class="hint superlibrarian-hint">This permission grants access to all areas. If selected, specific sub-permissions cannot be selected.</div>[% END %] > [% IF ( loo.sub_perm_loop ) %] > <a class="toggle-[% loo.bit | html %] togglechildren_off" href="#" data-bit="[% loo.bit | html %]"><i class="fa fa-minus-square-o"></i> Hide details</a> >- <a class="toggle-[% loo.bit | html %] togglechildren_on" href="#" data-bit="[% loo.bit | html %]"><i class="fa fa-plus-square-o"></i> Show details</a> >+ <a class="toggle-[% loo.bit | html %] togglechildren_on" href="#" data-bit="[% loo.bit | html %]" id="lientype"><i class="fa fa-plus-square-o"></i> Show details</a> > <div class="children" id="flag-[% loo.bit | html %]-children"> > [% FOREACH sub_perm_loo IN loo.sub_perm_loop %] > <div class="child-flags"> >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 89286b5c09..259211b5a8 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 >@@ -4,7 +4,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >@@ -13,7 +13,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > >-<body id="pat_member-password" class="pat"> >+<body id="pat_member-password"> > [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -37,6 +37,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"> >@@ -47,7 +53,7 @@ > [% INCLUDE 'members-toolbar.inc' %] > > [% IF ( newpassword ) %] >-<h1>Password updated</h1> >+<h2>Password updated</h2> > > [% ELSE %] > >@@ -84,7 +90,11 @@ > [% END %] > > >+<<<<<<< HEAD > <fieldset class="brief"><legend><h1>Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]</h1></legend> >+======= >+ <fieldset class="brief"><h3>Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]</h3> >+>>>>>>> Bug 30952: Search bar > <ol> > <li><label for="newuserid">New username:</label> > <input type="hidden" name="member" value="[% patron.borrowernumber | html %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% patron.userid | html %]" /></li> >@@ -102,12 +112,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 e75e5187c7..2fc47bf8d4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -75,12 +75,9 @@ > [% END %] > > <div id="searchresults"> >-<<<<<<< HEAD >-======= > <h3>Patrons found for: <span id="searchpattern">[% IF searchmember %] for '[% searchmember | html %]'[% END %]</span></h3> > > >->>>>>>> Bug 30952: Patrons Module > [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %] > <div class="searchheader fh-fixedHeader" id="searchheader" style="display:none;"> > <div> >@@ -126,9 +123,7 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >-<<<<<<< HEAD > [% PROCESS patron_search_filters categories => categories, libraries => libraries, filters => ['search_field', 'search_type', 'category', 'branch'], search_filter => searchmember %] >-======= > <div id="filters"> > <form method="get" id="searchform"> > <input type="hidden" id="firstletter_filter" value="" /> >@@ -204,7 +199,6 @@ > </fieldset> > </form> > </div> >->>>>>>> Bug 30952: Patrons Module > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >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 ce17068e73..d798927ac3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -10,7 +10,7 @@ > [% PROCESS 'member-alt-contact-style.inc' %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >@@ -27,7 +27,7 @@ > [% END %] › Patrons › Koha > </title> > <style> >-legend:hover { >+h3:hover { > cursor: pointer; > } > </style> >@@ -35,7 +35,7 @@ legend:hover { > </head> > > <body id="pat_memberentrygen"s> >- [% INCLUDE 'header.inc' form=formulaire %] >+ [% INCLUDE 'header.inc' form= formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -117,7 +117,7 @@ legend:hover { > [% INCLUDE 'noadd-warnings.inc' %] > > [% UNLESS ( no_add ) %] >- <h1> >+ <h2> > [% IF ( opadd ) %] > Add patron > [% ELSIF ( opduplicate ) %] >@@ -127,7 +127,7 @@ legend:hover { > [% END %] > [% INCLUDE 'patron-title.inc' %] > [% IF categoryname %]([% categoryname | html %])[% END %] >- </h1> >+ </h2> > > [% IF quickadd && opadd && !check_member %] > <a href="#" class="toggle_quick_add"><i class="fa fa-plus-square"></i> Show full form</a> >@@ -230,18 +230,19 @@ legend:hover { > > [% UNLESS ( check_member ) %] > <div id="toolbar" class="btn-toolbar"> >+ <div> > [% IF quickadd && opadd %] > <button class="btn btn-default toggler principal" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button> > [% END %] > <button class="btn btn-default toggler principal" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button> > [% IF opadd %] >- <a class="btn btn-default" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform"> >+ <a class="cancel" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform"> > [% ELSE %] >- <a class="btn btn-default" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]"> >+ <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]"> > [% END %] > <i class="fa fa-times"></i> Cancel > </a> >- </div> >+ </div></div> > [% END %] > > <form name="form" id="entryform" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off" class="toggler"> >@@ -277,7 +278,7 @@ legend:hover { > [% IF ( step_1 ) %] > [% UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %] > <fieldset class="rows" id="memberentry_identity"> >- <legend id="identity_lgd">[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend> >+ <h3 id="identity_lgd">[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</h3> > <ol> > [% UNLESS ( I ) %] > [% UNLESS notitle %] >@@ -442,7 +443,7 @@ legend:hover { > [% SET possible_relationships = Koha.Preference('borrowerRelationship') %] > <div id="memberentry_guarantor_anchor"> > <fieldset id="memberentry_guarantor" class="rows"> >- <legend>Patron guarantor</legend> >+ <h3>Patron guarantor</h3> > > <div id="guarantor_relationships"> > [% FOREACH r IN relationships %] >@@ -604,7 +605,7 @@ legend:hover { > > [% UNLESS nocontactname && nocontactfirstname && norelationship %] > <fieldset class="rows" id="non_patron_guarantor"> >- <legend>Non-patron guarantor</legend> >+ <h3>Non-patron guarantor</h3> > <ol> > [% UNLESS nocontactname %] > <li> >@@ -668,7 +669,7 @@ legend:hover { > > [% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %] > <fieldset class="rows" id="memberentry_contact"> >- <legend id="contact_lgd">Contact information</legend> >+ <h3 id="contact_lgd">Contact information</h3> > <ol> > [% UNLESS nophone %] > <li> >@@ -857,7 +858,7 @@ legend:hover { > [% IF ( step_3 ) %] > [% SET autoMemberNum = Koha.Preference('autoMemberNum') %] > <fieldset class="rows" id="memberentry_library_management"> >- <legend id="library_management_lgd">Library management</legend> >+ <h3 id="library_management_lgd">Library management</h3> > <ol> > [% UNLESS nocardnumber %] > <li> >@@ -1056,7 +1057,7 @@ legend:hover { > > [% UNLESS nodateenrolled && noopacnote && noborrowernotes %] > <fieldset class="rows" id="memberentry_subscription"> >- <legend id="library_setup_lgd">Library setup</legend><ol> >+ <h3 id="library_setup_lgd">Library setup</h3><ol> > [% UNLESS nodateenrolled %] > <li> > [% IF ( mandatorydateenrolled ) %] >@@ -1142,7 +1143,7 @@ legend:hover { > > [% UNLESS nouserid && nopassword && !CanUpdatePasswordExpiration %] > <fieldset class="rows" id="memberentry_userid"> >- <legend id="opac_staff_login_lgd">OPAC/Staff interface login</legend> >+ <h3 id="opac_staff_login_lgd">OPAC/Staff interface login</h3> > <ol> > [% UNLESS nouserid %] > <li> >@@ -1298,7 +1299,7 @@ legend:hover { > <!--this zones are not necessary in modif mode --> > [% UNLESS ( opadd || opduplicate ) %] > <fieldset class="rows" id="memberentry_account_flags"> >- <legend id="account_flags_lgd">Patron account flags</legend> >+ <h3 id="account_flags_lgd">Patron account flags</h3> > <ol class="radio"> > [% FOREACH flagloo IN flagloop %] > <li> >@@ -1332,7 +1333,7 @@ legend:hover { > </fieldset> <!-- /#memberentry_account_flags --> > > <fieldset class="rows" id="memberentry_restrictions"> >- <legend id="restrictions_lgd">Patron restrictions</legend> >+ <h3 id="restrictions_lgd">Patron restrictions</h3> > [% IF ( debarments ) %] > <table> > <thead> >@@ -1379,10 +1380,10 @@ legend:hover { > [% END # /IF ( debarments ) %] > > [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %] >- <p><a href="#" id="add_manual_restriction">Add manual restriction</a></p> >+ <p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p> > <fieldset id="manual_restriction_form"> > <input type="hidden" id="add_debarment" name="add_debarment" value="0" /> >- <legend id="manual_restriction_lgd">Add manual restriction</legend> >+ <h3 id="manual_restriction_lgd">Add manual restriction</h3> > <ol> > <li> > <label for="debarred_comment">Comment: </label> >@@ -1406,7 +1407,7 @@ legend:hover { > [% IF ( step_7 ) %] > [% IF Koha.Preference('HouseboundModule') %] > <fieldset class="rows" id="memberentry_housebound_roles"> >- <legend id="housebound_roles">Housebound roles</legend> >+ <h3 id="housebound_roles">Housebound roles</h3> > <ol class="radio"> > <li> > <label class="radio" for="housebound_chooser"> >@@ -1447,13 +1448,13 @@ legend:hover { > [% IF Koha.Preference('ExtendedPatronAttributes') %] > [% UNLESS ( no_patron_attribute_types ) %] > <fieldset class="rows" id="memberentry_patron_attributes"> >- <legend id="patron_attributes_lgd">Additional attributes and identifiers</legend> >+ <h3 id="patron_attributes_lgd">Additional attributes and identifiers</h3> > <input type="hidden" name="setting_extended_patron_attributes" value="1" /> > [% FOREACH pa_loo IN patron_attributes %] > <ol class="attributes_table"> > [% IF pa_loo.class %] > <fieldset id="aai_[% pa_loo.class | html %]"> >- <legend id="[% pa_loo.class | html %]_lgd">[% pa_loo.lib | html %]</legend> >+ <h3 id="[% pa_loo.class | html %]_lgd">[% pa_loo.lib | html %]</h3> > [% END %] > [% FOREACH patron_attribute IN pa_loo.items %] > <li data-category_code="[% patron_attribute.category_code | html %]"> >@@ -1489,7 +1490,7 @@ legend:hover { > [% END %] > [% END # /IF ( patron_attribute.use_dropdown ) %] > <input type="hidden" id="[% patron_attribute.form_id | html %]_code" name="[% patron_attribute.form_id | html %]_code" value="[% patron_attribute.code | html %]" /> >- <a href="#" class="clear_attribute"><i class="fa fa-fw fa-trash"></i> Clear</a> >+ <a href="#" class="clear_attribute" id="lientype"><i class="fa fa-fw fa-trash"></i> Clear</a> > [% IF ( patron_attribute.repeatable ) %] > <a href="#" class="clone_attribute"><i class="fa fa-fw fa-plus"></i> New</a> > [% END %] >@@ -1507,7 +1508,7 @@ legend:hover { > [% IF ( step_5 ) %] > [% IF ( EnhancedMessagingPreferences ) %] > <fieldset class="rows" id="memberentry_messaging_prefs"> >- <legend id="patron_messaging_prefs_lgd">Patron messaging preferences</legend> >+ <h3 id="patron_messaging_prefs_lgd">Patron messaging preferences</h3> > <div id="messaging_prefs_loading" class="form-message" style="display:none"> > <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading new messaging defaults > </div> >@@ -1542,7 +1543,7 @@ legend:hover { > > [% IF quickadd && opadd && !check_member %] > <form id="quick_add_form" class="toggler"> >- <fieldset class="rows quick_add"><legend>Quick add</legend> >+ <fieldset class="rows quick_add"><h3>Quick add</h3> > <ol id="quick_add_list"> > </ol> > </fieldset> >@@ -1580,72 +1581,72 @@ legend:hover { > function showHideFields(){ > [% UNLESS step == 1 %] > [% IF fieldstohide.match('identity') %] >- $("#memberentry_identity").find('legend').nextAll().toggle(); >+ $("#memberentry_identity").find('h3').nextAll().toggle(); > [% END %] > [% IF show_guarantor || guarantor %] > [% IF fieldstohide.match('guarantor') %] >- $("#memberentry_guarantor").find('legend').nextAll().toggle(); >+ $("#memberentry_guarantor").find('h3').nextAll().toggle(); > $("#guarantor_template").toggle(); > [% END %] > [% END %] > [% IF fieldstohide.match('primary_address') %] >- $("#memberentry_mainaddress").find('legend').nextAll().toggle(); >+ $("#memberentry_mainaddress").find('h3').nextAll().toggle(); > [% END %] > [% IF fieldstohide.match('primary_contact') %] >- $("#memberentry_contact").find('legend').nextAll().toggle(); >+ $("#memberentry_contact").find('h3').nextAll().toggle(); > [% END %] > [% END %] > [% UNLESS step == 6 %] > [% IF fieldstohide.match('alt_address') %] >- $("#memberentry_address").find('legend').nextAll().toggle(); >+ $("#memberentry_address").find('h3').nextAll().toggle(); > [% END %] > [% END %] > [% UNLESS step == 2 %] > [% IF fieldstohide.match('alt_contact') %] >- $("#memberentry_altaddress").find('legend').nextAll().toggle(); >+ $("#memberentry_altaddress").find('h3').nextAll().toggle(); > [% END %] > [% END %] > [% UNLESS step == 3 %] > [% IF fieldstohide.match('lib_mgmt') %] >- $("#memberentry_library_management").find('legend').nextAll().toggle(); >+ $("#memberentry_library_management").find('h3').nextAll().toggle(); > [% END %] > [% UNLESS nodateenrolled && noopacnote && noborrowernotes %] > [% IF fieldstohide.match('lib_setup') %] >- $("#memberentry_subscription").find('legend').nextAll().toggle(); >+ $("#memberentry_subscription").find('h3').nextAll().toggle(); > [% END %] > [% END %] > [% UNLESS nouserid && nopassword %] > [% IF fieldstohide.match('login') %] >- $("#memberentry_userid").find('legend').nextAll().toggle(); >+ $("#memberentry_userid").find('h3').nextAll().toggle(); > [% END %] > [% END %] > [% UNLESS ( opadd || opduplicate ) %] > [% IF fieldstohide.match('flags') %] >- $("#memberentry_account_flags").find('legend').nextAll().toggle(); >+ $("#memberentry_account_flags").find('h3').nextAll().toggle(); > [% END %] > [% END %] > [% IF fieldstohide.match('debarments') %] >- $("#memberentry_restrictions").find('legend').nextAll().toggle(); >+ $("#memberentry_restrictions").find('h3').nextAll().toggle(); > [% END %] > [% END %] > [% UNLESS step == 7 %] > [% IF Koha.Preference('HouseboundModule') %] > [% IF fieldstohide.match('housebound') %] >- $("#memberentry_housebound_roles").find('legend').nextAll().toggle(); >+ $("#memberentry_housebound_roles").find('h3').nextAll().toggle(); > [% END %] > [% END %] > [% END %] > [% UNLESS step == 4 %] > [% IF Koha.Preference('ExtendedPatronAttributes') %] > [% IF fieldstohide.match('additional') %] >- $("#memberentry_patron_attributes").find('legend').nextAll().toggle(); >+ $("#memberentry_patron_attributes").find('h3').nextAll().toggle(); > [% END %] > [% END %] > [% END %] > [% UNLESS step == 5 %] > [% IF Koha.Preference('EnhancedMessagingPreferences') %] > [% IF fieldstohide.match('messaging') %] >- $("#memberentry_messaging_prefs").find('legend').nextAll().toggle(); >+ $("#memberentry_messaging_prefs").find('h3').nextAll().toggle(); > $("#messaging_prefs_loading").toggle(); > [% END %] > [% END %] >@@ -1658,7 +1659,7 @@ legend:hover { > showHideFields(); > }); > >- $("legend").click(function(){ >+ $("h3").click(function(){ > $(this).nextAll().toggle(); > $("#messaging_prefs_loading").hide(); > $("#guarantor_template").hide(); >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 dc447f1796..9ac7822d77 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 >@@ -6,7 +6,7 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Update patron records › Patrons › Koha</title> >@@ -104,6 +104,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/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >index 2f84c7782a..f6d13935d7 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 >@@ -5,7 +5,7 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Merge patron records › Patrons › Koha</title> >@@ -48,7 +48,7 @@ > </style> > [% END %] > </head> >-<body id="pat_merge" class="pat"> >+<body id="pat_merge"> > [% INCLUDE 'header.inc' form=formulaire %] > > [% BLOCK display_names %] >@@ -93,19 +93,25 @@ > <a href="#" aria-current="page">Merge patron records</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"> > <div class="row"> > <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> >- <h1>Merge patron records</h1> >+ <h2>Merge patron records</h2> > > [% IF action == 'show' %] > [% IF patrons.count > 1 %] > [% 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 pat" id="compare_patrons"> > <i class="fa fa-arrows-h"></i> Compare patrons > </button> > </div> >@@ -156,7 +162,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 %] >@@ -199,7 +205,7 @@ > [% END %] > > [% UNLESS error %] >- <a class="btn btn-default" href="moremember.pl?borrowernumber=[% keeper.id | html %]">View patron record</a> >+ <a class="btn btn-default" href="moremember.pl?borrowernumber=[% keeper.id | html %]" id="lientype">View patron record</a> > [% END %] > [% END %] > </div> >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 e4b70cdf1b..ebea99a797 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -12,7 +12,7 @@ > [% PROCESS 'member-display-alt-address-style.inc' %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %] >@@ -91,17 +91,26 @@ > </div> > [% END %] > >- <div class="row"> >+ <div> > >- [% IF ( was_renewed ) %] >+ <h2> >+ [% UNLESS ( I ) %] >+ [% patron.title | html %] [% patron.firstname | html %] >+ [% END %] >+ [% patron.surname | html %] ([% patron.cardnumber | html %]) >+ </h2> >+ >+ <fieldset id="searchresults"> >+ [% IF ( was_renewed ) %] > <div class="dialog message"> > Patron's account has been renewed until [% patron.dateexpiry | $KohaDates %] > </div> >- [% END %] >+ [% END %] > >- <div id="patron_messages" class="circmessage attention"> >- [% INCLUDE 'patron_messages.inc' %] >- </div> >+ <div id="patron_messages" class="circmessage attention"> >+ [% INCLUDE 'patron_messages.inc' %] >+ </div> >+ </fieldset> > > <h1> > [% UNLESS ( I ) %] >@@ -110,15 +119,16 @@ > [% patron.surname | html %] ([% patron.cardnumber | html %]) > </h1> > <div class="col-sm-6"> >+ <fieldset class="rows"> > > <div id="patron-information" class="patroninfo-section"> > > <div class="patroninfo-heading"> > <h3>Contact information</h3> > [% IF ( guarantor.borrowernumber ) %] >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=1&guarantorid=[% guarantor.borrowernumber | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=1&guarantorid=[% guarantor.borrowernumber | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> > [% ELSE %] >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=1"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=1" id="lientype"><i class="fa fa-pencil"></i> Edit</a> > [% END %] > </div> > >@@ -263,12 +273,52 @@ > </div> [% # /div.rows %] > </div> [% # /div#patron-information %] > >+ [% IF ( patronimages ) %] >+ [% IF ( CAN_user_tools_batch_upload_patron_images ) %] >+ <div id="manage-patron-image" class="patroninfo-section"> >+ [% IF ( patron.image ) %] >+ <div class="patroninfo-heading"> >+ <h3>Manage patron image</h3> >+ <a class="btn btn-default btn-xs" id="show-picture-upload" href="#" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ </div> >+ [% ELSE %] >+ <div class="patroninfo-heading"> >+ <h3>Upload patron image</h3> >+ <a class="btn btn-default btn-xs" id="show-picture-upload" href="#"><i class="fa fa-plus"></i> Add</a> >+ </div> >+ [% END %] >+ <form method="post" id="picture-upload" style="display:none;" action="/cgi-bin/koha/tools/picture-upload.pl" enctype="multipart/form-data"> >+ [% IF ( patron.image ) %] >+ <div class="hint">To update the image for [% patron.title | html %] [% patron.firstname | html %] [% patron.surname | html %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image.</div> >+ [% ELSE %] >+ <div class="hint">[% patron.title | html %] [% patron.firstname | html %] [% patron.surname | html %] does not currently have an image available. To import an image for [% patron.title | html %] [% patron.firstname | html %] [% patron.surname | html %], enter the name of an image file to upload.</div> >+ [% END %] >+ <p>Only PNG, GIF, JPEG, XPM formats are supported. Maximum image size is 2MB.</p> >+ <label for="uploadfile">Select the file to upload: </label> >+ <input type="file" id="uploadfile" name="uploadfile" required="required" /> >+ <div class="action"> >+ <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" /> >+ <input type="hidden" id="image" name="filetype" value="image" /> >+ <input type="hidden" id="cardnumber" name="cardnumber" value="[% patron.cardnumber | html %]" /> >+ <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" /> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-upload"></i> Upload</button> >+ <input name="op" type="hidden" value="Upload" /> >+ [% IF ( patron.image ) %] >+ <a id="delpicture" href="/cgi-bin/koha/tools/picture-upload.pl?op=Delete&borrowernumber=[% patron.borrowernumber | html %]&csrf_token=[% csrf_token | html %]" class="btn btn-default btn-xs delete"><i class="fa fa-trash"></i> Delete</a> >+ [% END %] >+ <a href="#" id="cancel-picture-upload" class="cancel">Cancel</a> >+ </div> >+ </form> >+ </div> [% # /div#manage-patron-image %] >+ [% END %] >+ [% END %] >+ > [% IF Koha.Preference('HouseboundModule') %] > <div id="houseboundroles" class="patroninfo-section"> > [% IF ( housebound_role.housebound_chooser == 1 OR housebound_role.housebound_deliverer == 1 ) %] > <div class="patroninfo-heading"> > <h3>Housebound roles</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=7"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=7" id="lientype"><i class="fa fa-pencil"></i> Edit</a> > </div> > <div class="rows"> > <ol> >@@ -293,7 +343,7 @@ > [% ELSE %] > <div class="patroninfo-heading"> > <h3>Housebound roles</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=7"><i class="fa fa-plus"></i> Add</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=7" id="lientype"><i class="fa fa-plus"></i> Add</a> > </div> > [% END %] > </div> [% #/ div#houseboundroles %] >@@ -305,7 +355,7 @@ > [% IF ( attributes_loop ) %] > <div class="patroninfo-heading"> > <h3>Additional attributes and identifiers</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=4"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=4" id="lientype"><i class="fa fa-pencil"></i> Edit</a> > </div> > [% FOREACH attribute IN attributes_loop %] > [% IF attribute.class %] >@@ -329,7 +379,7 @@ > [% ELSE %] > <div class="patroninfo-heading"> > <h3>Additional attributes and identifiers</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=4"><i class="fa fa-plus"></i> Add</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=4" id="lientype"><i class="fa fa-plus"></i> Add</a> > </div> > [% END %] > </div> [% # /div#patron-extended-attributes %] >@@ -340,7 +390,7 @@ > <div id="patron-messaging-prefs" class="patroninfo-section"> > <div class="patroninfo-heading"> > <h3>Patron messaging preferences</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=5"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=5" id="lientype"><i class="fa fa-pencil"></i> Edit</a> > </div> > [% INCLUDE 'messaging-preference-form.inc' %] > [% IF Koha.Preference('SMSSendDriver') %] >@@ -361,14 +411,15 @@ > [% END %] > </div> [% # /div#patron-messaging-prefs %] > [% END %] >- >+ </fieldset> > </div> <!-- /.col-sm-6 --> > > <div class="col-sm-6"> >+ <fieldset class="rows"> > <div id="patron-library-details" class="patroninfo-section"> > <div class="patroninfo-heading"> > <h3>Library use</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=3"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=3" id="lientype"><i class="fa fa-pencil"></i> Edit</a> > </div> > <div class="rows"> > <ol> >@@ -404,12 +455,12 @@ > <span class="blocker"> > [% patron.dateexpiry | $KohaDates %] > <strong><em>Expired</em></strong> >- <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]">Edit details</a> >+ <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a> > </span> > [% ELSIF ( patron.is_going_to_expire ) %] > [% patron.dateexpiry | $KohaDates %] > <strong><em>Patron expires soon</em></strong> >- <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]">Edit details</a> >+ <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a> > [% ELSE %] > [% patron.dateexpiry | $KohaDates %] > [% END %] >@@ -510,7 +561,7 @@ > [% IF ( patron.B_phone || patron.B_email || patron.contactnote || patron.B_address || patron.B_address2 || patron.B_city || patron.B_zipcode || patron.B_country ) %] > <div class="patroninfo-heading"> > <h3>Alternate address</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=6"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=6" id="lientype"><i class="fa fa-pencil"></i> Edit</a> > </div> > <div class="address"> > <ul> >@@ -544,7 +595,7 @@ > [% ELSE %] > <div class="patroninfo-heading"> > <h3 class="inline">Alternate address</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=6"><i class="fa fa-plus"></i> Add</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=6" id="lientype"><i class="fa fa-plus"></i> Add</a> > </div> > [% END %] > </div> [% # /div#patron-alternate-address %] >@@ -553,7 +604,7 @@ > [% IF ( patron.altcontactsurname || patron.altcontactfirstname || patron.altcontactaddress1 || patron.altcontactaddress2 || patron.altcontactaddress3 || patron.altcontactstate || patron.altcontactzipcode || patron.altcontactcountry || patron.altcontactphone ) %] > <div class="patroninfo-heading"> > <h3>Alternative contact</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=2"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=2" id="lientype"><i class="fa fa-pencil"></i> Edit</a> > </div> > <div class="rows"> > <ol> >@@ -617,7 +668,7 @@ > [% ELSE %] > <div class="patroninfo-heading"> > <h3>Alternative contact</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=2"><i class="fa fa-plus"></i> Add</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=2" id="lientype"><i class="fa fa-plus"></i> Add</a> > </div> > [% END %] > </div> [% # /div#patron-alternative-contact %] >@@ -626,7 +677,7 @@ > <div id="patron-files" class="patroninfo-section"> > <div class="patroninfo-heading"> > <h3>Files</h3> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | uri %]"><i class="fa fa-list"></i> Manage</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | uri %]" id="lientype"><i class="fa fa-list"></i> Manage</a> > > [% IF ( files ) %] > <div class="rows"> >@@ -646,11 +697,13 @@ > </div> <!-- /.patroninfo-heading --> > </div> <!-- /#patron-files --> > [% END # /IF EnableBorrowerFiles %] >+ </fieldset> > > </div> <!-- /div.col-sm-6 --> > </div> <!-- /div.row --> > >- <div id="finesholdsissues" class="toptabs"> >+ <fieldset id="finesholdsissues" class="toptabs"> >+ <fieldset id="searchresultst"> > <ul> > <li> > <a href="#checkouts">Checkouts ([% issuecount || 0 | html %])</a> >@@ -791,7 +844,7 @@ > <fieldset class="action"> > <input type="hidden" name="from" value="borrower" /> > <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" /> >- <input type="submit" value="Suspend all holds" /> >+ <input type="submit" class="principal" value="Suspend all holds" /> > > [% IF Koha.Preference('AutoResumeSuspendedHolds') %] > <label for="suspend_until">until</label> >@@ -806,7 +859,7 @@ > <input type="hidden" name="from" value="borrower" /> > <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" /> > <input type="hidden" name="suspend" value="0" /> >- <input type="submit" value="Resume all suspended holds" /> >+ <input type="submit" class="principal" value="Resume all suspended holds" /> > </fieldset> > </form> > [% END # IF SuspendHoldsIntranet %] >@@ -830,8 +883,8 @@ > [% IF Koha.Preference('ArticleRequests') %] > [% INCLUDE 'patron-article-requests.inc' %] > [% END %] >- >- </div> <!-- /div#finesholdsissues --> >+ </fieldset> >+ </fieldset> <!-- /div#finesholdsissues --> > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> > >@@ -925,7 +978,7 @@ > for (var i=0;i < Nodes.length;i++){ > if (Nodes[i].nodeName=="INPUT" && Nodes[i].getAttribute("type")=="checkbox"){ > Nodes[i].checked=false; >- } >+ view_restrictions } > } > } else { > var Node=me.parentNode.nextSibling; >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 33939033a7..d0a4793431 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -6,7 +6,7 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> >@@ -16,7 +16,7 @@ > </style> > </head> > >-<body id="pat_notices" class="pat"> >+<body id="pat_notices"> > [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -33,6 +33,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,8 +47,9 @@ > <main> > > [% INCLUDE 'members-toolbar.inc' %] >- <h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1> >+ <h2>Sent notices for [% INCLUDE 'patron-title.inc' %]</h2> > >+ <div id="searchresults"> > [% IF ( QUEUED_MESSAGES ) %] > <table id="noticestable"> > <thead> >@@ -109,6 +116,7 @@ > [% ELSE %] > <div class="dialog message">There is no record of any messages that have been sent to this patron.</div> > [% END %] >+ </div> > > </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 9dbf426238..6741264d10 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -8,7 +8,7 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -16,7 +16,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > >-<body id="pat_pay" class="pat"> >+<body id="pat_pay"> > [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -33,6 +33,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/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >index 6ccd88ec7b..d142f8849e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >@@ -6,7 +6,7 @@ > [% USE Price %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -35,7 +35,7 @@ > </head> > > <body id="pat_paycollect" class="pat"> >-[% INCLUDE 'header.inc' form=formulaire %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -68,6 +68,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/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >index 16dc435c97..10d7cef640 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 >@@ -6,14 +6,14 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.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"> >+<body id="pat_purchase_suggestions"> > [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -30,6 +30,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"> >@@ -38,12 +44,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="pat" 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> > >+ <h2>Purchase suggestions</h2> >+ > [% IF suggestions %] > <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 c0eb2ed14f..49c5b9b1ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -7,14 +7,14 @@ > [% USE TablesSettings %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.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"> >+<body id="pat_readingrec"> > [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -31,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"> >@@ -39,7 +45,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/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >index 349a392bc8..3c6250b11c 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 >@@ -5,14 +5,14 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.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"> >+<body id="pat_routing_lists"> > [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -29,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"> >@@ -41,7 +47,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/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >index 04f152af3a..1f3cb0dd44 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >@@ -5,7 +5,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >@@ -16,8 +16,8 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > >-<body id="pat_statistics" class="pat"> >-[% INCLUDE 'header.inc' form=formulaire %] >+<body id="pat_statistics"> >+[% INCLUDE 'header.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -44,6 +44,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"> >@@ -53,7 +59,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/offline_circ/enqueue_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt >index 9c7563be11..51923e4b93 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,10 +1,12 @@ > [% 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> >@@ -18,6 +20,12 @@ > <a href="#" aria-current="page">Add offline circulations to queue</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/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >index fdcbd9e422..18533acbc1 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,14 +1,16 @@ > [% 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> >@@ -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"> >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..ccfecfa745 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,14 +1,16 @@ > [% 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> >@@ -36,6 +38,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"> >@@ -67,7 +75,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" id="principal" class="submit" 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 +84,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/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt >index 0659c688d5..c21b7931c3 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,8 +15,8 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > >-<body id="patlist_add_modify" class="pat patlist"> >-[% INCLUDE 'header.inc' %] >+<body id="patlist_add_modify" class="patlist"> >+[% INCLUDE 'header.inc' form = formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -36,34 +39,42 @@ > </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"> > <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> > >@@ -77,15 +88,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" id="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 6a5cfd9be2..e05a5fb1b8 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,8 +27,8 @@ > </style> > </head> > >-<body id="patlist_list" class="pat patlist"> >-[% INCLUDE 'header.inc' %] >+<body id="patlist_list" class="patlist"> >+[% INCLUDE 'header.inc' form = formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -47,6 +50,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,7 +63,7 @@ > <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' %] >@@ -102,7 +111,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> >@@ -132,15 +141,13 @@ > </li> > </span> > </ol> >- </fieldset> >- <fieldset id="patron_ids_submit" class="action"> >- <input type="submit" value="Submit" /> >+ <button id="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"> >@@ -152,18 +159,21 @@ > </form> > > <form action="list.pl" id="remove_patrons" method="post"> >+ <div 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> >@@ -211,8 +221,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> >+ </div> > </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 69c0e5bbb0..53ca96d473 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,14 +1,17 @@ > [% 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' %] >+<body id="patlist_lists" class="patlist"> >+[% INCLUDE 'header.inc' form = formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -24,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"> >@@ -33,14 +42,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="pat" 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> > > [% IF ( lists ) %] > >+ <div id="searchresults"> >+ > <table id="patron-lists-table"> > <thead> > <tr> >@@ -68,7 +79,7 @@ > </td> > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="listactions[% l.patron_list_id | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a id="lientype" class="btn btn-default btn-xs dropdown-toggle" id="listactions[% l.patron_list_id | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]"> >@@ -122,6 +133,8 @@ > > [% ELSE %] > <div class="dialog message">There are no patron lists.</div> >+ >+ </div> > [% END %] > > </main> >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 469cb049c9..ea88585430 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,13 +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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -35,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"> >@@ -72,13 +81,13 @@ > </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 ) %] > <form name="items"> >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 0b789aee38..83445842db 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,11 +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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -31,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"> >@@ -47,7 +56,7 @@ > <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> >@@ -278,7 +287,7 @@ > </div> > <div class="col-sm-6"> > <fieldset class="rows"> >- <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card graphic layout</legend> >+ <h3>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card graphic layout</h3> > <ol> > <!-- > <li> >@@ -471,7 +480,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 081dd6f350..d143d74caf 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,11 +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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -31,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"> >@@ -40,9 +49,9 @@ > > [% INCLUDE 'patroncards-toolbar.inc' %] > >- <h1>[% IF (profile_id) %]Edit[% ELSE %]Create[% END%] printer profile[% IF (profile_id) %] ([% profile_id | html %])[% END %]</h1> >+ <h2>[% IF (profile_id) %]Edit[% ELSE %]Create[% END%] printer profile[% IF (profile_id) %] ([% profile_id | html %])[% END %]</h2> > <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 ) %] >@@ -84,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 %]" /> >@@ -95,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 %]" /> >@@ -106,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 7451768ab1..f4e6c55481 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,13 +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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -33,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"> >@@ -43,6 +52,7 @@ > [% INCLUDE 'patroncards-toolbar.inc' %] > <h1>[% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id | html %])[% END %]</h1> > <form name="input" action="/cgi-bin/koha/patroncards/edit-template.pl" method="get"> >+ <h2>[% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id | html %])[% END %]</h2> > <div class="row"> > <div class="col-sm-6"> > <fieldset class="rows"> >@@ -158,7 +168,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 58a4552565..373f458993 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >@@ -1,9 +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 'header.inc' form=formulaire %] > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >@@ -18,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"> >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 d023a37709..6c6bf62773 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,11 +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 'header.inc' form=formulaire %] > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >@@ -23,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"> >@@ -60,7 +69,7 @@ > </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"> >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 ecb148e364..a4bdce6a3d 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,7 +32,7 @@ > </head> > > <body id="pcard_manage" class="tools pcard"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -48,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"> >@@ -92,9 +101,9 @@ > [% FOREACH text_field IN table_loo.text_fields %] > [% IF ( text_field.select_field ) %] > <td> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/patroncards/edit-[% card_element | html %].pl?op=edit&element_id=[% text_field.field_value | html %]"><i class="fa fa-edit"></i> Edit</a> >+ <a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/patroncards/edit-[% card_element | html %].pl?op=edit&element_id=[% text_field.field_value | html %]"><i class="fa fa-edit"></i> Edit</a> > [% IF ( print ) %]<a class="btn btn-default btn-xs export" data-batch-id="[% text_field.field_value |url %]" href="/cgi-bin/koha/patroncards/print.pl?batch_id=[% text_field.field_value |url %]"><i class="fa fa-share-square-o"></i> Export</a>[% END %] >- <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/patroncards/manage.pl?op=delete&card_element=[% card_element | html %]&element_id=[% text_field.field_value | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a id="lientype" class="btn btn-default btn-xs delete" href="/cgi-bin/koha/patroncards/manage.pl?op=delete&card_element=[% card_element | html %]&element_id=[% text_field.field_value | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > [% IF ( print ) %]<td><input type="checkbox" name="action" value="[% text_field.field_value | html %]" /></td>[% END %] > [% ELSIF ( text_field.field_value ) %] >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..5e554a19f6 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,8 +9,7 @@ > </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> >@@ -22,6 +25,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="container-fluid"> >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..a5465967be 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,8 +9,7 @@ > </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> >@@ -22,13 +25,19 @@ > </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"> > <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 %] >@@ -52,7 +61,7 @@ > </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..99426c26cf 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,8 +16,7 @@ > </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> >@@ -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/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >index b5604d8f97..1eb5acfbdc 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,8 +16,7 @@ > </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> >@@ -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"> >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 4a15758d6a..f4565a1791 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt >@@ -4,14 +4,16 @@ > [% 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> >@@ -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/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >index 54fcf4628e..cbe1dc0e3c 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 >@@ -53,6 +53,7 @@ > <h1>Acquisitions statistics </h1> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >+ <h2>Acquisitions statistics </h2> > [% IF ( mainloo.loopfilter.size ) %] > <p><strong>Filtered on:</strong></p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -114,7 +115,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> >@@ -283,7 +284,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" /> >@@ -304,7 +305,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" /> >@@ -330,7 +331,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/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >index 9ed12bf0cf..bc81b77ba0 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 >@@ -55,7 +55,7 @@ > > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >- <h1>Patrons with the most checkouts</h1> >+ <h2>Patrons with the most checkouts</h2> > [% IF ( mainloo.loopfilter ) %] > [% IF mainloo.loopfilter.size %] > <p>Filtered on:</p> >@@ -124,7 +124,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> >@@ -195,7 +195,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" /> >@@ -220,7 +220,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 2d7f93d58a..04bf2822a4 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,11 +1,14 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -38,7 +41,7 @@ > > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >- <h1>Patrons with no checkouts</h1> >+ <h2>Patrons with no checkouts</h2> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on:</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -65,7 +68,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> >@@ -81,7 +84,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> >@@ -103,7 +106,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" /> >@@ -131,7 +134,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 5e44b81fbf..2d4400eaa5 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 >@@ -61,6 +61,7 @@ > <h1>Patrons statistics</h1> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >+ <h2>Patrons statistics</h2> > [% IF ( mainloo.loopfilter.size>0 ) %] > <p>Filtered on:</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -101,7 +102,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> >@@ -293,7 +294,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" /> >@@ -321,7 +322,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/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >index 581a12f073..c510f629ba 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 >@@ -60,10 +60,10 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Cash register statistics</h1> >+ <h2>Cash register statistics</h2> > <form method="post" action="/cgi-bin/koha/reports/cash_register_stats.pl" id="frmCashRegister"> > <fieldset class="rows"> >- <legend>Cash register statistics [% beginDate | $KohaDates %] to [% endDate | $KohaDates %]</legend> >+ <h3>Cash register statistics [% beginDate | $KohaDates %] to [% endDate | $KohaDates %]</h3> > <ol> > <br> > <li> >@@ -141,7 +141,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Output</legend> >+ <h3>Output</h3> > <ol> > <li> > <label for="outputscreen">To screen into the browser: </label> >@@ -157,7 +157,7 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" value="Submit" name="do_it" /> >+ <input type="submit" class="principal" value="Submit" name="do_it" /> > </fieldset> > </form> > >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 81ed049467..9e8b2acb80 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 >@@ -54,7 +54,7 @@ > [% IF ( do_it ) %] > > [% FOREACH mainloo IN mainloop %] >- <h1>Top [% mainloo.limit | html %] Most-circulated items</h1> >+ <h2>Top [% mainloo.limit | html %] Most-circulated items</h2> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on:</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -95,7 +95,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> >@@ -159,7 +159,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> >@@ -184,7 +184,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" /> >@@ -212,7 +212,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 4a81d89767..c051bccf5e 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,7 +11,7 @@ > </style> > </head> > <body id="rep_catalogue_out" class="rep"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -39,7 +43,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> >@@ -105,7 +109,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"> >@@ -127,7 +131,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Limits</legend> >+ <h3>Limits</h3> > <ol> > <li> > <label for="numberlimit">Limit to: </label> >@@ -152,7 +156,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 05df192f2b..dae360ebba 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 >@@ -54,6 +54,7 @@ > <h1>Catalog statistics</h1> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >+ <h2>Catalog statistics</h2> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on:</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -106,7 +107,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> >@@ -284,7 +285,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> >@@ -302,7 +303,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" /> >@@ -327,7 +328,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/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >index a0d15d20fe..a8cbc4233b 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 -%] >@@ -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> >@@ -90,6 +98,14 @@ > </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"> >@@ -99,8 +115,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="pat" 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 +139,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 +160,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" id="lientype"><i class="fa fa-trash"></i> Delete</button> > </form></td> > </tr> > [% END %] >@@ -154,9 +171,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" /> >@@ -168,7 +185,7 @@ > </ol></fieldset> > > <fieldset class="action"><input type="hidden" name="phase" value="New Term step 2" /> >-<input name="submit" value="Next" type="submit" /></fieldset> >+<input name="submit" class="principal" value="Next" type="submit" /></fieldset> > </form> > [% END %] > >@@ -176,7 +193,7 @@ > <h3>Add new definition</h3> > <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" /> >@@ -190,7 +207,7 @@ > </li> > </ol> > </fieldset> >- <fieldset class="action"><input name="submit" value="Next" type="submit" /></fieldset> >+ <fieldset class="action"><input name="submit" class="principal" value="Next" type="submit" /></fieldset> > </form> > [%- END -%] > >@@ -198,7 +215,7 @@ > <h3>Add new definition</h3> > <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 %]" /> >@@ -226,7 +243,7 @@ > > <input type="hidden" name="phase" value="New Term step 4" /> > </fieldset> >-<fieldset class="action"><input type="submit" name="submit" value="Next" /></fieldset> >+<fieldset class="action"><input type="submit" class="principal" name="submit" value="Next" /></fieldset> > </form> > [% END %] > >@@ -234,7 +251,7 @@ > <h3>Add new definition</h3> > <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 %]" /> >@@ -275,7 +292,7 @@ > <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 %] >@@ -290,7 +307,7 @@ > <h3>Add new definition</h3> > > <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 -%] >@@ -321,7 +338,7 @@ > > <fieldset class="action"><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 e93e13aa6f..9bb6e6de87 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 >@@ -6,6 +6,9 @@ > [% USE TablesSettings %] > [% USE JSON.Escape %] > [% SET footerjs = 1 %] >+[% SET footerjs = 1 %][% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > > [%- BLOCK area_name -%] > [%- SWITCH area -%] >@@ -62,8 +65,7 @@ > </head> > > <body id="rep_guided_reports_start" class="rep"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -144,6 +146,14 @@ > </a> > [% 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> <!-- /#breadcrumbs --> > > <div id="update_sql" class="modal" tabindex="-1" role="dialog" aria-labelledby="update_sql_label" aria-hidden="true"> >@@ -180,21 +190,21 @@ > [% IF ( CAN_user_reports_create_reports ) %] > <form action="/cgi-bin/koha/reports/guided_reports.pl"> > <input type="hidden" name="phase" value="Build new" /> >- <input type="submit" name="submit" value="Build new"/> >+ <input type="submit" name="submit" id="lientype" value="Build new"/> > </form> > [% END %] > > [% IF ( CAN_user_reports_execute_reports ) %] > <form action="/cgi-bin/koha/reports/guided_reports.pl"> > <input type="hidden" name="phase" value="Use saved"/> >- <input type="submit" name="submit" value="Use saved"/> >+ <input type="submit" name="submit" id="lientype" value="Use saved"/> > </form> > [% END %] > > [% IF ( CAN_user_reports_create_reports ) %] > <form action="/cgi-bin/koha/reports/guided_reports.pl"> > <input type="hidden" name="phase" value="Create report from SQL"/> >- <input type="submit" name="submit" value="Create report from SQL"/> >+ <input type="submit" name="submit" id="lientype" value="Create report from SQL"/> > </form> > [% END %] > >@@ -202,7 +212,7 @@ > <p>Use the reports dictionary to define custom criteria to use in your reports</p> > <form action="/cgi-bin/koha/reports/dictionary.pl"> > <input type="hidden" name="phase" value="View Dictionary"/> >- <input type="submit" name="submit" value="View dictionary"/> >+ <input type="submit" name="submit" id="lientype" value="View dictionary"/> > </form> > [% END # /IF (start) %] > >@@ -219,7 +229,7 @@ > [% END %] > > [% IF ( saved1 ) %] >- <h1>Saved reports</h1> >+ <h2>Saved reports</h2> > [% IF ( savedreports ) %] > > [% IF ( filters.date || filters.author || filters.keyword ) %] >@@ -240,6 +250,7 @@ > [% END %] > > <div id="tabs" class="toptabs"> >+ <fieldset id="searchresults"> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation" class="active"> > <a href="#reports" aria-controls="reports" role="tab" data-toggle="tab">All</a> >@@ -408,14 +419,14 @@ > </tbody> > </table> > >- [% IF ( CAN_user_reports_delete_reports ) %] >- <fieldset class="action"> >- <input type="submit" value="Delete selected" /> >- </fieldset> >- [% END %] >- </form> >- </div> <!-- /#reports --> >- </div> <!-- /.tab-content --> >+ [% IF ( CAN_user_reports_delete_reports ) %] >+ <fieldset class="action"> >+ <input id="lientype" type="submit" value="Delete selected" /> >+ </fieldset> >+ [% END %] >+ </form> >+ </div> >+ </fieldset> > </div> > [% ELSE # IF ( savedreports ) %] > <div class="dialog message"> >@@ -458,10 +469,10 @@ > </div> > [% END %] > >- <h1>Build a report</h1> >+ <h2>Build a report</h2> > <form action="/cgi-bin/koha/reports/guided_reports.pl"> > <fieldset class="rows"> >- <legend>Step 1 of 6: Choose a module to report on,[% IF (usecache) %] Set cache expiry, [% END %] and choose report visibility </legend> >+ <h3>Step 1 of 6: Choose a module to report on,[% IF (usecache) %] Set cache expiry, [% END %] and choose report visibility </h3> > <ol> > <li> > <label for="area">Choose: </label> >@@ -502,22 +513,22 @@ > </li> > [% END %] > </ol> >- </fieldset> <!-- /.rows --> > <fieldset class="action"> > <input type="hidden" name="phase" value="Report on this Area" /> >- <input type="submit" name="submit" value="Next >>" /> >+ <input type="submit" class="principal" name="submit" value="Next >>" /> > </fieldset> >+ </fieldset> <!-- /.rows --> > </form> > [% END # /build1 %] > > [% IF ( build2 ) %] >- <h1>Build a report</h1> >+ <h2>Build a report</h2> > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> > <input type="hidden" name="area" value="[% area | html %]" /> > <input type="hidden" name="public" value="[% public | html %]" /> > <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> > <fieldset class="rows"> >- <legend>Step 2 of 6: Pick a report type</legend> >+ <h3>Step 2 of 6: Pick a report type</h3> > <ol> > <li> > <label for="types">Choose: </label> >@@ -528,19 +539,18 @@ > </select> > </li> > </ol> >- </fieldset> >- > <fieldset class="action"> > <input type="hidden" name="phase" value="Choose this type" /> >- <input type="button" name="back" value="<< Back" class="goback" /> >- <input type="submit" name="submit" value="Next >>" /> >+ <input type="button" name="back" value="<< Back" class="goback principal" /> >+ <input type="submit" class="principal" name="submit" value="Next >>" /> >+ </fieldset> > </fieldset> >+ > </form> > [% END # /IF (build2 ) %] > > [% IF ( build3 ) %] >- <h1>Build a report</h1> >- <h3>Step 3 of 6: Select columns for display</h3> >+ <h2>Build a report</h2> > <p>Note: Be careful selecting when selecting columns. If your choice is too broad it could result in a very large report that will either not complete, or slow your system down.</p> > > <form id="column_submit" action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> >@@ -549,6 +559,7 @@ > <input type="hidden" name="public" value="[% public | html %]" /> > <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> > <fieldset> >+ <h3>Step 3 of 6: Select columns for display</h3> > <div class="row"> > <div class="col-sm-6"> > <div style="float: left;"> >@@ -574,7 +585,7 @@ > </select> > </div> > <div style="width: 6.3em; float: right; margin-top: 100px"> >- <input type="button" name="Add" value="Add" class="button" style="width:6em;" id="addColumn" /><br /> >+ <input type="button" name="Add" value="Add >>" class="button" style="width:6em;" id="addColumn" /><br /> > <input type="button" name="delete" value="<< Delete" class="button" style="width: 6em; margin: 1em 0;" id="delColumn" /> > </div> > </div> <!-- /.col-sm-6 --> >@@ -584,17 +595,17 @@ > </select> > </div> > </div> <!-- /.row --> >- </fieldset> > <fieldset class="action"> > <input type="hidden" name="phase" value="Choose these columns" /> >- <input type="button" name="back" value="<< Back" class="goback" /> >- <input type="submit" name="submit" value="Next >>" /> >+ <input type="button" name="back" value="<< Back" class="goback principal" /> >+ <input type="submit" name="submit" class="principal" value="Next >>" /> >+ </fieldset> > </fieldset> > </form> <!-- /#column_submit --> > [% END # /IF ( build3 ) %] > > [% IF ( build4 ) %] >- <h1>Build a report</h1> >+ <h2>Build a report</h2> > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" > > <input type="hidden" name="area" value="[% area | html %]" /> > <input type="hidden" name="type" value="[% type | html %]" /> >@@ -602,7 +613,7 @@ > <input type="hidden" name="public" value="[% public | html %]" /> > <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> > <fieldset> >- <legend>Step 4 of 6: Select criteria to limit on</legend> >+ <h3>Step 4 of 6: Select criteria to limit on</h3> > <table> > [% FOREACH criteri IN criteria %] > <tr> >@@ -654,11 +665,16 @@ > [% END %] > [% END %] > </table> >+ <fieldset class="action"> >+ <input type="hidden" name="phase" value="Choose these criteria" /> >+ <input type="button" name="back" value="<< Back" class="goback principal" /> >+ <input type="submit" name="submit" class="principal" value="Next >>" /> >+ </fieldset> > </fieldset> > > [% IF ( definitions ) %] > <fieldset> >- <legend>Dictionary definitions</legend> >+ <h3>Dictionary definitions</h3> > <table> > [% FOREACH definition IN definitions %] > <tr> >@@ -672,17 +688,11 @@ > </fieldset> > [% END %] > >- <fieldset class="action"> >- <input type="hidden" name="phase" value="Choose these criteria" /> >- <input type="button" name="back" value="<< Back" class="goback" /> >- <input type="submit" name="submit" value="Next >>" /> >- </fieldset> > </form> > [% END # /IF ( build4 ) %] > > [% IF ( build5 ) %] >- <h1>Build a report</h1> >- <h3>Step 5 of 6: Pick which columns to total</h3> >+ <h2>Build a report</h2> > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> > <input type="hidden" name="area" value="[% area | html %]" /> > <input type="hidden" name="type" value="[% type | html %]" /> >@@ -692,6 +702,7 @@ > <input type="hidden" name="public" value="[% public | html %]" /> > <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> > <fieldset> >+ <h3>Step 5 of 6: Pick which columns to total</h3> > <table> > [% FOREACH total_b IN total_by %] > <tr> >@@ -709,18 +720,17 @@ > </tr> > [% END %] > </table> >- </fieldset> > > <fieldset class="action"><input type="hidden" name="phase" value="Choose these operations" /> >- <input type="button" name="back" value="<< Back" class="goback" /> >- <input type="submit" name="submit" value="Next >>" /> >+ <input type="button" name="back" value="<< Back" class="goback principal" /> >+ <input type="submit" name="submit" class="principal" value="Next >>" /> >+ </fieldset> > </fieldset> > </form> > [% END # /IF ( build5 ) %] > > [% IF ( build6 ) %] >- <h1>Build a report</h1> >- <h3>Step 6 of 6: Choose how you want the report ordered</h3> >+ <h2>Build a report</h2> > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> > <input type="hidden" name="area" value="[% area | html %]" /> > <input type="hidden" name="type" value="[% type | html %]" /> >@@ -731,6 +741,7 @@ > <input type="hidden" name="public" value="[% public | html %]" /> > <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> > <fieldset> >+ <h3>Step 6 of 6: Choose how you want the report ordered</h3> > <table> > [% FOREACH order_b IN order_by %] > <tr> >@@ -751,13 +762,13 @@ > </fieldset> > <fieldset class="action"> > <input type="hidden" name="phase" value="Build report" /> >- <input type="submit" name="submit" value="Finish" /> >+ <input type="submit" name="submit" class="principal" value="Finish" /> > </fieldset> > </form> > [% END #/ IF ( build6 ) %] > > [% IF ( showreport ) %] >- <h1>Confirm custom report</h1> >+ <h2>Confirm custom report</h2> > <p>Your report will be generated with the following SQL statement.</p> > <p> > [% sql | html %] >@@ -770,7 +781,7 @@ > <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> > <p>You will need to save the report before you can execute it</p> > <fieldset class="action"><input type="hidden" name="phase" value="Save" /> >- <input type="submit" name="submit" value="Next" /> >+ <input type="submit" name="submit" class="principal" value="Next" /> > </fieldset> > </form> > [% END #/ IF ( showreport ) %] >@@ -783,7 +794,7 @@ > <input type="hidden" name="public" value="[% public | html %]" /> > <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> > <fieldset class="rows"> >- <legend><h1>Save your custom report</h1></legend> >+ <h3>Save your custom report</h3> > <ol> > <li> > <label for="reportname" class="required">Report name: </label> >@@ -798,7 +809,7 @@ > </ol> > </fieldset> > <fieldset class="action"><input type="hidden" name="phase" value="Save Report" /> >- <input type="submit" name="submit" value="Save report" /> >+ <input type="submit" name="submit" class="principal" value="Save report" /> > </fieldset> > </form> > [% END # /IF( save ) %] >@@ -857,7 +868,7 @@ > <fieldset class="action"><input type="submit" value="Edit SQL" /></fieldset> > [% ELSE # IF ( auth_val_error ) %] > <input type='hidden' name='phase' value='Run this report' /> >- <h1>Enter parameters for report [% name | html %]:</h1> >+ <h2>Enter parameters for report [% name | html %]:</h2> > [% IF ( notes ) %] > <p>[% notes | html %]</p> > [% END %] >@@ -903,7 +914,7 @@ > [% END # /IF ( enter_params ) %] > > [% IF ( execute ) %] >- <h1>[% name | html %] <span class="report_heading_id"><span class="report_label">Report ID:</span> <span class="report_number">[% id | html %]</span></span></h1> >+ <h2>[% name | html %] <span class="report_heading_id"><span class="report_label">Report ID:</span> <span class="report_number">[% id | html %]</span></span></h2> > [% IF ( notes ) %] > <p><span class="label">Notes:</span> [% notes | html %]</p> > [% END %] >@@ -1200,7 +1211,7 @@ > <h1>Create from SQL</h1> > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" id="sql_report_form"> > <fieldset class="rows"> >- <legend>Create report from SQL</legend> >+ <h3>Create report from SQL</h3> > <ol> > <li> > <label for="reportname" class="required">Report name:</label> >@@ -1251,7 +1262,7 @@ > </fieldset> <!-- /.rows --> > > <fieldset class="rows"> >- <legend>SQL:</legend> >+ <h3>SQL:</h3> > <div style="margin:1em;"> > [% PROCESS insert_runtime_parameter %] > <textarea id="sql" name="sql" class="required" required="required" cols="50" rows="10">[% sql | html %]</textarea> >@@ -1261,14 +1272,14 @@ > > <fieldset class="action"> > <input type="hidden" name="phase" value="Save Report" /> >- <input type="submit" name="submit" value="Save report" /> >+ <input type="submit" name="submit" class="principal" value="Save report" /> > <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved" class="cancel">Cancel</a> > </fieldset> > </form> > [% END #/IF ( create ) %] > > [% IF saved_results %] >- <h1>Saved report results</h1> >+ <h2>Saved report results</h2> > <h2>[% name | html %]</h2> > <p>[% notes | html %]</p> > <table> >@@ -1285,7 +1296,7 @@ > [% IF ( showsql ) %] > <h1>Saved reports - SQL</h1> > <fieldset class="rows"> >- <legend>[% reportname | html %]</legend> >+ <h3>[% reportname | html %]</h3> > <ol> > [% IF ( notes ) %] > <li> >@@ -1317,7 +1328,7 @@ > <input type="hidden" name="phase" value="Update SQL" /> > <input type="hidden" name="id" value="[% id | html %]"/> > <fieldset class="rows"> >- <legend><h1>Edit SQL report</h1></legend> >+ <h3>Edit SQL report</h3> > <ol> > <li> > <label for="reportname" class="required">Report name: </label> >@@ -1363,14 +1374,14 @@ > </fieldset> <!-- /.rows --> > > <fieldset class="rows"> >- <legend>SQL:</legend> >+ <h3>SQL:</h3> > [% PROCESS insert_runtime_parameter %] > <textarea id="sql" name="sql" class="required" required="required" cols="50" rows="10">[% sql | html %]</textarea> > <span class="required" style="margin-left:30px;">Required</span> > </fieldset> > > <fieldset class="action"> >- <input type="submit" name="submit" value="Update SQL" /> >+ <input type="submit" name="submit" class="principal" value="Update SQL" /> > <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved" class="cancel">Cancel</a> > </fieldset> > </form> >@@ -1399,7 +1410,7 @@ > </div> > <fieldset class="action"> > <input type="hidden" name="phase" value="Use saved" /> >- <input type="submit" name="submit" value="Saved reports" /> >+ <input type="submit" name="submit" class="principal" value="Saved reports" /> > </fieldset> > </form> > [% END # /IF ( errors ) %] >@@ -1409,37 +1420,39 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >+ <div id="filters"> > [% IF ( saved1 ) %] > <div id="saved-reports-filter"> > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get"> > <input type="hidden" name="phase" value="Use saved" /> > <input type="hidden" name="filter_set" value="1" /> > <fieldset class="brief"> >- <h3>Filter</h3> >+ <h4>Filter</h4> > <ol> > <li> >- <label for="filter_date">Date:</label> >+ <p for="filter_date">Date: > <input type="text" id="filter_date" name="filter_date" size="10" value="[% filters.date | html %]" class="flatpickr" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> > </li> > <li> >- <label for="filter_author">Author:</label> >- <input type="text" id="filter_author" name="filter_author" value="[% filters.author | html %]" size="16" /> >+ <p for="filter_author">Author: >+ <input type="text" id="filter_author" name="filter_author" value="[% filters.author | html %]" size="16" /></p> > </li> > <li> >- <label for="filter_keyword">Keyword:</label> >- <input type="text" id="filter_keyword" name="filter_keyword" value="[% filters.keyword | html %]" size="16" /> >+ <p for="filter_keyword">Keyword: >+ <input type="text" id="filter_keyword" name="filter_keyword" value="[% filters.keyword | html %]" size="16" /></p> > </li> > </ol> >- </fieldset> <!-- /.brief --> > <fieldset class="action"> >- <input type="submit" value="Apply filter" /> >+ <input type="submit" class="principal" value="Apply filter" /> > <a id="resetReportsFilter" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&clear_filters=1">Clear</a> > </fieldset> >+ </fieldset> <!-- /.brief --> > </form> > </div> <!-- /#saved-reports-filter --> > [% END %] > [% INCLUDE 'guided-reports-view.inc' %] >+ </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >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 0cfef512ed..1533ec524b 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,12 +1,15 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -51,6 +54,7 @@ > <h1>Average checkout period</h1> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >+ <h2>Average checkout period</h2> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on:</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -95,7 +99,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> >@@ -228,7 +232,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" /> >@@ -257,7 +261,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 03c63a3efa..7979f4a0b4 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 >@@ -57,6 +57,7 @@ > <h1>Circulation statistics</h1> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >+ <h2>Circulation statistics</h2> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on:</p> > <ul> >@@ -121,7 +122,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> >@@ -349,7 +350,7 @@ > </table><br /></fieldset> > > <fieldset class="rows"> >- <legend>Cell value</legend> >+ <h3>Cell value</h3> > <ol> > <li> > <label for="cellvalue1">Count total items:</label> >@@ -367,7 +368,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" /> >@@ -395,7 +396,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 61250ac37b..b3151ca72f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -7,13 +7,16 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -57,7 +60,7 @@ > <main> > > >-<h1>Lost items</h1> >+<h2>Lost items</h2> > > [% IF ( get_items ) %] > >@@ -195,7 +198,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 a4dbea7b01..973e2657c1 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,7 +14,7 @@ > </head> > > <body id="rep_itemtypes" class="rep"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -56,7 +59,7 @@ > > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >- <h1>Reports on item types [% IF branch %] held at [% Branches.GetName( branch ) | html %][% END %]</h1> >+ <h2>Reports on item types [% IF branch %] held at [% Branches.GetName( branch ) | html %][% END %]</h2> > <table id="itemtypest"> > <thead> > <tr> >@@ -81,7 +84,7 @@ > </table> > [% END %] > [% ELSE %] >- <h1>View a count of items held at your library grouped by item type</h1> >+ <h2>View a count of items held at your library grouped by item type</h2> > <form method="post" action="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes"> > <fieldset class="rows"> > <ol> >@@ -95,7 +98,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 742c2f0ee2..f41fe52e25 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,13 +2,15 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -51,8 +53,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 ) %] >@@ -108,7 +110,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> >@@ -130,7 +132,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" /> >@@ -158,7 +160,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 9bd9001473..945afc97dc 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,7 +8,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="rep_reports-home" class="rep"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -43,21 +46,21 @@ > <input name="filter_set" value="1" type="hidden"> > [% IF ( CAN_user_reports_create_reports ) %] > <p> >- <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new"><i class="fa fa-code-fork"></i> Create guided report</a> >+ <a id="lientype" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new"><i class="fa fa-code-fork"></i> Create guided report</a> > </p> > <p> >- <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL"><i class="fa fa-plus"></i> Create from SQL</a> >+ <a id="lientype" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL"><i class="fa fa-plus"></i> Create from SQL</a> > </p> > [% END %] > <p> >- <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved"><i class="fa fa-list"></i> Use saved</a> >+ <a id="lientype" 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 354cd96653..85c6f161cc 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 >@@ -58,6 +58,7 @@ > <h1>Holds statistics</h1> > [% IF ( do_it ) %] > [% IF ( mainloop ) %] >+ <h2>Holds statistics</h2> > [% IF ( loopfilter ) %] > <p>Filtered on:</p> > <ul> >@@ -107,7 +108,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> >@@ -302,11 +303,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" /> >@@ -334,7 +335,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 f1155a2779..d67292a7b6 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 >@@ -46,7 +46,7 @@ > <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> >@@ -119,7 +119,7 @@ > > > <fieldset class="brief"> >- <h2>Output</h2> >+ <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" /> >@@ -147,7 +147,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 396afc7964..348180deb5 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 %] >@@ -29,8 +32,7 @@ > > <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"> >@@ -50,6 +52,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> > [% ELSE %] > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -78,6 +86,12 @@ > [% END %] > </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 # UNLESS multi_hold %] > >@@ -117,7 +131,7 @@ > <p>Hold placed by : <strong> [% nextreservsurname | html %] [% nextreservfirstname | html %]</strong> at : <strong> [% branchname | html %] </strong>, Please transfer this item. > </p> > <form name="cancelReservewithtransfert" action="branchreserves.pl" method="post"> >- <input type="submit" class="button" /> >+ <input type="submit" class="principal" /> > </form> > </div> > [% END %] >@@ -167,9 +181,34 @@ > <li role="presentation"><a href="#holds_clubsearch_pane" aria-controls="holds_clubsearch_pane" role="tab" data-toggle="tab">Clubs</a></li> > [% END %] > </ul> >- <div class="tab-content"> >- <div id="holds_patronsearch_pane" role="tabpanel" class="tab-pane active"> >- [% PROCESS patron_search_filters_simple %] >+ <div id="holds_patronsearch_pane"> >+ [% PROCESS patron_search_filters_simple %] >+ <form id="holds_patronsearch" action="request.pl?biblionumbers=[% biblionumbers | html %]" method="post"> >+ <div class="hint">Enter patron card number or partial name:</div> >+ <input type="text" size="40" id="patron" class="focus" name="findborrower" autocomplete="off" /> >+ <input type="submit" class="principal" value="Search" /> >+ [% IF multi_hold %] >+ <input type="hidden" name="biblionumbers" value="[% biblionumbers | html %]"/> >+ [% ELSE %] >+ <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" /> >+ [% END %] >+ >+ </form> <!-- /#holds_patronsearch --> >+ [% IF borrowers %] >+ [% INCLUDE 'circ-patron-search-results.inc' destination = "holds" %] >+ [% END %] >+ </div> >+ [% IF clubcount %] >+ <div id="holds_clubsearch_pane"> >+ <form id="holds_clubsearch" action="request.pl?biblionumbers=[% biblionumbers | html %]" method="post"> >+ <div class="hint">Enter club ID or partial name:</div> >+ <input type="text" size="40" id="club" class="focus" name="findclub" autocomplete="off" /> >+ <input type="submit" class="principal" value="Search" /> >+ [% IF multi_hold %] >+ <input type="hidden" name="biblionumbers" value="[% biblionumbers | html %]"/> >+ [% ELSE %] >+ <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" /> >+ [% END %] > > [% PROCESS patron_search_table table_id => 'table_borrowers', open_on_row_click => 1 %] > </div> >@@ -272,7 +311,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"> >@@ -565,11 +604,11 @@ > <fieldset class="action"> > [% IF ( patron.borrowernumber ) %] > [% IF ( override_required ) %] >- <button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button> >+ <button type="submit" class="btn btn-default warning" id="lientype"><i class="fa fa-exclamation-triangle "></i> Place hold</button> > [% ELSIF ( none_available ) %] >- <button type="submit" disabled="disabled" class="btn btn-default btn-disabled">Place hold</button> >+ <button type="submit" disabled="disabled" class="btn btn-default btn-disabled" id="lientype">Place hold</button> > [% ELSE %] >- <button type="submit" class="btn btn-default">Place hold</button> >+ <button type="submit" class="btn btn-default" id="lientype">Place hold</button> > [% END %] > [% END %] > </fieldset> >@@ -895,21 +934,21 @@ > [% IF ( patron AND patron.borrowernumber ) %] > [% IF ( multi_hold ) %] > [% IF ( override_required ) %] >- <button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place holds</button> >+ <button type="submit" class="btn btn-default warning" id="lientype"><i class="fa fa-exclamation-triangle "></i> Place holds</button> > [% ELSIF ( no_bibs_available ) %] >- <button type="submit" class="btn btn-default btn-disabled" disabled="disabled">Place holds</button> >+ <button type="submit" class="btn btn-default btn-disabled" disabled="disabled" id="lientype">Place holds</button> > [% ELSIF ( none_available ) %] >- <button type="submit" class="btn btn-default">Place holds</button> >+ <button type="submit" class="btn btn-default" id="lientype">Place holds</button> > [% ELSE %] > <button type="submit" class="btn btn-default" id="multi_hold_submit">Place holds</button> > [% END %] > [% ELSE %] > [% IF ( override_required ) %] >- <button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button> >+ <button type="submit" class="btn btn-default warning" id="lientype"><i class="fa fa-exclamation-triangle "></i> Place hold</button> > [% ELSIF ( none_available ) %] >- <button type="submit" class="btn btn-default btn-disabled" disabled="disabled">Place hold</button> >+ <button type="submit" class="btn btn-default btn-disabled" disabled="disabled" id="lientype">Place hold</button> > [% ELSE %] >- <button type="submit" class="btn btn-default">Place hold</button> >+ <button type="submit" class="btn btn-default" id="lientype" id="lientype">Place hold</button> > [% END %] > [% END %] > [% END # /IF patron %] >@@ -950,7 +989,7 @@ > > <h2>Existing holds</h2> > <div id="toolbar" class="btn-toolbar"> >- <input type="submit" name="submit" value="Update hold(s)" /> <button class="cancel_selected_holds" data-bulk="true"></button> >+ <input type="submit" name="submit" class="principal" value="Update hold(s)" /> <button class="cancel_selected_holds" data-bulk="true"></button> > <fieldset id="cancellation-reason-fieldset" class="action"> > [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] > [% IF hold_cancellation.count %] >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 ef01a2b3c1..cc90edfedb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.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 ( 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> >@@ -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"> >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 d09366f527..e310adb843 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,14 +1,16 @@ > [% 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> >@@ -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"> >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 e244801def..5683f078fd 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,8 +15,7 @@ > [% 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> >@@ -44,6 +46,12 @@ > </li> > [% END -%] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >index 77ae56e76f..3fd7b39854 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,14 +2,16 @@ > [% 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> >@@ -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"> >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..7cd5b3edf0 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,13 +2,15 @@ > [% 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> >@@ -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"> >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 9dfbb8bf48..5c9d5bc3e9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >@@ -1,13 +1,16 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -38,11 +41,11 @@ > <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> >@@ -75,8 +78,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 f8065be92a..78b922ccb6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -3,13 +3,16 @@ > [% 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 'header.inc' form=formulaire %] > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >@@ -50,7 +53,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Claims [% IF ( suppliername ) %] for [% suppliername | html %] [% END %]</h1> >+ <h2>Claims [% IF ( suppliername ) %] for [% suppliername | html %] [% END %]</h2> > > [% IF error_claim %] > [% IF error_claim == 'no_vendor_email' %] >@@ -86,7 +89,7 @@ > </option> > [% END %] > </select> >- <input type="submit" value="OK" /> >+ <input type="submit" class="principal" value="OK" /> > </fieldset> > </form> > >@@ -94,7 +97,7 @@ > <h3>Missing issues</h3> > <form action="claims.pl" id="filter_claims_form"> > <fieldset class="rows"> >- <legend>Filters :</legend> >+ <h3>Filters :</h3> > > <ol> > <li> >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..ca2f700f47 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,12 +1,14 @@ > [% 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> >@@ -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"> >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 6d4974a8d3..fe1cd5c608 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >@@ -1,12 +1,14 @@ > [% 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> >@@ -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"> >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 22dac4b769..3b5d1d5e41 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,14 +4,16 @@ > [% 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> >@@ -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/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >index d1b93145f4..8abfe70183 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,8 +82,7 @@ $(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> >@@ -95,6 +98,12 @@ $(document).ready(function() { > </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/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt >index eac2840076..5de2dc7997 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,12 +3,15 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >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 ab8a126f7d..0ff0e77760 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,7 +16,7 @@ > </head> > > <body id="ser_serials-home" class="ser"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -362,8 +365,7 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- >- [% INCLUDE 'serials-menu.inc' %] >+ <div id="filters"> > [% IF ( done_searched ) %] > [% UNLESS ( mana ) %] > <div id="advsearch"> >@@ -372,51 +374,51 @@ > <h4>Search subscriptions</h4> > <ol> > <li> >- <label for="issn">ISSN:</label> >- <input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter | html %]" /> >+ <p for="issn">ISSN: >+ <input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter | html %]" /></p> > </li> > <li> >- <label for="title">Title:</label> >- <input type="text" id="title" name="title_filter" value="[% title_filter | html %]" /> >+ <p for="title">Title: >+ <input type="text" id="title" name="title_filter" value="[% title_filter | html %]" /></p> > </li> > [% IF ( marcflavour == "UNIMARC" ) %] > <li> >- <label for="ean">EAN:</label> >- <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter | html %]" /> >+ <p for="ean">EAN: >+ <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter | html %]" /></p> > </li> > [% END %] > <li> >- <label for="callnumber">Call number:</label> >- <input type="text" id="callnumber" name="callnumber_filter" value="[% callnumber_filter | html %]" /> >+ <p for="callnumber">Call number: >+ <input type="text" id="callnumber" name="callnumber_filter" value="[% callnumber_filter | html %]" /></p> > </li> > <li> >- <label for="publisher">Publisher:</label> >- <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" /> >+ <p for="publisher">Publisher: >+ <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" /></p> > </li> > <li> >- <label for="bookseller">Vendor:</label> >- <input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter | html %]" /> >+ <p for="bookseller">Vendor: >+ <input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter | html %]" /></p> > </li> > <li> >- <label for="branch">Library:</label> >+ <p for="branch">Library: > <select id="branch" name="branch_filter"> > <option value="">All</option> > [%# FIXME Should not we filter the libraries? %] > [% PROCESS options_for_libraries libraries => Branches.all( selected => branch_filter, unfiltered => 1 ) %] >- </select> >+ </select></p> > </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> >+ <p for="to">Expires before: > <input type="text" id="to" name="expiration_date_filter" value="[% expiration_date_filter | $KohaDates %]" size="10" maxlength="10" class="flatpickr" /> >- </li> >+ </p></li> > > [% FOR field IN additional_fields_for_subscription %] > <li> >- <label for="additional_field_[% field.id | html %]ID"> [% field.name | html %]: </label> >+ <p for="additional_field_[% field.id | html %]ID"> [% field.name | html %]: > [% IF field.authorised_value_category %] > <select id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]"> > <option value="">All</option> >@@ -430,13 +432,13 @@ > </select> > [% ELSE %] > <input id="additional_field_[% field.id | html %]" type="text" value="[% additional_field_filters.${field.id} | html %]" name="additional_field_[% field.id | html %]" /> >- [% END %] >+ [% END %]</p> > </li> > [% END %] > </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 --> >@@ -444,6 +446,8 @@ > </div> <!-- /#advsearch --> > [% END # / UNLESS ( mana ) %] > [% END # / IF ( done_searched ) %] >+ [% INCLUDE 'serials-menu.inc' %] >+ </div> > </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 53760cf4fb..8103979932 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' %] >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 f6f4b3fe5a..dcd25dbb0a 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 89850249e5..765a71b070 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,11 +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 'header.inc' form=formulaire %] > > [% BLOCK translate_frequnit %] > [% SWITCH frequnit %] >@@ -45,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) %] >@@ -113,7 +116,7 @@ > </div> > </div> > >- <h1>Frequencies</h1> >+ <h2>Frequencies</h2> > [% IF still_used %] > <div class="dialog alert"> > <p> >@@ -162,8 +165,8 @@ > <td>[% frequency.unitsperissue | html %]</td> > <td>[% frequency.displayorder | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=modify&frequencyid=[% frequency.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="delete_frequency btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=del&frequencyid=[% frequency.id | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" id="lientype" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=modify&frequencyid=[% frequency.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="delete_frequency btn btn-default btn-xs" id="lientype" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=del&frequencyid=[% frequency.id | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >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..46e89d2596 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,13 +1,15 @@ > [% 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> >@@ -23,6 +25,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-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt >index e038e38a26..d47b973594 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,13 +1,16 @@ > [% 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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -59,16 +62,23 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >+ >+ <div id="toolbar" class="btn-toolbar"> >+ <div> >+ <a class="pat" 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> >@@ -261,7 +271,7 @@ > </form> > > [% ELSE %] >- <h1>Numbering patterns</h1> >+ <h2>Numbering patterns</h2> > [% IF still_used %] > <div class="dialog alert"> > <p> >@@ -289,12 +299,6 @@ > </div> > [% END %] > >- <div id="toolbar" class="btn-toolbar"> >- <div> >- <a class="pat" 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 (numberpatterns_loop.size) %] > <table id="numberpatternst"> > <thead> >@@ -314,8 +318,8 @@ > <td>[% numberpattern.numberingmethod | html %]</td> > <td>[% numberpattern.displayorder | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=modify&id=[% numberpattern.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="delete_pattern btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=del&id=[% numberpattern.id | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" id="lientype" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=modify&id=[% numberpattern.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="delete_pattern btn btn-default btn-xs" id="lientype" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=del&id=[% numberpattern.id | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >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..dd99cac159 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt >@@ -1,10 +1,13 @@ >+ >+[% 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> >@@ -20,6 +23,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/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index c0b1d7573c..5cc2d28c17 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -104,6 +104,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> <!-- /.breadcrumbs --> > > [% IF ( op == 'show' ) %] >@@ -117,7 +123,7 @@ > </div> > > <fieldset class="rows"> >- <legend>Bibliographic information</legend> >+ <h3>Bibliographic information</h3> > <ol> > [% IF ( title ) %] > <li> >@@ -191,7 +197,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Suggestion management</legend> >+ <h3>Suggestion management</h3> > <ol> > <li> > <span class="label">Status:</span> >@@ -285,7 +291,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Acquisition information</legend> >+ <h3>Acquisition information</h3> > <ol> > <li> > <span class="label">Library:</span> >@@ -350,14 +356,14 @@ > <input type="hidden" name="redirect" id="redirect" value="[% redirect | html %]" /> > <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber | html %]" /> > [% IF ( suggestionid ) %] >- <h1>Edit purchase suggestion #[% suggestionid | html %]</h1> >+ <h2>Edit purchase suggestion #[% suggestionid | html %]</h2> > <input type="hidden" name="suggestionid" value="[% suggestionid | html %]"/> > [% ELSE %] >- <h1>Enter a new purchase suggestion</h1> >+ <h2>Enter a new purchase suggestion</h2> > [% END %] > > <fieldset class="rows"> >- <legend>Bibliographic information</legend> >+ <h3>Bibliographic information</h3> > <ol> > <li> > <label for="title" class="required">Title:</label> >@@ -415,7 +421,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Suggestion management</legend> >+ <h3>Suggestion management</h3> > <ol> > [% IF ( suggestionid ) %] > <li> >@@ -576,7 +582,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Acquisition information</legend> >+ <h3>Acquisition information</h3> > <ol> > <li> > <label for="branchcode">Library:</label> >@@ -642,7 +648,7 @@ > <input type="hidden" name="save_confirmed" value="1" /> > <input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" /> > [% ELSE %] >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > [% END %] > <a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby | uri %]#suggestions[% ELSE %]suggestion.pl[% END %]">Cancel</a> > [% ELSE %] >@@ -650,7 +656,7 @@ > <input type="hidden" name="save_confirmed" value="1" /> > <input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" /> > [% ELSE %] >- <input type="submit" value="Submit your suggestion" /> >+ <input type="submit" class="principal" value="Submit your suggestion" /> > [% END %] > <a class="cancel" href="suggestion.pl">Cancel</a> > [% END %] >@@ -665,7 +671,7 @@ > </div> > </div> > >- <h1>Suggestions management</h1> >+ <h2>Suggestions management</h2> > > [% IF ( displayby != "branchcode" ) %] > <label for="branchcode">Viewing suggestions for library:</label> >@@ -690,7 +696,8 @@ > > [% UNLESS ( notabs ) %] > <div id="suggestiontabs" class="toptabs"> >- <ul class="nav nav-tabs" role="tablist"> >+ <fieldset id="searchresults"> >+ <ul class="ui-tabs-nav" role="tablist"> > [% FOREACH suggestion IN suggestions %] > <li role="presentation"> > <a href="#[% suggestion.suggestiontype | uri %]" aria-controls="[% suggestion.suggestiontype | uri %]" role="tab" data-toggle="tab"> >@@ -723,119 +730,142 @@ > <div id="[% suggestion.suggestiontype | html %]" role="tabpanel" class="tab-pane"> > <form class="update_suggestions" name="f" method="post" action="/cgi-bin/koha/suggestion/suggestion.pl#[% suggestion.suggestiontype| uri %]"> > >- [% IF ( suggestion.suggestions_loop ) %] >- <p> >- <a class="checkall" href="#">Check all</a> | <a class="uncheckall" href="#">Uncheck all</a> >- </p> >+ [% IF ( suggestion.suggestions_loop ) %] >+ <p> >+ <a class="checkall" id="lientype" href="#">Check all</a> | <a class="uncheckall" id="lientype" href="#">Uncheck all</a> >+ </p> > > <table id="table_[% loop.count | html %]" class="sorted"> > <thead> > <tr> >- <th class="NoSort noExport"> </th> >- <th class="anti-the">Suggestion</th> >- <th>Suggested by</th> >- <th>Suggested on</th> >- <th>Patron reason</th> >- <th>Managed by</th> >- <th>Managed on</th> >- <th>Last modification by</th> >- <th>Last modification on</th> >- <th>Last updated</th> >- <th>Library</th> >- <th>Fund</th> >- <th>Status</th> >- <th class="NoSort noExport"> </th> >+ <td> >+ <input type="checkbox" name="suggestionid" value="[% suggestions_loo.suggestionid | html %]" /> >+ </td> >+ <td> >+ <a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | uri %]&op=show" title="suggestion" > >+ [% suggestions_loo.title | html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author | html %][% END %] >+ </a> >+ <br /> >+ [% IF ( suggestions_loo.copyrightdate ) %] >+ © <span class="suggestion_copyrightdate">[% suggestions_loo.copyrightdate | html %]</span> >+ [% END %] >+ [% IF ( suggestions_loo.volumedesc ) %] >+ ; <span class="suggestion_volume">Volume:<em>[% suggestions_loo.volumedesc | html %]</em></span> >+ [% END %] >+ [% IF ( suggestions_loo.isbn ) %] >+ ; <span class="suggestion_isbn">ISBN: <em>[% suggestions_loo.isbn | html %]</em></span> >+ [% END %] >+ [% IF ( suggestions_loo.publishercode ) %] >+ ; <span class="suggestion_publishercode">Published by [% suggestions_loo.publishercode | html %]</span> >+ [% END %] >+ [% IF ( suggestions_loo.publicationyear ) %] >+ in <span class="suggestion_publicationyear"><em>[% suggestions_loo.publicationyear | html %]</em></span> >+ [% END %] >+ [% IF ( suggestions_loo.place ) %] >+ in <span class="suggestion_place"><em>[% suggestions_loo.place | html %]</em></span> >+ [% END %] >+ [% IF ( suggestions_loo.collectiontitle ) %] >+ ; <span class="suggestion_collectiontitle">[% suggestions_loo.collectiontitle | html %]</span> >+ [% END %] >+ [% IF ( suggestions_loo.itemtype ) %] >+ ; <span class="suggestion_itype">[% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) | html %]</span> >+ [% END %] >+ <br /> >+ [% IF ( suggestions_loo.note ) %] >+ <div class="suggestion_note"><i class="fa fa-comment"></i> [% suggestions_loo.note | html %]</div> >+ [% END %] >+ [% IF suggestions_loo.archived %] >+ <br /><i class="fa fa-archive"></i> Archived >+ [% END %] >+ </td> >+ <td> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | uri %]">[% suggestions_loo.surnamesuggestedby | html %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby | html %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby | html %])[% END %]</a> >+ </td> >+ <td data-order="[% suggestions_loo.suggesteddate | html %]"> >+ [% IF ( suggestions_loo.suggesteddate ) %][% suggestions_loo.suggesteddate | $KohaDates %][% END %] >+ </td> >+ <td> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.managedby | uri %]">[% suggestions_loo.surnamemanagedby | html %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby | html %][% END %]</a> >+ </td> >+ <td data-order="[% suggestions_loo.manageddate | html %]"> >+ [% IF ( suggestions_loo.manageddate ) %][% suggestions_loo.manageddate | $KohaDates %][% END %] >+ </td> >+ <td> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.lastmodificationby | uri %]">[% suggestions_loo.surnamelastmodificationby | html %][% IF ( suggestions_loo.firstnamelastmodificationby ) %], [% suggestions_loo.firstnamelastmodificationby | html %][% END %]</a> >+ </td> >+ <td data-order="[% suggestions_loo.lastmodificationdate | html %]"> >+ [% IF ( suggestions_loo.lastmodificationdate ) %][% suggestions_loo.lastmodificationdate | $KohaDates %][% END %] >+ </td> >+ <td> >+ [% suggestions_loo.date | $KohaDates %] >+ </td> >+ <td> >+ [% Branches.GetName( suggestions_loo.branchcode ) | html %] >+ </td> >+ <td> >+ [% suggestions_loo.budget_name | html %] >+ </td> >+ <td> >+ [% IF ( suggestions_loo.ASKED ) %] >+ Pending >+ [% ELSIF ( suggestions_loo.ACCEPTED ) %] >+ Accepted >+ [% ELSIF ( suggestions_loo.ORDERED ) %] >+ Ordered >+ [% ELSIF ( suggestions_loo.REJECTED ) %] >+ Rejected >+ [% ELSIF ( suggestions_loo.CHECKED ) %] >+ Checked >+ [% ELSIF ( suggestions_loo.AVAILABLE ) %] >+ Available >+ [% ELSIF AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) %] >+ [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) | html %] >+ [% ELSE %] >+ Status unknown >+ [% END %] >+ >+ [% IF ( suggestions_loo.reason ) %] >+ <br />([% suggestions_loo.reason | html %]) >+ [% END %] >+ </td> >+ <td class="actions"> >+ <div class="btn-group dropup"> >+ <a class="btn btn-default btn-xs" role="button" id="lientype" href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | html %]&op=edit"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" id="lientype" sid="more_actions_[% suggestions_loo.suggestionid | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> >+ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="more_actions_[% suggestions_loo.suggestionid | html %]"> >+ <li><a class="deletesuggestion" href="suggestion.pl?op=delete&suggestionid=[% suggestions_loo.suggestionid | html %]"><i class="fa fa-trash"></i> Delete</a></li> >+ [% UNLESS suggestions_loo.archived %] >+ <li><a class="archivesuggestion" href="suggestion.pl?op=archive&suggestionid=[% suggestions_loo.suggestionid | html %]"><i class="fa fa-archive"></i> Archive</a></li> >+ [% ELSE %] >+ <li><a class="unarchivesuggestion" href="suggestion.pl?op=unarchive&suggestionid=[% suggestions_loo.suggestionid | html %]"><i class="fa fa-archive"></i> Unarchive</a></li> >+ [% END %] >+ </ul> >+ </div> >+ </td> > </tr> >- </thead> >- <tbody> >- [% FOREACH suggestions_loo IN suggestion.suggestions_loop %] >- <tr> >- <td> >- <input type="checkbox" name="suggestionid" value="[% suggestions_loo.suggestionid | html %]" /> >- </td> >- <td> >- <a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | uri %]&op=show" title="suggestion" > >- [% suggestions_loo.title | html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author | html %][% END %] >- </a> >- <br /> >- [% IF ( suggestions_loo.copyrightdate ) %] >- © <span class="suggestion_copyrightdate">[% suggestions_loo.copyrightdate | html %]</span> >- [% END %] >- [% IF ( suggestions_loo.volumedesc ) %] >- ; <span class="suggestion_volume">Volume:<em>[% suggestions_loo.volumedesc | html %]</em></span> >- [% END %] >- [% IF ( suggestions_loo.isbn ) %] >- ; <span class="suggestion_isbn">ISBN: <em>[% suggestions_loo.isbn | html %]</em></span> >- [% END %] >- [% IF ( suggestions_loo.publishercode ) %] >- ; <span class="suggestion_publishercode">Published by [% suggestions_loo.publishercode | html %]</span> >- [% END %] >- [% IF ( suggestions_loo.publicationyear ) %] >- in <span class="suggestion_publicationyear"><em>[% suggestions_loo.publicationyear | html %]</em></span> >- [% END %] >- [% IF ( suggestions_loo.place ) %] >- in <span class="suggestion_place"><em>[% suggestions_loo.place | html %]</em></span> >- [% END %] >- [% IF ( suggestions_loo.collectiontitle ) %] >- ; <span class="suggestion_collectiontitle">[% suggestions_loo.collectiontitle | html %]</span> >- [% END %] >- [% IF ( suggestions_loo.itemtype ) %] >- ; <span class="suggestion_itype">[% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) | html %]</span> >- [% END %] >- <br /> >- [% IF ( suggestions_loo.note ) %] >- <div class="suggestion_note"><i class="fa fa-comment"></i> [% suggestions_loo.note | html %]</div> >- [% END %] >- [% IF suggestions_loo.archived %] >- <br /><i class="fa fa-archive"></i> Archived >- [% END %] >- </td> >- <td> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | uri %]">[% suggestions_loo.surnamesuggestedby | html %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby | html %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby | html %])[% END %]</a> >- </td> >- <td data-order="[% suggestions_loo.suggesteddate | html %]"> >- [% IF ( suggestions_loo.suggesteddate ) %][% suggestions_loo.suggesteddate | $KohaDates %][% END %] >- </td> >- <td>[% AuthorisedValues.GetByCode( 'OPAC_SUG', suggestions_loo.patronreason ) | html %]</td> >- <td> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.managedby | uri %]">[% suggestions_loo.surnamemanagedby | html %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby | html %][% END %]</a> >- </td> >- <td data-order="[% suggestions_loo.manageddate | html %]"> >- [% IF ( suggestions_loo.manageddate ) %][% suggestions_loo.manageddate | $KohaDates %][% END %] >- </td> >- <td> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.lastmodificationby | uri %]">[% suggestions_loo.surnamelastmodificationby | html %][% IF ( suggestions_loo.firstnamelastmodificationby ) %], [% suggestions_loo.firstnamelastmodificationby | html %][% END %]</a> >- </td> >- <td data-order="[% suggestions_loo.lastmodificationdate | html %]"> >- [% IF ( suggestions_loo.lastmodificationdate ) %][% suggestions_loo.lastmodificationdate | $KohaDates %][% END %] >- </td> >- <td> >- [% suggestions_loo.date | $KohaDates %] >- </td> >- <td> >- [% Branches.GetName( suggestions_loo.branchcode ) | html %] >- </td> >- <td> >- [% suggestions_loo.budget_name | html %] >- </td> >- <td> >- [% IF ( suggestions_loo.ASKED ) %] >- Pending >- [% ELSIF ( suggestions_loo.ACCEPTED ) %] >- Accepted >- [% ELSIF ( suggestions_loo.ORDERED ) %] >- Ordered >- [% ELSIF ( suggestions_loo.REJECTED ) %] >- Rejected >- [% ELSIF ( suggestions_loo.CHECKED ) %] >- Checked >- [% ELSIF ( suggestions_loo.AVAILABLE ) %] >- Available >- [% ELSIF AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) %] >- [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS ) | html %] >- [% ELSE %] >- Status unknown >- [% END %] >+ [% END # /FOREACH suggestions_loo %] >+ </tbody> >+ </table> <!-- /#table_[% loop.count | html %] --> >+ >+ <div class="row"> >+ <h3 style="padding-left:1em;">Change selected suggestions</h3> >+ <div class="col-sm-4"> >+ <fieldset> >+ <div id="select-reason[% loop.index | html %]"> >+ <label for="STATUSreason[% loop.index | html %]">Mark selected as: </label> >+ <select name="STATUS" id="STATUSreason[% loop.index | html %]"> >+ <option value=""> -- Choose a status --</option> >+ >+ [% IF (statusselected_ASKED ) %] >+ <option value="ASKED" selected="selected">Pending</option> >+ [% ELSE %] >+ <option value="ASKED">Pending</option> >+ [% END %] >+ >+ [% IF (statusselected_ACCEPTED ) %] >+ <option value="ACCEPTED" selected="selected">Accepted</option> >+ [% ELSE %] >+ <option value="ACCEPTED">Accepted</option> >+ [% END %] > > [% IF ( suggestions_loo.reason ) %] > <br />([% suggestions_loo.reason | html %]) >@@ -903,65 +933,49 @@ > [% END %] > </select> > >- <label for="choosereason[% loop.index | html %]">with this reason:</label> >- <select name="reason" id="choosereason[% loop.index | html %]"> >- <option value=""> -- Choose a reason -- </option> >- [% FOREACH reasonsloo IN suggestion.reasonsloop %] >- <option value="[% reasonsloo.lib | html %]">[% reasonsloo.lib | html %]</option> >- [% END %] >- <option value="other">Others...</option> >- </select> >- >- <span class="other_reason"> >- <input type="text" size="31" name="other_reason" placeholder="please note your reason here..." /> >- <a href="#" class="cancel_note">Cancel</a> >- </span> >- </div> >- >- <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> >- <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> >- <fieldset class="action"> >- <button type="submit" class="btn btn-default btn-xs" value="update_status">Submit</button> >- </fieldset> >+ <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> >+ <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> >+ <fieldset class="action"> >+ <button type="submit" class="btn btn-default btn-xs" id="lientype" value="update_status">Submit</button> > </fieldset> >- </div> <!-- /.col-sm-4 --> >- >- <div class="col-sm-4"> >- <fieldset> >- <label> >- Update item types with: >- [% PROCESS 'av-build-dropbox.inc' name="suggestion_itemtype", category="SUGGEST_FORMAT", size = 20 %] >- </label> >- <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> >- <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> >- <fieldset class="action"> >- <button type="submit" class="btn btn-default btn-xs" value="update_itemtype">Submit</button> >- </fieldset> >+ </fieldset> >+ </div> <!-- /.col-sm-4 --> >+ >+ <div class="col-sm-4"> >+ <fieldset> >+ <label> >+ Update item types with: >+ [% PROCESS 'av-build-dropbox.inc' name="suggestion_itemtype", category="SUGGEST_FORMAT", size = 20 %] >+ </label> >+ <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> >+ <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> >+ <fieldset class="action"> >+ <button type="submit" class="btn btn-default btn-xs" id="lientype" value="update_itemtype">Submit</button> > </fieldset> >- </div> <!-- /.col-sm-4 --> >- >- <div class="col-sm-2"> >- <fieldset> >- <span class="label">Update manager</span><br/> >- <a id="set_manager_[% loop.count | html %]" data-tab="[% loop.count | html %]" class="set_manager" href="#"><i class="fa fa-search"></i> Select manager</a> >- <span id="managedby_name[% loop.count | html %]"></span> >- <input type="hidden" name="suggestion_managedby" id="managedby[% loop.count | html %]" value="[% logged_in_user.borrowernumber | html %]" /> >- <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> >- <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> >- <fieldset class="action"> >- <button type="submit" class="btn btn-default btn-xs" value="update_manager">Submit</button> >- </fieldset> >+ </fieldset> >+ </div> <!-- /.col-sm-4 --> >+ >+ <div class="col-sm-2"> >+ <fieldset> >+ <span class="label">Update manager</span><br/> >+ <a id="set_manager_[% loop.count | html %]" data-tab="[% loop.count | html %]" class="set_manager" href="#"><i class="fa fa-search"></i> Select manager</a> >+ <span id="managedby_name[% loop.count | html %]"></span> >+ <input type="hidden" name="suggestion_managedby" id="managedby[% loop.count | html %]" value="[% logged_in_user.borrowernumber | html %]" /> >+ <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> >+ <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> >+ <fieldset class="action"> >+ <button type="submit" class="btn btn-default btn-xs" id="lientype" value="update_manager">Submit</button> > </fieldset> >- </div> <!-- /.col-sm-2 --> >- >- <div class="col-sm-2"> >- <fieldset> >- <span class="label">Delete selected</span> >- <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> >- <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> >- <fieldset class="action"> >- <button type="submit" class="btn btn-default btn-xs" value="delete">Delete</button> >- </fieldset> >+ </fieldset> >+ </div> <!-- /.col-sm-2 --> >+ >+ <div class="col-sm-2"> >+ <fieldset> >+ <span class="label">Delete selected</span> >+ <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> >+ <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> >+ <fieldset class="action"> >+ <button type="submit" class="btn btn-default btn-xs" id="lientype" value="delete">Delete</button> > </fieldset> > </div> <!-- /.col-sm-2 --> > <div class="col-sm-2"> >@@ -983,7 +997,7 @@ > </div> <!-- /#[% suggestion.suggestiontype | html %] --> > [% END # /FOREACH suggestion %] > [% UNLESS ( notabs ) %] >- </div> <!-- /.tab-content --> >+ </fieldset> > </div> <!-- /.notabs --> > [% END # /UNLESS notabs %] > [% END # /IF op == 'else' %] >@@ -994,12 +1008,13 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >+ <div id="filters"> > <form name="suggestionfilter" action="suggestion.pl" method="get"> > <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> > <fieldset class="brief"> > <ol style="display:block;"> > <li> >- <label for="displayby">Organize by: </label> >+ <p for="displayby">Organize by: > <select name="displayby" id="displayby" style="width:auto;"> > [% IF ( displayby == "STATUS" ) %] > <option value="STATUS" selected="selected">Status</option> >@@ -1027,57 +1042,57 @@ > <option value="acceptedby">Accepted by</option> > [% END %] > </select> >- <input type="submit" value="Go" /> >+ <input class="principal" type="submit" value="Go" /></p> > </li> > </ol> > </fieldset> <!-- /.brief --> > >- <h4>Filter by: <a style="font-size:80%;font-weight:normal;" href="/cgi-bin/koha/suggestion/suggestion.pl">[clear]</a></h4> >+ <h4>Filter by: <a id="lientype" style="font-size:80%;font-weight:normal;" href="/cgi-bin/koha/suggestion/suggestion.pl">[clear]</a></h4> > > <div id="limits"> > <fieldset class="brief"> >- <h4 class="local_collapse"><a href="#">Bibliographic information</a></h4> >+ <h4 class="local_collapse"><a href="#">Bibliographic information <span class="caret"></span></a></h4> > <ol> > <li> >- <label for="title"> Title:</label> >- <input type="text" id="title" name="title" value="[% title | html %]" /> >+ <p for="title"> Title: >+ <input type="text" id="title" name="title" value="[% title | html %]" /></p> > </li> > <li> >- <label for="author"> Author:</label> >- <input type="text" id="author" name="author" value="[% author | html %]" /> >+ <p for="author"> Author: >+ <input type="text" id="author" name="author" value="[% author | html %]" /></p> > </li> > <li> >- <label for="isbn"> ISBN:</label> >- <input type="text" id="isbn" name="isbn" value="[% isbn | html %]" /> >+ <p for="isbn"> ISBN: >+ <input type="text" id="isbn" name="isbn" value="[% isbn | html %]" /></p> > </li> > <li> >- <label for="publishercode"> Publisher:</label> >- <input type="text" id="publishercode" name="publishercode" value="[% publishercode | html %]" /> >+ <p for="publishercode"> Publisher: >+ <input type="text" id="publishercode" name="publishercode" value="[% publishercode | html %]" /></p> > </li> > <li> >- <label for="copyrightdate_filter"> Copyright date:</label> >- <input type="text" id="copyrightdate_filter" name="copyrightdate" value="[% copyrightdate | html %]" /> >+ <p for="copyrightdate_filter"> Copyright date: >+ <input type="text" id="copyrightdate_filter" name="copyrightdate" value="[% copyrightdate | html %]" /></p> > </li> > <li> >- <label for="collectiontitle"> Collection title:</label> >- <input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle | html %]" /></li><li><input type="submit" value="Go" /> >- </li> >+ <p for="collectiontitle"> Collection title: >+ <input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle | html %]" /></li><li><input class="principal" type="submit" value="Go" /> >+ </p></li> > </ol> > </fieldset> <!-- /.brief --> > > <fieldset class="brief"> >- <h4 class="local_collapse"><a href="#">Suggestion information</a></h4> >+ <h4 class="local_collapse"><a href="#">Suggestion information <span class="caret"></span></a></h4> > <ol> > <li> >- <label for="archived" style="display: inline;">Include archived:</label> >+ <p for="archived" style="display: inline;">Include archived: > [% IF filter_archived %] > <input type="checkbox" id="archived" name="filter_archived" checked="checked" title="Include archived suggestions in the search" /> > [% ELSE %] > <input type="checkbox" id="archived" name="filter_archived" title="Include archived suggestions in the search" /> >- [% END %] >+ [% END %]</p> > </li> > <li> >- <label for="STATUS[% loop.index | html %]"> Status:</label> >+ <p for="STATUS[% loop.index | html %]"> Status: > <select name="STATUS" id="STATUS[% loop.index | html %]"> > <option value="">Any</option> > [% IF (statusselected_ASKED ) %] >@@ -1117,11 +1132,11 @@ > <option value="[% s.authorised_value | html %]">[% s.lib | html %]</option> > [% END %] > [% END %] >- </select> >+ </select></p> > </li> > > <li> >- <label for="suggestedby"> Suggested by:</label> >+ <p for="suggestedby"> Suggested by: > <select id="suggestedby" name="suggestedby"> > <option value="">Any</option> > [% FOREACH suggestedby_loo IN suggestedby_loop %] >@@ -1131,18 +1146,18 @@ > <option value="[% suggestedby_loo.code | html %]">[% suggestedby_loo.desc | html %]</option> > [% END %] > [% END %] >- </select> >+ </select></p> > </li> > <li> >- <label for="suggesteddate_from">Suggested date from:</label> >+ <p for="suggesteddate_from">Suggested date from: > <input type="text" id="suggesteddate_from" size="10" name="suggesteddate_from" value="[% suggesteddate_from | html %]" data-date_to="suggesteddate_to" class="flatpickr" /> >- </li> >+ </p></li> > <li> >- <label for="suggesteddate_to">To:</label> >+ <p for="suggesteddate_to">To: > <input type="text" id="suggesteddate_to" size="10" name="suggesteddate_to" value="[% suggesteddate_to | html %]" class="flatpickr" /> >- </li> >+ </p></li> > <li> >- <label for="managedby"> Managed by:</label> >+ <p for="managedby"> Managed by: > <select id="managedby" name="managedby"> > <option value="">Any</option> > [% FOREACH managedby_loo IN managedby_loop %] >@@ -1152,18 +1167,18 @@ > <option value="[% managedby_loo.code | html %]">[% managedby_loo.desc | html %]</option> > [% END %] > [% END %] >- </select> >+ </select></p> > </li> > <li> >- <label for="manageddate_from">Management date from:</label> >+ <p for="manageddate_from">Management date from: > <input type="text" id="manageddate_from" size="10" name="manageddate_from" value="[% manageddate_from | html %]" data-date_to="manageddate_to" class="flatpickr" /> >- </li> >+ </p></li> > <li> >- <label for="manageddate_to">To:</label> >+ <p for="manageddate_to">To: > <input type="text" id="manageddate_to" size="10" name="manageddate_to" value="[% manageddate_to | html %]" class="flatpickr" /> >- </li> >+ </p></li> > <li> >- <label for="acceptedby"> Accepted by:</label> >+ <p for="acceptedby"> Accepted by: > <select id="acceptedby" name="acceptedby"> > <option value="">Any</option> > [% FOREACH acceptedby_loo IN acceptedby_loop %] >@@ -1174,28 +1189,28 @@ > [% END %] > [% END %] > </select> >- </li> >+ </p></li> > <li> >- <label for="accepteddate_from">Accepted date from:</label> >+ <p for="accepteddate_from">Accepted date from: > <input type="text" id="accepteddate_from" size="10" name="accepteddate_from" value="[% accepteddate_from | html %]" data-date_to="accepteddate_to" class="flatpickr" /> >- </li> >+ </p></li> > <li> >- <label for="accepteddate_to">To:</label> >+ <p for="accepteddate_to">To: > <input type="text" id="accepteddate_to" size="10" name="accepteddate_to" value="[% accepteddate_to | html %]" class="flatpickr" /> >- </li> >+ </p></li> > <li> >- <input type="submit" value="Go" /> >+ <input class="principal" type="submit" value="Go" /> > </li> > </ol> > </fieldset> > > <fieldset class="brief"> > <h4 class="local_collapse"> >- <a href="#">Acquisition information</a> >+ <a href="#">Acquisition information <span class="caret"></span></a> > </h4> > <ol> > <li> >- <label for="budgetid"> Book fund:</label> >+ <p for="budgetid"> Book fund: > <select name="budgetid" id="budgetid"> > <option value="__ANY__">Any</option> > [% IF budgetid == '__NONE__' %] >@@ -1210,10 +1225,10 @@ > <option value="[% budgetsloo.budget_id | html %]">[% budgetsloo.budget_name | html %]</option> > [% END %] > [% END %] >- </select> >+ </select></p> > </li> > <li> >- <input type="submit" value="Go" /> >+ <input class="principal" type="submit" value="Go" /> > </li> > </ol> > </fieldset> >@@ -1221,7 +1236,7 @@ > </form> <!-- /suggestionsfilter --> > > [% INCLUDE 'acquisitions-menu.inc' %] >- >+ </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > [% END # /UNLESS ( op == 'show' ) %] >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 e7962321fe..dec1ec5fae 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"> >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 33d3aac422..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,12 +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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -23,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"> >@@ -30,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 96b88db8a3..845b6da7d2 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,7 +31,7 @@ > </head> > > <body id="tools_additional-contents" class="tools"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -70,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' %] >@@ -118,42 +127,44 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- >- <div id="news-filter"> >+ <div id="filters"> > <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> >+ <h4>Filter</h4> >+ >+ <fieldset> >+ <ol> >+ <li> >+ <p for="news_keyword">Keyword: >+ <input type="text" name="news_keyword" id="news_keyword" /></p> >+ </li> >+ <li> >+ <p for="news_display_location">Display location: >+ <select name="news_display_location" id="news_display_location"> >+ <option value="">All</option> >+ [% PROCESS locations_options category => category %] >+ </select></p> >+ </li> >+ <li> >+ <p for="news_library">Library: >+ <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></p> >+ </li> >+ <li> >+ <p> >+ <input type="checkbox" name="show_expired" id="show_expired" /> Show expired >+ </p> >+ </li> >+ </ol> >+ </fieldset> > </fieldset> > </form> >- </div> > >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'tools-menu.inc' %] >+ </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > [% END %] >@@ -162,20 +173,20 @@ > > [% BLOCK add_form %] > [% 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> >- </div> >+ <button class="principal" id="submit_form"><i class="fa fa-save"></i> Save</button> > [% 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"> >@@ -275,6 +286,7 @@ > <textarea name="content" id="content_default" data-lang="[% language.lang | html %]" cols="75" rows="10">[% additional_content.content | html %]</textarea> > </div> > </div> >+ </div> > [% END %] > </form> > [% END %] >@@ -283,7 +295,8 @@ > > <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="pat" id="newentry"> <i class="fa fa-plus"></i> New entry</a> >+ <button class="pat fleche dropdown-toggle" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu pull-right"> >@@ -300,7 +313,7 @@ > > <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" id="lientype">HTML customizations</a> > [% ELSE %] > See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a> > [% END %] >@@ -310,6 +323,7 @@ > [% END %] > > [% IF additional_contents.count %] >+ <div id="searchresults"> > <form id="del_form" method="post" action="/cgi-bin/koha/tools/additional-contents.pl"> > <table id="table_additional_contents"> > <thead> >@@ -357,7 +371,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 %]" id="lientype"><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"> >@@ -376,7 +390,8 @@ > </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" id="lientype"> <i class="fa fa-pencil"></i> Edit</a> >+ <button class="btn btn-default btn-xs dropdown-toggle" id="lientype" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu pull-right"> >@@ -390,7 +405,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 %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </div> > </td> > </tr> >@@ -399,7 +414,7 @@ > </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> > </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" /> >@@ -409,6 +424,7 @@ > [% ELSE %] > <div class="dialog message">There are no additional contents.</div> > [% END %] >+</div> > [% END %] > > [% BLOCK locations_options %] >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 17f6aa1f31..30ee551e37 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 >@@ -1,13 +1,16 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Automatic item modifications by age › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="tools_automatic_item_modification_by_age" class="tools"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -35,6 +38,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"> >@@ -44,29 +53,33 @@ > > [% IF ( op == 'edit_form' ) %] > <form method="post" id="rules_form" action="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"> >- <h1>Rules for automatic item modifications by age</h1> >+ <h2>Rules for automatic item modifications by age</h2> > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <button class="btn btn-default add_rule"><i class="fa fa-plus"></i> Add rule</button> >+ <button class="pat add_rule"><i class="fa fa-plus"></i> Add rule</button> > </div> > <div class="btn-group"> >- <button type="submit" id="save_rules" class="btn btn-default"><i class="fa fa-save"></i> Save</button> >+ <button type="submit" id="save_rules" class="pat"><i class="fa fa-save"></i> Save</button> > </div> > <div class="btn-group"> >- <a class="btn btn-default" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"><i class="fa fa-remove"></i> Cancel</a> >+ <a class="pat" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"><i class="fa fa-remove"></i> Cancel</a> > </div> > </div> >+ <h2>Rules for automatic item modifications by age</h2> > [% ELSE %] >- <h1>Automatic item modifications by age</h1> >+ <h2>Automatic item modifications by age</h2> > [% IF ( rules ) %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-pencil"></i> Edit rules</a> >- </div> >+ <div class="btn-group"> >+ <a class="pat" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-pencil"></i> Edit rules</a> >+ </div></div> > [% ELSE %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-plus"></i> Add rules</a> >- </div> >+ <div class="btn-group"> >+ <a class="pat" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-plus"></i> Add rules</a> >+ </div></div> > [% END %] >+ <h2>Automatic item modifications by age</h2> > [% END %] > > [% FOR message IN messages %] >@@ -85,7 +98,7 @@ > [% FOR rule IN rules %] > [% SET id = loop.count %] > <fieldset class="rule"> >- <legend>Rule <span class="rulecount">[% loop.count | html %]</span> <a href="#" class="remove_rule"><i class="fa fa-trash"></i> Remove this rule</a></legend> >+ <h3>Rule <span class="rulecount">[% loop.count | html %]</span> <a href="#" class="remove_rule"><i class="fa fa-trash"></i> Remove this rule</a></h3> > <input type="hidden" name="unique_id" value="[% loop.count | html %]" /> <!-- FIXME on update, the unique_id should be filled --> > <div class="age"> > <h5>Age in days</h5> >@@ -160,7 +173,7 @@ > </div> > > <fieldset id="new_rule"> >- <legend>Rule <span class="rulecount"></span> <a href="#" class="remove_rule"><i class="fa fa-trash"></i> Remove this rule</a></legend> >+ <h3>Rule <span class="rulecount"></span> <a href="#" class="remove_rule"><i class="fa fa-trash"></i> Remove this rule</a></h3> > <input type="hidden" name="unique_id" /> > <div class="age"> > <h5>Age in days</h5> >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 1e9596e553..d5338b41b6 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,7 +16,7 @@ > <![endif]--> > </head> > <body id="tools_batchMod-del" class="tools"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -27,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"> >@@ -155,7 +164,7 @@ > </fieldset> > </div> > [% ELSE %] >- <p><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a></p> >+ <p><a href="/cgi-bin/koha/tools/batchMod.pl?del=1" id="lientype">Return to batch item deletion</a></p> > [% END %] > [% END %] > </form> >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 2f48a3d33a..833e4bda59 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,7 +16,7 @@ > </head> > > <body id="tools_batchMod-edit" class="tools"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -27,6 +30,12 @@ > <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"> >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 d10d57762c..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,12 +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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -31,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"> >@@ -38,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> >@@ -52,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> >@@ -64,7 +73,7 @@ > > [% UNLESS del %] > <fieldset class="rows"> >- <legend>Use default values</legend> >+ <h3>Use default values</h3> > <ol class="radio"> > <li> > <label> >@@ -78,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 904193a8ea..51347b2d41 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,7 +11,7 @@ > </head> > > <body id="tools_batch_delete_records" class="tools"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -22,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"> >@@ -29,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"> >@@ -58,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> >@@ -66,6 +75,7 @@ > </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> >@@ -83,6 +93,7 @@ > <div class="tab-content"> > <div id="uploadfile_tab" role="tabpanel" class="tab-pane active"> > <fieldset class="rows"> >+ <h3>Use a file</h3> > <ol> > <li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li> > </ol> >@@ -93,6 +104,7 @@ > [% IF lists.count %] > <div id="shelves_tab" role="tabpanel" class="tab-pane"> > <fieldset class="rows"> >+ <h3>Or select a list of records</h3> > <ol> > <li> > <label for="shelf_number">List: </label> >@@ -111,6 +123,7 @@ > > <div id="enterlist_tab" role="tabpanel" class="tab-pane"> > <fieldset class="rows"> >+ <h3>Or enter a list of record numbers</h3> > <ol> > <li> > <label for="recordnumber_list">IDs: </label> >@@ -121,13 +134,12 @@ > </fieldset> > > </div> >- >- </div> <!-- /.tab-content --> >- </div> >+ </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 024320d5dc..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,7 +17,7 @@ > </head> > > <body id="tools_batch_extend_due_dates" class="tools"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -28,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"> >@@ -35,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"> >@@ -60,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> >@@ -91,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> >@@ -105,7 +114,7 @@ > </ol> > </fieldset> > <fieldset class="rows"> >- <legend>Options:</legend> >+ <h3>Options:</h3> > <ol> > <li> > <label for="preview_results">Preview results:</label> >@@ -116,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 9138959c5d..571e0427bd 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,7 +12,7 @@ > </head> > > <body id="tools_batch_record_modification" class="tools"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -23,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"> >@@ -30,7 +39,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Batch record modification</h1> >+ <h2>Batch record modification</h2> > > [% IF ( messages ) %] > <div class="dialog message"> >@@ -64,7 +73,7 @@ > [% IF view == 'form' %] > <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batch_record_modification.pl" id="record_ids_selection"> > <fieldset class="rows"> >- <legend>Record type</legend> >+ <h3>Record type</h3> > <ol> > <li><label for="biblio_type">Biblios: </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> >@@ -74,6 +83,7 @@ > <br><br> > > <div id="batch_mod_form" class="toptabs" style="clear:both"> >+ <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> >@@ -120,6 +130,7 @@ > > <div id="enterlist_tab" role="tabpanel" class="tab-pane"> > <fieldset class="rows"> >+ <h3>Or select a list of records</h3> > <ol> > <li> > <label for="recordnumber_list">Record numbers: </label> >@@ -130,11 +141,25 @@ > </fieldset> > > </div> >- </div> <!-- /.tab-content --> >+ [% END %] >+ >+ <div id="enterlist_tab"> >+ <fieldset class="rows"> >+ <h3>Or enter a list of record numbers</h3> >+ <ol> >+ <li> >+ <label for="recordnumber_list">List of biblionumbers or authority ids (one per line): </label> >+ <textarea rows="10" cols="30" id="recordnumber_list" name="recordnumber_list"></textarea> >+ </li> >+ </ol> >+ </fieldset> >+ >+ </div> >+ </fieldset> > </div> <!-- /#batch_mod_form --> > > <fieldset class="rows"> >- <legend>MARC modification template</legend> >+ <h3>Use MARC modification template:</h3> > <ol> > <li> > <label for="marc_modification_template_id" class="required">Template: </label> >@@ -149,7 +174,7 @@ > </fieldset> > <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> <!-- /#record_ids_selection --> >@@ -178,7 +203,7 @@ > <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> >@@ -204,7 +229,7 @@ > <td>[% biblio.biblionumber | html %]</td> > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></td> > <td class="actions"> >- <a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber | uri %]&mmtid=[% mmtid | uri %]&overlay_context=batchmod" class="previewMARC btn btn-default btn-xs" data-record_type="biblio" data-record_id="[% biblio.biblionumber | html %]" data-mmtid="[% mmtid | html %]" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a> >+ <a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber | uri %]&mmtid=[% mmtid | uri %]&overlay_context=batchmod" class="previewMARC btn btn-default btn-xs" data-record_type="biblio" data-record_id="[% biblio.biblionumber | html %]" data-mmtid="[% mmtid | html %]" id="lientype" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a> > </td> > </tr> > [% END %] >@@ -241,7 +266,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" class="principal" id="mainformsubmit" value="Modify selected records" class="button" /> > </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 e465ec56c2..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,7 +19,7 @@ > </head> > > <body id="tools_cleanborrowers" class="tools"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -55,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"> >@@ -64,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"> >@@ -84,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 %] >@@ -103,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> >@@ -151,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 %] >@@ -169,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 --> >@@ -190,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> >@@ -230,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 50757188cf..8d78592693 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,7 +19,7 @@ > </head> > > <body id="tools_csv-profiles" class="tools"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -49,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"> >@@ -259,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> >@@ -286,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="pat" id="newcsvprofile" href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form"><i class="fa fa-plus"></i> New CSV profile</a> >+ </diiv> > </div> > > <h1>CSV profiles</h1> >@@ -314,8 +325,8 @@ > <td>[% PROCESS type_description type_code = csv_profile.type %]</td> > <td>[% PROCESS used_for_description used_for_code = csv_profile.used_for %]</td> > <td class="actions"> >- <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form&export_format_id=[% csv_profile.export_format_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=delete_confirm&export_format_id=[% csv_profile.export_format_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >+ <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form&export_format_id=[% csv_profile.export_format_id | uri %]" id="lientype" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=delete_confirm&export_format_id=[% csv_profile.export_format_id | uri %]" id="lientype" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >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 da89fab787..e90e089826 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,7 +16,7 @@ > </head> > > <body id="tools_export" class="tools"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -29,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"> >@@ -48,16 +57,55 @@ > [% END %] > > <div id="exporttype" class="toptabs"> >- <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> >+<fieldset id="searchresults"> >+<ul> >+<li><a href="#bibs">Export bibliographic records</a></li> >+<li><a href="#auths">Export authority records</a></li> >+[% IF ( allow_db_export ) %] >+<li><a href="#db">Export database</a></li> >+[% END %] >+[% IF ( allow_conf_export ) %] >+<li><a href="#conf">Export configuration</a></li> >+[% END %] >+</ul> >+<div id="bibs"> >+<p> >+ <strong>Note : The items are exported by this tool unless specified.</strong> >+</p> >+ >+<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/export.pl"> >+ <fieldset class="rows"> >+ <h3> Select records to export </h3> >+ <ol> >+ <li> >+ <label for="start">From biblionumber: </label> >+ <input id="start" type="text" name="StartingBiblionumber" size="5" /> >+ </li> >+ <li> >+ <label for="end">To biblionumber: </label> >+ <input id="end" type="text" name="EndingBiblionumber" size="5" /> >+ </li> >+ >+ <li> >+ <label for="itemtype">Item type: </label> >+ <select name="itemtype" id="itemtype"> >+ <option value="">-- All --</option> >+ [% FOREACH itemtype IN itemtypes %] >+ <option value="[% itemtype.itemtype | html %]">[% itemtype.translated_description | html %]</option> >+ [% END %] >+ </select> > </li> > <li role="presentation"> > <a href="#auths" aria-controls="auths" role="tab" data-toggle="tab">Export authority records</a> > </li> >- [% IF ( allow_db_export ) %] >- <li role="presentation"> >- <a href="#db" aria-controls="db" role="tab" data-toggle="tab">Export database</a> >+ </ol> >+ >+ <fieldset class="rows"> >+ <h3>Call number range</h3> >+ <ol> >+ <li> >+ <label for="startcn">From item call number: </label> >+ <input id="startcn" type="text" name="start_callnumber" size="15" /> > </li> > [% END %] > [% IF ( allow_conf_export ) %] >@@ -72,48 +120,137 @@ > <strong>Note : The items are exported by this tool unless specified.</strong> > </p> > >- <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/export.pl"> >- <fieldset class="rows"> >- <legend> Select records to export </legend> >- <ol> >- <li> >- <label for="start">From biblionumber: </label> >- <input id="start" type="text" name="StartingBiblionumber" size="5" /> >- </li> >- <li> >- <label for="end">To biblionumber: </label> >- <input id="end" type="text" name="EndingBiblionumber" size="5" /> >- </li> >+ <fieldset class="rows"> >+ <h3>Accession date (inclusive)</h3> >+ <ol> >+ <li> >+ <label for="from">Start date:</label> >+ <input type="text" size="10" id="from" name="start_accession" value="[% from | html %]" class="flatpickr" data-date_to="to" /> >+ </li> >+ <li> >+ <label for="to">End date:</label> >+ <input size="10" id="to" name="end_accession" value="[% end_accession | html %]" type="text" class="flatpickr" /> >+ </li> >+ </ol> >+ </fieldset> > >- <li> >- <label for="itemtype">Item type: </label> >- <select name="itemtype" id="itemtype"> >- <option value="">-- All --</option> >- [% FOREACH itemtype IN itemtypes %] >- <option value="[% itemtype.itemtype | html %]">[% itemtype.translated_description | html %]</option> >- [% END %] >- </select> >- </li> >+ </fieldset> >+ <fieldset class="rows"> >+ <h3> >+ Use a file >+ </h3> >+ <ol> >+ <li>File containing a list of biblionumbers with one biblionumber per line. This list works as a filter: it is compatible with other parameters. (File types accepted: .csv and .txt)</li> >+ <li><label for="id_list_file">File: </label> <input type="file" id="id_list_file" name="id_list_file" /></li> >+ </ol> >+ </fieldset> >+ <fieldset class="rows"> >+ <h3> Options</h3> >+<ol> <li> >+ <label for="dont_export_item">Don't export items:</label> >+ <input id="dont_export_item" type="checkbox" name="dont_export_item" /> >+ </li> >+ <li> >+ <label for="strip_items_not_from_libraries">Remove items not owned by selected libraries:</label> >+ <input id="strip_items_not_from_libraries" type="checkbox" name="strip_items_not_from_libraries" /> >+ </li> >+ <li> >+ <label for="export_remove_fields">Don't export fields:</label> >+ <input id="export_remove_fields" type="text" name="export_remove_fields" value="[% export_remove_fields | html %]" /> >+ separate by a blank. (e.g., 100a 200 606) >+ </li></ol> >+ </fieldset> >+ <fieldset class="rows"> >+ <h3> >+ Output format >+ </h3> >+ <ol><li> >+ <label for="output_format">File format: </label> >+ <select id="output_format" name="output_format"> >+ <option value="iso2709">MARC</option> >+ <option value="xml">XML</option> >+ [% IF csv_profiles %] >+ <option value="csv">CSV</option> >+ [% ELSE %] >+ <option value="csv" disabled data-toggle="tooltip" data-placement="left" title="You must create a CSV profile for MARC exports to use this option.">CSV</option> >+ [% END %] >+ </select> >+ </li> >+ <li class="csv_profiles"> >+ <label for="bibs_csv_profile">CSV profile: </label> >+ <select id="bibs_csv_profile" name="csv_profile_id"> >+ [% FOR csv_profile IN csv_profiles %] >+ <option value="[% csv_profile.export_format_id | html %]">[% csv_profile.profile | html %]</option> >+ [% END %] >+ </select> >+ </li> >+ <li> >+ <label for="filename">File name:</label><input id="filename" type="text" name="filename" value="koha.mrc" /> >+ </li></ol> >+ </fieldset> >+ <input type="hidden" name="op" value="export" /> >+ <input type="hidden" name="record_type" value="bibs" /> > >- <li> >- <label>With items owned by the following libraries: </label> >- [% INCLUDE 'branch-selector.inc' branches = libraries %] >- </li> >- </ol> >+ <fieldset class="action"><input type="submit" class="principal" value="Export bibliographic records" class="button" /></fieldset> >+</form> >+</div> > >- <fieldset class="rows"> >- <legend>Call number range</legend> >- <ol> >- <li> >- <label for="startcn">From item call number: </label> >- <input id="startcn" type="text" name="start_callnumber" size="15" /> >- </li> >- <li> >- <label for="endcn">To item call number: </label> >- <input id="endcn" type="text" name="end_callnumber" size="15" /> >- </li> >- </ol> >- </fieldset> >+<div id="auths"> >+<form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/export.pl"> >+ <fieldset class="rows"> >+ <h3> Select records to export </h3> >+ <ol><li> >+ <label for="start">From authid: </label> >+ <input id="start" type="text" name="starting_authid" size="6" /> >+ </li> >+ <li> >+ <label for="end">To authid: </label> >+ <input id="end" type="text" name="ending_authid" size="6" /> >+ </li> >+ <li> >+ <label for="authtype">Authority type: </label> >+ <select name="authtype" id="authtype"> >+ <option value="">-- All --</option> >+ [% FOREACH authority_type IN authority_types %] >+ <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >+ [% END %] >+ </select> >+ </li> >+ </ol> >+ </fieldset> >+ <fieldset class="rows"> >+ <h3> >+ Use a file >+ </h3> >+ <ol> >+ <li>File containing a list of authids with one authid per line. This list works as a filter: it is compatible with other parameters. (File types accepted: .csv and .txt)</li> >+ <li><label for="id_list_file">File:</label> <input type="file" id="id_list_file" name="id_list_file" /></li> >+ </ol> >+ </fieldset> >+ <fieldset class="rows"> >+ <h3>Options</h3> >+ <ol> >+ <li> >+ <label for="export_remove_fields">Don't export fields:</label> >+ <input id="export_remove_fields" type="text" name="export_remove_fields" /> >+ separate by a blank. (e.g., 100a 200 606) >+ </li></ol> >+ </fieldset> >+ <fieldset class="rows"> >+ <h3>Output format</h3> >+ <ol><li> >+ <label for="output_format">File format: </label> >+ <select id="output_format_auth" name="output_format"> >+ <option value="marc">MARC</option> >+ <option value="xml">XML</option> >+ </select> >+ </li> >+ <li> >+ <label for="filename_auth">File name:</label><input id="filename_auth" type="text" name="filename_auth" value="koha.mrc" /> >+ </li></ol> >+ </fieldset> >+ <input type="hidden" name="op" value="export" /> >+ <inpexporttyut type="hidden" name="record_type" value="auths" /> > > <fieldset class="rows"> > <legend>Accession date (inclusive)</legend> >@@ -129,62 +266,22 @@ > </ol> > </fieldset> > >- </fieldset> >- <fieldset class="rows"> >- <legend> >- Use a file >- </legend> >- <ol> >- <li>File containing a list of biblionumbers with one biblionumber per line. This list works as a filter: it is compatible with other parameters. (File types accepted: .csv and .txt)</li> >- <li><label for="id_list_file">File: </label> <input type="file" id="id_list_file" name="id_list_file" /></li> >- </ol> >- </fieldset> >- <fieldset class="rows"> >- <legend> Options</legend> >- <ol> <li> >- <label for="dont_export_item">Don't export items:</label> >- <input id="dont_export_item" type="checkbox" name="dont_export_item" /> >- </li> >- <li> >- <label for="strip_items_not_from_libraries">Remove items not owned by selected libraries:</label> >- <input id="strip_items_not_from_libraries" type="checkbox" name="strip_items_not_from_libraries" /> >- </li> >- <li> >- <label for="export_remove_fields">Don't export fields:</label> >- <input id="export_remove_fields" type="text" name="export_remove_fields" value="[% export_remove_fields | html %]" /> >- separate by a blank. (e.g., 100a 200 606) >- </li></ol> >- </fieldset> >- <fieldset class="rows"> >- <legend> >- Output format >- </legend> >- <ol><li> >- <label for="output_format">File format: </label> >- <select id="output_format" name="output_format"> >- <option value="iso2709">MARC</option> >- <option value="xml">XML</option> >- [% IF csv_profiles %] >- <option value="csv">CSV</option> >- [% ELSE %] >- <option value="csv" disabled data-toggle="tooltip" data-placement="left" title="You must create a CSV profile for MARC exports to use this option.">CSV</option> >- [% END %] >- </select> >- </li> >- <li class="csv_profiles"> >- <label for="bibs_csv_profile">CSV profile: </label> >- <select id="bibs_csv_profile" name="csv_profile_id"> >- [% FOR csv_profile IN csv_profiles %] >- <option value="[% csv_profile.export_format_id | html %]">[% csv_profile.profile | html %]</option> >- [% END %] >- </select> >- </li> >- <li> >- <label for="filename">File name:</label><input id="filename" type="text" name="filename" value="koha.mrc" /> >- </li></ol> >- </fieldset> >- <input type="hidden" name="op" value="export" /> >- <input type="hidden" name="record_type" value="bibs" /> >+[% IF ( allow_db_export ) %] >+<div id="db"> >+<form method="post" action="/cgi-bin/koha/tools/export.pl"> >+ <p><strong>Note : This export file will be very large, and is generated nightly.</strong></p> >+ <fieldset class="rows"> >+ <h3> Choose a file </h3> >+ [% IF ( dbfiles && (dbfiles.size > 0) ) %] >+ <ul> >+ [% FOREACH dbfile IN dbfiles %] >+ <li><input type="radio" name="filename" value="[% dbfile | html %]">[% dbfile | html %]</input></li> >+ [% END %] >+ </ul> >+ [% ELSE %] >+ <p>Unfortunately, no backups are available.</p> >+ [% END %] >+ </fieldset> > > <fieldset class="action"><input type="submit" value="Export bibliographic records" class="button" /></fieldset> > </form> >@@ -251,58 +348,27 @@ > </form> > </div> > >- [% IF ( allow_db_export ) %] >- <div id="db" role="tabpanel" class="tab-pane"> >- <form method="post" action="/cgi-bin/koha/tools/export.pl"> >- <p><strong>Note : This export file will be very large, and is generated nightly.</strong></p> >- <fieldset class="rows"> >- <legend> Choose a file </legend> >- [% IF ( dbfiles && (dbfiles.size > 0) ) %] >- <ul> >- [% FOREACH dbfile IN dbfiles %] >- <li><input type="radio" name="filename" value="[% dbfile | html %]">[% dbfile | html %]</input></li> >- [% END %] >- </ul> >- [% ELSE %] >- <p>Unfortunately, no backups are available.</p> >- [% END %] >- </fieldset> >- >- [% IF ( dbfiles && (dbfiles.size > 0) ) %] >- <input type="hidden" name="op" value="export" /> >- <input type="hidden" name="record_type" value="db" /> >- <fieldset class="action"><input type="submit" value="Download database" class="button" /></fieldset> >- [% END %] >- </form> >- </div> >+[% IF ( allow_conf_export ) %] >+<div id="conf"> >+<form method="post" action="/cgi-bin/koha/tools/export.pl"> >+ <p><strong>Note : This export file will be very large, and is generated nightly.</strong></p> >+ <fieldset class="rows"> >+ <h3> Choose a file </h3> >+ [% IF ( conffiles && (conffiles.size > 0) ) %] >+ <ul> >+ [% FOREACH conffile IN conffiles %] >+ <li><input type="radio" name="filename" value="[% conffile | html %]">[% conffile | html %]</input></li> > [% END %] > >- [% IF ( allow_conf_export ) %] >- <div id="conf" role="tabpanel" class="tab-pane"> >- <form method="post" action="/cgi-bin/koha/tools/export.pl"> >- <p><strong>Note : This export file will be very large, and is generated nightly.</strong></p> >- <fieldset class="rows"> >- <legend> Choose a file </legend> >- [% IF ( conffiles && (conffiles.size > 0) ) %] >- <ul> >- [% FOREACH conffile IN conffiles %] >- <li><input type="radio" name="filename" value="[% conffile | html %]">[% conffile | html %]</input></li> >- [% END %] >- </ul> >- [% ELSE %] >- <p>Unfortunately, no backups are available.</p> >- [% END %] >- </fieldset> >- >- [% IF ( conffiles && (conffiles.size > 0) ) %] >- <input type="hidden" name="op" value="export" /> >- <input type="hidden" name="record_type" value="conf" /> >- <fieldset class="action"><input type="submit" value="Download configuration" class="button" /></fieldset> >- [% END %] >- </form> >- </div> >- [% END %] >- </div> <!-- /.tab-content --> >+ [% IF ( conffiles && (conffiles.size > 0) ) %] >+ <input type="hidden" name="op" value="export" /> >+ <input type="hidden" name="record_type" value="conf" /> >+ <fieldset class="action"><input type="submit" value="Download configuration" class="button" /></fieldset> >+ [% END %] >+</form> >+</div> >+[% END %] >+</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 cf1d1f408d..a8aebfda8a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -2,13 +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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -24,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"> >@@ -78,11 +87,7 @@ > <!-- showTitle is necessary for exception radio button to work properly --> > <li> > <label for="showDescription">Description:</label> >- <textarea rows="2" cols="40" id="showDescription" name="showDescription"></textarea> >- </li> >- <li class="radio"> >- <div class="exceptionPossibility" style="position:static"> >- <input type="radio" name="showOperation" id="showOperationExc" value="exception" /> <label for="showOperationExc">Generate an exception for this repeated holiday.</label> >+ <textarea rows="2" cols="40" id="showDescription" name="showDescription"></textarea>holiday Holiday repeating weekly Holiday repeatintion for this repeated holiday.</label> > <a href="#" class="helptext">[?]</a> > <div class="hint">You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.</div> > </div> >@@ -127,8 +132,8 @@ > <div class="hint">If checked, changes for this holiday will be copied to all libraries. If the holiday doesn't exists for a library, no change is made.</div> > </li> > </ol> >- <fieldset class="action"> >- <input type="submit" name="submit" value="Save" /> >+ <fieldset class="action">ay Unique holiday Holiday repeating weekly Holiday >+ <input class="principal" type="submit" name="submit" value="Save" /> > <a href="#" class="cancel hidePanel showHoliday">Cancel</a> > </fieldset> > </fieldset> <!-- /.brief --> >@@ -236,7 +241,7 @@ > <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option> > [% END %] > </select> >- <input type="submit" value="Copy" /> >+ <input class="principal" type="submit" 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 87a65e558e..c82ea1f764 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 >@@ -4,7 +4,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >@@ -48,6 +48,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' %] >@@ -58,7 +64,7 @@ > > <div class="row"> > <div class="col-sm-6"> >-<h1>Import patrons</h1> >+<h2>Import patrons</h2> > [% IF ( uploadborrowers ) %] > <h5>Import results :</h5> > <ul> >@@ -209,7 +215,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> >@@ -226,7 +232,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"> >@@ -241,10 +247,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 %] >@@ -291,10 +297,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> >@@ -309,7 +315,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"> >@@ -330,7 +336,7 @@ > > [% IF ( Koha.Preference('ExtendedPatronAttributes') == 1 ) %] > <fieldset class="rows"> >- <legend>Patron attributes</legend> >+ <h3>Patron attributes</h3> > > <ol> > <li class="radio"> >@@ -357,7 +363,7 @@ > > <fieldset class="action"> > <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" /> >- <input type="submit" value="Import" /> >+ <input id="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 ccdc690146..05e4b14389 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -4,13 +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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -38,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"> >@@ -45,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 %] >@@ -66,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> >@@ -82,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> >@@ -91,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> >@@ -153,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> >+ <h3>[% status.fieldname | html %]</h3> > <ul id="statuses-[% fieldname | html %]" style="display: inline;"> > [% FOREACH value IN status.values %] > [% IF (value.lib) %] >@@ -202,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"> >@@ -223,7 +232,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Additional options</legend> >+ <h3>Additional options</h3> > <ol> > > <li> >@@ -234,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 %] >@@ -248,9 +257,10 @@ > <input type="hidden" name="ccode" value="[% ccode | html %]" /> > > [% UNLESS uploadedbarcodesflag %] >- <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> >+ <div><a id="lientype" href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a id="lientype" href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div> > [% END %] > >+<div id="searchresults"> > <table id="inventoryt"> > <thead> > <tr> >@@ -333,12 +343,13 @@ > </table> > <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" /> >+ <div style="padding : .3em 0"><a id="lientype" href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a id="lientype" href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div> >+ <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> >+</div> > > > [% END %] >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 0e59f63814..282b167633 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,8 @@ > </head> > > <body id="tools_letter" class="tools"> >- [% INCLUDE 'header.inc' %] >- >+ [% INCLUDE 'header.inc' form=formulaire %] >+ > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >@@ -110,6 +113,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> <!-- /#breadcrumbs --> > > <div id="preview_template" class="modal in" tabindex="-1" role="dialog" aria-labelledby="preview_template_label" aria-hidden="true"> >@@ -144,23 +153,10 @@ > [% END %] > > [% IF ( no_op_set ) %] >- <h1>Notices & 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> >+ <button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New notice <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=acquisition">Acquisition</a></li> > <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=catalogue">Catalog</a></li> >@@ -178,6 +174,22 @@ > </div> > </div> <!-- /#toolbar --> > >+ >+ >+ <h2>Notices & slips</h2> >+ <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 +205,7 @@ > [% END %] > > [% IF letter %] >+ <div id="searchresults"> > <table id="lettert"> > <thead> > <tr> >@@ -248,16 +261,16 @@ > [% ELSE %] > [% select_for_copy | $raw %] > [% END %] >- <button class="btn btn-default btn-xs"><i class="fa fa-clone"></i> Copy</button> >+ <button id="lientype" class="btn btn-default btn-xs"><i class="fa fa-clone"></i> Copy</button> > </form> > [% END # /IF !independent_branch %] > </td> > <td class="actions"> > [% IF can_edit %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=[% lette.branchcode | html %]&module=[% lette.module | html %]&code=[% lette.code | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=[% lette.branchcode | html %]&module=[% lette.module | html %]&code=[% lette.code | html %]"><i class="fa fa-pencil"></i> Edit</a> > [% END %] > [% IF !lette.protected && can_edit %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&branchcode=[% lette.branchcode | html %]&module=[% lette.module | html %]&code=[% lette.code | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&branchcode=[% lette.branchcode | html %]&module=[% lette.module | html %]&code=[% lette.code | html %]"><i class="fa fa-trash"></i> Delete</a> > [% END %] > </td> > </tr> >@@ -272,6 +285,7 @@ > <p>There are no notices.</p> > [% END %] > </div> >+ </div> > [% END # /IF lette %] > [% END # /IF no_op_set %] > >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 a08ca23418..f7f6873212 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,7 +21,7 @@ > </head> > > <body id="tools_manage-marc-import" class="tools"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -45,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 ) %] >@@ -228,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 --> >@@ -251,7 +260,7 @@ > </select> > [% END %] > <br /> >- <input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" /> >+ <input type="submit" id="lientype" class="button" name="mainformsubmit" value="Import this batch into the catalog" /> > </fieldset> > </form> <!-- /#import_batch_form --> > <div id="jobpanel"> >@@ -274,6 +283,8 @@ > [% END # /IF can_revert %] > </div> > >+ <div id="searchresults"> >+ > [% IF ( did_commit ) %] > <div class="dialog message">Completed import of records</div> > <table> >@@ -334,6 +345,7 @@ > </table> > [% END # /IF did_revert%] > >+ > [% END # /IF batch_info %] > > <br style="clear:both;" /> >@@ -392,7 +404,7 @@ > <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 id="lientype" 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"> >@@ -443,6 +455,8 @@ > </div> > </div> <!-- /#marcPreview --> > [% END # /IF import_batch_id %] >+ >+ </div> > </main> > > </div> <!-- /.col-sm-10.col-sm-push-2 --> >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 60283e2a5e..ccb79681a3 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,7 +23,7 @@ > </head> > > <body id="tools_marc_modification_templates" class="tools"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > [% IF ( TemplatesLoop ) %] > [% FOREACH TemplatesLoo IN TemplatesLoop %] >@@ -56,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"> >@@ -64,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="pat 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="pat"><i class="fa fa-plus"></i> New action</a> >+ <a class="pat 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' %] >@@ -83,6 +93,7 @@ > > <h1>MARC modification templates [% template_id | html %]</h1> > >+<div id="searchresults"> > <table id="templatest"> > <thead> > <tr> >@@ -97,21 +108,22 @@ > <td>[% TemplatesLoo.template_id | html %]</td> > <td>[% TemplatesLoo.name | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id | html %]&op=select_template" ><i class="fa fa-fw fa-pencil"></i> Edit actions</a> >- <a class="btn btn-default btn-xs duplicate_template" href="#" data-toggle="modal" data-template_id="[% TemplatesLoo.template_id | html %]" data-target="#createTemplate"><i class="fa fa-fw fa-copy"></i> Duplicate</a> >- <a class="btn btn-default btn-xs delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id | html %]&op=delete_template"><i class="fa fa-fw fa-trash"></i> Delete</a> >+ <a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id | html %]&op=select_template" ><i class="fa fa-fw fa-pencil"></i> Edit actions</a> >+ <a id="lientype" class="btn btn-default btn-xs duplicate_template" href="#" data-toggle="modal" data-template_id="[% TemplatesLoo.template_id | html %]" data-target="#createTemplate"><i class="fa fa-fw fa-copy"></i> Duplicate</a> >+ <a id="lientype" class="btn btn-default btn-xs delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id | html %]&op=delete_template"><i class="fa fa-fw fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </tbody> > </table> >+</div> > > [% ELSE %] > > <h1>Actions for <em>[% template_name | html %]</em></h1> > > [% IF ( ActionsLoop ) %] >- >+<div id="searchresults"> > <table id="template_actions" class="template_actions"> > <thead> > <tr> >@@ -191,15 +203,16 @@ > </td> > <td>[% ActionsLoo.description | html %]</td> > <td> >- <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> >+ <a class="btn btn-default btn-xs edit_action" id="lientype" 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" id="lientype" 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> >+ </div> > [% ELSE %] > <div class="dialog message template_actions"><p>There are no defined actions for this template.</p></div> > [% END # /IF ActionsLoop %] >@@ -207,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"> >@@ -289,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> > >@@ -335,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 91f14900bc..d530bb24ff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -6,13 +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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -26,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"> >@@ -73,9 +82,8 @@ > name="cardnumberlist">[% cardnumberlist | html %]</textarea> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <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> > </div> >@@ -139,7 +147,7 @@ > <div class="dialog alert"> > <p>No patron card numbers or borrowernumbers given.</p> > <form action="/cgi-bin/koha/tools/modborrowers.pl" method="get"> >- <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button> >+ <button type="submit" class="approve" id="lientype"><i class="fa fa-fw fa-check"></i> OK</button> > </form> > </div> > [% END #Alert if no patrons %] >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 8d18bf71b3..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,13 +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 '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/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >index 0ffd8e7b8a..a0935c757f 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 >@@ -2,7 +2,7 @@ > [% USE Asset %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc.inc' %] >+ [% INCLUDE 'patron-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Upload patron images › Tools › Koha</title> >@@ -11,7 +11,7 @@ > > <body id="tools_picture-upload" class="tools"> > >-[% INCLUDE 'header.inc' form= formulaire %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -38,6 +38,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' %] >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 9d07ddd053..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,7 +13,7 @@ > > <body id="tools_problem-reports" class="tools"> > >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -26,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 353179a567..9093494a9f 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,7 +12,7 @@ > </head> > > <body id="tools_quotes" class="tools"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -28,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 +58,7 @@ > <div id="csv_error" class="alert" style="visibility: hidden;">Something went wrong, check your CSV file.</div> > <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 +76,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 a737b90e5b..88ee022fad 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,7 +11,7 @@ > </head> > > <body id="tools_quotes" class="tools"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -24,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"> >@@ -53,13 +62,15 @@ > > [% 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="pat" id="newquote" href="/cgi-bin/koha/tools/quotes.pl?op=add_form"><i class="fa fa-plus"></i> New quote</a> >+ <a class="pat" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> Import quotes</a> >+ </div> > </div> > [% END %] > > [% IF op == 'add_form' %] >- <h1>[% IF quote %]Modify quote[% ELSE %]New quote[% END %]</h1> >+ <h2>[% IF quote %]Modify quote[% ELSE %]New quote[% END %]</h2> > <form action="/cgi-bin/koha/tools/quotes.pl" id="Aform" name="Aform" class="validated" method="post"> > <fieldset class="rows"> > <input type="hidden" name="op" value="add_validate" /> >@@ -78,7 +89,7 @@ > </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> >@@ -100,8 +111,9 @@ > [% END %] > > [% IF op == 'list' %] >- <h1>Quotes</h1> >+ <h2>Quotes</h2> > [% IF quotes_count > 0 %] >+ <div id="searchresults"> > <table id="quotes"> > <thead> > <tr> >@@ -115,6 +127,7 @@ > </table> > [% 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> >+ </div> > [% END %] > > <div id="delete_confirm_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="delete_confirm_modal_label" aria-hidden="true"> >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 be61a4d1e5..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,13 +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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -23,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"> >@@ -40,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> >@@ -73,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 6579532953..882e2c5f00 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,7 +15,7 @@ > > </head> > <body id="tools_stage-marc-import" class="tools"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -40,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"> >@@ -54,6 +63,7 @@ > </div> > [% END %] > >+<h2>Stage MARC records for import</h2> > [% IF ( uploadmarc ) %] > <h1>MARC staging results</h1> > <ul> >@@ -96,7 +106,7 @@ > </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"> >@@ -106,7 +116,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> >@@ -122,7 +132,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> >@@ -145,7 +155,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" /> >@@ -183,7 +193,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> >@@ -199,7 +209,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> >@@ -218,7 +228,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" /> >@@ -238,7 +248,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> >@@ -250,7 +260,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 c1dbbb8479..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,13 +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 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -81,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/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index f140dd05ad..7efa0fbfe0 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,7 +79,7 @@ > </head> > > <body id="tools_upload-images" class="tools"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -121,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"> >@@ -129,14 +138,14 @@ > <main> > > [% UNLESS itemnumber || biblionumber %] >- <h1>Upload local cover image</h1> >+ <h2>Upload local cover image</h2> > [% ELSIF biblio %] >- <h1> >+ <h2> > Upload local cover image for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><em>[% INCLUDE 'biblio-title.inc' %]</em></a> > [% IF ( itemnumber ) %], Item number: [% itemnumber | html %][% END %] >- </h1> >+ </h2> > [% ELSIF itemnumber %] >- <h1>Upload local cover image for item number: [% itemnumber | html %]</h1> >+ <h2>Upload local cover image for item number: [% itemnumber | html %]</h2> > [% END %] > > [% IF ( uploadimage ) %] >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 e56c81bb5a..f5d8873f77 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,7 +155,7 @@ > [% 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> >@@ -154,7 +163,7 @@ > </li> > </ol> > <fieldset class="action"> >- <button id="searchbutton" class="submit">Search</button> >+ <button id="searchbutton" class="submit principal">Search</button> > </fieldset> > </fieldset> > </form> >@@ -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 %] >@@ -262,7 +271,7 @@ > <main> > [% ELSE %] > <body id="tools_upload" class="tools"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > [% PROCESS breadcrumbs %] > > <div class="main container-fluid"> >@@ -271,7 +280,7 @@ > <main> > [% END %] > >-<h1>Upload</h1> >+<h2>Upload</h2> > <div class="dialog alert" id="myalerts" style="display:none;"></div> > > [% PROCESS submitter %] >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 fac8718927..c6ed43fda9 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,7 +63,7 @@ > </head> > > <body id="tools_viewlog" class="tools"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > [% BLOCK translate_log_module %] > [% SWITCH module %] >@@ -189,6 +192,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 +205,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 +297,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 +317,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/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index 27c33fe200..97571f7dd6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -4,7 +4,7 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'circ-search.inc' %] >+ [% INCLUDE 'lis-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >@@ -328,7 +328,7 @@ > [% IF op == 'add_form' OR op == 'edit_form' %] > > <form method="post" action="/cgi-bin/koha/virtualshelves/shelves.pl" class="validated"> >- <fieldset class="brief"> >+ <fieldset id="select-libs"> > > [% IF op == 'add_form' %] > <h3>Create a new list</h3> >-- >2.17.1
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=136895">View the attachment on a separate page</a>.</b>
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