Bugzilla – Attachment 136969 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: update patron and suggestion
Bug-30952-update-patron-and-suggestion.patch (text/plain), 481.11 KB, created by
Solene D
on 2022-07-01 14:23:18 UTC
(
hide
)
Description:
Bug 30952: update patron and suggestion
Filename:
MIME Type:
Creator:
Solene D
Created:
2022-07-01 14:23:18 UTC
Size:
481.11 KB
patch
obsolete
>From aaa9b1447d7dfa46c216cef3cd4de624335dd975 Mon Sep 17 00:00:00 2001 >From: Solene Desvaux <sdesvaux@biblibre.com> >Date: Mon, 27 Jun 2022 09:49:37 +0200 >Subject: [PATCH] Bug 30952: update patron and suggestion > >--- > .../intranet-tmpl/prog/css/src/_tables.scss | 19 + > .../prog/css/src/staff-global.scss | 158 ++++-- > .../prog/en/includes/.patron-search.inc.swp | Bin 16384 -> 0 bytes > .../prog/en/includes/acquisitions-search.inc | 4 +- > .../prog/en/includes/authorities-search.inc | 511 ++++++++++------- > .../prog/en/includes/authorities-toolbar.inc | 2 +- > .../prog/en/includes/budgets-admin-search.inc | 6 +- > .../prog/en/includes/cat-search.inc | 2 +- > .../prog/en/includes/cat-toolbar.inc | 4 +- > .../prog/en/includes/cities-admin-search.inc | 75 +++ > .../prog/en/includes/clubs-table.inc | 10 +- > .../en/includes/contracts-admin-search.inc | 74 +++ > .../en/includes/currencies-admin-search.inc | 85 ++- > .../prog/en/includes/desks-admin-search.inc | 75 +++ > .../prog/en/includes/letters-search.inc | 77 ++- > .../prog/en/includes/members-toolbar.inc | 4 +- > .../prog/en/includes/patron-search.inc | 124 +---- > .../prog/en/includes/patron_messages.inc | 2 + > .../prog/en/includes/patrons-admin-search.inc | 75 +++ > .../prog/en/includes/prefs-admin-search.inc | 55 +- > .../prog/en/includes/reports-toolbar.inc | 6 +- > .../prog/en/includes/serials-toolbar.inc | 4 +- > .../en/includes/suggestions-add-search.inc | 75 +++ > .../prog/en/includes/z3950-admin-search.inc | 79 ++- > .../prog/en/modules/acqui/acqui-home.tt | 8 +- > .../prog/en/modules/acqui/basket.tt | 22 +- > .../prog/en/modules/admin/aqbudgetperiods.tt | 3 - > .../prog/en/modules/admin/aqbudgets.tt | 18 +- > .../prog/en/modules/admin/aqplan.tt | 5 +- > .../prog/en/modules/admin/audio_alerts.tt | 3 +- > .../prog/en/modules/admin/authtypes.tt | 10 +- > .../prog/en/modules/admin/background_jobs.tt | 2 +- > .../prog/en/modules/admin/biblio_framework.tt | 18 +- > .../modules/admin/branch_transfer_limits.tt | 6 +- > .../prog/en/modules/admin/branches.tt | 6 +- > .../prog/en/modules/admin/classsources.tt | 22 +- > .../prog/en/modules/admin/columns_settings.tt | 280 +++------- > .../prog/en/modules/admin/credit_types.tt | 6 +- > .../prog/en/modules/admin/currency.tt | 4 +- > .../prog/en/modules/admin/debit_types.tt | 8 +- > .../prog/en/modules/admin/edi_accounts.tt | 8 +- > .../prog/en/modules/admin/edi_ean_accounts.tt | 3 +- > .../en/modules/admin/items_search_fields.tt | 9 +- > .../prog/en/modules/admin/library_groups.tt | 28 +- > .../en/modules/admin/marc-overlay-rules.tt | 15 +- > .../modules/admin/marc_subfields_structure.tt | 34 +- > .../prog/en/modules/admin/marctagstructure.tt | 9 +- > .../prog/en/modules/admin/matching-rules.tt | 28 +- > .../prog/en/modules/admin/oai_sets.tt | 14 +- > .../en/modules/admin/patron-attr-types.tt | 8 +- > .../prog/en/modules/admin/share_content.tt | 8 +- > .../prog/en/modules/admin/transfer_limits.tt | 6 +- > .../prog/en/modules/admin/usage_statistics.tt | 6 +- > .../prog/en/modules/admin/z3950servers.tt | 2 +- > .../modules/authorities/authorities-home.tt | 2 +- > .../prog/en/modules/authorities/detail.tt | 7 +- > .../modules/authorities/searchresultlist.tt | 2 +- > .../prog/en/modules/catalogue/ISBDdetail.tt | 6 +- > .../prog/en/modules/catalogue/MARCdetail.tt | 6 +- > .../prog/en/modules/catalogue/detail.tt | 4 +- > .../prog/en/modules/catalogue/issuehistory.tt | 2 +- > .../prog/en/modules/catalogue/itemsearch.tt | 4 +- > .../prog/en/modules/catalogue/moredetail.tt | 4 +- > .../prog/en/modules/catalogue/results.tt | 32 +- > .../prog/en/modules/clubs/club-enrollments.tt | 2 +- > .../prog/en/modules/clubs/clubs-add-modify.tt | 14 +- > .../prog/en/modules/clubs/clubs.tt | 59 +- > .../prog/en/modules/clubs/patron-clubs-tab.tt | 4 +- > .../prog/en/modules/clubs/patron-enroll.tt | 6 +- > .../en/modules/clubs/templates-add-modify.tt | 18 +- > .../prog/en/modules/labels/barcode-print.tt | 8 +- > .../en/modules/labels/label-bib-search.tt | 6 +- > .../en/modules/labels/label-edit-profile.tt | 15 +- > .../en/modules/labels/label-edit-range.tt | 2 +- > .../en/modules/labels/label-edit-template.tt | 8 +- > .../prog/en/modules/labels/label-manage.tt | 10 +- > .../prog/en/modules/labels/label-print.tt | 30 +- > .../prog/en/modules/labels/result.tt | 6 +- > .../prog/en/modules/labels/search.tt | 8 +- > .../prog/en/modules/labels/spinelabel-home.tt | 2 +- > .../prog/en/modules/members/member.tt | 521 +++++++++++++----- > .../prog/en/modules/members/members-update.tt | 2 +- > .../prog/en/modules/members/moremember.tt | 11 +- > .../prog/en/modules/patroncards/edit-batch.tt | 26 +- > .../en/modules/patroncards/edit-layout.tt | 4 +- > .../en/modules/patroncards/edit-template.tt | 3 +- > .../prog/en/modules/patroncards/home.tt | 2 +- > .../en/modules/patroncards/image-manage.tt | 33 +- > .../prog/en/modules/patroncards/manage.tt | 16 +- > .../prog/en/modules/patroncards/print.tt | 33 +- > .../en/modules/plugins/plugins-disabled.tt | 2 +- > .../prog/en/modules/plugins/plugins-home.tt | 4 +- > .../prog/en/modules/plugins/plugins-upload.tt | 5 +- > .../en/modules/reports/acquisitions_stats.tt | 5 +- > .../prog/en/modules/reports/bor_issues_top.tt | 2 +- > .../prog/en/modules/reports/borrowers_out.tt | 2 +- > .../en/modules/reports/borrowers_stats.tt | 5 +- > .../en/modules/reports/cash_register_stats.tt | 95 ++-- > .../prog/en/modules/reports/cat_issues_top.tt | 2 +- > .../en/modules/reports/catalogue_stats.tt | 6 +- > .../prog/en/modules/reports/dictionary.tt | 28 +- > .../modules/reports/guided_reports_start.tt | 54 +- > .../en/modules/reports/issues_avg_stats.tt | 3 +- > .../prog/en/modules/reports/issues_stats.tt | 3 +- > .../prog/en/modules/reports/itemtypes.tt | 2 +- > .../prog/en/modules/reports/reports-home.tt | 2 +- > .../prog/en/modules/reports/reserves_stats.tt | 3 +- > .../prog/en/modules/reports/serials_stats.tt | 4 +- > .../prog/en/modules/reviews/reviewswaiting.tt | 2 +- > .../modules/rotating_collections/addItems.tt | 11 +- > .../rotating_collections/editCollections.tt | 11 +- > .../rotatingCollections.tt | 6 +- > .../transferCollection.tt | 11 +- > .../prog/en/modules/suggestion/suggestion.tt | 239 ++++---- > .../prog/en/modules/tags/review.tt | 24 +- > .../en/modules/tools/additional-contents.tt | 6 +- > .../automatic_item_modification_by_age.tt | 22 +- > .../prog/en/modules/tools/batchMod-edit.tt | 33 +- > .../en/modules/tools/batch_delete_records.tt | 20 +- > .../tools/batch_record_modification.tt | 90 ++- > .../prog/en/modules/tools/export.tt | 135 ++--- > .../prog/en/modules/tools/import_borrowers.tt | 2 +- > .../prog/en/modules/tools/letter.tt | 24 +- > .../en/modules/tools/manage-marc-import.tt | 20 +- > .../prog/en/modules/tools/modborrowers.tt | 30 +- > .../prog/en/modules/tools/picture-upload.tt | 13 +- > .../prog/en/modules/tools/quotes.tt | 3 +- > .../en/modules/tools/stage-marc-import.tt | 2 - > .../prog/en/modules/tools/upload-images.tt | 8 +- > .../prog/en/modules/tools/upload.tt | 16 +- > .../virtualshelves/addbybiblionumber.tt | 2 +- > 131 files changed, 2390 insertions(+), 1610 deletions(-) > delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/.patron-search.inc.swp > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss >index 5741c60254..3d50ddedc2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss >@@ -401,6 +401,25 @@ tbody { > } > } > } >+ .dropdown-menu{ >+ >+ background-color: #fff; >+ color: #000; >+ top: 100%; >+ >+ a{ >+ color: #000; >+ >+ &:hover, >+ &:focus{ >+ background-image: none; >+ background-color: #fff; >+ color: #000; >+ padding: 3px 20px; >+ text-decoration: underline; >+ } >+ } >+ } > } > > .dataTables_wrapper { >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 082ffaefea..c0633c856b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -28,7 +28,7 @@ a { > } > > &.authlink { >- background-color: #e6f0f2; >+ background-color: #e3f1df; > border-radius: 5px; > display: inline-block; > padding: 2px 4px; >@@ -38,7 +38,7 @@ a { > &:link, > &:visited { > //color: #71B443; >- padding: 6px 25px; >+ // padding: 6px 25px; > } > > &.btn-link { >@@ -64,16 +64,16 @@ a { > box-shadow: none; > font-size: 100%; > >- &:hover, &:focus, &:active{ >+ &:hover, &:focus, &:active, &:active:hover, &:active:focus{ > text-decoration: underline; > color: #71B443; >- padding: .3em; >- border: none; >- background-color: transparent; >- border: none; >- box-shadow: none; >- font-size: 100%; >- } >+ padding: .3em; >+ border: none; >+ background-color: transparent; >+ border: none; >+ box-shadow: none; >+ font-size: 100%; >+ } > } > > &.cancel { >@@ -694,6 +694,38 @@ p { > font: 400 13.3333px Arial; > } > } >+ >+ &.plusdessous{ >+ background-color: #352C2E; >+ height: auto !important; >+ padding: 0 5px 10px 5px; >+ top: 30px; >+ border-bottom-left-radius: 17px; >+ border-bottom-right-radius: 17px; >+ >+ input{ >+ outline-offset: 0px; >+ outline: 1px black; >+ height: 20px; >+ border-radius: 17px; >+ padding-left: 2em; >+ padding-right: 1.5em; >+ border: none; >+ margin-top: 5px; >+ margin-left: 0px; >+ width: 100%; >+ z-index: 100; >+ display: inline-block !important; >+ letter-spacing: normal; >+ word-spacing: normal; >+ text-transform: none; >+ text-indent: 0px; >+ text-shadow: none; >+ text-align: start; >+ cursor: text; >+ font: 400 13.3333px Arial; >+ } >+ } > } > > strong { >@@ -1255,13 +1287,13 @@ ol { > } > > fieldset { >- overflow: auto; >+ //overflow: auto; > background-color: #FFF; > position: relative; > color: #696969; > left: 0px; > top: 0px; >- //border: 2px solid #B9D8D9; >+ //border: 2px solid #bfd9b9; > //border-radius: 5px; > margin: 0em 1em 1em 0em; > //display: block; >@@ -1282,7 +1314,7 @@ fieldset { > } > > .standard { >- background-color:#f4f8f9 !important; >+ background-color:#F4F8F9 !important; > } > > .contrast { >@@ -1306,9 +1338,10 @@ fieldset { > > > &.brief { >- //border: 2px solid #B9D8D9; >+ //border: 2px solid #bfd9b9; > width: 50%; > box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); >+ overflow: visible; > > div { > &.hint { >@@ -1671,7 +1704,7 @@ fieldset { > /* > legend { > background-color: #FFFFFF; >- border: 2px solid #B9D8D9; >+ border: 2px solid #bfd9b9; > border-radius: 3px; > font-size: 123.1%; > font-weight: bold; >@@ -1808,7 +1841,7 @@ div { > > &.rule { > background-color: #F4F8F9; >- border: 2px solid #B9D8D9; >+ border: 2px solid #bfd9b9; > border-radius: 5px; > margin: .3em; > padding: .3em; >@@ -2140,7 +2173,7 @@ dd { > position: relative; > float: right; > height: 100%; >- padding: 0.3em; >+ // padding: 0.3em; > > .dropdown-menu { > /*border-top-width: 1px; >@@ -2162,7 +2195,7 @@ dd { > border: 0.5px solid lightgray; > font-size: 100%; > background-color: #fff; >- margin: 0; >+ margin: 5px 0 0 0; > box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5); > position: absolute; > text-decoration: none; >@@ -2319,7 +2352,7 @@ dd { > padding-bottom: 25px; > > h5 { >- //border-right: 1px solid #B9D8D9; >+ //border-right: 1px solid #bfd9b9; > margin-bottom: 0; > padding: .5em .9em; > font-weight: bold; >@@ -2357,7 +2390,7 @@ dd { > } > > > div { >- //border-right: 1px solid #B9D8D9; >+ //border-right: 1px solid #bfd9b9; > width: 100%; > } > >@@ -2584,7 +2617,7 @@ i { > .circ-settings { > //background-color: #F4F8F9; > border-radius: 0; >- //border-top: 2px solid #B9D8D9; >+ //border-top: 2px solid #bfd9b9; > display: none; > margin-left: -1em; > margin-right: -1em; >@@ -2794,6 +2827,9 @@ i { > //border: 1px solid #BCBCBC; > color: #000000; > text-align: center; >+ background-color: #fff; >+ // box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); >+ > > ul, > h5 { >@@ -2888,7 +2924,7 @@ i { > } > > #menu { >- border-right: 1px solid #B9D8D9; >+ border-right: 1px solid #bfd9b9; > margin-right: .5em; > padding-bottom: 2em; > padding-top: 1em; >@@ -2896,7 +2932,7 @@ i { > li { > a { > background: linear-gradient(to bottom, #E8F0F6 0%, #E8F0F6 96%, #C1C1C1 100%); >- border: 1px solid #B9D8D9; >+ border: 1px solid #bfd9b9; > border-bottom-left-radius: 5px; > border-top-left-radius: 5px; > display: block; >@@ -3060,6 +3096,7 @@ li { > #searchresults { > background-color: #fff; > margin-top: 20px; >+ // overflow: auto; > box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); > padding: 20px; > >@@ -3078,8 +3115,8 @@ 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); >+ // background-color: #fff; >+ //box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); > color: #000; > top: 100%; > >@@ -3145,6 +3182,7 @@ li { > //top: 50px; > background-color: #fff; > color: #000; >+ height: fit-content; > top: 100%; > > a{ >@@ -3270,7 +3308,7 @@ li { > } > > #biblio-cover-slider { >- border: 1px solid #b9d8d9; >+ border: 1px solid #bfd9b9; > border-radius: 3px; > margin: 5px; > padding: 10px 5px 5px 5px; >@@ -3321,7 +3359,7 @@ td { > } > } > >-#lientype, #show_invoice_adjustment, #cancel_invoice_adjustment, #show_active_vendors, #add-contact, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #addauth, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #z3950submit, #add_manual_restriction{ >+#lientype, #add, #merge-patrons, #btn_batchremove, #doedit, #show_invoice_adjustment, #cancel_invoice_adjustment, #show_active_vendors, #add-contact, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #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; >@@ -3330,7 +3368,7 @@ td { > box-shadow: none; > font-size: 100%; > >- &:hover{ >+ &:hover, &:active, &:focus, &:active:hover, &:active:focus{ > text-decoration: underline; > } > } >@@ -3792,8 +3830,8 @@ td { > } > > .ui-widget-header { >- background: #E6F0F2 none; >- border: 1px solid #B9D8D9; >+ background: #b5dbad none; >+ border: 1px solid #bfd9b9; > color: #222222; > font-weight: bold; > } >@@ -3802,7 +3840,7 @@ td { > .ui-widget-content .ui-state-default, > .ui-widget-header .ui-state-default { > // background: #F4F8F9 none; >- border: 1px solid #B9D8D9; >+ border: 1px solid #bfd9b9; > color: #555555; > font-weight: normal; > } >@@ -3813,8 +3851,8 @@ td { > .ui-state-focus, > .ui-widget-content .ui-state-focus, > .ui-widget-header .ui-state-focus { >- background: #E6F0F2 none; >- border: 1px solid #B9D8D9; >+ background: #cad8c6 none; >+ border: 1px solid #bfd9b9; > color: #212121; > font-weight: normal; > } >@@ -3856,7 +3894,7 @@ td { > padding: 3px 1em 3px .4em; > > &:hover { >- background: #E6F0F2 none; >+ background: #e3f1df none; > color: #212121; > font-weight: normal; > } >@@ -4065,8 +4103,8 @@ td { > } > > li { >- //background: none repeat scroll 0 0 #E6F0F2; >- //border: 1px solid #B9D8D9; >+ //background: none repeat scroll 0 0 #e3f1df; >+ //border: 1px solid #bfd9b9; > // border-bottom: 0 none; > border-top-left-radius: 4px; > border-top-right-radius: 4px; >@@ -4104,7 +4142,7 @@ td { > a { > background: none repeat scroll 0 0 transparent; > color: #fff; >- cursor: text; >+ // cursor: text; > //font-weight: bold; > outline: 0 none; > top: 1px; >@@ -4250,7 +4288,7 @@ td { > } > > .pluginname { >- background-color: #E6F0F2; >+ background-color: #e3f1df; > cursor: move; > margin: .3em; > padding-bottom: 4px; >@@ -4418,6 +4456,12 @@ nav { > li { > list-style: none; > >+ .haut{ >+ position: relative; >+ bottom: 3px; >+ left: 300px; >+ } >+ > .filteraction{ > position: absolute; > right: 30px; >@@ -5069,6 +5113,7 @@ button, > &:active, > &:focus{ > background-color: #fec22c9f; >+ color: #000; > } > } > >@@ -5083,6 +5128,10 @@ button, > .panel { > background: #F4F8F9 none; > box-shadow: none; >+ >+ &:hover{ >+ background: #e3f1df none; >+ } > } > > .panel-collapse { >@@ -5105,7 +5154,7 @@ button, > } > > &:hover { >- background: #e6f0f2 none; >+ background: #e3f1df none; > border-bottom-left-radius: 0; > border-bottom-right-radius: 0; > } >@@ -5119,7 +5168,7 @@ button, > } > > &:hover { >- background: #e6f0f2 none; >+ background: #e3f1df none; > border-bottom-left-radius: 3px; > border-bottom-right-radius: 3px; > } >@@ -5128,14 +5177,14 @@ button, > } > > .panel-default { >- border: 1px solid #B9D8D9; >+ border: 1px solid #bfd9b9; > > .panel-heading { > background: transparent none; > padding: 0; > > + .panel-collapse { > > .panel-body { >- border-top-color: #B9D8D9; >+ border-top-color: #bfd9b9; > } > } > } >@@ -5334,7 +5383,7 @@ label { > > fieldset, > ol { >- background-color: transparent; >+ background-color: #FFF; > border: 0; > margin: 0; > padding: 0; >@@ -5342,7 +5391,7 @@ label { > } > > .modal-content { >- background-color: #EDF4F6; >+ background-color: rgb(211, 223, 204); > } > > .btn-group { >@@ -5385,10 +5434,11 @@ code { > > .tab-content { > /* background-color: #FFF; >- border: 1px solid #B9D8D9; >+ border: 1px solid #bfd9b9; > border-top-width: 0;*/ > border: 3px solid #538200; > border-radius: 4px; >+ overflow: auto; > //border-top-width: 0; > padding: 1em; > } >@@ -5477,7 +5527,7 @@ progress { > } > > span { >- background-color: #EBF3FF; >+ background-color: #ecffeb; > border-radius: 5px; > display: inline-block; > font-size: 75%; >@@ -5486,7 +5536,7 @@ progress { > white-space: nowrap; > > &.selected { >- background-color: #CCE0FC; >+ background-color: #d2fad0; > } > } > } >@@ -5547,7 +5597,7 @@ progress { > > #browse-return-to-results { > background-color: #E8F0F6; >- border: 1px solid #B9D8D9; >+ border: 1px solid #bfd9b9; > border-bottom-width: 0; > border-top-left-radius: 5px; > border-top-right-radius: 5px; >@@ -5558,7 +5608,7 @@ progress { > > .browse-button { > background-color: #FFF; >- border: 1px solid #B9D8D9; >+ border: 1px solid #bfd9b9; > color: #004D99; > display: block; > overflow: hidden; >@@ -5746,7 +5796,7 @@ input.renew { > > .branchgriditem { > background-color: #FFFFFF; >- border: 1px solid #B9D8D9; >+ border: 1px solid #bfd9b9; > border-radius: 3px; > display: table-cell; > float: left; >@@ -5773,7 +5823,7 @@ input.renew { > > #new_rule { > background-color: #F4F8F9; >- border: 2px solid #B9D8D9; >+ border: 2px solid #bfd9b9; > border-radius: 5px; > display: none; > margin: .3em; >@@ -5859,7 +5909,7 @@ input.renew { > } > > #fixedlengthbuilderaction { >- border: 3px solid #E6F0F2; >+ border: 3px solid #e3f1df; > left: 80%; > padding: 5px; > position: relative; >@@ -6295,7 +6345,7 @@ input.renew { > } > > .about h2 { >- border-bottom: 1px solid #B9D8D9; >+ border-bottom: 1px solid #bfd9b9; > padding: .5em .2em; > margin: .5em 0; > } >@@ -6319,7 +6369,7 @@ input.renew { > > /*#catalog-search-link { > //color : #fff; >- //border-right: 1px solid lighten( #E6F0F2, 15% ); >+ //border-right: 1px solid lighten( #e3f1df, 15% ); > //padding-right: .3em; > > }*/ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/.patron-search.inc.swp b/koha-tmpl/intranet-tmpl/prog/en/includes/.patron-search.inc.swp >deleted file mode 100644 >index 4c9496a048b2bae1f74c3bc559a4e30a71e1609c..0000000000000000000000000000000000000000 >GIT binary patch >literal 0 >HcmV?d00001 > >literal 16384 >zcmeHNO^*~s7%ox1R6c@`a8Zj!vb)ilS%d(=o*}!-f*W8LS<oorq^GB5r=_QR?CxP% >z6-+d6^<b2vCgRN)^`Kr%#DgajLjotlL4Sb8L_zWMsjjM?o@Qnl0x@c8k|#Y~Z`E5> >zPd)usS9Mi}pPbl7x8;Wkek%z%cH;fY+SNPA&@-FKQNM2S<Qx6^&3BS#EQEnw;D2&a >zqv;kLFA6M=MdGd*_%j9OA=P$URTdVSRuuSNE@W0<*YileQCqZKGoTsh#lSMM>Cuhx >zqrTo)NAFv8s8>dvt{Kn_Xa+O`ngPv#W<WEb8PE*;4;hG>%gHO~*8<tMee!xo=K7cX >zjmz}OjQvk(SLttL?0-o6luZ9NWB*;+)rw?THbAxGH)$V{<xXYn*QDK)_OCMbU!{G! >zv@ehyR{npH_EBj!Gxn>Q@+UL)E7JaiEdN=?{<E}?N&C_}#UEAwPtsnI_PrUqyd`U- >z{ez5MChLo4Kr^5j&<tn>Gy|Fe&46Y=GoTsJ3}^<rGGJ8+IR(o_z7WOtf3^PqaRnjY >z0p9@UfRBK)z-vGS*a~a`Rst)4OUns)6YzkG%Wwq<@cF%j90wRs1$G1X1J~{$<U?Q| >z@Bpw1SOP2tF5OMYm%tgI3G4ut0T-4M@-gr_-~qdVEx<b9(h@>yz<yu~7z7pqmlqTA >z1rPz-fXj;rc?Wn7*bH1<NXTj6SzrsW7Wn=yLe2xP0y}|4z&Wh9cK~aEAF#GR54;PU >z1_}V@?}A#)cV+q?Or-Pt%#gXvj;LofSkVv%D{2mNt6?<PWCnGr*Qb_ijvKMSD3N&_ >zQ`5C7%%wFyn8(9(e3FC4HEuTxagp9`P1oseJiLL9jZBZz0nq_85Iq>68;<mBA?oVk >zOZCYt2x_|5sB-ZuY9F86IbUt*+@{}*9N(kIEVl*9QP{R3Hsc3#dG*KktBk%(>rumn >zSEH29gJUpu;0PB<7PBCn_SM#1QwPRJ#vV_qr4y6tzr(_Qx{>LEQ5x~)`fGxc8<$nO >zw>K}TuBFE$lea@ks)GNFjNE($XQ%9X7xgF;f6Cj!>Tk%T!j)=VE*IB9RY9L>xuwVB >zCbT6RI<c$WynN`q$mqHv-Pn(;(a`DfgYD9^NJnEvS(vw6caZv?J6Em+exp1S_^l=_ >zmf(2kMy}JEZ;#N;E51wFz418A-43}6?>)uNxp`{hAi_qiTYq7OKwyJ7#Ox3U5|R#l >z{D1GTYdT)D6;VFx6pe@-kJ58bSseURoTXxC67czq)RwkEZPyCJqEYkhR%p;d_sDqt >z9F?i5Bqpfd1Yb8LnZDaums#H=z3{n^ik_GSq$cc`V#Z~WYIOzAR!z>YCQ3Epd03L5 >zx{PFG0rR7Kr^fb3$7N-Wr|5VP4sTdbb5y2tez#L4NyGNN$Z|Y`qGd)HSwTc+ov3b< >z_#k%_6jO9kQnW=(+<0QbC{;p5&UQUAw=!f42<^4Ai|{hnneA!6g=xy8QJs0{Y#352 >z&OrTIT5_V%a@eR)RnoSdPS|v<Ih3@095-dhC2Nu$K0poLbIxjNN;eDKkQ%SFR>M}M >z;Xti&J{L82D6WgNd0Z+Qn}_EUd8dM{R^*FDM=0snYMoV7onuNobsVBKO5+}XAQIw( >zD)m~83X)<C29aaA@k<}1jk2O|w<NW4=x|D@Qcjy|X-LRT2ZdDa9m#2i>rS=Gpi%LT >z`a;XGj|w#>q;KpXLphSX%Yl(p$D^f+i)f=puuG6I!zLuBMk0QuEStZ+32!3QiIg%D >zOVqT)qw4agQx90JXspKz+`~uAf>pvRCEVc>_pYs{q`@~+8x+v9x?H+CqTH*i<VDa~ >z!BJ|wZl;CUU|c9k2(2@#Dvw-O{Ns2=;)t3K)Oe<BR`=a1!@GXJ!pkfl%#?!DT2EyY >z@)T?rje<Sn<SLFApB^uWHiz<>Z@LC;u&D0iJ+tYDcphRF;!60tXGbVadK$3Mfzl!= >zj}jqC0Zsx7WOPjm)X-<RCg!?aj*hY!$D{k>BkCbNAbn905a=kV%jM#Dz5l?}*!c7` >z9T2S$!JnUIk7r+mo+JZb0hH^^ZL%OtXE=nl&Ou*1X_ViLgdt{+IA+K9fi;`D8<lS{ >zsicXG+a^=DdvF4u-}3eUdsvUJ;p=s*|JC>9Gg#9f1tx*3Skr$Ed;**W-U4QU2CxlS >z16)D*Pl30A=YeTpE06;o1i1gzfc|L)Gy|Fe&46Y=GoTsJ3}^;41Db(<6$9DLAn^gF >zy?j5>vBI8pysAH&w_QJEgF}yX*x)I>ucQ{_{MyWm&rRi4$b!L&9|Zm^3&ftyBeZHo >zRySXJvG&8VE$v7+LrpgJtSgp%w7o0ZuUl-PCxtWKk6GAM!p6AlrQc*83)-EmwY+$H >z1RHAnv*J9Rp)Vz^&hTeBQ5kzhW#KzZVP|IE+3Qn!r*g|fgT{KttNF%IKCJt**$Q|T >z^-E>tOYy<-pdr@xbYMd`KrQS`RrBz}x3;XPO)oyP3}uE(xjaFc8?sdIl|fy3oeZNN >f^w~a@w_5`pY?8VGwl3x<wkEK18t<6S)8fAY6+KMD > >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 94dc7e8bab..b1484f8c90 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >@@ -26,8 +26,8 @@ > > > <ul id="taille"> >- <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> >+ <li><a id="icon_1" title="Vendor search" onclick="clique(this)" class="iconsearch" href="#supplier_search"><i class="fa fa-upload"></i></a></li> >+ <li><a id="icon_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> >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 05e740501a..57cda07ccf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >@@ -1,209 +1,197 @@ > <!-- Begin Authorities Resident Search Box --> > >-<div id="header_search" class="residentsearch fold"> >+<div id="header_search" class="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> >- <input type="hidden" name="op" value="do_search" /> >- <input type="hidden" name="type" value="intranet" /> >- <select name="authtypecode" id="authtype_main_heading_a"> >- [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >- [% FOREACH authority_type IN authority_types %] >- [% IF authority_type.authtypecode == authtypecode %] >- <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >- [% ELSE %] >- <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >- [% END %] >- [% END %] >- </select> >- <input type="hidden" name="marclist" value="mainmainentry" /> >- <input type="hidden" name="and_or" value="and" /> >- <input type="hidden" name="excluding" value="" /> >- <select name="operator"> >- [% IF ( operator == 'contains' ) %] >- <option value="contains" selected="selected">contains</option> >- [% ELSE %] >- <option value="contains">contains</option> >- [% END %] >- [% IF ( operator == 'start' ) %] >- <option value="start" selected="selected">starts with</option> >- [% ELSE %] >- <option value="start">starts with</option> >- [% END %] >- [% IF ( operator == 'exact' ) %] >- <option value="exact" selected="selected">is exactly</option> >- [% ELSE %] >- <option value="exact">is exactly</option> >- [% END %] >- </select> >- <input id="value_mainentry" type="text" name="value" value="[% value | html %]" class="head-searchbox" /> >- <select name="orderby"> >- [% IF ( orderby == 'HeadingAsc' ) %] >- <option value="HeadingAsc" selected="selected">Heading A-Z</option> >- [% ELSE %] >- <option value="HeadingAsc">Heading A-Z</option> >- [% END %] >- [% IF ( orderby == 'HeadingDsc' ) %] >- <option value="HeadingDsc" selected="selected">Heading Z-A</option> >- [% ELSE %] >- <option value="HeadingDsc">Heading Z-A</option> >- [% END %] >- [% IF ( orderby == '' && op ) %] >- <option value="" selected="selected">None</option> >- [% ELSE %] >- <option value="">None</option> >- [% END %] >- </select> >- <input type="submit" class="submit principal" value="Submit" /> >- </form> >+ <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> >+ >+ <select name="orderby" class="haut"> >+ [% IF ( orderby == 'HeadingAsc' ) %] >+ <option value="HeadingAsc" selected="selected">Heading A-Z</option> >+ [% ELSE %] >+ <option value="HeadingAsc">Heading A-Z</option> >+ [% END %] >+ [% IF ( orderby == 'HeadingDsc' ) %] >+ <option value="HeadingDsc" selected="selected">Heading Z-A</option> >+ [% ELSE %] >+ <option value="HeadingDsc">Heading Z-A</option> >+ [% END %] >+ [% IF ( orderby == '' && op ) %] >+ <option value="" selected="selected">None</option> >+ [% ELSE %] >+ <option value="">None</option> >+ [% END %] >+ </select> >+ >+ <p class="plusdessous" id="filters"> >+ <input type="hidden" name="op" value="do_search" /> >+ <input type="hidden" name="type" value="intranet" /> >+ <select name="authtypecode" id="authtype_main_heading_a"> >+ [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >+ [% FOREACH authority_type IN authority_types %] >+ [% IF authority_type.authtypecode == authtypecode %] >+ <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >+ [% ELSE %] >+ <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ >+ <input type="hidden" name="marclist" value="mainmainentry" /> >+ <input type="hidden" name="and_or" value="and" /> >+ <input type="hidden" name="excluding" value="" /> >+ <select name="operator"> >+ [% IF ( operator == 'contains' ) %] >+ <option value="contains" selected="selected">contains</option> >+ [% ELSE %] >+ <option value="contains">contains</option> >+ [% END %] >+ [% IF ( operator == 'start' ) %] >+ <option value="start" selected="selected">starts with</option> >+ [% ELSE %] >+ <option value="start">starts with</option> >+ [% END %] >+ [% IF ( operator == 'exact' ) %] >+ <optiontype value="exact" selected="selected">is exactly</option> >+ [% ELSE %] >+ <option value="exact">is exactly</option> >+ [% END %] >+ </select> >+ >+ <input id="value_mainentry" type="text" name="value" value="[% value | html %]" placeholder="Enter main heading ($a only)" /> >+ </p> >+ >+ <input type="submit" class="submit" id="submit" value="" /> >+ </form> > </div> >+ >+ > <div id="main_heading" class="residentsearch"> >- <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> >- <label class="tip" for="value_mainheading">Enter main heading:</label> >- <input type="hidden" name="op" value="do_search" /> >- <input type="hidden" name="type" value="intranet" /> >- <select name="authtypecode" id="authtype_main_heading"> >- [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >- [% FOREACH authority_type IN authority_types %] >- [% IF authority_type.authtypecode == authtypecode %] >- <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >- [% ELSE %] >- <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >- [% END %] >- [% END %] >- </select> >- <input type="hidden" name="marclist" value="mainentry" /> >- <input type="hidden" name="and_or" value="and" /> >- <input type="hidden" name="excluding" value="" /> >- <select name="operator"> >- [% IF ( operator == 'contains' ) %] >- <option value="contains" selected="selected">contains</option> >- [% ELSE %] >- <option value="contains">contains</option> >- [% END %] >- [% IF ( operator == 'start' ) %] >- <option value="start" selected="selected">starts with</option> >- [% ELSE %] >- <option value="start">starts with</option> >- [% END %] >- [% IF ( operator == 'exact' ) %] >- <option value="exact" selected="selected">is exactly</option> >- [% ELSE %] >- <option value="exact">is exactly</option> >- [% END %] >- </select> >- <input id="value_mainheading" type="text" name="value" value="[% value | html %]" class="head-searchbox" /> >- <select name="orderby"> >- [% IF ( orderby == 'HeadingAsc' ) %] >- <option value="HeadingAsc" selected="selected">Heading A-Z</option> >- [% ELSE %] >- <option value="HeadingAsc">Heading A-Z</option> >- [% END %] >- [% IF ( orderby == 'HeadingDsc' ) %] >- <option value="HeadingDsc" selected="selected">Heading Z-A</option> >- [% ELSE %] >- <option value="HeadingDsc">Heading Z-A</option> >- [% END %] >- [% IF ( orderby == '' && op ) %] >- <option value="" selected="selected">None</option> >- [% ELSE %] >- <option value="">None</option> >- [% END %] >- </select> >- <input type="submit" class="submit principal" value="Submit" /> >- </form> >+ <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> >+ <select name="orderby" class="haut"> >+ [% IF ( orderby == 'HeadingAsc' ) %] >+ <option value="HeadingAsc" selected="selected">Heading A-Z</option> >+ [% ELSE %] >+ <option value="HeadingAsc">Heading A-Z</option> >+ [% END %] >+ [% IF ( orderby == 'HeadingDsc' ) %] >+ <option value="HeadingDsc" selected="selected">Heading Z-A</option> >+ [% ELSE %] >+ <option value="HeadingDsc">Heading Z-A</option> >+ [% END %] >+ [% IF ( orderby == '' && op ) %] >+ <option value="" selected="selected">None</option> >+ [% ELSE %] >+ <option value="">None</option> >+ [% END %] >+ </select> >+ >+ <p class="plusdessous" id="filters"> >+ <input type="hidden" name="op" value="do_search" /> >+ <input type="hidden" name="type" value="intranet" /> >+ <select name="authtypecode" id="authtype_main_heading"> >+ [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >+ [% FOREACH authority_type IN authority_types %] >+ [% IF authority_type.authtypecode == authtypecode %] >+ <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >+ [% ELSE %] >+ <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ >+ <input type="hidden" name="marclist" value="mainentry" /> >+ <input type="hidden" name="and_or" value="and" /> >+ <input type="hidden" name="excluding" value="" /> >+ <select name="operator"> >+ [% IF ( operator == 'contains' ) %] >+ <option value="contains" selected="selected">contains</option> >+ [% ELSE %] >+ <option value="contains">contains</option> >+ [% END %] >+ [% IF ( operator == 'start' ) %] >+ <option value="start" selected="selected">starts with</option> >+ [% ELSE %] >+ <option value="start">starts with</option> >+ [% END %] >+ [% IF ( operator == 'exact' ) %] >+ <option value="exact" selected="selected">is exactly</option> >+ [% ELSE %] >+ <option value="exact">is exactly</option> >+ [% END %] >+ </select> >+ >+ <input id="value_mainheading" type="text" name="value" value="[% value | html %]" placeholder="Enter main heading" /> >+ </p> >+ >+ <input type="submit" class="submit" id="submit" value="" /> >+ </form> > </div> >+ > <div id="matchheading_search" class="residentsearch"> >- <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> >- <label class="tip" for="value_matchheading">Enter any heading:</label> >- <input type="hidden" name="op" value="do_search" /> >- <input type="hidden" name="type" value="intranet" /> >- <select name="authtypecode" id="authtype_all_headings"> >- [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >- [% FOREACH authority_type IN authority_types %] >- [% IF authority_type.authtypecode == authtypecode %] >- <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >- [% ELSE %] >- <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >- [% END %] >- [% END %] >- </select> >- <input type="hidden" name="marclist" value="match" /> >- <select name="operator"> >- [% IF ( operator == 'contains' ) %] >- <option value="contains" selected="selected">contains</option> >- [% ELSE %] >- <option value="contains">contains</option> >- [% END %] >- [% IF ( operator == 'start' ) %] >- <option value="start" selected="selected">starts with</option> >- [% ELSE %] >- <option value="start">starts with</option> >- [% END %] >- [% IF ( operator == 'exact' ) %] >- <option value="exact" selected="selected">is exactly</option> >- [% ELSE %] >- <option value="exact">is exactly</option> >- [% END %] >- </select> >- <input id="value_matchheading" type="text" name="value" value="[% value | html %]" class="head-searchbox" /> >- <select name="orderby"> >- [% IF ( orderby == 'HeadingAsc' ) %] >- <option value="HeadingAsc" selected="selected">Heading A-Z</option> >- [% ELSE %] >- <option value="HeadingAsc">Heading A-Z</option> >- [% END %] >- [% IF ( orderby == 'HeadingDsc' ) %] >- <option value="HeadingDsc" selected="selected">Heading Z-A</option> >- [% ELSE %] >- <option value="HeadingDsc">Heading Z-A</option> >- [% END %] >- [% IF ( orderby == '' && op ) %] >- <option value="" selected="selected">None</option> >- [% ELSE %] >- <option value="">None</option> >- [% END %] >- </select> >- <input type="submit" class="submit principal" value="Submit" /> >- </form> >+ <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> >+ >+ <select name="orderby" class="haut"> >+ [% IF ( orderby == 'HeadingAsc' ) %] >+ <option value="HeadingAsc" selected="selected">Heading A-Z</option> >+ [% ELSE %] >+ <option value="HeadingAsc">Heading A-Z</option> >+ [% END %] >+ [% IF ( orderby == 'HeadingDsc' ) %] >+ <option value="HeadingDsc" selected="selected">Heading Z-A</option> >+ [% ELSE %] >+ <option value="HeadingDsc">Heading Z-A</option> >+ [% END %] >+ [% IF ( orderby == '' && op ) %] >+ <option value="" selected="selected">None</option> >+ [% ELSE %] >+ <option value="">None</option> >+ [% END %] >+ </select> >+ >+ <p class="plusdessous" id="filters"> >+ <input type="hidden" name="op" value="do_search" /> >+ <input type="hidden" name="type" value="intranet" /> >+ <select name="authtypecode" id="authtype_all_headings"> >+ [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >+ [% FOREACH authority_type IN authority_types %] >+ [% IF authority_type.authtypecode == authtypecode %] >+ <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >+ [% ELSE %] >+ <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ >+ <input type="hidden" name="marclist" value="match" /> >+ <select name="operator"> >+ [% IF ( operator == 'contains' ) %] >+ <option value="contains" selected="selected">contains</option> >+ [% ELSE %] >+ <option value="contains">contains</option> >+ [% END %] >+ [% IF ( operator == 'start' ) %] >+ <option value="start" selected="selected">starts with</option> >+ [% ELSE %] >+ <option value="start">starts with</option> >+ [% END %] >+ [% IF ( operator == 'exact' ) %] >+ <option value="exact" selected="selected">is exactly</option> >+ [% ELSE %] >+ <option value="exact">is exactly</option> >+ [% END %] >+ </select> >+ >+ <input id="value_matchheading" type="text" name="value" value="[% value | html %]" placeholder="Enter any heading" /> >+ </p> >+ >+ <input type="submit" class="submit" id="submit" value="" /> >+ </form> > </div> >+ > <div id="entire_record" class="residentsearch"> > <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> >- <label class="tip" for="value_anywhere">Enter any authority field:</label> >- <input type="hidden" name="op" value="do_search" /> >- <input type="hidden" name="type" value="intranet" /> >- <select name="authtypecode" id="authtype_entire_record"> >- [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >- [% FOREACH authority_type IN authority_types %] >- [% IF authority_type.authtypecode == authtypecode %] >- <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >- [% ELSE %] >- <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >- [% END %] >- [% END %] >- </select> >- <input type="hidden" name="marclist" value="all" /> >- <input type="hidden" name="and_or" value="and" /> >- <input type="hidden" name="excluding" value="" /> >- <select name="operator"> >- [% IF ( operator == 'contains' ) %] >- <option value="contains" selected="selected">contains</option> >- [% ELSE %] >- <option value="contains">contains</option> >- [% END %] >- [% IF ( operator == 'start' ) %] >- <option value="start" selected="selected">starts with</option> >- [% ELSE %] >- <option value="start">starts with</option> >- [% END %] >- [% IF ( operator == 'exact' ) %] >- <option value="exact" selected="selected">is exactly</option> >- [% ELSE %] >- <option value="exact">is exactly</option> >- [% END %] >- </select> >- <input id="value_anywhere" type="text" name="value" value="[% value | html %]" class="head-searchbox" /> >- <select name="orderby"> >+ >+ <select name="orderby" class="haut"> > [% IF ( orderby == 'HeadingAsc' ) %] > <option value="HeadingAsc" selected="selected">Heading A-Z</option> > [% ELSE %] >@@ -220,15 +208,134 @@ > <option value="">None</option> > [% END %] > </select> >- <input type="submit" class="submit principal" value="Submit" /> >+ >+ <p class="plusdessous" id="filters"> >+ <input type="hidden" name="op" value="do_search" /> >+ <input type="hidden" name="type" value="intranet" /> >+ <select name="authtypecode" id="authtype_entire_record"> >+ [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %] >+ [% FOREACH authority_type IN authority_types %] >+ [% IF authority_type.authtypecode == authtypecode %] >+ <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option> >+ [% ELSE %] >+ <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ >+ <input type="hidden" name="marclist" value="all" /> >+ <input type="hidden" name="and_or" value="and" /> >+ <input type="hidden" name="excluding" value="" /> >+ <select name="operator"> >+ [% IF ( operator == 'contains' ) %] >+ <option value="contains" selected="selected">contains</option> >+ [% ELSE %] >+ <option value="contains">contains</option> >+ [% END %] >+ [% IF ( operator == 'start' ) %] >+ <option value="start" selected="selected">starts with</option> >+ [% ELSE %] >+ <option value="start">starts with</option> >+ [% END %] >+ [% IF ( operator == 'exact' ) %] >+ <option value="exact" selected="selected">is exactly</option> >+ [% ELSE %] >+ <option value="exact">is exactly</option> >+ [% END %] >+ </select> >+ >+ <input id="value_anywhere" type="text" name="value" value="[% value | html %]" placeholder="Enter any authority field" /> >+ </p> >+ >+ <input type="submit" class="submit" id="submit" value="" /> > </form> > </div> >+ > <ul> >- <li><a class="keep_text" href="#mainmain_heading">Search main heading ($a only)</a></li> >- <li><a class="keep_text" href="#main_heading">Search main heading</a></li> >- <li><a class="keep_text" href="#matchheading_search">Search all headings</a></li> >- <li><a class="keep_text" href="#entire_record">Search entire record</a></li> >+ <li><a id="icon_1" title="Search main heading ($a only)" onclick="clique(this)" class="iconsearch" href="#mainmain_heading"><i style="font-weight:bold">$a</i></a></li> >+ <li><a id="icon_2" title="Search main heading" onclick="clique(this)" class="iconsearch" href="#main_heading"><i class="fa fa-upload"></i></a></li> >+ <li><a id="icon_3" title="Search all headings" onclick="clique(this)" class="iconsearch" href="#matchheading_search"><i class="fa fa-upload"></i></a></li> >+ <li><a id="icon_4" title="Search entire record" onclick="clique(this)" class="iconsearch" href="#entire_record"><i class="fa fa-upload"></i></a></li> >+ >+ <span id="button_1" class="buttonsearch active">Search main heading ($a only)</span> >+ <span id="button_2" class="buttonsearch">Search main heading</span> >+ <span id="button_3" class="buttonsearch">Search all headings</span> >+ <span id="button_4" class="buttonsearch">Search entire record</span> >+ > </ul> > </div><!-- /header_search --> >-</div><!-- /gradient --> >+ >+<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)"; >+ } >+ , 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> > <!-- End Authorities Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >index 95cd9bb103..40852695f1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >@@ -41,7 +41,7 @@ > [% END %] > > <div class="btn-group"> >- <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-download"></i> Save >+ <a class="btn btn-default dropdown-toggle principal" data-toggle="dropdown" href="#"><i class="fa fa-download"></i> Save > <span class="caret"></span> > </a> > <ul class="dropdown-menu"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc >index a0e850e3e9..db6772d99c 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 >@@ -4,10 +4,10 @@ > > <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: " /> >+ <input class="query focus" type="text" name="filter_budgetname" id="filter_budgetname" value="[% filter_budgetname | html %]" style="width:150px" placeholder="Fund code" /> > >- <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;"> >- <option value="Library: "></option> >+ <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;position: relative;left: 170px;bottom: 3px;"> >+ <option disabled selected hidden>Library:</option> > [% FOREACH branchloo IN Branches.all( selected => selected_branchcode ) %] > [% IF branchloo.selected %] > <option value="[% branchloo.branchcode | html %]" selected="selected">[% branchloo.branchname | html %]</option> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >index 11b78205f0..769c2ad4e1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >@@ -1,5 +1,5 @@ > [% USE Koha %] >-<div id="header_search"> >+<div id="header_search" class="fold"> > > [% INCLUDE 'patron-search-box.inc' %] > >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 126f9c848a..a07708ef1e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >@@ -232,12 +232,12 @@ > </fieldset> > </div> > <div class="modal-footer"> >- <button type="submit" class="pat">Export</button> >+ <button type="submit" class="principal">Export</button> > <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > <input type="hidden" name="op" value="export" /> > <input type="hidden" name="bib" value="[% biblionumber | html %]" /> > </form> > </div> >- </div> > </div> >+</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc >index ac0320ea5b..c86c981446 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 >@@ -21,4 +21,79 @@ > <span id="button_3" class="buttonsearch">Search the 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)"; >+ } >+ , 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> >+ > <!-- End Cities Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc >index e59aa8c751..b199ef1cfd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc >@@ -75,7 +75,7 @@ > <a class="btn btn-default btn-xs dropdown-toggle lientype" id="clubactions[% c.id | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> >- <ul class="dropdown-menu pull-right" id="lientype" role="menu" aria-labelledby="clubactions[% c.id | html %]"> >+ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="clubactions[% c.id | html %]"> > [% IF ( c.club_enrollments.count ) %] > <li> > <a href="club-enrollments.pl?id=[% c.id | uri %]"> >@@ -84,26 +84,26 @@ > </li> > [% ELSE %] > <li class="disabled"> >- <a href="#" data-toggle="tooltip" data-placement="left" id="lientype" title="There are no enrollments for this club yet"> >+ <a href="#" data-toggle="tooltip" data-placement="left" title="There are no enrollments for this club yet"> > <i class="fa fa-list-ul"></i> Enrollments > </a> > </li> > [% END %] > [% IF CAN_user_clubs_edit_clubs %] > <li> >- <a id="lientype" href="clubs-add-modify.pl?id=[% c.id | uri %]"> >+ <a href="clubs-add-modify.pl?id=[% c.id | uri %]"> > <i class="fa fa-pencil"></i> Edit > </a> > </li> > <li> >- <a href="#" id="lientype" class="delete_club" data-id="[% c.id | html %]" data-name="[% c.name | html %]"> >+ <a href="#" class="delete_club" data-id="[% c.id | html %]" data-name="[% c.name | html %]"> > <i class="fa fa-trash"></i> Delete > </a> > </li> > [% END %] > [% IF ( c.club_enrollments.count ) %] > <li> >- <a href="#" class="club_hold_search" id="lientype" data-id="[% c.id | html %]"> >+ <a href="#" class="club_hold_search" data-id="[% c.id | html %]"> > <i class="fa fa-search"></i> Search to hold > </a> > </li> >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 7070648336..9972462d50 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 >@@ -22,4 +22,78 @@ > </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)"; >+ } >+ , 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> >+ > <!-- 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 3da8458484..7554241372 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 >@@ -13,13 +13,88 @@ > [% INCLUDE 'catalogue-search-box.inc' %] > > <ul id="taille"> >- <li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#currency_search"><i class="fa fa-dollar"></i></a></li> >+ <li><a id="icon_1" title="Search currencies" onclick="clique(this)" class="iconsearch" href="#currency_search"><i class="fa fa-dollar"></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 %] >+ [% 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 currencies</span> >- <span class="keep_text">Check out</span> >- <span class="keep_text">Search the catalog</span> >+ <span id="button_1" class="buttonsearch active">Search currencies</span> >+ <span id="button_2" class="buttonsearch">Check out</span> >+ <span id="button_3" 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)"; >+ } >+ , 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> >+ > <!-- End Currencies Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc >index 11ee830a03..07c4ebb701 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc >@@ -22,4 +22,79 @@ > <span id="button_3" 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)"; >+ } >+ , 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> >+ > <!-- End Desks Resident Search Box --> >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 d12402a8e1..42a8805303 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >@@ -3,7 +3,7 @@ > <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 class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="" placeholder="Search existing notices"/> > <input type="submit" class="submit" id="submit" name="search" value="" /> > </form> > </div> >@@ -22,4 +22,79 @@ > <span id="button_3" class="buttonsearch">Search the 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)"; >+ } >+ , 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> >+ > <!-- End Notices Resident Search Box --> >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 5b8d05a5d4..06d917cc74 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >@@ -136,8 +136,8 @@ > <input type="hidden" name="branchcode" value="[% Branches.GetLoggedInBranchcode | html %]" /> > </div> > <div class="modal-footer"> >- <button class="pat" type="submit"><i class="fa fa-check"></i> Save</button> >- <button class="pat" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button> >+ <button class="principal" type="submit"><i class="fa fa-check"></i> Save</button> >+ <button class="Cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button> > </div> > </form> > </div> >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 508b45a1d6..6c23e3690a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >@@ -6,19 +6,6 @@ > [% 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 %] >@@ -106,8 +93,8 @@ > [% END %] > </ol> > <fieldset class="action"> >- <input type="submit" value="Search" /> >- <input type="button" value="Clear" id="clear_search" /> >+ <input type="submit" class="principal" value="Search" /> >+ <input type="button" value="Clear" class="cancel" id="clear_search" /> > </fieldset> > </fieldset> > </form> >@@ -182,22 +169,8 @@ > </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 --> > <div class="modal" id="patronPreview" tabindex="-1" role="dialog" aria-labelledby="patronPreviewLabel"> >@@ -834,97 +807,6 @@ > > 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)"; >- } >- >- 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> > > // modify parent window owner element > function add_user(borrowernumber, borrowername) { >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 d2242d7cb1..22e7af5751 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >@@ -2,6 +2,7 @@ > [% SET return_claims = patron.return_claims %] > > [% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || charges || charges_guarantors_guarantees || charges_guarantees || credits ) %] >+ <fieldset id="searchresults"> > <h3>Attention</h3> > <ul> > [% IF ( has_modifications ) %] >@@ -126,6 +127,7 @@ > [% END %] > > </ul> >+ </fieldset> > > [% END # /F ( has_modifications || warndeparture... %] > >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 6a05dac007..2a6fe7b17e 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 >@@ -22,4 +22,79 @@ > <span id="button_3" class="buttonsearch">Search the 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)"; >+ } >+ , 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> >+ > <!-- 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 33585b0444..6c67755aa6 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 >@@ -28,10 +28,10 @@ > > <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'); >@@ -42,25 +42,62 @@ > 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]) >+ } >+ } > >- document.getElementById('containersearch').classList.add('fold'); >- // document.getElementById('inputsearch').style = "width:calc(500px - 100px)"; >+ 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/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >index b66a33ce59..d138438a0f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >@@ -123,7 +123,7 @@ > </ul> > </div> > <div class="btn-group"> >- <button type="button" id="toggle_sql" class="btn btn-default toggle_sql" data-complete-text="<i class='fa fa-eye-slash'></i> [% t('Hide SQL code') | html %]" data-toggle="button" aria-pressed="false" autocomplete="off"> >+ <button type="button" id="toggle_sql pat" class="btn btn-default toggle_sql" data-complete-text="<i class='fa fa-eye-slash'></i> [% t('Hide SQL code') | html %]" data-toggle="button" aria-pressed="false" autocomplete="off"> > <i class="fa fa-eye"></i> Show SQL code > </button> > </div> >@@ -163,7 +163,7 @@ > <p> > Search reports by keyword: > <input type="text" id="mana_search_field" /> >- <input type="submit" class="mana_search_button" value="Search" /> >+ <input type="submit" class="mana_search_button principal" value="Search" /> > <span id="mana-loading" style="display:none"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </span> > </p> > </fieldset> >@@ -171,7 +171,7 @@ > </div> > </div> > <div class="modal-footer"> >- <button type="button" class="pat" data-dismiss="modal">Cancel</button> >+ <button type="button" class="Cancel" data-dismiss="modal">Cancel</button> > </div> > </div> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >index c1945eb876..eece5f481b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >@@ -210,8 +210,8 @@ > [% END %] > </div> <!-- /.modal-body --> > <div class="modal-footer"> >- <button type="submit" form="mana_share_form" class="pat">Share</button> >- <button class="pat" data-dismiss="modal" aria-hidden="true">Cancel</button> >+ <button type="submit" form="mana_share_form" class="principal">Share</button> >+ <button class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > </div> <!-- /.modal-content --> > </div> <!-- /.modal-dialog --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >index 22ab92a3c4..fdd99987f4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >@@ -25,4 +25,79 @@ > <span id="button_3" 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)"; >+ } >+ , 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> >+ > <!-- End Suggestions Resident Search Box --> >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 b6763e8ebf..8730af969b 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 >@@ -4,7 +4,7 @@ > <div id="z3950_search" class="residentsearch"> > <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" id="submit" name="search" value="Search" /> >+ <input type="submit" class="submit" id="submit" name="search" value="" /> > </form> > </div> > >@@ -13,7 +13,7 @@ > [% INCLUDE 'catalogue-search-box.inc' %] > > <ul id="taille"> >- <li><li><a id="icon_1" title="Search Z39.50/SRU servers" onclick="clique(this)" class="iconsearch" href="#z3950_search"><i class="fa fa-square-z"></i></a></li> >+ <li><li><a id="icon_1" title="Search Z39.50/SRU servers" onclick="clique(this)" class="iconsearch" href="#z3950_search"><i style="font-weight:bold">Z39.50</i></a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><li><a 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 %] > >@@ -23,4 +23,79 @@ > <span id="button_3" class="buttonsearch">Search the 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)"; >+ } >+ , 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> >+ > <!-- End Members Resident Search Box --> >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 7240302a23..8fb8be7d3b 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 >@@ -41,8 +41,8 @@ > <main> > > >-<h2>Acquisitions</h2> > [% INCLUDE 'acquisitions-toolbar.inc' %] >+<h2>Acquisitions</h2> > [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] > [% UNLESS ( loop_budget ) %] > [% IF ( CAN_user_acquisition_period_manage ) %] >@@ -58,7 +58,7 @@ > <div class="col-sm-12"> > [% END %] > <div id="acqui_acqui_home_order"> >- <fieldset class="brief"> >+ <fieldset class="rows"> > <h3>Manage orders</h3> > <fieldset> > <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post"> >@@ -73,8 +73,8 @@ > [% IF ( CAN_user_suggestions_suggestions_manage && ( suggestions_count || all_pendingsuggestions ) ) %] > <div class="col-sm-6"> > <div id="acqui_acqui_home_suggestions"> >- <fieldset> >- <legend>Pending suggestions</legend> >+ <fieldset class="rows"> >+ <h3>Pending suggestions</h3> > <p> > Manage suggestions: > <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]#ASKED"> >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 104880faf9..ee83208529 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -4,8 +4,8 @@ > [% PROCESS 'i18n.inc' %] > [% BLOCK csv_export %] > <div class="btn-group"> >- <a id="exportbutton" class="btn btn-default" href="[% script_name | url %]?op=export&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]"><i class="fa fa-download"></i> Export as CSV</a> >- <a class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a> >+ <a id="exportbutton" class="btn btn-default pat" href="[% script_name | url %]?op=export&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]"><i class="fa fa-download"></i> Export as CSV</a> >+ <a class="btn btn-default dropdown-toggle pat" data-toggle="dropdown"><span class="caret"></span></a> > <ul class="dropdown-menu" id="export-csv-menu"> > <li><a href="#">Default</a></li> > [% IF csv_profiles.count %] >@@ -87,28 +87,28 @@ > [% UNLESS ( delete_confirmed ) %] > <div id="toolbar" class="btn-toolbar fh-fixedHeader"> > [% IF active %] >- <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div> >+ <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default pat" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div> > [% END %] >- <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&op=add_form" class="btn btn-default" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div> >+ <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&op=add_form" class="btn btn-default pat" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div> > [% IF CAN_user_acquisition_delete_baskets %] >- <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete basket</a></div> >+ <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default pat" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete basket</a></div> > [% END %] > [% IF ( unclosable ) %] > [% ELSIF ( uncertainprices ) %] >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&owner=1" class="btn btn-default" id="uncertpricesbutton"><i class="fa fa-usd"></i> Uncertain prices</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&owner=1" class="btn btn-default pat" id="uncertpricesbutton"><i class="fa fa-usd"></i> Uncertain prices</a></div> > <div title="Can not close baskets that have items with uncertain prices in them." class="btn-group"> >- <a href="" class="btn btn-default disabled" id="closebutton"><i class="fa fa-times-circle"></i> Close basket</a> >+ <a href="" class="btn btn-default disabled pat" id="closebutton"><i class="fa fa-times-circle"></i> Close basket</a> > </div> > [% ELSE %] > <div class="btn-group"> >- <a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="closebutton"><i class="fa fa-times-circle"></i> Close basket</a> >+ <a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default pat" id="closebutton"><i class="fa fa-times-circle"></i> Close basket</a> > </div> > [% END %] > > [% PROCESS csv_export %] > > [% IF Koha.Preference('EDIFACT') && ediaccount %] >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default pat" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div> > [% END %] > > [% IF ( active && books_loop ) %] >@@ -116,7 +116,7 @@ > <form action="/cgi-bin/koha/acqui/basket.pl" method="post"> > <input type="hidden" name="op" value="email" /> > <input type="hidden" name="basketno" value="[% basketno | html %]" /> >- <button type="submit" class="btn btn-default" id="emailvendorbutton"><i class="fa fa-envelope"></i> E-mail order</button> >+ <button type="submit" class="btn btn-default pat" id="emailvendorbutton"><i class="fa fa-envelope"></i> E-mail order</button> > </form> > </div> > [% END %] >@@ -264,7 +264,7 @@ > </li> > [% END %] > <li> >- <a href="#" id="add_user"><i class="fa fa-plus"></i> Add user</a> >+ <a id="lientype" href="#" id="add_user"><i class="fa fa-plus"></i> Add user</a> > </li> > <li id="add_user_submit" style="display:none;"> > <button type="submit" class="btn btn-default btn-xs">Save changes</button> >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 015ac38ae4..eb9034e246 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -77,9 +77,6 @@ > > [% INCLUDE 'header.inc' form=formulaire %] > >-<!-- ################################################################################# --> >-<!-- BREADCRUMBS --> >-<!-- ################################################################################# --> > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >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 c37eb70237..77e61ffed7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -110,6 +110,7 @@ > [% INCLUDE 'budgets-active-currency.inc' %] > > [% IF budgets %] >+<fieldset id="searchresults"> > > [% UNLESS budget_period_id %] > <div class="toolbar btn-toolbar"> >@@ -220,7 +221,7 @@ > [% ELSE %] > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="budgetactions[% budget.budget_id | html %]_[% budget.budget_period_id | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle lientype" id="budgetactions[% budget.budget_id | html %]_[% budget.budget_period_id | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetactions[% budget.budget_id | html %]_[% budget.budget_period_id | html %]"> >@@ -240,7 +241,7 @@ > </tbody> > </table> > </div> >- >+</fieldset > [% ELSE %] > <p>No fund found</p> > [% END %] >@@ -300,15 +301,15 @@ > <span class="label">Owner: </span> > [% IF budget_owner %] > <span id="budget_owner_name"> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner.borrowernumber | uri %]"> >+ < href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner.borrowernumber | uri %]"> > [% budget_owner.firstname | html %] [% budget_owner.surname | html %] > </a> | > </span> > [% ELSE %] > <span id="budget_owner_name"></span> > [% END %] >- <a id="edit_owner" class="new_window" href="#"><i class="fa fa-search"></i> Select owner</a> >- <a id="remove_owner" href="#"><i class="fa fa-trash"></i> Remove owner</a> >+ <a id="edit_owner" class="new_window lientype" href="#"><i class="fa fa-search"></i> Select owner</a> >+ <a id="remove_owner" href="#" class="lientype"><i class="fa fa-trash lientype"></i> Remove owner</a> > <input type="hidden" name="budget_owner_id" id="budget_owner_id" > value="[% budget_owner.borrowernumber | html %]" /> > </li> >@@ -332,10 +333,10 @@ > <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% user.borrowernumber | uri %]"> > [% user.firstname | html %] [% user.surname | html %] > </a> >- • <a href="#" class="del_user" data-borrowernumber="[% user.borrowernumber | html %]"><i class="fa fa-trash"></i> Remove</a> >+ • <a href="#" class="del_user" id="lientype" data-borrowernumber="[% user.borrowernumber | html %]"><i class="fa fa-trash"></i> Remove</a> > </li> > [% END %] >- <li><a href="#" id="add_user_button"><i class="fa fa-plus"></i> Add users</a></li> >+ <li><a class="lientype" href="#" id="add_user_button"><i class="fa fa-plus"></i> Add users</a></li> > </ul> > <input type="hidden" name="budget_users_ids" id="budget_users_id" value="[% budget_users_ids | html %]" /> > </li> >@@ -420,7 +421,7 @@ > > [% IF op == 'delete_confirm' %] > <div class="dialog alert"> >- <h1>Delete fund [% budget_name | html %]?</h1> >+ <h2>Delete fund [% budget_name | html %]?</h2> > If you delete this fund, all orders linked to this fund will be deleted! > <table> > <tr> >@@ -450,7 +451,6 @@ > > [% IF op == 'list' %] > <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get"> >- <a href="#" id="filterbutton">Filters</a> > <fieldset class="brief" id="fundfilters"> > <h4>Fund filters</h4> > <ol> >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 9ca36bd8f8..850d835b71 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >@@ -49,7 +49,7 @@ > [% INCLUDE 'budgets-admin-toolbar.inc' %] > > <form method="post" id="Aform" name="Aform" action="/cgi-bin/koha/admin/aqplan.pl"> >-<h1>Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]</h1> >+<h2>Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]</h2> > <input type="hidden" name="authcat" value="[% authcat | html %]" /> > <!-- Budget Lines --> > >@@ -62,6 +62,8 @@ > <p><strong>Cells contain estimated values only.</strong></p> > [% END %] > >+ <fieldset id="searchresults"> >+ > <p id="selections"> > <strong>Show/hide columns:</strong> <span class="selected"><input type="checkbox" checked="checked" id="showall"/><label for="showall">Show all columns</label></span> <span><input type="checkbox" id="hideall"/><label for="hideall">Hide all columns</label></span> > [% FOREACH authvals_ro IN authvals_row %] >@@ -176,6 +178,7 @@ > [% ELSE %] > <input type="hidden" name="op" class="principal" value="save" /> > <fieldset class="action"><input type="submit" class="principal" value="Save"/></fieldset> >+ </fieldset> > [% END %] > > >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 2905ad1198..ea99761c59 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 >@@ -46,7 +46,6 @@ > > <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="" /> >@@ -100,7 +99,7 @@ > <div class="dialog alert"> > <h3>Audio alerts are disabled</h3> > [% IF ( CAN_user_parameters_manage_sysprefs ) %] >- <p>Please enable system preference <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AudioAlerts">AudioAlerts</a> to activate sounds.</p> >+ <p>Please enable system preference <a id="lientype" href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AudioAlerts">AudioAlerts</a> to activate sounds.</p> > [% ELSE %] > <p>The system preference <strong>AudioAlerts</strong> must be enabled to activate sounds.</p> > [% END %] >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 a033e71ec8..c230ff8521 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -195,7 +195,7 @@ Authority types › Administration › Koha > <td>[% authority_type.auth_tag_to_report | html %]</td> > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="authtypeactions[% authority_type.authtypecode | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle lientype" id="authtypeactions[% authority_type.authtypecode | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtypeactions[% authority_type.authtypecode | html %]"> > <li><a href="auth_tag_structure.pl?authtypecode=[% authority_type.authtypecode | uri %]" class="button parameters"><i class="fa fa-eye"></i> MARC structure</a></li> >@@ -225,8 +225,8 @@ Authority types › Administration › Koha > </fieldset> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Export</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> >+ <button type="submit" class="btn btn-default principal">Export</button> >+ <button class="btn btn-link cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > </form> > </div> >@@ -249,8 +249,8 @@ Authority types › Administration › Koha > <div id="importing_[% authority_type.authtypecode | html %]" style="display:none" class="importing"><img src="[% interface | html %]/[% theme | html %]/img/loading-small.gif" alt="" /><span class="importing_msg"></span></div> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Import</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button type="submit" class="btn btn-default principal">Import</button> >+ <button class="btn btn-link cancel" data-dismiss="modal" aria-hidden="true">Close</button> > </div> > </form> > </div> >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 00365caf94..f1a0ff8cbe 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 >@@ -162,7 +162,7 @@ > > [% IF op == 'list' %] > >- <h1>Background jobs</h1> >+ <h2>Background jobs</h2> > > [% IF jobs.count %] > <div id="searchresults"> >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 093680ba74..b4bd08131d 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 >@@ -150,7 +150,7 @@ MARC frameworks › Administration › Koha > <p><strong><span class="ex">[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</span></strong></p> > <p>The framework is used [% biblios_use_this_framework | html %] times.</p> > <form action="/cgi-bin/koha/admin/biblio_framework.pl" method="get"> >- <button type="submit"><i class="fa fa-fw fa-arrow-left"></i> Return to frameworks</button> >+ <button type="submit" id="lientype"><i class="fa fa-fw fa-arrow-left"></i> Return to frameworks</button> > </form> > [% ELSE %] > <h1>Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])?</h1> >@@ -212,8 +212,8 @@ MARC frameworks › Administration › Koha > </fieldset> > </div> <!-- /.modal-body --> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Export</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> >+ <button type="submit" class="btn btn-default principal">Export</button> >+ <button class="btn btn-link cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> <!-- /.modal-footer --> > </form> <!-- /.form_export --> > </div> <!-- /.modal-content --> >@@ -236,8 +236,8 @@ MARC frameworks › Administration › Koha > <div id="importing_default" style="display:none" class="importing"><img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /><span class="importing_msg"></span></div> > </div> <!-- /.modal-body --> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Import</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button type="submit" class="btn btn-default principal">Import</button> >+ <button class="btn btn-link cancel" data-dismiss="modal" aria-hidden="true">Close</button> > </div> <!-- /.modal-footer --> > </form> <!-- /.form_export --> > </div> <!-- /.modal-content --> >@@ -282,8 +282,8 @@ MARC frameworks › Administration › Koha > </fieldset> > </div> <!-- /.modal-body --> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Export</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> >+ <button type="submit" class="btn btn-default principal">Export</button> >+ <button class="btn btn-link cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> <!-- /.modal-footer --> > </form> <!-- /.form_export --> > </div> <!-- /.modal-content --> >@@ -306,8 +306,8 @@ MARC frameworks › Administration › Koha > <div id="importing_[% loo.frameworkcode | html %]" style="display:none" class="importing"><img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /><span class="importing_msg"></span></div> > </div> <!-- /.modal-body --> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default" title="[% loo.frameworkcode | html %]">Import</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button type="submit" class="btn btn-default principal" title="[% loo.frameworkcode | html %]">Import</button> >+ <button class="btn btn-link cancel" data-dismiss="modal" aria-hidden="true">Close</button> > </div> <!-- /.modal-footer --> > </form> <!-- /.form_export --> > </div> <!-- /.modal-content --> >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 fa3874fdd6..22ea436dda 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 >@@ -54,9 +54,9 @@ > <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="CheckAll" href="#" class="lientype"><i class="fa fa-check"></i> Select all</a> > | >- <a id="UncheckAll" href="#"><i class="fa fa-remove"></i> Clear all</a> >+ <a id="UncheckAll" href="#" class="lientype"><i class="fa fa-remove"></i> Clear all</a> > | > <a href="/cgi-bin/koha/admin/transfer_limits.pl" id="lientype">Switch to advanced editor</a> > </fieldset> >@@ -77,7 +77,7 @@ > <div role="tabpanel" class="tab-pane" id="[% codes_loo.code | html %]set"> > <h4>Policy for [% codes_loo.limit_phrase | html %]: [% codes_loo.code | html %]</h4> > >- <p><a id="CheckAll[% codes_loo.code | html %]table" data-cb="[% codes_loo.code | html %]" class="checkall" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="UncheckAll[% codes_loo.code | html %]table" data-cb="[% codes_loo.code | html %]" class="uncheckall" href="#"><i class="fa fa-remove"></i> Clear all</a></p> >+ <p><a id="CheckAll[% codes_loo.code | html %]table" data-cb="[% codes_loo.code | html %]" class="checkall lientype" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="UncheckAll[% codes_loo.code | html %]table" data-cb="[% codes_loo.code | html %]" class="uncheckall lientype" href="#"><i class="fa fa-remove"></i> Clear all</a></p> > > <table id="[% codes_loo.code | html %]table" class="sorted"> > <thead> >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 b2445e28cb..4231df3661 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -147,7 +147,7 @@ Libraries › Administration › Koha > > <div id="searchresults"> > [% IF op == 'add_form' %] >- <h1>[% IF library %]Modify library[% ELSE %]New library[% END %]</h1> >+ <h2>[% IF library %]Modify library[% ELSE %]New library[% END %]</h2> > <form action="/cgi-bin/koha/admin/branches.pl" id="Aform" name="Aform" class="validated" method="post"> > <fieldset> > <input type="hidden" name="op" value="add_validate" /> >@@ -312,7 +312,7 @@ Libraries › Administration › Koha > [% IF op == 'delete_confirm' and not ( items_count or patrons_count )%] > <div class="dialog alert"> > <form action="/cgi-bin/koha/admin/branches.pl" method="post"> >- <h1>Are you sure you want to delete [% library.branchname | html %] ([% library.branchcode | html %])?</h1> >+ <h2>Are you sure you want to delete [% library.branchname | html %] ([% library.branchcode | html %])?</h2> > <input type="hidden" name="op" value="delete_confirmed" /> > <input type="hidden" name="branchcode" value="[% library.branchcode | html %]" /> > <input type="hidden" name="branchname" value="[% library.branchname | html %]"> >@@ -325,7 +325,7 @@ Libraries › Administration › Koha > [% END %] > > [% IF op == 'list' %] >- <h1>Libraries</h1> >+ <h2>Libraries</h2> > [% IF libraries_count > 0 %] > <table id="libraries"> > <thead> >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 8c84441293..50caf8bf1c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >@@ -159,9 +159,9 @@ Classification sources › Administration › Koha > > [% IF op == 'add_source' %] > [% IF class_source %] >-<h1>Modify classification source</h1> >+<h2>Modify classification source</h2> > [% ELSE %] >-<h1>Add classification source</h1> >+<h2>Add classification source</h2> > [% END %] > <form action="[% script_name | html %]" name="Aform" class="validated" method="post"> > <input type="hidden" name="op" value="add_source_validate" /> >@@ -223,9 +223,9 @@ Classification sources › Administration › Koha > > [% IF op == 'add_sort_rule' %] > [% IF sort_rule %] >-<h1>Modify filing rule</h1> >+<h2>Modify filing rule</h2> > [% ELSE %] >-<h1>Add filing rule</h1> >+<h2>Add filing rule</h2> > [% END %] > <form action="[% script_name | html %]" name="Aform" class="validated" method="post"> > <input type="hidden" name="op" value="add_sort_rule_validate" /> >@@ -261,17 +261,17 @@ Classification sources › Administration › Koha > </ol> > <fieldset class="action"> > <input type="submit" class="principal" value="Save" /> >- <a class="c >- </fieldset>ancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a> >+ <a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a> >+ </fieldset> > </fieldset> > </form> > [% END %] > > [% IF op == 'add_split_rule' %] > [% IF split_rule %] >-<h1>Modify splitting rule</h1> >+<h2>Modify splitting rule</h2> > [% ELSE %] >-<h1>Add splitting rule</h1> >+<h2>Add splitting rule</h2> > [% END %] > <form action="[% script_name | html %]" name="Aform" class="validated" method="post"> > <input type="hidden" name="op" value="add_split_rule_validate" /> >@@ -288,11 +288,13 @@ Classification sources › Administration › Koha > <span class="required">Required</span> > [% END %] > </li> >- <li><label for="description" class="required">Description: </label> >+ <li> >+ <label for="description" class="required">Description: </label> > <input class="required" required="required" type="text" id="description" name="description" size="50" maxlength="250" value="[% split_rule.description | html %]" /> > <span class="required">Required</span> > </li> >- <li><label for="split_routine" class="required">Splitting routine: </label> >+ <li> >+ <label for="split_routine" class="required">Splitting routine: </label> > <select class="required" required="required" id="split_routine" name="split_routine"> > [% FOREACH routine_name IN split_routines %] > [% IF routine_name == split_rule.split_routine %] >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 b42c9f92aa..269536c6be 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >@@ -30,7 +30,7 @@ > <div class="datatable_config" id="[% table_id | html %]"> > <input type="hidden" name="table_id" value="[% table_id| html %]" /> > [% IF pagename == 'additem' AND tablename == 'itemst' %] >- <div class="alert">Changes made below will only apply to item subfields that are mapped to the 'items' table. <a href="/cgi-bin/koha/admin/koha2marclinks.pl?tablename=items">Go to Koha to MARC mapping</a></div> >+ <div class="alert">Changes made below will only apply to item subfields that are mapped to the 'items' table. <a id="lientype" href="/cgi-bin/koha/admin/koha2marclinks.pl?tablename=items">Go to Koha to MARC mapping</a></div> > [% END %] > <table> > <caption> >@@ -208,230 +208,90 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Table settings</h1> >- <div class="panel-group" id="modules" role="tablist" aria-multiselectable="true"> >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="acquiHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#acqui" aria-expanded="false" aria-controls="collapseOne"> >- Acquisition >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="acqui" class="panel-collapse collapse" role="tabpanel" aria-labelledby="acquiHeading"> >- <div class="panel-body"> >- <h3>Acquisition tables</h3> >- [% PROCESS pagelist module=modules.acqui modulename="acqui" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <h2>Table settings</h2> >+ <div id="modules"> >+ <div class="panel_header"><a href="#acqui">Acquisition</a></div> >+ <div id="acqui"> >+ <h3>Acquisition tables</h3> >+ [% PROCESS pagelist module=modules.acqui modulename="acqui" %] > </div> > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="adminHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#admin" aria-expanded="false" aria-controls="collapseOne"> >- Administration >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="admin" class="panel-collapse collapse" role="tabpanel" aria-labelledby="adminHeading"> >- <div class="panel-body"> >- <h3>Administration tables</h3> >- [% PROCESS pagelist module=modules.admin modulename="admin" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <div class="panel_header"><a href="#admin">Administration</a></div> >+ <div id="admin"> >+ <h3>Administration tables</h3> >+ [% PROCESS pagelist module=modules.admin modulename="admin" %] > </div> > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="authoritiesHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#authorities" aria-expanded="false" aria-controls="collapseOne"> >- Authorities >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="authorities" class="panel-collapse collapse" role="tabpanel" aria-labelledby="authoritiesHeading"> >- <div class="panel-body"> >- <h3>Authorities tables</h3> >- [% PROCESS pagelist module=modules.authorities modulename="authorities" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <div class="panel_header"><a href="#authorities">Authorities</a></div> >+ <div id="authorities"> >+ <h3>Authorities tables</h3> >+ [% PROCESS pagelist module=modules.authorities modulename="authorities" %] > </div> > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="catalogueHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#catalogue" aria-expanded="false" aria-controls="collapseOne"> >- Catalog >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="catalogue" class="panel-collapse collapse" role="tabpanel" aria-labelledby="catalogueHeading"> >- <div class="panel-body"> >- <h3>Catalogue tables</h3> >- [% PROCESS pagelist module=modules.catalogue modulename="catalogue" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <div class="panel_header"><a href="#catalog">Catalog</a></div> >+ <div id="catalogue"> >+ <h3>Catalogue tables</h3> >+ [% PROCESS pagelist module=modules.catalogue modulename="catalogue" %] > </div> > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="cataloguingHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#cataloguing" aria-expanded="false" aria-controls="collapseOne"> >- Cataloging >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="cataloguing" class="panel-collapse collapse" role="tabpanel" aria-labelledby="cataloguingHeading"> >- <div class="panel-body"> >- <h3>Cataloguing tables</h3> >- [% PROCESS pagelist module=modules.cataloguing modulename="cataloguing" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <div class="panel_header"><a href="#cataloguing">Cataloging</a></div> >+ <div id="cataloguing"> >+ <h3>Cataloguing tables</h3> >+ [% PROCESS pagelist module=modules.cataloguing modulename="cataloguing" %] > </div> > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="circulationHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#circulation" aria-expanded="false" aria-controls="collapseOne"> >- Circulation >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="circulation" class="panel-collapse collapse" role="tabpanel" aria-labelledby="circulationHeading"> >- <div class="panel-body"> >- <h3>Circulation tables</h3> >- [% PROCESS pagelist module=modules.circ modulename="circ" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <div class="panel_header"><a href="#circulation">Circulation</a></div> >+ <div id="circulation"> >+ <h3>Circulation tables</h3> >+ [% PROCESS pagelist module=modules.circ modulename="circ" %] > </div> > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="coursereservesHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#coursereserves" aria-expanded="false" aria-controls="collapseOne"> >- Course reserves >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="coursereserves" class="panel-collapse collapse" role="tabpanel" aria-labelledby="coursereservesHeading"> >- <div class="panel-body"> >- <h3>Course reserves tables</h3> >- [% PROCESS pagelist module=modules.coursereserves modulename="coursereserves" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <div class="panel_header"><a href="#coursereserves">Course reserves</a></div> >+ <div id="coursereserves"> >+ <h3>Course reserves tables</h3> >+ [% PROCESS pagelist module=modules.coursereserves modulename="coursereserves" %] > </div> > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="illHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#ill" aria-expanded="false" aria-controls="collapseOne"> >- Interlibrary loans >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="ill" class="panel-collapse collapse" role="tabpanel" aria-labelledby="illHeading"> >- <div class="panel-body"> >- <h3>Interlibrary loans tables</h3> >- [% PROCESS pagelist module=modules.illrequests modulename="illrequests" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <div class="panel_header"><a href="#ill">Interlibrary loans</a></div> >+ <div id="ill"> >+ <h3>Interlibrary loans tables</h3> >+ [% PROCESS pagelist module=modules.illrequests modulename="illrequests" %] > </div> > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="membersHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#members" aria-expanded="false" aria-controls="collapseOne"> >- Patrons >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="members" class="panel-collapse collapse" role="tabpanel" aria-labelledby="membersHeading"> >- <div class="panel-body"> >- <h3>Patrons tables</h3> >- [% PROCESS pagelist module=modules.members modulename="members" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <div class="panel_header"><a href="#members">Patrons</a></div> >+ <div id="members"> >+ <h3>Patrons tables</h3> >+ [% PROCESS pagelist module=modules.members modulename="members" %] > </div> > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="posHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#pos" aria-expanded="false" aria-controls="collapseOne"> >- Point of sale >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="pos" class="panel-collapse collapse" role="tabpanel" aria-labelledby="posHeading"> >- <div class="panel-body"> >- <h3>Point of sale tables</h3> >- [% PROCESS pagelist module=modules.pos modulename="pos" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <div class="panel_header"><a href="#pos">Point of sale</a></div> >+ <div id="pos"> >+ <h3>Point of sale tables</h3> >+ [% PROCESS pagelist module=modules.pos modulename="pos" %] > </div> > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="toolsHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#tools" aria-expanded="false" aria-controls="collapseOne"> >- Tools >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="tools" class="panel-collapse collapse" role="tabpanel" aria-labelledby="toolsHeading"> >- <div class="panel-body"> >- <h3>Tools tables</h3> >- [% PROCESS pagelist module=modules.tools modulename="tools" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <div class="panel_header"><a href="#tools">Tools</a></div> >+ <div id="tools"> >+ <h3>Tools tables</h3> >+ [% PROCESS pagelist module=modules.tools modulename="tools" %] > </div> > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="opacHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#opac" aria-expanded="false" aria-controls="collapseOne"> >- OPAC >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="opac" class="panel-collapse collapse" role="tabpanel" aria-labelledby="opacHeading"> >- <div class="panel-body"> >- <h3>OPAC tables</h3> >- [% PROCESS pagelist module=modules.opac modulename="opac" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <div class="panel_header"><a href="#opac">OPAC</a></div> >+ <div id="opac"> >+ <h3>OPAC tables</h3> >+ [% PROCESS pagelist module=modules.opac modulename="opac" %] > </div> > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="reportsHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#reports" aria-expanded="false" aria-controls="collapseOne"> >- Reports >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="reports" class="panel-collapse collapse" role="tabpanel" aria-labelledby="reportsHeading"> >- <div class="panel-body"> >- <h3>Reports tables</h3> >- [% PROCESS pagelist module=modules.reports modulename="reports" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <div class="panel_header"><a href="#reports">Reports</a></div> >+ <div id="reports"> >+ <h3>Reports tables</h3> >+ [% PROCESS pagelist module=modules.reports modulename="reports" %] > </div> > >- <div class="panel panel-default"> >- <div class="panel-heading" role="tab" id="serialsHeading"> >- <h2 class="panel-title"> >- <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#serials" aria-expanded="false" aria-controls="collapseOne"> >- Serials >- </a> >- </h2> >- </div> <!-- /.panel-heading --> >- <div id="serials" class="panel-collapse collapse" role="tabpanel" aria-labelledby="serialsHeading"> >- <div class="panel-body"> >- <h3>Serials tables</h3> >- [% PROCESS pagelist module=modules.serials modulename="serials" %] >- </div> <!-- /.panel-body --> >- </div> <!-- /.panel-collapse --> >+ <div class="panel_header"><a href="#serials">Serials</a></div> >+ <div id="serials"> >+ <h3>Serials tables</h3> >+ [% PROCESS pagelist module=modules.serials modulename="serials" %] > </div> > > </div> >@@ -445,15 +305,23 @@ > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > >+ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >- >- [%- IF ( panel.defined && panel >= 0 ) -%] >- <script> >- $(document).ready( function() { >- $("#modules a.collapsed:eq(" + Number( [% panel | html %] ) + ")").click(); >+ <script> >+ $(document).ready( function() { >+ var accordion = $( "#modules" ).accordion({ >+ collapsible: true, >+ heightStyle: "content", >+ header: ".panel_header", >+ [%- IF panel -%] >+ [%# we were asked to show a specific panel, usually on update %] >+ active: [%- panel | html -%] >+ [%- ELSE -%] >+ active: false >+ [%- END -%] > }); >- </script> >- [%- END -%] >+ }); >+ </script> > [% END %] > [% INCLUDE 'intranet-bottom.inc' %] >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 7951f705f1..77de826cc3 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 >@@ -87,9 +87,9 @@ > > [% IF op == 'add_form' %] > [% IF credit_type %] >- <h1>Modify a credit type</h1> >+ <h2>Modify a credit type</h2> > [% ELSE %] >- <h1>New credit type</h1> >+ <h2>New credit type</h2> > [% END %] > > <form action="/cgi-bin/koha/admin/credit_types.pl" name="Aform" method="post" class="validated"> >@@ -166,7 +166,7 @@ > <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> >+ <h2>Account credit types</h2> > [% IF credit_types.count %] > <div id="searchresults"> > <table id="table_credit_types"> >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 04e6b0656e..3e56bde0d7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -169,7 +169,7 @@ > [% IF op =='delete_confirm' %] > [% IF nb_of_orders or nb_of_vendors %] > <div class="dialog alert"> >- <h1>Cannot delete currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</h1> >+ <h2>Cannot delete currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</h2> > <p> > [% IF nb_of_orders %] > <span>This currency is used by [% nb_of_orders | html %] orders.</span> >@@ -209,7 +209,7 @@ > > [% IF op == 'list' %] > >-<h1>Currencies and exchange rates</h1> >+<h2>Currencies and exchange rates</h2> > > [% IF currencies and no_active_currency %] > <div class="dialog alert"><h3>No active currency is defined</h3><p>Please edit one currency and mark it as active.</p></div> >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 b5867c67dc..1ec5cc2aef 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 >@@ -85,9 +85,9 @@ > > [% IF op == 'add_form' %] > [% IF debit_type %] >- <h1>Modify a debit type</h1> >+ <h2>Modify a debit type</h2> > [% ELSE %] >- <h1>New debit type</h1> >+ <h2>New debit type</h2> > [% END %] > > <form action="/cgi-bin/koha/admin/debit_types.pl" name="Aform" method="post" class="validated"> >@@ -157,7 +157,7 @@ > <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> >+ <h2>Account debit types</h2> > [% IF debit_types.count %] > <div id="searchresults"> > <table id="table_debit_types"> >@@ -222,7 +222,7 @@ > </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> >+ There are no account debit types defined. <a href="/cgi-bin/koha/admin/debit_types.pl?op=add_form" id="lientype">Create new debit type</a> > </div> > [% END %] > [% END %] >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 f7b0222253..dffca766d3 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 >@@ -265,16 +265,16 @@ EDI accounts › Administration › Koha > </ol> > <fieldset class="action"> > <input type="submit" class="principal" value="Submit" /> >- <a href="/ >+ <a href="/cgi-bin/koha/admin/edi_accounts.pl" class="cancel">Cancel</a> > </fieldset> >-cgi-bin/koha/admin/edi_accounts.pl" class="cancel">Cancel</a> >+ > </fieldset> > </form> > > [% END %] > [% IF delete_confirm %] > <div class="dialog alert"> >-<h1>Delete this account?</h1> >+<h2>Delete this account?</h2> > <table> > <tr> > <th>Vendor</th> >@@ -303,7 +303,7 @@ cgi-bin/koha/admin/edi_accounts.pl" class="cancel">Cancel</a> > [% END %] > [% IF display %] > [% IF ( ediaccounts ) %] >-<h1>Vendor EDI accounts</h1> >+<h2>Vendor EDI accounts</h2> > > <div id="searchresults"> > >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 00dcb55878..868ae1d147 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 >@@ -148,7 +148,7 @@ Library EANs › Administration › Koha > > [% IF delete_confirm %] > <div class="dialog alert"> >-<h1>Delete EAN [% ean.ean | html %] for [% ean.branch.branchname | html %]?</h1> >+<h2>Delete EAN [% ean.ean | html %] for [% ean.branch.branchname | html %]?</h2> > <form action="/cgi-bin/koha/admin/edi_ean_accounts.pl" method="post"> > <input type="hidden" name="op" value="delete_confirmed" /> > <input type="hidden" name="id" value="[% ean.id | html %]" /> >@@ -161,7 +161,6 @@ Library EANs › Administration › Koha > [% END %] > > [% IF display %] >- <h1>Library EANs</h1> > [% IF ( eans ) %] > <h2>Library EANs</h2> > <div id="searchresults"> >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 1d4fafbff5..87c0efa6f0 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 >@@ -75,7 +75,7 @@ > [% END %] > [% IF fields.size %] > <div id="search_fields_list"> >- <h1>Item search fields</h1> >+ <h2>Item search fields</h2> > > <div id="searchresults"> > >@@ -108,7 +108,7 @@ > </table> > </div></div> > [% ELSE %] >- <h1>Item search fields</h1> >+ <h2>Item search fields</h2> > <div class="dialog message"> > There are no item search fields defined. > </div> >@@ -116,15 +116,12 @@ > > <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 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> >+ <a href="#" class="cancel hide_form">Cancel</a> > </fieldset> > </fieldset> > </form> >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 69a9392ec4..15bb31ff0a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >@@ -74,13 +74,13 @@ > > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a id="add-group-root" class="btn btn-default add-group" href="#"> >+ <a id="add-group-root" class="btn btn-default add-group pat" href="#"> > <i class="fa fa-plus"></i> Add group > </a> > </div> > </div> > >- <h1>Library groups</h1> >+ <h2>Library groups</h2> > > [% FOREACH root_group IN root_groups %] > <table class="library-groups"> >@@ -112,7 +112,7 @@ > <h3 id="add-group-modal-label">Add group</h3> > </div> > <div class="modal-body"> >- <fieldset class="rows"> >+ <fieldset> > <input type="hidden" id="add-group-modal-parent-id" name="parent_id" value="" /> > <input type="hidden" id="add-group-modal-action" name="action" value="add"> > <ol> >@@ -159,7 +159,7 @@ > </div> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Save</button> >+ <button type="submit" class="btn btn-default principal">Save</button> > <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a> > </div> > </div> >@@ -177,7 +177,7 @@ > <div class="modal-body"> > <input type="hidden" id="edit-group-modal-id" name="id" value="" /> > <input type="hidden" id="edit-group-modal-action" name="action" value="edit" /> >- <fieldset class="rows"> >+ <fieldset> > <ol> > <li> > <label for="edit-group-modal-title">Title: </label> >@@ -223,7 +223,7 @@ > </div> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Update</button> >+ <button type="submit" class="btn btn-default principal">Update</button> > <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a> > </div> > </div> >@@ -244,7 +244,7 @@ > Are you sure you want to delete <span id="delete-group-modal-title" class="name"></span>? > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> Delete</button> >+ <button type="submit" class="btn btn-danger principal"><i class="fa fa-trash"></i> Delete</button> > <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > </div> >@@ -265,7 +265,7 @@ > Are you sure you want to remove <span id="remove-library-modal-library" class="name"></span> from <span id="remove-library-modal-group" class="name"></span>? > </div> > <div class="modal-footer"> >- <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> Remove</button> >+ <button type="submit" class="btn btn-danger principal"><i class="fa fa-trash"></i> Remove</button> > <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > </div> >@@ -420,25 +420,25 @@ > </td> > <td> > [% IF group.branchcode %] >- <button class="btn btn-default btn-xs remove-library" data-group-id="[% group.id | html %]" data-group-library="[% group.library.branchname | html %]" data-group-parent-title="[% group.parent.title | html %]" ><i class="fa fa-trash"></i> Remove from group</button> >+ <button id="lientype" class="btn btn-default btn-xs remove-library" data-group-id="[% group.id | html %]" data-group-library="[% group.library.branchname | html %]" data-group-parent-title="[% group.parent.title | html %]" ><i class="fa fa-trash"></i> Remove from group</button> > [% ELSE %] > <div class="btn-group"> >- <button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><i class="fa fa-wrench"></i> Actions <span class="caret"></span></button> >+ <button id="lientype" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><i class="fa fa-wrench"></i> Actions <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li> >- <a id="add-group-[% group.id | html %]" href="#" class="add-group" data-group-id="[% group.id | html %]"> >+ <a id="add-group-[% group.id | html %]" href="#" class="add-group lientype" data-group-id="[% group.id | html %]"> > <i class="fa fa-plus"></i> Add sub-group > </a> > </li> > > <li> >- <a class="edit-group" id="edit-group-[% group.id | html %]" href="#" data-group-id="[% group.id | html %]" data-group-parent-id="[% group.parent_id | html %]" data-group-title="[% group.title | html %]" data-group-description="[% group.description | html %]" data-group-ft_hide_patron_info="[% group.ft_hide_patron_info | html %]" data-group-ft_search_groups_opac="[% group.ft_search_groups_opac | html %]" data-group-ft_search_groups_staff="[% group.ft_search_groups_staff | html %]" data-group-ft_local_hold_group="[% group.ft_local_hold_group | html %]" > >+ <a class="edit-group lientype" id="edit-group-[% group.id | html %]" href="#" data-group-id="[% group.id | html %]" data-group-parent-id="[% group.parent_id | html %]" data-group-title="[% group.title | html %]" data-group-description="[% group.description | html %]" data-group-ft_hide_patron_info="[% group.ft_hide_patron_info | html %]" data-group-ft_search_groups_opac="[% group.ft_search_groups_opac | html %]" data-group-ft_search_groups_staff="[% group.ft_search_groups_staff | html %]" data-group-ft_local_hold_group="[% group.ft_local_hold_group | html %]" > > <i class="fa fa-pencil"></i> Edit > </a> > </li> > > <li> >- <a class="delete-group" id="delete-group-[% group.id | html %]" href="#" data-group-id="[% group.id | html %]" data-group-title="[% group.title | html %]"> >+ <a class="delete-group lientype" id="delete-group-[% group.id | html %]" href="#" data-group-id="[% group.id | html %]" data-group-title="[% group.title | html %]"> > <i class="fa fa-trash"></i> Delete > </a> > </li> >@@ -446,7 +446,7 @@ > </div> > > <div class="btn-group"> >- <button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Add library <span class="caret"></span></button> >+ <button class="btn btn-default btn-xs dropdown-toggle" id="lientype" data-toggle="dropdown"><i class="fa fa-plus"></i> Add library <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% FOREACH library IN group.libraries_not_direct_children %] > <li> >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 3a3211677b..f57f5c73b2 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 >@@ -46,7 +46,7 @@ > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > >- <h1>Manage MARC overlay rules</h1> >+ <h2>Manage MARC overlay rules</h2> > > [% FOR m IN messages %] > <div class="dialog [% m.type | html %]"> >@@ -62,7 +62,7 @@ > [% END %] > > [% UNLESS Koha.Preference( 'MARCOverlayRules' ) %] >- [% SET pref_MARCOverlayRules_link = '<a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=MARCOverlayRules">MARCOverlayRules</a>' %] >+ [% SET pref_MARCOverlayRules_link = '<a id="lientype" href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=MARCOverlayRules">MARCOverlayRules</a>' %] > <div class="dialog message"> > The [% pref_MARCOverlayRules_link | $raw | $KohaSpan %] preference is not set, don't forget to enable it for rules to take effect. > </div> >@@ -78,7 +78,7 @@ > <button type="button" class="approve" id="doremove"><i class="fa fa-fw fa-check"></i> Yes, remove</button> > </div> > [% END %] >- >+ <fieldset id="searchresults"> > <form action="/cgi-bin/koha/admin/marc-overlay-rules.pl" method="POST" id="marc-overlay-rules-form"> > <table id="marc-overlay-rules"> > <thead><tr> >@@ -142,7 +142,7 @@ > </select> > </th> > <th><button class="btn btn-default btn-xs" title="Add" id="add"><i class="fa fa-plus"></i> Add rule</button></th> >- <th><button id="btn_batchremove" disabled="disabled" class="btn btn-default btn-xs" title="Batch remove"><i class="fa fa-trash"></i> Delete selected</button></th> >+ <th><button id="btn_batchremove" disabled="disabled" class=" btn btn-default btn-xs " title="Batch remove"><i class="fa fa-trash"></i> Delete selected</button></th> > </tr> > </tfoot> > [% END %] >@@ -228,7 +228,7 @@ > </td> > <td class="actions"> > <button class="btn btn-default btn-xs" title="Save" id="doedit" value="[% rule.id | html %]"><i class="fa fa-check"></i> Save</button> >- <button type="submit" class="btn btn-default btn-xs" title="Cancel" ><i class="fa fa-times"></i> Cancel</button> >+ <button type="submit" class="btn btn-default btn-xs" id="lientype" title="Cancel" ><i class="fa fa-times"></i> Cancel</button> > </td> > <td></td> > [% ELSE %] >@@ -242,8 +242,8 @@ > <td class="rule-operation-action" data-operation="remove">[% IF rule.remove %]Remove[% ELSE %]Skip[% END %]</td> > <td class="rule-operation-action" data-operation="delete">[% IF rule.delete %]Delete[% ELSE %]Skip[% END %]</td> > <td class="actions"> >- <a href="?op=remove&id=[% rule.id | uri %]" title="Delete" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >- <a href="?op=edit&id=[% rule.id | uri %]" title="Edit" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a id="lientype" href="?op=remove&id=[% rule.id | uri %]" title="Delete" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >+ <a id="lientype" href="?op=edit&id=[% rule.id | uri %]" title="Edit" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> > </td> > <td> > [% IF rule.removemarked %] >@@ -258,6 +258,7 @@ > </tbody> > </table> > </form> >+ </fieldset> > > <form action="/cgi-bin/koha/admin/marc-overlay-rules.pl" method="post"> > <input type="hidden" name="op" value="redo-matching" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >index 7d6181248e..897edc173b 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 >@@ -119,13 +119,13 @@ > <main> > > [% IF ( add_form ) %] >- <h1> >+ <h2> > [% IF ( use_heading_flags_p ) %] > [% IF ( heading_edit_subfields_p ) %]<span>Tag</span> [% tagfield | html %] <span>Subfield constraints</span>[% END %] > [% ELSE %] > [% action | html %] > [% END %] >- </h1> >+ </h2> > > <form action="[% script_name | html %]" name="Aform" method="post"> > <input type="hidden" name="op" value="add_validate" /> >@@ -144,6 +144,7 @@ > [% END %][% END %] > > <div id="subfieldtabs" class="toptabs numbered"> >+ <fieldset id="searchresults"> > <ul class="nav nav-tabs" role="tablist"> > [% FOREACH loo IN loop %] > <li id="tab_subfield_[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]" class="tab-item" role="presentation"> >@@ -163,8 +164,8 @@ > [% FOREACH loo IN loop %] > <div class="constraints tab-pane" role="tabpanel" id="sub[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]field"> > <div id="basic[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]" class="contraints"> >- <fieldset class="rows"> >- <legend>Basic constraints</legend> >+ <fieldset> >+ <h3>Basic constraints</h3> > <ol> > [% IF ( subfieldcode == 0 || subfieldcode ) %] > <li> >@@ -236,8 +237,8 @@ > </div> <!-- /#basic[%- PROCESS outputsubfield subfieldanchor = subfieldcode -%] --> > > <div id="advanced[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]" class="contraints"> >- <fieldset class="rows"> >- <legend>Advanced constraints</legend> >+ <fieldset> >+ <h3>Advanced constraints</h3> > <ol> > <li> > <label for="defaultvalue[% loo.row | html %]">Default value:</label> >@@ -299,8 +300,8 @@ > </div> <!-- /#advanced[%- PROCESS outputsubfield subfieldanchor = subfieldcode -%] --> > > <div id="oth[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]" class="constraints"> >- <fieldset class="rows"> >- <legend>Other options (choose one)</legend> >+ <fieldset> >+ <h3>Other options (choose one)</h3> > <ol> > <li> > <label for="authorised_value[% loo.row | html %]">Authorized value:</label> >@@ -345,17 +346,16 @@ > </div><!-- /constraints --> > [% END # /FOREACH loo %] > </div> <!-- /.tab-content --> >- </div><!-- /subfieldtabs --> > >- <fieldset class="action"> >- <input type="submit" value="Save changes" /> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | uri %]" class="cancel">Cancel</a> >+ <input type="submit" class="principal" value="Save changes" /> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | uri %]" class="cancel">Cancel</a> > </fieldset> >+ </div><!-- /subfieldtabs --> > </form> > [% END # /IF ( add_form ) %] > > [% IF ( delete_confirm ) %] > <div class="dialog alert"> >- <h1>Confirm deletion of subfield [% mss.tagsubfield | html %]?</h1> >+ <h3>Confirm deletion of subfield [% mss.tagsubfield | html %]?</h3> > <p>Subfield: [% mss.tagsubfield | html %]</p> > <p>Description: [% mss.liblibrarian | html_entity %]</p> > >@@ -377,11 +377,12 @@ > [% END # /IF ( delete_confirm ) %] > > [% IF ( else ) %] >- <h1>MARC subfield structure admin for [% tagfield | html %] [% IF ( frameworkcode ) %](framework [% frameworkcode | html %])[% ELSE %](default framework)[% END %]</h1> >+ <h2>MARC subfield structure admin for [% tagfield | html %] [% IF ( frameworkcode ) %](framework [% frameworkcode | html %])[% ELSE %](default framework)[% END %]</h2> > > <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.</p> > <p>The column 'Koha field' shows that the subfield is linked with a Koha field.</p> > >+ <div id="searchresults"> > <table id="table_marcsubfieldstructure"> > <thead> > <tr> >@@ -421,8 +422,8 @@ > [% END %] > </td> > <td class="actions"> >- <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield=[% loo.tagfield | uri %]&tagsubfield=[% loo.tagsubfield | uri %]&frameworkcode=[% frameworkcode | uri %]#sub[% loo.tagsubfield | uri %]field" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=delete_confirm&tagfield=[% loo.tagfield | uri %]&tagsubfield=[% loo.tagsubfield | uri %]&frameworkcode=[% frameworkcode | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >+ <a id="lientype" href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield=[% loo.tagfield | uri %]&tagsubfield=[% loo.tagsubfield | uri %]&frameworkcode=[% frameworkcode | uri %]#sub[% loo.tagsubfield | uri %]field" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a id="lientype" href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=delete_confirm&tagfield=[% loo.tagfield | uri %]&tagsubfield=[% loo.tagsubfield | uri %]&frameworkcode=[% frameworkcode | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -433,10 +434,11 @@ > <fieldset class="action"><input type="hidden" name="op" value="add_form" /> > <input type="hidden" name="tagfield" value="[% edit_tagfield | html %]" /> > <input type="hidden" name="frameworkcode" value="[% edit_frameworkcode | html %]" /> >- <input type="submit" value="Edit subfields" /> >+ <input type="submit" class="principal" value="Edit subfields" /> > <a class="cancel" href="marctagstructure.pl?searchfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | html %]">Cancel</a> > </fieldset> > </form> >+ </div> > > [% END # /IF else %] > >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 743688f68f..96c765515b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -128,13 +128,13 @@ MARC frameworks › Administration › Koha > <form action="[% script_name | html %]" name="Aform" method="post" class="validated"> > > <fieldset class="rows"> >- <legend> >+ <h3> > [% IF heading_add_tag_p %] > <span>Add tag</span> > [% ELSE %] > <span>Modify tag</span> <input type="hidden" name="modif" value="1" />[% searchfield | html %] > [% END %] >- </legend> >+ </h3> > <input type="hidden" name="op" value="add_validate" /> > <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode | html %]" /> > <ol> >@@ -184,8 +184,7 @@ MARC frameworks › Administration › Koha > [% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => authorised_value ) %] > </select> > (if you select a value here, the indicators will be limited to the authorized value list)</li> >-</ol></fieldset> >- <fieldset class="action"> >+</ol> > <input type="submit" value="Save changes" class="principal"/> > <a class="cancel" href="[% script_name | url %]?frameworkcode=[% framework.frameworkcode | uri %]">Cancel</a> > </fieldset> >@@ -261,6 +260,7 @@ MARC frameworks › Administration › Koha > </fieldset> > </form> > >+<div id="searchresults"> > <table id="table_marctagstructure"> > <thead> > <tr> >@@ -312,6 +312,7 @@ MARC frameworks › Administration › Koha > [% END %] > </tbody> > </table> >+ </div> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >index 4714a5cc69..66775012d2 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 >@@ -120,9 +120,9 @@ > > [% IF ( matching_rule_form ) %] > [% IF ( edit_matching_rule ) %] >- <h1>Modify record matching rule</h1> >+ <h2>Modify record matching rule</h2> > [% ELSE %] >- <h1>Add record matching rule</h1> >+ <h2>Add record matching rule</h2> > [% END %] > <form action="[% script_name | html %]" name="Aform" method="post"> > <input type="hidden" name="op" value="[% confirm_op | html %]" /> >@@ -170,10 +170,10 @@ > [% ELSE %] > <p id="addMatchPoint"> > [% END %] >- <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a> >+ <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;" id="lientype">Add match point</a> > </p> > [% ELSE %] >- <p id="addMatchPoint" style="display:none;"><a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;"> >+ <p id="addMatchPoint" style="display:none;"><a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;" id="lientype"> > Add match point</a> > </p> > [% END %] >@@ -182,7 +182,7 @@ > [% FOREACH matchpoint IN matchpoints %] > <div id="mp_[% matchpoint.mp_num | html %]" class="matchgroup"> > <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> >+ <h3>Match point [% matchpoint.mp_num | html %] | <a href="#" id="lientype" class="button" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num | html %]', 'mp_template'); return false;">Add match point</a> | <a href="#" id="lientype" 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> >@@ -233,7 +233,7 @@ > [% ELSE # IF ( edit_matching_rule ) %] > <div id="mp_1" class="matchgroup"> > <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> >+ <h3>Match point 1 | <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;" id="lientype">Add match point</a> | <a href="#" id="lientype" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></h3> > <ol> > <li> > <label for="mp_1_search_index">Search index: </label> >@@ -283,16 +283,16 @@ > [% ELSE %] > <p id="addMatchCheck"> > [% END %] >- <a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"> Add match check</a></p> >+ <a id="lientype" 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 id="lientype" 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> >- <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> >+ <h3>Match check [% matchcheck.mc_num | html %]<a id="lientype" href="#" class="button" onclick="InsertMatchcheck('mc_[% matchcheck.mc_num | html %]', 'mc_template'); return false;"> Add match check</a> | <a id="lientype" 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 id="mc_[% src_component.mc_num | html %]_src_c_[% src_component.comp_num | html %]"> >@@ -362,7 +362,7 @@ > [% ELSE # IF ( edit_matching_rule ) %] > <div id="mc_1" class="matchgroup"> > <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> >+ <h3>Match check 1 | <a id="lientype" href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a> | <a id="lientype" 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 id="mc_1_src_c_1"> > <h3>Source (incoming) record check field</h3> >@@ -433,7 +433,7 @@ > > [% IF ( delete_matching_rule_form ) %] > <div class="dialog alert"> >- <h1>Confirm deletion of record matching rule <span class="ex">'[% code | html %]' ([% description | html %])</span>?</h1> >+ <h2>Confirm deletion of record matching rule <span class="ex">'[% code | html %]' ([% description | html %])</span>?</h2> > <form action="[% script_name | html %]" name="Aform" method="post"> > <input type="hidden" name="op" value="[% confirm_op | html %]" /> > <input type="hidden" name="matcher_id" value="[% matcher_id | html %]" /> >@@ -452,7 +452,7 @@ > <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> >+ <h2>Record matching rules</h2> > > [% IF ( added_matching_rule ) %] > <div class="dialog message">Added record matching rule "[% added_matching_rule | html %]"</div> >@@ -495,7 +495,7 @@ > [% IF ( matching_rule_form ) %] > <div id="mp_template" class="matchgroup" style="display:none;"> > <fieldset> >- <h3>Match point <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></h3> >+ <h3>Match point <span class="counter"></span> | <a id="lientype" 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> >@@ -537,7 +537,7 @@ > > <div id="mc_template" class="matchgroup" style="display:none"> > <fieldset> >- <h3>Match check <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></h3> >+ <h3>Match check <span class="counter"></span> | <a id="lientype" 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 id="mc_num_src_c_1"> > <h3>Source (incoming) record check field</h3> >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 a4e1e3cee7..9827757059 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 >@@ -69,10 +69,10 @@ > [% IF ( op_new || op_mod ) %] > <form method="post" action="/cgi-bin/koha/admin/oai_sets.pl" class="validated"> > [% IF ( op_new ) %] >- <h1>Add a new OAI set</h1> >+ <h2>Add a new OAI set</h2> > <input type="hidden" name="op" value="savenew" /> > [% ELSIF ( op_mod ) %] >- <h1>Edit OAI set '[% spec | html %]'</h1> >+ <h2>Edit OAI set '[% spec | html %]'</h2> > <input type="hidden" name="op" value="savemod" /> > <input type="hidden" name="id" value="[% id | html %]" /> > [% END %] >@@ -92,10 +92,10 @@ > <li> > <label>setDescription: </label> > <textarea style="vertical-align:middle" rows="2" cols="30" name="description">[% desc.description | html %]</textarea> >- <a class="remove_description" href="#"><i class="fa fa-fw fa-trash"></i> Remove</a> >+ <a class="remove_description" href="#" id="lientype"><i class="fa fa-fw fa-trash"></i> Remove</a> > </li> > [% END %] >- <li id="adddescription"><span class="label"> </span><a href="#" class="add_description"><i class="fa fa-fw fa-plus"></i> Add description</a></li> >+ <li id="adddescription"><span class="label"> </span><a href="#" class="add_description" id="lientype"><i class="fa fa-fw fa-plus"></i> Add description</a></li> > > </ol> > <fieldset class="action"> >@@ -110,9 +110,10 @@ > <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> >+ <h2>OAI sets</h2> > [% IF sets_loop %] > <div id="searchresults"> >+ <div> > <table> > <thead> > <tr> >@@ -140,7 +141,7 @@ > </td> > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="oaisetsactions[% set.id | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle lientype" 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 %]" id="lientype"><i class="fa fa-fw fa-pencil"></i> Edit</a></li> >@@ -154,6 +155,7 @@ > </tbody> > </table> > </div> >+ </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/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >index 45b2a83c68..4ca9b24b06 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 >@@ -87,9 +87,9 @@ Patron attribute types › Administration › Koha > > [% IF ( attribute_type_form ) %] > [% IF ( edit_attribute_type ) %] >-<h1>Modify patron attribute type</h1> >+<h2>Modify patron attribute type</h2> > [% ELSE %] >-<h1>Add patron attribute type</h1> >+<h2>Add patron attribute type</h2> > [% END %] > [% IF ( duplicate_code_error ) %] > <div class="dialog message">Could not add patron attribute type "[% duplicate_code_error | html %]" >@@ -259,7 +259,7 @@ Patron attribute types › Administration › Koha > > [% IF ( delete_attribute_type_form ) %] > <div class="dialog alert"> >- <h1>Confirm deletion of patron attribute type <span class="ex">'[% code | html %]' ([% description | html %])</span>?</h1> >+ <h2>Confirm deletion of patron attribute type <span class="ex">'[% code | html %]' ([% description | html %])</span>?</h2> > <form action="[% script_name | html %]" name="Aform" method="post"> > <input type="hidden" name="op" value="[% confirm_op | html %]" /> > <input type="hidden" name="code" value="[% code | html %]" /> >@@ -279,7 +279,7 @@ Patron attribute types › Administration › Koha > </div></div> > > >-<h1>Patron attribute types</h1> >+<h2>Patron attribute types</h2> > [% IF ( added_attribute_type ) %] > <div class="dialog message">Added patron attribute type "[% added_attribute_type | html %]"</div> > [% END %] >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 f7b352aecf..256152aba6 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 >@@ -38,7 +38,7 @@ > <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> >- <div class="col-sm-6"> >+ <div class="col-sm-12"> > [% IF result.code != 201 && result.msg %] > <div class="dialog alert" role="alert"> > [% result.msg | html %] >@@ -110,7 +110,7 @@ > </ol> > <fieldset class="action"> > <input type="hidden" name="op" value="save" /> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > </fieldset> > </fieldset> > </form> >@@ -134,7 +134,7 @@ > </ol> > <fieldset class="action"> > <input type="hidden" name="op" value="reset" /> >- <input type="submit" value="Reset your token" /> >+ <input type="submit" class="principal" value="Reset your token" /> > </fieldset> > </fieldset> > </form> >@@ -154,7 +154,7 @@ > </ol> > <fieldset class="action"> > <input type="hidden" name="op" value="send" /> >- <input type="submit" value="Send to Mana KB" /> >+ <input type="submit" class="principal" value="Send to Mana KB" /> > </fieldset> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt >index 960614a9fa..84ce787e41 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 >@@ -76,12 +76,12 @@ > </p> > > <p class="help">Check the boxes for the libraries you allow your items to be transferred to.</p> >- <fieldset> >+ <fieldset class="rows"> > <a id="check-all" class="limit-action" href="#"><i class="fa fa-check"></i> Check all</a> > | >- <a id="uncheck-all" class="limit-action" href="#"><i class="fa fa-remove"></i> Uncheck all</a> >+ <a id="uncheck-all" class="limit-action lientype" href="#"><i class="fa fa-remove"></i> Uncheck all</a> > | >- <a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Switch to basic editor</a> >+ <a href="/cgi-bin/koha/admin/branch_transfer_limits.pl" id="lientype">Switch to basic editor</a> > </fieldset> > > <table id="transfer_limits" class="table table-striped table-bordered table-hover table-condensed"> >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 b4b9bc549d..162477c0cc 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 >@@ -71,7 +71,7 @@ > [% END %] > > <form id="category_form" action="/cgi-bin/koha/admin/usage_statistics.pl" method="post"> >- <h1>Modify the statistics you share with the Koha community</h1> >+ <h2>Modify the statistics you share with the Koha community</h2> > <div class="row"> > <div class="col-xs-12 col-sm-6"> > <fieldset class="rows"> >@@ -212,7 +212,7 @@ > > <li id="libraries_info"> > <fieldset class="rows"> >- <legend>Libraries</legend> >+ <h3>Libraries</h3> > <ol> > [% FOR l IN libraries %] > <li> >@@ -253,7 +253,7 @@ > > <fieldset class="action"> > <input type="hidden" name="op" value="update" /> >- <input type="submit" value="Update your statistics usage" /> >+ <input type="submit" class="principal" value="Update your statistics usage" /> > <a class="cancel" href="/cgi-bin/koha/admin/usage_statistics.pl">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index c5e5c496e4..891df647fd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -241,7 +241,7 @@ > <td>[% loo.attributes | html %]</td> > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle lientype" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]"> >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 094ab17c10..b4e0625532 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 >@@ -43,7 +43,7 @@ > > [% INCLUDE 'authorities-toolbar.inc' %] > >- <h1>Authorities</h1> >+ <h2>Authorities</h2> > > <div id="merge_in_progress"></div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >index 315fd5afa4..d4a2ecaefa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >@@ -64,11 +64,11 @@ > > > [% IF ( unknownauthid ) %] >- <h1>Authority does not exist</h1> >+ <h2>Authority does not exist</h2> > <div class="dialog message">The authority record you requested does not exist ([% errauthid | html %]).</div> > [% ELSE %] > >- <h1>Authority #[% authid | html %] ([% authtypetext | html %])</h1> >+ <h2>Authority #[% authid | html %] ([% authtypetext | html %])</h2> > > <div id="action"> > [% IF count %] >@@ -129,6 +129,9 @@ > </div> <!-- /.tab-pane --> > [% END # /FOREACH BIG_LOO %] > </div> <!-- /.tab-content --> >+ </fieldset> >+ </div> >+ </div> > </div> <!-- /#authoritiestabs --> > [% END # /IF ( unknownauthid ) %] > </div> <!-- /.col-md-8 col-md-offset-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >index a9e8659049..1b4c89f50f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >@@ -105,7 +105,7 @@ > [% IF ( CAN_user_editauthorities ) %] > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="authactions[% resul.authid | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle lientype" id="authactions[% resul.authid | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authactions[% resul.authid | html %]"> > <li><a href="/cgi-bin/koha/authorities/authorities.pl?authid=[% resul.authid | uri %]"><i class="fa fa-pencil"></i> Edit</a></li> >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 4d1ab0fb48..a835f6c099 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >@@ -58,19 +58,19 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1> >+ [% INCLUDE 'cat-toolbar.inc' %] >+ <h2> > [% IF ( unknownbiblionumber ) %] > Unknown record > [% ELSE %] > ISBD details for [% INCLUDE 'biblio-title-head.inc' %] > [% END %] >- </h1> >+ </h2> > > [% IF ( unknownbiblionumber ) %] > <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div> > [% ELSE %] > >- [% INCLUDE 'cat-toolbar.inc' %] > [% IF ( ocoins ) %] > <!-- COinS / OpenURL --> > <span class="Z3988" title="[% ocoins | html %]"></span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >index 765fbd20de..ef7e8141c8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >@@ -60,14 +60,14 @@ > <main> > > [% IF ( unknownbiblionumber ) %] >- <h1>Unknown record</h1> >+ <h2>Unknown record</h2> > <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div> > [% ELSE %] > > [% INCLUDE 'cat-toolbar.inc' %] > > [% UNLESS ( popup ) %] >- <h1>MARC record: [% biblionumber | html %] ( [% bibliotitle | html %] )</h1> >+ <h2>MARC record: [% biblionumber | html %] ( [% bibliotitle | html %] )</h2> > [% END %] > > <p><strong>With framework : <select name="Frameworks" id="Frameworks"> >@@ -125,6 +125,7 @@ > [% END %] > > <div id="bibliotabs" class="toptabs"> >+ <fieldset id="searchresults"> > <ul class="nav nav-tabs" role="tablist"> > [% IF ( tab0XX ) %] > <li role="presentation"><a href="#tab0XX" aria-controls="tab0XX" role="tab" data-toggle="tab">0</a></li> >@@ -200,6 +201,7 @@ > </div> > [% END %] > </div> <!-- /.tab-content --> >+ </fieldset> > </div> <!-- /#bibliotabs --> > > </main> >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 3053b96bc3..6b38a863a2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -277,6 +277,7 @@ > </div> > > <div id="bibliodetails" class="toptabs"> >+<fieldset id="searchresults"> > > <ul class="nav nav-tabs" role="tablist"> > [% IF (SeparateHoldings) %] >@@ -1017,6 +1018,7 @@ Note that permanent location is a code, and location may be an authval. > [% END %] > > </div><!-- /tab-content --> >+</fieldset> > </div><!-- /bibliodetails --> > > <div id="export" style="margin-top: 1em;"> >@@ -1029,7 +1031,7 @@ Note that permanent location is a code, and location may be an authval. > <option value="marcxml">MARCXML</option> > <option value="marc8">MARC (non-Unicode/MARC-8)</option> > <option value="utf8">MARC (Unicode/UTF-8)</option> </select> >- <input type="submit" name="save" value="Download record" /></td> >+ <input type="submit" class="principal" name="save" value="Download record" /></td> > </tr> > <tr><td> > <input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="[% biblionumber | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index 4b13c5df62..c45f8e8f59 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -47,7 +47,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Checkout history for [% INCLUDE 'biblio-title.inc' %]</h1> >+<h2>Checkout history for [% INCLUDE 'biblio-title.inc' %]</h2> > [% IF biblio.author %]<h3>by [% biblio.author | html %]</h3>[% END %] > > [% SET show_patron_column = Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >index 3644018eaa..a21bf2784c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -444,7 +444,7 @@ > .append(exportButton); > > var results_heading = $('<div>').addClass('results-heading') >- .append("<h1>" + _("Item search results") + "</h1>") >+ .append("<h2>" + _("Item search results") + "</h2>") > .append($('<p>').append(advSearchLink)) > .append($('<p>').append(editSearchLink)) > .append(exportLinks); >@@ -594,7 +594,7 @@ > // Add the "New field" link. > var form_field = $('div.form-field-select-text').last() > var NEW_FIELD = _("New field"); >- var button_field_new = $('<a href="#" class="button-field-new" title="Add a new field"><i class="fa fa-plus"></i> ' + NEW_FIELD + '</a>'); >+ var button_field_new = $('<a href="#" class="button-field-new" id="lientype" title="Add a new field"><i class="fa fa-plus"></i> ' + NEW_FIELD + '</a>'); > button_field_new.click(function(e) { > e.preventDefault(); > addNewField( $(this) ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index 2983cf6023..58f95568d8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -47,9 +47,9 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Item details for [% INCLUDE 'biblio-title-head.inc' %]</h1> >- > [% INCLUDE 'cat-toolbar.inc' %] >+ <h2>Item details for [% INCLUDE 'biblio-title-head.inc' %]</h2> >+ > > <div id="catalogue_detail_biblio"> > >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 823ea43819..84787d69f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -52,7 +52,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Search results</h1> >+ <h2>Search results</h2> > > [% IF ( outer_sup_results_loop ) %] > <div class="row"> >@@ -76,7 +76,7 @@ > <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> >- <a href="/cgi-bin/koha/catalogue/search.pl?advsearch=1&edit_search=1&[% query_cgi | $raw %]&[% limit_cgi | $raw %]&sort_by=[% sort_by | $raw %]">Edit this search</a> >+ <a id="lientype" href="/cgi-bin/koha/catalogue/search.pl?advsearch=1&edit_search=1&[% query_cgi | $raw %]&[% limit_cgi | $raw %]&sort_by=[% sort_by | $raw %]">Edit this search</a> > > <div class="searchheader" id="searchheader"> > <div id="selection_ops"> >@@ -130,11 +130,11 @@ > <li role="separator" class="divider"></li> > [% IF add_to_some_private_shelves.count > 10 or add_to_some_public_shelves.count > 10 %] > <li> >- <a href="#" class="addtolist morelists">More lists</a> >+ <a id="lientype" href="#" class="addtolist morelists">More lists</a> > </li> > [% END %] > <li> >- <a href="#" class="addtolist newlist">New list</a> >+ <a id="lientype" href="#" class="addtolist newlist">New list</a> > </li> > </ul> > </div> >@@ -144,7 +144,7 @@ > [% IF ( holdfor or holdforclub ) %] > <div id="placeholdc" class="btn-group"> > <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"> >+ <button class="btn btn-default btn-xs dropdown-toggle" id="lientype" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -311,7 +311,7 @@ > [% END %] Library default: [% Koha.Preference('numSearchResults') | html %] > </a></li> > [% END %] >- <li><a href="/cgi-bin/koha/catalogue/search.pl?count=20[% PROCESS sort_search_query %]">[% IF results_per_page == '20' %]<i class="fa fa-check"></i>[% END %] 20</a></li> >+ <li><a results_batch_opshref="/cgi-bin/koha/catalogue/search.pl?count=20[% PROCESS sort_search_query %]">[% IF results_per_page == '20' %]<i class="fa fa-check"></i>[% END %] 20</a></li> > <li><a href="/cgi-bin/koha/catalogue/search.pl?count=40[% PROCESS sort_search_query %]" id="resultsperpage-40">[% IF results_per_page == '40' %]<i class="fa fa-check"></i>[% END %] 40</a></li> > <li><a href="/cgi-bin/koha/catalogue/search.pl?count=60[% PROCESS sort_search_query %]" id="resultsperpage-60">[% IF results_per_page == '60' %]<i class="fa fa-check"></i>[% END %] 60</a></li> > <li><a href="/cgi-bin/koha/catalogue/search.pl?count=80[% PROCESS sort_search_query %]" id="resultsperpage-80">[% IF results_per_page == '80' %]<i class="fa fa-check"></i>[% END %] 80</a></li> >@@ -335,9 +335,9 @@ > No results match your search [% IF ( query_desc ) %]for <span style="font-weight: bold;">'[% query_desc | html %]'</span>[% END %][% IF ( limit_desc ) %] with limit(s): <span style="font-weight: bold;">'[% limit_desc | html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName | html %] Catalog[% END %]. > </p> > [% IF CAN_user_acquisition_order_manage && searchtoorder_basketno && searchtoorder_vendorid %][%# Coming from the basket or vendor view %] >- <p><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% searchtoorder_basketno | uri %]">View basket<a></p> >+ <p><a id="lientype" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% searchtoorder_basketno | uri %]">View basket<a></p> > [% END %] >- <a href="/cgi-bin/koha/catalogue/search.pl?advsearch=1&edit_search=1&[% query_cgi | $raw %]&[% limit_cgi | $raw %]&sort_by=[% sort_by | $raw %]">Edit this search</a> >+ <a id="lientype" href="/cgi-bin/koha/catalogue/search.pl?advsearch=1&edit_search=1&[% query_cgi | $raw %]&[% limit_cgi | $raw %]&sort_by=[% sort_by | $raw %]">Edit this search</a> > [% ELSE %] > <p>You did not specify any search criteria.</p> > [% END %] >@@ -352,7 +352,7 @@ > <!-- Search Results Table --> > [% IF ( total ) %] > [% IF ( scan ) %] >- <h1>Scan index:</h1> >+ <h2>Scan index:</h2> > <form action="/cgi-bin/koha/catalogue/search.pl" method="get"> > <table> > <tr> >@@ -539,32 +539,32 @@ > > [% IF Koha.Preference('intranetbookbag') == 1 %] > [% IF ( SEARCH_RESULT.incart ) %] >- | <a class="addtocart" id="cart[% SEARCH_RESULT.biblionumber | html %]" href="#">In your cart</a> <a class="cartRemove" id="cartR[% SEARCH_RESULT.biblionumber | html %]" href="#">(remove)</a> >+ | <a id="lientype" class="addtocart" id="cart[% SEARCH_RESULT.biblionumber | html %]" href="#">In your cart</a> <a class="cartRemove lientype" id="cartR[% SEARCH_RESULT.biblionumber | html %]" href="#">(remove)</a> > [% ELSE %] >- | <a class="addtocart" id="cart[% SEARCH_RESULT.biblionumber | html %]" href="#">Add to cart</a> <a style="display:none;" class="cartRemove" id="cartR[% SEARCH_RESULT.biblionumber | html %]" href="#">(remove)</a> >+ | <a id="lientype" class="addtocart" id="cart[% SEARCH_RESULT.biblionumber | html %]" href="#">Add to cart</a> <a style="display:none;" class="cartRemove" id="cartR[% SEARCH_RESULT.biblionumber | html %]" href="#">(remove)</a> > [% END %] > [% END # / IF intranetbookbag %] > > [% IF Koha.Preference('ArticleRequests') %] >- | <a id="requst_article_[% SEARCH_RESULT.biblionumber | html %]" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Request article</a> >+ | <a class="lientype" id="requst_article_[% SEARCH_RESULT.biblionumber | html %]" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Request article</a> > [% END %] > > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] >- | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit record</a> >+ | <a id="lientype" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit record</a> > [% END %] > [% IF ( CAN_user_editcatalogue_edit_items ) %] >- | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit items</a> >+ | <a id="lientype" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit items</a> > [% END %] > > [% IF ( CAN_user_acquisition_order_manage ) %] > [% IF ( searchtoorder_basketno && searchtoorder_vendorid ) %] >- | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&basketno=[% searchtoorder_basketno | uri %]&biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Add order</a> >+ | <a id="lientype" href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&basketno=[% searchtoorder_basketno | uri %]&biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Add order</a> > [% END %] > [% END %] > > [% IF ( OPACBaseURL ) %] > <span class="view-in-opac"> >- | <a href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]" target="_blank">OPAC view</a> >+ | <a id="lientype" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]" target="_blank">OPAC view</a> > </span> > [% END %] > </p> <!-- /.holds --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt >index 28a2f9c384..1b858ba4f5 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 >@@ -45,7 +45,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Club enrollments for <em>[% club.name | html %]</em></h1> >+ <h2>Club enrollments for <em>[% club.name | html %]</em></h2> > > <table id="enrollments-table"> > <thead> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt >index 20f1f7a0d2..ca023e5428 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 >@@ -57,17 +57,17 @@ > <input type="hidden" name="id" value="[% club.id | html %]" /> > <input type="hidden" name="club_template_id" value="[% club_template.id | html %]" /> > >- <fieldset class="rows"> >- >- <legend> >- <h1> >+ <h2> > [% IF club %] > Modify club <em>[% club.name | html %]</em> > [% ELSE %] > Create a new <em>[% club_template.name | html %]</em> club > [% END %] >- </h1> >- </legend> >+ </h2> >+ >+ <fieldset class="rows"> >+ >+ > > <ol> > <li> >@@ -145,7 +145,7 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a href="clubs.pl" class="cancel">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >index a147a08dcd..87fb31a9ad 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >@@ -43,7 +43,31 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Patron clubs</h1> >+ <div id="toolbar" class="btn-toolbar"> >+ [% IF CAN_user_clubs_edit_templates %] >+ <div class="btn-group"> >+ <a class="btn btn-default pat" href="templates-add-modify.pl"><i class="fa fa-plus"></i> New club template</a> >+ </div> >+ [% END %] >+ >+ [% IF CAN_user_clubs_edit_clubs %] >+ <div class="btn-group"> >+ [% IF club_templates.count %] >+ <button class="btn btn-default dropdown-toggle pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button> >+ [% ELSE %] >+ <button disabled="disabled" class="btn btn-default dropdown-toggle pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button> >+ [% END %] >+ <ul class="dropdown-menu"> >+ [% FOREACH t IN club_templates %] >+ <li><a href="/cgi-bin/koha/clubs/clubs-add-modify.pl?club_template_id=[% t.id | uri %]">[% t.name | html %]</a></li> >+ [% END %] >+ </ul> >+ </div> >+ [% END %] >+ </div> >+ >+ >+ <h2>Patron clubs</h2> > > [% IF club_template %] > <div class="dialog message"> >@@ -63,16 +87,9 @@ > </div> > [% END %] > >+ <fieldset id="rows"> > <h3>Club templates</h3> > >- [% IF CAN_user_clubs_edit_templates %] >- <div class="btn-toolbar"> >- <div class="btn-group"> >- <a class="btn btn-default" href="templates-add-modify.pl"><i class="fa fa-plus"></i> New club template</a> >- </div> >- </div> >- [% END %] >- > [% IF club_templates.count %] > <table id="club-templates-table"> > <thead> >@@ -107,10 +124,10 @@ > <td>[% Branches.GetName( t.branchcode ) | html %]</td> > <td class="actions"> > [% IF CAN_user_clubs_edit_templates %] >- <a class="btn btn-xs btn-default" style="white-space:nowrap" href="/cgi-bin/koha/clubs/templates-add-modify.pl?id=[% t.id | html %]"> >+ <a id="lientype" class="btn btn-xs btn-default" style="white-space:nowrap" href="/cgi-bin/koha/clubs/templates-add-modify.pl?id=[% t.id | html %]"> > <i class="fa fa-pencil"></i> Edit > </a> >- <a class="btn btn-xs btn-default delete_template" href="#" data-id="[% t.id | html %]" data-name="[% t.name | html %]"> >+ <a id="lientype" class="btn btn-xs btn-default delete_template" href="#" data-id="[% t.id | html %]" data-name="[% t.name | html %]"> > <i class="fa fa-trash"></i> Delete > </a> > [% END %] >@@ -122,26 +139,11 @@ > [% ELSE %] > <div class="dialog message">No club templates defined.</div> > [% END %] >+ </fieldset> > >+ <fieldset id="rows"> > <h3>Clubs</h3> > >- [% IF CAN_user_clubs_edit_clubs %] >- <div class="btn-toolbar"> >- <div class="btn-group"> >- [% IF club_templates.count %] >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button> >- [% ELSE %] >- <button disabled="disabled" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button> >- [% END %] >- <ul class="dropdown-menu"> >- [% FOREACH t IN club_templates %] >- <li><a href="/cgi-bin/koha/clubs/clubs-add-modify.pl?club_template_id=[% t.id | uri %]">[% t.name | html %]</a></li> >- [% END %] >- </ul> >- </div> >- </div> >- [% END %] >- > [% IF clubs.count %] > [% INCLUDE 'clubs-table.inc' %] > [% ELSE %] >@@ -151,6 +153,7 @@ > <div class="dialog message">No clubs defined. A club template must be defined before a club can be defined.</div> > [% END %] > [% END %] >+ </fieldset> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt >index ddfe228327..a91d71031a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt >@@ -21,7 +21,7 @@ > <td>[% e.date_enrolled | $KohaDates %]</td> > [% IF CAN_user_clubs_enroll %] > <td> >- <button class="btn btn-xs btn-default" onclick="cancelEnrollment( [% e.id | html %] )"> >+ <button id="lientype" class="btn btn-xs btn-default" onclick="cancelEnrollment( [% e.id | html %] )"> > <i class="fa fa-remove"></i> Cancel enrollment > </button> > </td> >@@ -52,7 +52,7 @@ > <td>[% c.description | html %]</td> > [% IF CAN_user_clubs_enroll %] > <td class="action"> >- <button class="btn btn-xs btn-default" onclick="loadEnrollmentForm([% c.id | html %])"> >+ <button class="btn btn-xs btn-default" id="lientype" onclick="loadEnrollmentForm([% c.id | html %])"> > <i class="fa fa-plus"></i> Enroll > </button> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt >index 13f209ba46..682e252a13 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt >@@ -1,9 +1,9 @@ > [% USE AuthorisedValues %] > [% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %] > >-<h1> >+<h2> > Enroll in <em>[% club.name | html %]</em> >-</h1> >+</h2> > > <div class="container"> > <form id="patron-enrollment-form"> >@@ -28,7 +28,7 @@ > [% END %] > > <li> >- <a href="#" class="btn btn-sm btn-default" onclick="addEnrollment(); return false;">Finish enrollment</a> >+ <a href="#" class="btn btn-sm btn-default principal" onclick="addEnrollment(); return false;">Finish enrollment</a> > <a class="cancel" href="#" onclick="showClubs(); return false;">Cancel</a> > </li> > </ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt >index b479bb2728..4f423a9687 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 >@@ -60,13 +60,13 @@ > <form method="post" class="validated"> > <input type="hidden" name="id" value="[% club_template.id | html %]" /> > >- <h1> >+ <h2> > [% IF club_template %] > Modify club template <em>[% club_template.name | html %]</em> > [% ELSE %] > Create a new club template > [% END %] >- </h1> >+ </h2> > > > <fieldset class="rows"> >@@ -115,7 +115,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Club fields:</legend> >+ <h3>Club fields</h3> > <p><span class="hint">These fields will be used in the creation of clubs based on this template</span></p> > <div id="club-template-fields"> > [% FOREACH f IN club_template.club_template_fields %] >@@ -149,14 +149,14 @@ > [% END %] > </div> > <fieldset class="action"> >- <a href="#" class="add_club_field"> >+ <a id="lientype" href="#" class="add_club_field"> > <i class="fa fa-plus"></i> Add new field > </a> > </fieldset> > </fieldset> > > <fieldset class="rows"> >- <legend>Enrollment fields</legend> >+ <h3>Enrollment fields</h3> > <p><span class="hint">These fields will be used when enrolling a patron in a club based on this template</span></p> > <div id="club-template-enrollment-fields"> > [% FOREACH f IN club_template.club_template_enrollment_fields %] >@@ -194,7 +194,7 @@ > [% END %] > </div> > <fieldset class="action"> >- <a href="#" class="add_enrollment_field"> >+ <a id="lientype" href="#" class="add_enrollment_field"> > <i class="fa fa-plus"></i> Add new field > </a> > </fieldset> >@@ -202,7 +202,7 @@ > > <fieldset class="action"> > <input type="hidden" name="id" value="[% club_template.id | html %]" /> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > <a href="clubs.pl" class="cancel">Cancel</a> > </fieldset> > </form> >@@ -234,7 +234,7 @@ > </select> > </li> > </ol> >- <fieldset class="action"><a href="#" class="delete_club_field"><i class="fa fa-trash"></i> Delete field</a></fieldset> >+ <fieldset class="action"><a id="lientype" href="#" class="delete_club_field"><i class="fa fa-trash"></i> Delete field</a></fieldset> > <hr/> > </div> > >@@ -261,7 +261,7 @@ > </select> > </li> > </ol> >- <fieldset class="action"><a href="#" class="delete_enrollment_field"><i class="fa fa-trash"></i> Delete field</a></fieldset> >+ <fieldset class="action"><a id="lientype" href="#" class="delete_enrollment_field"><i class="fa fa-trash"></i> Delete field</a></fieldset> > </div> > > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >index f020565e43..cf4d1ba2b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %]<title>Barcode image generator › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("css/humanmsg.css") | $raw %] >@@ -40,8 +43,7 @@ > </head> > > <body id="labels_spinelabel-home" class="tools labels"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'cat-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -109,7 +111,7 @@ > </li> > </ol> > <fieldset class="action"> >- <input type="submit" value="Show barcode" /> >+ <input type="submit" class="principal" value="Show barcode" /> > </fieldset> > </div> > <div class="col-sm-6"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt >index 9440e482c1..55d15c5232 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt >@@ -3,13 +3,13 @@ > <body id="labels_label-bib-search" class="tools labels"> > <div id="main-compact"> > >-<h1>Search</h1> >+<h2>Search</h2> > > <form name="f" method="post"> > <input type="hidden" name="op" value="do_search" /> > <input type="hidden" name="type" value="intranet" /> > <div class="details"> >- <h2>Search on</h2> >+ <h3>Search on</h3> > <p> > <label for="category">Name or ISSN: </label> > [% category | html %] >@@ -25,7 +25,7 @@ > <input type="hidden" id="index" name="index" value="[% index | html %]" /> > </p> > <p> >- <input type="submit" value="Start search" class="submit" /> >+ <input type="submit" value="Start search" class="submit principal" /> > </p> > </div> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >index 96bf2f1e27..0d57904875 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 >@@ -52,13 +52,13 @@ > [% INCLUDE 'labels-toolbar.inc' %] > > [% IF ( profile_id ) %] >- <h1>Edit printer profile [% profile_id | html %]</h1> >+ <h2>Edit printer profile [% profile_id | html %]</h2> > [% ELSE %] >- <h1>New printer profile</h1> >+ <h2>New printer profile</h2> > [% END%] > > <form name="input" action="/cgi-bin/koha/labels/label-edit-profile.pl" method="get"> >- <fieldset class="rows"><legend>Profile settings</legend> >+ <fieldset class="rows"><h3>Profile settings</h3> > <ol> > <li> > [% IF ( profile_id ) %] >@@ -111,7 +111,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 %]" /> >@@ -122,7 +122,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 %]" /> >@@ -131,9 +131,8 @@ > <label for="creep_vert">Vertical: </label><input type="text" size="4" name="creep_vert" id="creep_vert" value="[% creep_vert | html %]" /> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="submit" value="Save" /> >+ >+ <input type="submit" value="Save" class="princip"/> > <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile" class="cancel">Cancel</a> > <input type="hidden" name="op" value="save" /> > <input type="hidden" name="profile_id" value="[% profile_id | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >index ce08d1acbd..c96750fc07 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 >@@ -40,7 +40,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > [% INCLUDE 'labels-toolbar.inc' %] >- <h1>Print barcode range</h1> >+ <h2>Print barcode range</h2> > <form name="add_by_number" action="/cgi-bin/koha/labels/label-edit-batch.pl" method="post"> > <input type="hidden" name="op" value="add" /> > <fieldset class="rows"> >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 afa4140905..ecf8107b1d 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 >@@ -50,9 +50,9 @@ > [% INCLUDE 'labels-toolbar.inc' %] > > [% IF ( template_id ) %] >- <h1>Edit label template [% template_id | html %]</h1> >+ <h2>Edit label template [% template_id | html %]</h2> > [% ELSE %] >- <h1>New label template</h1> >+ <h2>New label template</h2> > [% END %] > > <form name="input" action="/cgi-bin/koha/labels/label-edit-template.pl" method="get"> >@@ -169,7 +169,7 @@ > [% END %] > [% IF ( profile_list.size == 1 ) %] > <br> >- <a href="/cgi-bin/koha/labels/label-edit-profile.pl?op=new">Make a new printer profile.</a> >+ <a href="/cgi-bin/koha/labels/label-edit-profile.pl?op=new" id="lientype">Make a new printer profile.</a> > [% END %] > </li> > </ol> >@@ -177,7 +177,7 @@ > </div> > </div> > <fieldset class="action"> >- <input type="submit" class="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Cancel</a> >+ <input type="submit" class="submit principal" value="Save" /><a class="cancel" href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Cancel</a> > <input type="hidden" name="op" value="save" /> > [% IF ( template_id ) %] > <input type="hidden" name="template_id" value="[% template_id | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index b58e40fe4f..f71da3b54a 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 >@@ -56,7 +56,7 @@ > <main> > > [% INCLUDE 'labels-toolbar.inc' %] >- <h1>Manage labels</h1> >+ <h2>Manage labels</h2> > > [% IF ( error ) %] > <div class="dialog alert"> >@@ -68,13 +68,13 @@ > [% IF ( table_loop ) %] > <form name="layouts" action="/cgi-bin/koha/label-manage.pl?label_element=[% label_element | html %]"> > [% IF ( label_element == 'layout' ) %] >- <h2>Currently available layouts</h2> >+ <h3>Currently available layouts</h3> > [% ELSIF ( label_element == 'template' ) %] >- <h2>Currently available templates</h2> >+ <h3>Currently available templates</h3> > [% ELSIF ( label_element == 'profile' ) %] >- <h2>Currently available profiles</h2> >+ <h3>Currently available profiles</h3> > [% ELSIF ( label_element == 'batch' ) %] >- <h2>Currently available batches</h2> >+ <h3>Currently available batches</h3> > [% END %] > <table id="labels-table"> > [% FOREACH table_loo IN table_loop %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >index 7349d8fb06..040abcf7c7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >@@ -8,7 +8,7 @@ > > <body id="labels_label-print" class="tools labels"> > <div class="main container-fluid"> >- <h1>Label printing/exporting</h1> >+ <h2>Label printing/exporting</h2> > [% IF ( batches ) %] > <form> > <h3>Click on the following links to download the exported batch(es).</h3> >@@ -21,32 +21,32 @@ > [% FOREACH batche IN batches %] > <fieldset> > [% IF ( batche.label_ids ) %] >- <legend>[% IF ( batche.label_count == 1 ) %][% batche.label_count | html %] single label[% ELSE %][% batche.label_count | html %] single labels[% END %]</legend> >+ <h3>[% IF ( batche.label_count == 1 ) %][% batche.label_count | html %] single label[% ELSE %][% batche.label_count | html %] single labels[% END %]</h3> > <a class="document pdf" href="/cgi-bin/koha/labels/label-create-pdf.pl?batch_id=0&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %]&from=[% batche.from | html %]&to=[% batche.to | html %]&barcode_length=[% batche.barcode_length| html %]">Download as PDF</a> > >- <p><a class="document csv" href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.label_ids | html %]">Download as CSV</a></p> >+ <p><a id="lientype" class="document csv" href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.label_ids | html %]">Download as CSV</a></p> > >- <p><a class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.label_ids | html %]">Download as XML</a></p> >+ <p><a id="lientype" class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.label_ids | html %]">Download as XML</a></p> > [% ELSIF ( batche.item_numbers ) %] >- <legend>[% IF ( batche.label_count == 1 ) %][% batche.label_count | html %] single label[% ELSE %][% batche.label_count | html %] single labels[% END %]</legend> >- <p><a class="document pdf" href="/cgi-bin/koha/labels/[% batche.create_script | html %]?template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %][% batche.item_numbers | html %]">Download as PDF</a></p> >+ <h3>[% IF ( batche.label_count == 1 ) %][% batche.label_count | html %] single label[% ELSE %][% batche.label_count | html %] single labels[% END %]</h3> >+ <p><a id="lientype" class="document pdf" href="/cgi-bin/koha/labels/[% batche.create_script | html %]?template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %][% batche.item_numbers | html %]">Download as PDF</a></p> > >- <p><a class="document csv" href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.item_numbers | html %]">Download as CSV</a></p> >+ <p><a id="lientype" class="document csv" href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.item_numbers | html %]">Download as CSV</a></p> > >- <p><a class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.item_numbers | html %]">Download as XML</a></p> >+ <p><a id="lientype" class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.item_numbers | html %]">Download as XML</a></p> > [% ELSIF ( batche.batch_id) %] >- <legend>Label batch number [% batche.batch_id | html %]</legend> >- <p><a class="document pdf" href="/cgi-bin/koha/labels/label-create-pdf.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %]">Download as PDF</a> >+ <h3>Label batch number [% batche.batch_id | html %]</h3> >+ <p><a id="lientype" class="document pdf" href="/cgi-bin/koha/labels/label-create-pdf.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %]">Download as PDF</a> > </p> > <p> >- <a class="document csv" href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]">Download as CSV</a> >+ <a id="lientype" class="document csv" href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]">Download as CSV</a> > </p> > <p> >- <a class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]">Download as XML</a></p> >+ <a id="lientype" class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]">Download as XML</a></p> > [% ELSIF (batche.from && batche.to) %] >- <legend>Barcodes from [% batche.from | html %] to [% batche.to | html %]</legend> >+ <h3>Barcodes from [% batche.from | html %] to [% batche.to | html %]</h3> > <p> >- <a class="document pdf" href="/cgi-bin/koha/labels/label-create-pdf.pl?batch_id=0&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %]&from=[% batche.from | html %]&to=[% batche.to | html %]&barcode_length=[% batche.barcode_length | html %]">Download as PDF</a> >+ <a id="lientype" class="document pdf" href="/cgi-bin/koha/labels/label-create-pdf.pl?batch_id=0&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %]&from=[% batche.from | html %]&to=[% batche.to | html %]&barcode_length=[% batche.barcode_length | html %]">Download as PDF</a> > </p> > [% END %] > </fieldset> >@@ -105,7 +105,7 @@ > </ol> > </fieldset> > <fieldset class="action"> >- <input type="submit" value="Export" /> >+ <input type="submit" class="principal" value="Export" /> > <a href="#" class="cancel gb-close">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >index 3e31ec279b..4df9bba6ab 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >@@ -29,7 +29,7 @@ > > <body id="labels_result" class="tools labels"> > <div class="main container-fluid"> >- <h1>Search results</h1> >+ <h2>Search results</h2> > <div class="results"> > [% PROCESS pagination %] > [% IF ( results ) %] >@@ -83,7 +83,7 @@ > <td><input type="checkbox" name="action" value="[% text_field.field_value | html %]"></td> > [% ELSIF ( text_field.link_field ) %] > <td> >- <a class="btn btn-default btn-xs select_item" data-item-number="[% text_field.field_value | html %]" data-batch-id="[% batch_id | html %]" data-field-type="[% text_field.type | html %]"><i class="fa fa-plus"></i> Add</a> >+ <a id="lientype" class="btn btn-default btn-xs select_item" data-item-number="[% text_field.field_value | html %]" data-batch-id="[% batch_id | html %]" data-field-type="[% text_field.type | html %]"><i class="fa fa-plus"></i> Add</a> > </td> > [% ELSE %] > <td>[% text_field.field_value | html %]</td> >@@ -99,7 +99,7 @@ > </form> > </div> > [% PROCESS pagination %] >- <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div> >+ <div id="closewindow"><a href="#" class="btn btn-default btn-default close cancel">Close</a></div> > </div> > > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >index 8cf3a91bb5..4909f32e64 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >@@ -7,11 +7,11 @@ > <body id="labels_search" class="tools labels"> > <div class="main container-fluid"> > >-<h1>Search for items >+<h2>Search for items > [% IF ( batch_id ) %] > to add to Batch [% batch_id | html %] > [% END %] >-</h1> >+</h2> > > <form name="f" method="post" action="/cgi-bin/koha/labels/label-item-search.pl"> > <input type="hidden" name="op" value="do_search" /> >@@ -71,7 +71,7 @@ to add to Batch [% batch_id | html %] > </fieldset> > > [% IF ( sort_by_loop ) %] >-<fieldset><legend>Sort by: </legend> >+<fieldset><h3>Sort by: </h3> > <p><select id="sort_by" name="sort_by"> > <option value="">Field-weighted, relevance ranked</option> > [% FOREACH sort_by_loo IN sort_by_loop %] >@@ -101,7 +101,7 @@ to add to Batch [% batch_id | html %] > </ol> > </fieldset> > >-<fieldset class="action"><input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset> >+<fieldset class="action"><input type="submit" value="Search" class="submit principal" /> <a class="cancel close" href="#">Cancel</a></fieldset> > </form> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt >index 67ff57b65f..1e5eb45df1 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 >@@ -38,9 +38,9 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Quick spine label creator</h1> > <form action="/cgi-bin/koha/labels/spinelabel-print.pl" method="post" id="spinelabelprint"> > <fieldset class="brief"> >+<h3>Quick spine label creator</h3> > <ol> > <li><label for="barcode">Barcode: </label> > <input type="text" name="barcode" id="barcode" class="focus" required="required" /> >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 e45ae0314a..2ce1f157bb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -9,17 +9,13 @@ > [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% PROCESS 'patronfields.inc' %] >-[% SET libraries = Branches.all %] >-[% SET categories = Categories.all.unblessed %] >-[% SET columns = ['cardnumber', 'name-address', 'dateofbirth', 'branch', 'category', 'dateexpiry', 'checkouts', 'account_balance', 'borrowernotes', 'action'] %] >-[% PROCESS 'patron-search.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Patrons[% IF ( searching ) %] › Search results[% END %] › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="pat_member"> >-[% INCLUDE 'header.inc' form= formulaire %] >+[% INCLUDE 'header.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -43,14 +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> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <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"> >@@ -59,7 +53,7 @@ > <main> > > [% IF CAN_user_tools_manage_patron_lists %] >- <div id="patron_list_dialog" class="dialog message"> >+ <div id="patron_list_dialog" class="dialog message lientype"> > Added <span class="patrons-length"></span> patrons to <a></a>. > </div> > [% END %] >@@ -67,6 +61,13 @@ > [% INCLUDE 'patron-toolbar.inc' %] > [% INCLUDE 'noadd-warnings.inc' %] > >+ <div class="browse"> >+ Browse by last name: >+ [% FOREACH letter IN alphabet.split(' ') %] >+ <a href="#" class="filterByLetter">[% letter | html %]</a> >+ [% END %] >+ </div> >+ > [% IF CAN_user_borrowers_edit_borrowers && pending_borrower_modifications %] > <div class="pending-info" id="patron_updates_pending"> > <a href="/cgi-bin/koha/members/members-update.pl">Patrons requesting modifications</a>: >@@ -76,46 +77,60 @@ > > <div id="searchresults"> > <h3>Patrons found for: <span id="searchpattern">[% IF searchmember %] for '[% searchmember | html %]'[% END %]</span></h3> >- >- > [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %] >- <div class="searchheader fh-fixedHeader" id="searchheader" style="display:none;"> >+ <div class="searchheader fh-fixedHeader" id="searchheader"> > <div> > <a href="#" class="btn btn-link" id="select_all"><i class="fa fa-check"></i> Select all</a> >+ | > <a href="#" class="btn btn-link" id="clear_all"><i class="fa fa-remove"></i> Clear all</a> > [% IF CAN_user_tools_manage_patron_lists %] > > [% END %] > > [% IF CAN_user_tools_manage_patron_lists %] >- Add selected patrons to: >- <select name="searchfieldstype" id="searchfieldstype_filter"> >- <option selected="selected" value=""> [New list] </option> >- [% IF patron_lists %] >- [% FOREACH pl IN patron_lists %] >- <option>[% pl.name | html %]</option> >+ <div id="patronlist-dropdown" class="btn-group"> >+ <button id="patronlist-menu" type="button" class="btn btn-sm btn-default dropdown-toggle patron-edits disabled" disabled="disabled" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> >+ Add to patron list <span class="caret"></span> >+ </button> >+ <ul class="dropdown-menu"> >+ [% IF patron_lists %] >+ [% FOREACH pl IN patron_lists %] >+ <li><a href="#" class="patron-list-add" data-listid="[% pl.patron_list_id | html %]">[% pl.name | html %]</a></li> >+ [% END %] > [% END %] >- [% END %] >- </select> >- >- <input type="text" name="new_list_name" id="mini_inp"/> >- >- <button type="submit" id="add_to_patron_list_submit" class="btn btn-link">Save</button> >- >- >+ <li role="separator" class="divider"></li> >+ <li><a id="lientype" href="#" class="patron-list-add" data-listid="new">New list</a></li> >+ </ul> >+ </div> > [% END %] > > [% IF CAN_user_borrowers_edit_borrowers %] >- | <button id="merge-patrons" class="btn btn-sm btn-default disabled" disabled="disabled" type="submit"><i class="fa fa-compress" aria-hidden="true"></i> Merge selected patrons</button> >+ <button id="merge-patrons" class="btn btn-sm btn-default disabled" disabled="disabled" type="submit"><i class="fa fa-compress" aria-hidden="true"></i> Merge selected patrons</button> > [% END %] > </div> > </div> > [% END %] > >- [% IF CAN_user_borrowers_edit_borrowers || CAN_user_tools_manage_patron_lists %] >- [% columns.unshift('checkbox') | html %] >- [% END %] >- [% PROCESS patron_search_table table_id => 'memberresultst' columns => columns %] >+ <table id="memberresultst"> >+ <thead> >+ <tr> >+ [% IF CAN_user_borrowers_edit_borrowers || CAN_user_tools_manage_patron_lists %] >+ <th> </th> >+ [% END %] >+ <th>Card</th> >+ <th>Name</th> >+ <th>Date of birth</th> >+ <th>Category</th> >+ <th>Library</th> >+ <th>Expires on</th> >+ <th>OD/Checkouts</th> >+ <th>Fines</th> >+ <th>Circ note</th> >+ <th> </th> >+ </tr> >+ </thead> >+ <tbody></tbody> >+ </table> > </div> > > </main> >@@ -123,93 +138,122 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% 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="" /> >- <fieldset class="brief"> >- <h4>Search patrons</h4> >- >- <fieldset> >- <ol> >- <li> >- <p>Search: >- <input type="text" id="searchmember_filter" value="[% searchmember | html %]"/></p> >- </li> >- <li> >- <p>Search field: >- <select name="searchfieldstype" id="searchfieldstype_filter"> >- [% pref_fields = Koha.Preference('DefaultPatronSearchFields').split(',') %] >- [% default_fields = [ 'standard', 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %] >- [% search_options = default_fields.merge(pref_fields).unique %] >- [% FOREACH s_o IN search_options %] >- [% display_name = PROCESS patron_fields name=s_o %] >- [% NEXT IF !display_name %] >- [% IF searchfieldstype == s_o %] >- <option selected="selected" value=[% s_o | html %]>[% display_name | $raw %]</option> >- [% ELSE %] >- <option value=[% s_o | html %]>[% display_name | $raw %]</option> >- [% END %] >- [% END %] >- </select></p> >- </li> >- <li> >- <p>Search type: >- <select name="searchtype" id="searchtype_filter"> >- [% IF searchtype == "start_with" %] >- <option value='start_with' selected="selected">Starts with</option> >- <option value="contain">Contains</option> >- [% ELSE %] >- <option value='start_with'>Starts with</option> >- <option value="contain" selected="selected">Contains</option> >- [% END %] >- </select></p> >- </li> >- <li> >- <p>Patron category: >- [% SET categories = Categories.all() %] >- <select id="categorycode_filter"> >- <option value="">Any</option> >- [% FOREACH cat IN categories %] >- [% IF cat.categorycode == categorycode_filter %] >- <option selected="selected" value="[% cat.categorycode | html %]">[% cat.description | html %]</option> >- [% ELSE %] >- <option value="[% cat.categorycode | html %]">[% cat.description | html %]</option> >- >- [% END %] >- [% END %] >- </select></p> >- </li> >- <li> >- <p>Library: >- [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %] >- <select id="branchcode_filter"> >- [% IF branches.size != 1 %] >- <option value="">Any</option> >- [% END %] >- [% PROCESS options_for_libraries libraries => branches %] >- </select></p> >- </li> >- </ol> >- <ol> >- <button class="submit" id="principal" type="submit">Search</button> >- <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a> >- </ol> >- </fieldset> >- </fieldset> >- </form> >+ <div id="filters"> >+ <form method="get" id="searchform"> >+ <input type="hidden" id="firstletter_filter" value="" /> >+ <fieldset class="brief"> >+ <h3>Search patrons</h3> >+ <ol> >+ <li> >+ <p for="searchmember_filter">Search for: >+ <input type="text" id="searchmember_filter" value="[% searchmember | html %]"/> >+ </p></li> >+ <li> >+ <p for="searchfieldstype_filter">Search field: >+ <select name="searchfieldstype" id="searchfieldstype_filter"> >+ [% pref_fields = Koha.Preference('DefaultPatronSearchFields').split(',') %] >+ [% default_fields = [ 'standard', 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %] >+ [% search_options = default_fields.merge(pref_fields).unique %] >+ [% FOREACH s_o IN search_options %] >+ [% display_name = PROCESS patron_fields name=s_o %] >+ [% NEXT IF !display_name %] >+ [% IF searchfieldstype == s_o %] >+ <option selected="selected" value=[% s_o | html %]>[% display_name | $raw %]</option> >+ [% ELSE %] >+ <option value=[% s_o | html %]>[% display_name | $raw %]</option> >+ [% END %] >+ [% END %] >+ </select></p> >+ </li> >+ <li> >+ <p for="searchtype_filter">Search type: >+ <select name="searchtype" id="searchtype_filter"> >+ [% IF searchtype == "start_with" %] >+ <option value='start_with' selected="selected">Starts with</option> >+ <option value="contain">Contains</option> >+ [% ELSE %] >+ <option value='start_with'>Starts with</option> >+ <option value="contain" selected="selected">Contains</option> >+ [% END %] >+ </select></p> >+ </li> >+ <li> >+ <p for="categorycode_filter">Patron category: >+ [% SET categories = Categories.all() %] >+ <select id="categorycode_filter"> >+ <option value="">Any</option> >+ [% FOREACH cat IN categories %] >+ [% IF cat.categorycode == categorycode_filter %] >+ <option selected="selected" value="[% cat.categorycode | html %]">[% cat.description | html %]</option> >+ [% ELSE %] >+ <option value="[% cat.categorycode | html %]">[% cat.description | html %]</option> >+ >+ [% END %] >+ [% END %] >+ </select></p> >+ </li> >+ <li> >+ <p for="branchcode_filter">Library: >+ [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %] >+ <select id="branchcode_filter"> >+ [% IF branches.size != 1 %] >+ <option value="">Any</option> >+ [% END %] >+ [% PROCESS options_for_libraries libraries => branches %] >+ </select></p> >+ </li> >+ </ol> >+ <fieldset class="action"> >+ <input type="submit" class="principal" value="Search" /> >+ <a href="/cgi-bin/koha/members/members-home.pl" class="cancel">Clear</a> >+ </fieldset> >+ </fieldset> >+ </form> > </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > >+ <!-- New Patron List Modal --> >+ <div class="modal" id="new-patron-list" tabindex="-1" role="dialog" aria-labelledby="new-patron-listLabel"> >+ <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="new-patron-listLabel">Add patrons to a new patron list</h4> >+ </div> >+ <form id="new-patron-list_form"> >+ <div class="modal-body"> >+ <div class="form-group"> >+ <label for="new_patron_list" class="required">Patron list name: </label> >+ <input class="form-control required" type="text" name="new_patron_list" id="new_patron_list" required="required" /> >+ <input type="hidden" name="add_to_patron_list" id="add_to_patron_list" /> >+ <span class="required">Required</span> >+ </div> >+ </div> <!-- /.modal-body --> >+ <div class="modal-footer"> >+ <button type="submit" id="add_to_patron_list_submit" class="btn btn-default approve">Submit</button> >+ <button type="button" class="btn btn-default deny" data-dismiss="modal">Cancel</button> >+ </div> <!-- /.modal-footer --> >+ </form> <!-- /#new-patron-list_form --> >+ </div> <!-- /.modal-content --> >+ </div> <!-- /.modal-dialog --> >+ </div> <!-- /#new-patron-list --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'str/members-menu.inc' %] >+ [% Asset.js("lib/hc-sticky.js") | $raw %] > [% Asset.js("js/members-menu.js") | $raw %] > <script> >+ var singleBranchMode = '[% singleBranchMode | html %]'; >+ var dtMemberResults; >+ var search = 1; >+ /* popstate event triggered by forward and back button. Need to refresh search */ >+ window.addEventListener('popstate', (event) => { >+ getSearchByLocation( false ); >+ }); > > $(document).ready(function() { > $('#merge-patrons').prop('disabled', true); >@@ -279,6 +323,10 @@ > patronListAdd(); > }); > >+ $(".filterByLetter").on("click",function(e){ >+ e.preventDefault(); >+ filterByFirstLetterSurname( $(this).text(), true ); >+ }); > $("#select_all").on("click",function(e){ > e.preventDefault(); > $(".selection").prop("checked", true).change(); >@@ -287,6 +335,11 @@ > e.preventDefault(); > $(".selection").prop("checked", false).change(); > }); >+ $("#clear_search").on("click",function(e){ >+ e.preventDefault(); >+ clearFilters(true); >+ }); >+ $("#searchform").on("submit", filter); > > [% IF searchmember %] > $("#searchmember_filter").val("[% searchmember | html %]"); >@@ -304,9 +357,161 @@ > $("#branchcode_filter").val("[% branchcode_filter | html %]"); > [% END %] > >- $("#searchheader").hide(); >- $("#patron_search_form").on('submit', function(){$("#searchheader").show();}); >- $("#clear_search").on("click",function(e){$("#searchheader").hide();}); >+ [% IF view != "show_results" %] >+ search = 0; >+ [% ELSE %] >+ $("#searchresults").show(); >+ [% END %] >+ >+ // Build the aLengthMenu >+ var aLengthMenu = [ >+ [% PatronsPerPage | html %], 10, 20, 50, 100, -1 >+ ]; >+ jQuery.unique(aLengthMenu); >+ aLengthMenu.sort(function( a, b ){ >+ // Put "All" at the end >+ if ( a == -1 ) { >+ return 1; >+ } else if ( b == -1 ) { >+ return -1; >+ } >+ return parseInt(a) < parseInt(b) ? -1 : 1;} >+ ); >+ var aLengthMenuLabel = []; >+ $(aLengthMenu).each(function(){ >+ if ( this == -1 ) { >+ // Label for -1 is "All" >+ aLengthMenuLabel.push(_("All")); >+ } else { >+ aLengthMenuLabel.push(this); >+ } >+ }); >+ >+ // Apply DataTables on the results table >+ var columns_settings = [% TablesSettings.GetColumns( 'members', 'member', 'memberresultst', 'json' ) | $raw %]; >+ [% UNLESS CAN_user_borrowers_edit_borrowers OR CAN_user_tools_manage_patron_lists %] >+ [%# Remove the first column if we do not display the checkbox %] >+ columns_settings.splice(0, 1); >+ [% END %] >+ dtMemberResults = KohaTable("memberresultst", { >+ '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': 'searchfieldstype', >+ 'value': $("#searchfieldstype_filter").val() >+ },{ >+ 'name': 'searchtype', >+ 'value': $("#searchtype_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': 'members/tables/members_results.tt', >+ }); >+ $.ajax({ >+ 'dataType': 'json', >+ 'type': 'POST', >+ 'url': sSource, >+ 'data': aoData, >+ 'success': function(json){ >+ // redirect if there is only 1 result. >+ if ( json.aaData.length == 1 ) { >+ var borrowernumber = json.aaData[0].borrowernumber; >+ /* Overwrite history state of firstletter search since only one result was returned; This prevents a loop upon clicking back */ >+ history.replaceState( {}, null, window.location.href.split("?" )[0]); >+ [% IF circsearch == 1 %] >+ [% SET redirect = "circ/circulation" %] >+ [% ELSE %] >+ [% SET redirect = "members/moremember" %] >+ [% END %] >+ document.location.href="/cgi-bin/koha/[% redirect | $raw %].pl?borrowernumber="+borrowernumber; >+ return false; >+ } >+ fnCallback(json); >+ } >+ }); >+ }, >+ 'aoColumns':[ >+ [% IF CAN_user_borrowers_edit_borrowers || CAN_user_tools_manage_patron_lists %] >+ { 'mDataProp': 'dt_borrowernumber', 'bSortable': false }, >+ [% END %] >+ { 'mDataProp': 'dt_cardnumber' }, >+ { 'mDataProp': 'dt_name' }, >+ { 'mDataProp': 'dt_dateofbirth' }, >+ { 'mDataProp': 'dt_category' }, >+ { >+ 'mDataProp': function ( oObj ) { >+ if( !singleBranchMode && oObj.dt_branch == "[% Branches.GetLoggedInBranchname | html %]" ){ >+ return "<span class=\"currentlibrary\">" + oObj.dt_branch + "</span>"; >+ } else { >+ return oObj.dt_branch; >+ } >+ } >+ }, >+ { 'mDataProp': 'dt_dateexpiry' }, >+ { 'mDataProp': 'dt_od_checkouts', 'bSortable': false }, >+ { 'mDataProp': 'dt_fines', 'bSortable': false }, >+ { 'mDataProp': 'dt_borrowernotes' }, >+ { 'mDataProp': 'dt_action', 'bSortable': false, 'sClass': 'actions' } >+ ], >+ 'bFilter': false, >+ 'bAutoWidth': false, >+ [% IF CAN_user_borrowers_edit_borrowers || CAN_user_tools_manage_patron_lists %] >+ 'aaSorting': [[2, 'asc']], >+ [% ELSE %] >+ 'aaSorting': [[1, 'asc']], >+ [% END %] >+ "aLengthMenu": [aLengthMenu, aLengthMenuLabel], >+ 'sPaginationType': 'full_numbers', >+ "iDisplayLength": [% PatronsPerPage | html %], >+ "bProcessing": true, >+ "initComplete": function(settings, json) { >+ Sticky = $("#searchheader"); >+ Sticky.hcSticky({ >+ stickTo: "#searchresults", >+ stickyClass: "floating" >+ }); >+ } >+ }, columns_settings); >+ update_searched(); >+ /* Initial page load doesn't trigger the popstate event, so we explicitly call this */ >+ getSearchByLocation( false ); >+ > }); > > function patronListAdd(){ >@@ -341,6 +546,52 @@ > return true; > } > >+ function getSearchByLocation( setstate ){ >+ /* Check to see if the URL contains a search parameter */ >+ if( location.search != ""){ >+ var params = new URLSearchParams( location.search ); >+ var firstletter = params.get("firstletter"); >+ /* Check to see if search is a first letter param */ >+ if( firstletter ){ >+ /* Trigger function to return search results by letter */ >+ filterByFirstLetterSurname( firstletter, setstate ); >+ } >+ } >+ } >+ >+ // Update the string "Results found ..." >+ function update_searched(){ >+ var searched = $("#searchfieldstype_filter").find("option:selected").text(); >+ if ( $("#searchmember_filter").val() ) { >+ if ( $("#searchtype_filter").val() == 'start_with' ) { >+ searched += _(" starting with "); >+ } else { >+ searched += _(" containing "); >+ } >+ searched += "'" + $("#searchmember_filter").val() + "'"; >+ } >+ if ( $("#firstletter_filter").val() ) { >+ searched += _(" begins with ") + "'" + $("#firstletter_filter").val() +"'"; >+ } >+ if ( $("#categorycode_filter").val() ) { >+ searched += _(" with category ") + "'" + $("#categorycode_filter").find("option:selected").text() + "'"; >+ } >+ if ( $("#branchcode_filter").val() ) { >+ searched += _(" in library ") + $("#branchcode_filter").find("option:selected").text(); >+ } >+ $("#searchpattern").text(searched); >+ } >+ >+ // Redraw the table >+ function filter() { >+ $("#firstletter_filter").val(''); >+ update_searched(); >+ search = 1; >+ $("#searchresults").show(); >+ dtMemberResults.fnDraw(); >+ return false; >+ } >+ > $('#memberresultst tbody').on('click','td',function(e){ > var $checkbox = $(this).find("input[type=checkbox]"); > if (e.target.type != "checkbox") { >@@ -349,24 +600,34 @@ > } > }); > >- </script> >+ // User has clicked on the Clear button >+ function clearFilters(redraw) { >+ $("#searchform select").val(''); >+ $("#firstletter_filter").val(''); >+ $("#searchmember_filter").val(''); >+ if(redraw) { >+ /* remove any search string added by firstletter search */ >+ history.pushState( {}, null, window.location.href.split("?" )[0]); >+ update_searched(); >+ search = 0; >+ $("#searchresults").hide(); >+ dtMemberResults.fnDraw(); >+ } >+ } > >- <script> >- // Apply DataTables on the results table >- var table_settings = [% TablesSettings.GetColumns( 'members', 'member', 'memberresultst', 'json' ) | $raw %]; >- [% UNLESS CAN_user_borrowers_edit_borrowers OR CAN_user_tools_manage_patron_lists %] >- [%# Remove the first column if we do not display the checkbox %] >- table_settings['columns'].splice(0, 1); >- [% END %] >+ // User has clicked on a letter >+ function filterByFirstLetterSurname( letter, setstate ) { >+ clearFilters(false); >+ $("#firstletter_filter").val(letter); >+ if( setstate ){ >+ history.pushState( null, null, "?firstletter=" + letter ); >+ } >+ update_searched(); >+ search = 1; >+ $("#searchresults").show(); >+ dtMemberResults.fnDraw(); >+ } > </script> >- >- [% IF circsearch == 1 %] >- [% SET redirect_url = '/cgi-bin/koha/circ/circulation.pl' %] >- [% ELSE %] >- [% SET redirect_url = '/cgi-bin/koha/members/moremember.pl' %] >- [% END %] >- [% PROCESS patron_search_js table_id => 'memberresultst', categories => categories, libraries => libraries, extended_attribute_types => attribute_type_codes, columns => columns,actions => ['edit', 'checkout'], redirect_if_one_result => 1, redirect_url => redirect_url, sticky_header => "searchheader", sticky_to => "searchresults", default_sort_column => 'name-address', display_search_description => 1 %] >- > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >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 1d29f32265..60ece84bd4 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.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Update patron records › Patrons › Koha</title> >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 2965910323..2652227ea5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -93,24 +93,17 @@ > > <div> > >- <h2> >- [% UNLESS ( I ) %] >- [% patron.title | html %] [% patron.firstname | html %] >- [% END %] >- [% patron.surname | html %] ([% patron.cardnumber | html %]) >- </h2> >- >- <fieldset id="searchresults"> > [% IF ( was_renewed ) %] >+ <fieldset id="searchresults"> > <div class="dialog message"> > Patron's account has been renewed until [% patron.dateexpiry | $KohaDates %] > </div> >+ </fieldset> > [% END %] > > <div id="patron_messages" class="circmessage attention"> > [% INCLUDE 'patron_messages.inc' %] > </div> >- </fieldset> > > <h1>[% INCLUDE 'patron-title.inc' no_html = 1 %]</h1> > <div class="col-sm-6"> >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 2e2c15be0e..1a4f86fbfb 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 >@@ -53,10 +53,10 @@ > > [% INCLUDE 'patroncards-toolbar.inc' %] > >- <h1>[% IF description %]<span>Edit</span> [% description | html %] >+ <h2>[% IF description %]<span>Edit</span> [% description | html %] > [% ELSIF batch_id %]<span>Edit patron card batch</span> [% batch_id | html %] > [% ELSE %]<span>New patron card batch</span>[% END %] >- </h1> >+ </h2> > > [% IF ( duplicate_message ) %] > <div class="dialog message"> >@@ -84,17 +84,18 @@ > </div> > </form> > <div id="batch-manage" class="action"> >- <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 %] >+ <a class="lientype" id="additems" href="#"><i class="fa fa-plus"></i> Add patron(s)</a>[% IF ( table_loop ) %] >+ <a class="lientype" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a> >+ <a class="lientype" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected patrons</a> >+ <a class="lientype" ="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a> >+ <a class="lientype" id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a> >+ <a class="lientype" id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected card(s)</a> >+ <a class="lientype" id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export card batch</a>[% END %] > </div> > [% IF ( table_loop ) %] >+ <fieldset id="searchresults"> > <form name="items"> >- <h2>Patrons in batch number [% batch_id | html %]</h2> >+ <h3>Patrons in batch number [% batch_id | html %]</h3> > <table id="batcht"> > [% FOREACH table_loo IN table_loop %] > [% IF ( table_loo.header_fields ) %] >@@ -122,8 +123,8 @@ > [% FOREACH text_field IN table_loo.text_fields %] > [% IF ( text_field.select_field ) %] > <td> >- <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/patroncards/edit-batch.pl?op=remove&batch_id=[% batch_id | html %]&label_id=[% text_field.field_value | html %]"><i class="fa fa-trash"></i> Delete</a> >- <a class="btn btn-default btn-xs export" href="#" data-batch-id="[% batch_id | html %]" data-label-id="[% text_field.field_value | html %]"><i class="fa fa-share-square-o"></i> Export</a> >+ <a id="lientype" class="btn btn-default btn-xs delete" href="/cgi-bin/koha/patroncards/edit-batch.pl?op=remove&batch_id=[% batch_id | html %]&label_id=[% text_field.field_value | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a id="lientype" class="btn btn-default btn-xs export" href="#" data-batch-id="[% batch_id | html %]" data-label-id="[% text_field.field_value | html %]"><i class="fa fa-share-square-o"></i> Export</a> > </td> > <td><input type="checkbox" name="action" value="[% text_field.field_value | html %]" /></td> > [% ELSE %] >@@ -136,6 +137,7 @@ > </tbody> > </table> > </form> >+ </fieldset> > [% ELSE %] > <fieldset class="rows" style="border-bottom: 0px; border: 0px;"> > <ol><li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >index ce6d428c02..a3bbc256e7 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 >@@ -49,9 +49,9 @@ > > [% INCLUDE 'patroncards-toolbar.inc' %] > >- <h1>[% IF ( layout_id ) %]<span>Edit patron card layout</span> [% layout_id | html %] >+ <h2>[% IF ( layout_id ) %]<span>Edit patron card layout</span> [% layout_id | html %] > [% ELSE %]<span>Create patron card layout</span>[% END %] >- </h1> >+ </h2> > > <!-- NOTE: The order of the elements on this form is crictical to correct processing. You've been warned... --> > <form name="input" action="/cgi-bin/koha/patroncards/edit-layout.pl" method="get"> >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 f4e6c55481..0722657b71 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt >@@ -50,9 +50,8 @@ > <main> > > [% INCLUDE 'patroncards-toolbar.inc' %] >- <h1>[% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id | html %])[% END %]</h1> >+ <h2>[% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id | html %])[% END %]</h2> > <form name="input" action="/cgi-bin/koha/patroncards/edit-template.pl" method="get"> >- <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"> >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 373f458993..126c7b04ae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt >@@ -37,7 +37,7 @@ > > [% INCLUDE 'patroncards-toolbar.inc' %] > >- <h1>Patron card creator</h1> >+ <h2>Patron card creator</h2> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >index 6c6bf62773..571c856f77 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 >@@ -40,15 +40,15 @@ > <main> > > [% INCLUDE 'patroncards-toolbar.inc' %] >- <h1>Image manager</h1> >+ <h2>Image manager</h2> > [% INCLUDE 'patroncards-errors.inc' %] > <div class="row"> > <div class="col-sm-6"> >- <h2>Upload additional images for patron cards</h2> >+ <fieldset class="rows"> >+ <h3>Upload additional images for patron cards</h3> > <p>Manage additional images to use as logo, decoration or background on a patron card layout.</p> > <form name="upload_images" method="post" action="/cgi-bin/koha/patroncards/image-manage.pl" enctype="multipart/form-data"> >- <fieldset class="brief"> >- <div class="hint">Only PNG, GIF, JPEG, XPM formats are supported. Maximum image size is 2MB.</div> >+ <div class="hint">Only PNG, GIF, JPEG, XPM formats are supported. Maximum image size is 2MB.</div> > <ol> > <li> > <label for="uploadfile">Select the file to upload: </label> >@@ -57,14 +57,15 @@ > </li> > <li> > <label for="image_name">Image name: </label> >+ >+ <input type="text" id="image_name" name="image_name" size="20" /> >+ > <div class="hint"> > This will be the name by which you will refer to this image in the patron card layout editor. > </div> > <div class="hint"> > To replace an image, delete it, upload a new file and give it the same image name. > </div> >- >- <input type="text" id="image_name" name="image_name" size="20" /> > </li> > </ol> > <div class="action"> >@@ -78,15 +79,15 @@ > <li>Image name: [% IMAGE_NAME | html %]</li></ul> > </div> > [% END %] >- </fieldset> >- > </form> >+ </fieldset> > </div> >+ > <div class="col-sm-6"> >- <h2>Delete images</h2> >- [% IF ( TABLE ) %] >- <form name="delete_images" method="post" action="/cgi-bin/koha/patroncards/image-manage.pl" enctype="multipart/form-data"> >- <fieldset class="brief"> >+ <fieldset class="rows"> >+ <h3>Delete images</h3> >+ [% IF ( TABLE ) %] >+ <form name="delete_images" method="post" action="/cgi-bin/koha/patroncards/image-manage.pl" enctype="multipart/form-data"> > <div class="hint"> > Select one or more images to delete. > </div> >@@ -114,7 +115,7 @@ > [% FOREACH text_field IN TABL.text_fields %] > [% IF ( text_field.select_field ) %] > <td> >- <a class="delete_image btn btn-default btn-xs" href="/cgi-bin/koha/patroncards/image-manage.pl?op=delete&image_id=[% text_field.field_value | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="delete_image btn btn-default btn-xs" href="/cgi-bin/koha/patroncards/image-manage.pl?op=delete&image_id=[% text_field.field_value | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > <td align="center"><input type="checkbox" name="action" value="[% text_field.field_value | html %]" /></td> > [% ELSIF ( text_field.field_value ) %] >@@ -129,17 +130,17 @@ > </table> > <div class="action"> > <input type="hidden" name="op" value="delete" /> >- <input class="btn btn-default btn-default" type="button" id="delete" value="Delete selected" /> >+ <input class="btn btn-default btn-default lientype" type="button" id="delete" value="Delete selected" /> > </div> > [% IF ( DELETE_SUCCESSFULL ) %] > <div id="dialog" class="dialog message"> > <h3>Image(s) successfully deleted</h3> > </div> > [% END %] >- </fieldset> > </form> >+ </fieldset> > [% ELSE %] >- <fieldset class="brief"> >+ > <div class="hint"> > No images are currently available. > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >index a4bdce6a3d..028b05b62e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >@@ -66,13 +66,14 @@ > > [% INCLUDE 'patroncards-toolbar.inc' %] > >- <h1>Patron card templates</h1> >+ <h2>Patron card templates</h2> > > [% INCLUDE 'patroncards-errors.inc' %] > <div id="manage-patroncards-layouts"> > [% IF ( table_loop ) %] > <form name="layouts" action="/cgi-bin/koha/manage.pl?card_element=[% card_element | html %]"> >- <h2>Currently available [% PROCESS translate_card_element element=card_element_title FILTER lower %]</h2> >+ <fieldset id="rows"> >+ <h3>Currently available [% PROCESS translate_card_element element=card_element_title FILTER lower %]</h3> > <table> > [% FOREACH table_loo IN table_loop %] > [% IF ( table_loo.header_fields ) %] >@@ -102,7 +103,7 @@ > [% IF ( text_field.select_field ) %] > <td> > <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 %] >+ [% IF ( print ) %]<a id="lientype" 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 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 %] >@@ -117,11 +118,12 @@ > [% END %] > </table> > <fieldset class="action"> >- [% IF ( print ) %]<input type="button" id="print" value="Export selected batches" />[% END %] >+ [% IF ( print ) %]<input type="button" id="print" class="principal" value="Export selected batches" />[% END %] >+ </fieldset> > </fieldset> > [% IF patron_lists %] > <fieldset class="rows"> >- <legend>Or use a patron list</legend> >+ <h3>Or use a patron list</h3> > <ol> > <li> > <label for="patron_list_id">Patron list: </label> >@@ -133,9 +135,7 @@ > </select> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="button" id="printlist" value="Export from patron list" /> >+ <input type="button" id="printlist" class="principal" value="Export from patron list" /> > </fieldset> > [% END %] > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt >index 195cd7aa4d..f3cf0665fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt >@@ -7,41 +7,41 @@ > > <body id="pcard_print" class="tools pcard"> > <div class="container-fluid"> >- <h1>Patron card printing/exporting</h1> >+ <h2>Patron card printing/exporting</h2> > [% IF ( batches ) %] > <form> >- <h3>Click on the following link(s) to download the exported batch(es).</h3> > <fieldset> > [% FOREACH batche IN batches %] > [% IF ( batche.label_ids ) %] >- <legend>[% batche.card_count | html %] Single patron cards</legend> >+ <h3>[% batche.card_count | html %] Single patron cards</h3> > <p> > <a class="document pdf" href="/cgi-bin/koha/patroncards/[% batche.create_script | html %]?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]]&layout_back_id=[% batche.layout_back_id | html %]&start_card=[% batche.start_card | html %][% batche.label_ids | html %]">label_single_[% batche.card_count | html %].pdf</a> > </p> > [% ELSIF ( batche.borrower_numbers ) %] >- <legend>[% batche.card_count | html %] Single patron cards</legend> >+ <h3>[% batche.card_count | html %] Single patron cards</h3> > <p> > <a class="document pdf" href="/cgi-bin/koha/patroncards/[% batche.create_script | html %]?template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&layout_back_id=[% batche.layout_back_id | html %]&start_card=[% batche.start_card | html %][% batche.borrower_numbers | html %]">label_single_[% batche.card_count | html %].pdf</a> > </p> > [% ELSE %] >- <legend>Card batch number [% batche.batch_id | html %]</legend> >+ <h3>Card batch number [% batche.batch_id | html %]</h3> > <p> > <a class="document pdf" href="/cgi-bin/koha/patroncards/create-pdf.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&layout_back_id=[% batche.layout_back_id | html %]&start_card=[% batche.start_card | html %]">label_batch_[% batche.batch_id | html %].pdf</a> > </p> > [% END %] > [% END %] >- </fieldset> >+ <p>Click on the link(s) to download the exported batch(es).</p> > >- <fieldset class="action"> >- <input type="button" class="gb-close" value="Done" /> >+ <input type="button" class="gb-close principal" value="Done" /> > </fieldset> > </form> > [% ELSIF ( patronlist_id && template_id && layout_id ) %] > <div id="export_patron_list"> >- <h3>Click on the link to download the patron cards from the patron list.</h3> >+ <fieldset> >+ <h3>Click on the link to download the patron cards from the patron list</h3> > <p> > <a class="document pdf" href="/cgi-bin/koha/patroncards/create-pdf.pl?patronlist_id=[% patronlist_id | html %]&template_id=[% template_id | html %]&layout_id=[% layout_id | html %]&layout_back_id=[% layout_back_id | html %]&start_card=[% start_card | html %]">label_patronlist_[% patronlist_id | html %].pdf</a> > </p> >+ </fieldset> > </div> > [% ELSE %] > <h3> >@@ -68,6 +68,16 @@ > [% END %] > [% IF (patronlist_id) %] <input type="hidden" name="patronlist_id" value="[% patronlist_id | html %]" /> [% END %] > <fieldset class="rows"> >+ <h3> >+ [% IF ( label_ids ) %] >+ [% IF ( card_count == 1 ) %]Exporting [% card_count | html %] patron card[% ELSE %]Exporting [% card_count | html %] patron cards[% END %] >+ [% ELSIF ( borrower_numbers ) %] >+ [% IF ( borrower_count == 1 ) %]Exporting [% borrower_count | html %] patron card[% ELSE %]Exporting [% borrower_count | html %] patron cards[% END %] >+ [% ELSIF ( patronlist_id ) %] Exporting from patron list >+ [% ELSE %] >+ [% IF ( multi_batch_count == 1 ) %][% multi_batch_count | html %] batch to export[% ELSE %][% multi_batch_count | html %] batches to export[% END %] >+ [% END %] >+ </h3> > <ol> > <li> > <label style="width:9em" for="template_id">Select a template to be applied: </label> >@@ -101,9 +111,8 @@ > <input type="text" size="5" id="start_card" name="start_card" class="focus" title="Starting card number" value="1" /> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="submit" value="Export" /> >+ >+ <input type="submit" class="principal" value="Export" /> > <a href="#" class="cancel gb-close">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt >index 5e554a19f6..ddd6c97b39 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 >@@ -36,7 +36,7 @@ > <div class="container-fluid"> > <div class="row"> > <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3"> >- <h1>Plugins disabled!</h1> >+ <h2>Plugins disabled!</h2> > > <p>To enable Koha plugins, the flag enable_plugins must be set in the Koha configuration file</p> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >index cb9d59745d..a81dd5040f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >@@ -41,7 +41,7 @@ > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> >- <h1>Plugins</h1> >+ <h2>Plugins</h2> > > <div class="details"> > >@@ -185,7 +185,7 @@ > [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool ) %] > <td class="actions"> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="pluginactions[% plugin.class | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle lientype" id="pluginactions[% plugin.class | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="pluginactions[% plugin.class | html %]"> >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 a5465967be..9d551f3c8b 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 >@@ -51,15 +51,14 @@ > </div> > [% END %] > <form method="post" action="/cgi-bin/koha/plugins/plugins-upload.pl" enctype="multipart/form-data"> >- <fieldset class="brief"> >+ <fieldset class="rows"> > <div class="hint"><strong>NOTE:</strong> Only KPZ file format is supported.</div> > <ol> > <li> > <label for="uploadfile">Select the file to upload: </label><input type="file" id="uploadfile" name="uploadfile" /> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >+ > <input type="hidden" name="op" value="Upload" /> > <input class="principal" type="submit" value="Upload" class="submit" /> > </fieldset> >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 cbe1dc0e3c..3663ddf62d 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 >@@ -50,10 +50,9 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Acquisitions statistics </h1> >+<h2>Acquisitions statistics </h2> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >- <h2>Acquisitions statistics </h2> > [% IF ( mainloo.loopfilter.size ) %] > <p><strong>Filtered on:</strong></p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -328,9 +327,7 @@ > </select> > </li> > </ol> >- </fieldset> > >- <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" /> >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 bc81b77ba0..3fac8bec59 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 >@@ -54,8 +54,8 @@ > <main> > > [% IF ( do_it ) %] >+ <h2>Patrons with the most checkouts</h2> > [% FOREACH mainloo IN mainloop %] >- <h2>Patrons with the most checkouts</h2> > [% IF ( mainloo.loopfilter ) %] > [% IF mainloo.loopfilter.size %] > <p>Filtered on:</p> >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 04bf2822a4..dcc49f301a 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 >@@ -40,8 +40,8 @@ > <main> > > [% IF ( do_it ) %] >+ <h2>Patrons with no checkouts</h2> > [% FOREACH mainloo IN mainloop %] >- <h2>Patrons with no checkouts</h2> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on:</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >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 2d4400eaa5..ba5688394f 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 >@@ -58,10 +58,9 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Patrons statistics</h1> >+<h2>Patrons statistics</h2> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >- <h2>Patrons statistics</h2> > [% IF ( mainloo.loopfilter.size>0 ) %] > <p>Filtered on:</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -319,9 +318,7 @@ > </select> > </li> > </ol> >- </fieldset> > >- <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" /> >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 c510f629ba..a6c8dfb8e9 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 >@@ -61,6 +61,55 @@ > <main> > > <h2>Cash register statistics</h2> >+ >+[% IF ( do_it ) %] >+ <div> </div> >+ <table id="tbl_cash_register_stats"> >+ <thead> >+ <tr> >+ <th>Manager name</th> >+ <th>Patron card number</th> >+ <th>Patron name</th> >+ <th>Transaction library</th> >+ <th>Transaction date</th> >+ <th>Updated</th> >+ <th>Transaction type</th> >+ <th>Notes</th> >+ <th>Amount</th> >+ <th>Bibliographic record title</th> >+ <th>Barcode</th> >+ <th>Item type</th> >+ </tr> >+ </thead> >+ [% FOREACH loopresul IN loopresult %] >+ <tr> >+ <td>[% loopresul.mfirstname | html %] [% loopresul.msurname | html %]</td> >+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopresul.borrowernumber | uri %]">[% loopresul.cardnumber | html %]</a></td> >+ <td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td> >+ <td>[% loopresul.branchname | html %]</td> >+ <td>[% loopresul.date | $KohaDates %]</td> >+ <td>[% loopresul.timestamp | $KohaDates with_hours = 1 %]</td> >+ <td>[% loopresul.type_description | html %]</td> >+ <td>[% loopresul.note | html %]</td> >+ <td style="text-align:right;">[% loopresul.amount | $Price %]</td> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | uri %]">[% loopresul.title | html %]</a></td> >+ <td>[% loopresul.barcode | html %]</td> >+ <td>[% ItemTypes.GetDescription(loopresul.itype) | html %]</td> >+ </tr> >+ [% END %] >+ <tfoot> >+ <tr> >+ [% IF transaction_type == "ACT" %] >+ <th colspan="8" style="text-align:right;">TOTAL</th> >+ <th style="text-align:right;">[% total | $Price %]</th> >+ <th colspan="3"> </th> >+ [% END %] >+ </tr> >+ </tfoot> >+ </table> >+ >+ [% ELSE %] >+ > <form method="post" action="/cgi-bin/koha/reports/cash_register_stats.pl" id="frmCashRegister"> > <fieldset class="rows"> > <h3>Cash register statistics [% beginDate | $KohaDates %] to [% endDate | $KohaDates %]</h3> >@@ -161,52 +210,6 @@ > </fieldset> > </form> > >- [% IF ( do_it ) %] >- <div> </div> >- <table id="tbl_cash_register_stats"> >- <thead> >- <tr> >- <th>Manager name</th> >- <th>Patron card number</th> >- <th>Patron name</th> >- <th>Transaction library</th> >- <th>Transaction date</th> >- <th>Updated</th> >- <th>Transaction type</th> >- <th>Notes</th> >- <th>Amount</th> >- <th>Bibliographic record title</th> >- <th>Barcode</th> >- <th>Item type</th> >- </tr> >- </thead> >- [% FOREACH loopresul IN loopresult %] >- <tr> >- <td>[% loopresul.mfirstname | html %] [% loopresul.msurname | html %]</td> >- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopresul.borrowernumber | uri %]">[% loopresul.cardnumber | html %]</a></td> >- <td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td> >- <td>[% loopresul.branchname | html %]</td> >- <td>[% loopresul.date | $KohaDates %]</td> >- <td>[% loopresul.timestamp | $KohaDates with_hours = 1 %]</td> >- <td>[% loopresul.type_description | html %]</td> >- <td>[% loopresul.note | html %]</td> >- <td style="text-align:right;">[% loopresul.amount | $Price %]</td> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | uri %]">[% loopresul.title | html %]</a></td> >- <td>[% loopresul.barcode | html %]</td> >- <td>[% ItemTypes.GetDescription(loopresul.itype) | html %]</td> >- </tr> >- [% END %] >- <tfoot> >- <tr> >- [% IF transaction_type == "ACT" %] >- <th colspan="8" style="text-align:right;">TOTAL</th> >- <th style="text-align:right;">[% total | $Price %]</th> >- <th colspan="3"> </th> >- [% END %] >- </tr> >- </tfoot> >- </table> >- > [% END %] [%# do_it %] > > </main> >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 9e8b2acb80..2e324a1c10 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 >@@ -53,8 +53,8 @@ > > [% IF ( do_it ) %] > >+ <h2>Top [% mainloo.limit | html %] Most-circulated items</h2> > [% FOREACH mainloo IN mainloop %] >- <h2>Top [% mainloo.limit | html %] Most-circulated items</h2> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on:</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >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 dae360ebba..dbec3f103a 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 >@@ -51,10 +51,9 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Catalog statistics</h1> >+<h2>Catalog statistics</h2> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >- <h2>Catalog statistics</h2> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on:</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >@@ -325,9 +324,6 @@ > </select> > </li> > </ol> >- </fieldset> >- >- <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" /> >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 a8cbc4233b..c684c6c7d1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >@@ -166,7 +166,7 @@ > [% END %] > </table> > [% ELSE %] >- <div class="dialog message">There are no saved definitions. <a id="newdictionary" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition">Add a definition to the dictionary.</a></div> >+ <div class="dialog message">There are no saved definitions. <a class="lientype" id="newdictionary" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition">Add a definition to the dictionary.</a></div> > [% END %] > [% END %] > >@@ -182,15 +182,14 @@ > <label for="definition_description">Definition description:</label> > <textarea name="definition_description" id="definition_description" rows="3" cols="20"></textarea> > </li> >-</ol></fieldset> >- >-<fieldset class="action"><input type="hidden" name="phase" value="New Term step 2" /> >+</ol> >+<input type="hidden" name="phase" value="New Term step 2" /> > <input name="submit" class="principal" value="Next" type="submit" /></fieldset> > </form> > [% END %] > > [%- IF ( step_2 ) -%] >-<h3>Add new definition</h3> >+<h2>Add new definition</h2> > <form action="/cgi-bin/koha/reports/dictionary.pl" method="post"> > <fieldset class="rows"> > <h3>Step 2 of 5: Choose the area</h3> >@@ -206,13 +205,12 @@ > </select> > </li> > </ol> >- </fieldset> >- <fieldset class="action"><input name="submit" class="principal" value="Next" type="submit" /></fieldset> >+<input name="submit" class="principal" value="Next" type="submit" /></fieldset> > </form> > [%- END -%] > > [% IF ( step_3 ) %] >-<h3>Add new definition</h3> >+<h2>Add new definition</h2> > <form action="/cgi-bin/koha/reports/dictionary.pl" method="post"> > <fieldset class="rows"> > <h3>Step 3 of 5: Choose a column</h3> >@@ -242,13 +240,12 @@ > </select> > > <input type="hidden" name="phase" value="New Term step 4" /> >-</fieldset> >-<fieldset class="action"><input type="submit" class="principal" name="submit" value="Next" /></fieldset> >+<input type="submit" class="principal" name="submit" value="Next" /></fieldset> > </form> > [% END %] > > [% IF ( step_4 ) %] >-<h3>Add new definition</h3> >+<h2>Add new definition</h2> > <form action="/cgi-bin/koha/reports/dictionary.pl" method="post"> > <fieldset class="rows"> > <h3>Step 4 of 5: Specify a value</h3> >@@ -290,8 +287,7 @@ > [% END %] > </ol> > <input type="hidden" name="phase" value="New Term step 5" /> >-</fieldset> >-<fieldset class="action"> >+ > <input type="submit" class="principal" name="submit" value="Next" /> > </fieldset> > </form> >@@ -304,7 +300,7 @@ > <input type="hidden" name="definition_description" value="[% definition_description | html %]" /> > <input type="hidden" name="columnstring" value="[% columnstring | html %]" /> > >-<h3>Add new definition</h3> >+<h2>Add new definition</h2> > > <fieldset class="rows"> > <h3>Step 5 of 5: Confirm details</h3> >@@ -334,9 +330,7 @@ > </table> > </li> > </ol> >-</fieldset> >- >-<fieldset class="action"><input type="hidden" name="sql" value="[% query | html %]" /> >+<input type="hidden" name="sql" value="[% query | html %]" /> > <input type="hidden" name="phase" value="New Term step 6" /> > <input type="submit" class="principal" name="submit" value="Save" /> </fieldset> > >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 0a30c58488..974bfdba0c 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 >@@ -168,7 +168,7 @@ > <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div> > </div> > <div class="modal-footer"> >- <a href="#" class="btn btn-default" id="update_sql_button" role="button" data-toggle="modal">Update</a> >+ <a href="#" class="btn btn-default lientype" id="update_sql_button" role="button" data-toggle="modal">Update</a> > <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> > </div> > </div> <!-- /.modal-content --> >@@ -183,7 +183,7 @@ > [% INCLUDE "reports-toolbar.inc" %] > > [% IF ( start ) %] >- <h1>Guided reports</h1> >+ <h2>Guided reports</h2> > <p>Use the guided reports engine to create non standard reports. This feature aims to provide some middle ground between the built in canned reports and writing custom SQL reports.</p> > > <h3>Build and run reports</h3> >@@ -245,7 +245,7 @@ > [% IF ( filters.keyword ) %] > <span class="filter_keyword"><strong>Keyword:</strong> [% filters.keyword | html %]</span> > [% END %] >- <a class="clear_filter" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&clear_filters=1"><i class="fa fa-remove"></i> Clear</a> >+ <a class="clear_filter" id="lientype" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&clear_filters=1"><i class="fa fa-remove"></i> Clear</a> > </span> > </p> > [% END %] >@@ -382,16 +382,16 @@ > <td> > [% IF savedreport.seems_obsolete %] > This report seems obsolete, it uses biblioitems.marcxml field. >- <a href="/cgi-bin/koha/svc/convert_report?report_id=[% savedreport.id | uri %]" data-report_id="[% savedreport.id | html %]" class="update_sql btn btn-default btn-xs" title="Update SQL"><i class="fa fa-eye"></i> Update SQL</a> >+ <a href="/cgi-bin/koha/svc/convert_report?report_id=[% savedreport.id | uri %]" data-report_id="[% savedreport.id | html %]" class="update_sql btn btn-default btn-xs" id="lientype" title="Update SQL"><i class="fa fa-eye"></i> Update SQL</a> > [% END %] > </td> > <td> > <div class="btn-group dropup"> > [%# There should be no space between these two buttons, it would render badly %] >- <a class="btn btn-default btn-xs" role="button" >+ <a class="btn btn-default btn-xs lientype" role="button" > href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | html %]&phase=Run%20this%20report"><i > class="fa fa-play"></i> Run</a><a >- class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown" >+ class="btn btn-default btn-xs dropdown-toggle lientype" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown" > href="#"><b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]"> > <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | uri %]&phase=Show%20SQL"><i class="fa fa-search"></i> View</a></li> >@@ -448,13 +448,13 @@ > <input type="hidden" name="phase" value="Use saved" /> > <input type="hidden" name="filter_set" value="1" /> > <input type="hidden" name="filter_keyword" value="" /> >- <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> Cancel filter</button> >+ <button type="submit" class="deny cancel"><i class="fa fa-fw fa-remove"></i> Cancel filter</button> > </form> > [% END %] > [% ELSE %] > <h4>There are no saved reports. </h4> > [% IF ( CAN_user_reports_create_reports ) %] >- <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build a new report?</a> >+ <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new" id="lientype">Build a new report?</a> > [% END %] > [% END # IF (filter_set || filters.date || filters.author || filters.keyword) %] > </div> <!-- /.dialog.message --> >@@ -564,7 +564,7 @@ > <div class="row"> > <div class="col-sm-6"> > <div style="float: left;"> >- <select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width: 200px;height:300px;"> >+ <select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width: 200px; width: 100%; overflow: auto; height:300px;"> > [% FOREACH column IN columns %] > [% IF ( column.table ) %] > [% IF ( loop.first ) %] >@@ -935,8 +935,8 @@ > </div> > > <div> >- <a href="#" id="toggle_chart_settings_hid" class="toggle_chart_settings" style="display:none"><i class="fa fa-eye-slash"></i> Hide chart</a> >- <a href="#" id="toggle_chart_settings_vis" class="toggle_chart_settings" style="display:none"><i class="fa fa fa-eye"></i> Show chart</a> >+ <a href="#" id="toggle_chart_settings_hid" class="toggle_chart_settings lientype" style="display:none"><i class="fa fa-eye-slash"></i> Hide chart</a> >+ <a href="#" id="toggle_chart_settings_vis" class="toggle_chart_settings lientype" style="display:none"><i class="fa fa fa-eye"></i> Show chart</a> > </div> > <div id="chart" class="clearfix"></div> > >@@ -1040,7 +1040,7 @@ > <div id="toolbar" class="btn-toolbar"> > [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %] > <div class="btn-group"> >- <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="batch_mod_menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> >+ <button class="btn btn-default btn-sm dropdown-toggle pat" type="button" id="batch_mod_menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> > Batch operations with [% IF unlimited_total >= limit %][% limit | html %][% ELSE %][% unlimited_total | html %][% END %] visible records > <span class="caret"></span> > </button> >@@ -1080,7 +1080,7 @@ > > [% IF ( unlimited_total > 10 && limit <= 1000 ) %] > <div class="btn-group"> >- <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> >+ <button type="button" class="btn btn-default btn-sm dropdown-toggle pat" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> > [% IF ( limit ) %] > Rows per page: <strong>[% limit | html %]</strong> > [% ELSE %] >@@ -1106,7 +1106,7 @@ > [% END # /IF ( unlimited_total > 10 && limit <= 1000 ) %] > > [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %] >- <a href="#" class="btn btn-link" id="toggle_auto_links"> >+ <a href="#" class="btn btn-link pat" id="toggle_auto_links"> > <i class="fa fa-eye autolink" style="display:none"></i> > <i class="fa fa-eye-slash autolink"></i> > <span class="autolink" style="display:none">Show data menus</span> >@@ -1152,9 +1152,9 @@ > <span class="data-plain">[% cells.cell | $raw %]</span> > <div id="itemnumber_autolink" class="btn-group dropup autolink"><a class="btn btn-link dropdown-toggle" role="button" data-toggle="dropdown" href="#">[% cells.cell | $raw %] <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu"> >- <li><a target="_blank" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&itemnumber=[% cells.cell | $raw %]"><i class="fa fa-fw fa-pencil"></i> Edit record</a></li> >+ <li><a id="lientype" target="_blank" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&itemnumber=[% cells.cell | $raw %]"><i class="fa fa-fw fa-pencil"></i> Edit record</a></li> > <li role="separator" class="divider"></li> >- <li><a target="_blank" href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% cells.cell | $raw %]"><i class="fa fa-fw fa-eye"></i> View record</a></li> >+ <li><a id="lientype" target="_blank" href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% cells.cell | $raw %]"><i class="fa fa-fw fa-eye"></i> View record</a></li> > </ul> > </div> > </td> >@@ -1163,9 +1163,9 @@ > <span class="data-plain">[% cells.cell | $raw %]</span> > <div id="biblionumber_autolink" class="btn-group dropup autolink"><a class="btn btn-link dropdown-toggle" role="button" data-toggle="dropdown" href="#">[% cells.cell | $raw %] <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu"> >- <li><a target="_blank" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% cells.cell | $raw %]"><i class="fa fa-pencil"></i> Edit record</a></li> >+ <li><a id="lientype" target="_blank" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% cells.cell | $raw %]"><i class="fa fa-pencil"></i> Edit record</a></li> > <li role="separator" class="divider"></li> >- <li><a target="_blank" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cells.cell | $raw %]"><i class="fa fa-eye"></i> View record</a></li> >+ <li><a id="lientype" target="_blank" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cells.cell | $raw %]"><i class="fa fa-eye"></i> View record</a></li> > </ul> > </div> > </td> >@@ -1174,11 +1174,11 @@ > <span class="data-plain">[% cells.cell | $raw %]</span> > <div id="borrowernumber_autolink" class="btn-group dropup autolink"><a class="btn btn-link dropdown-toggle" role="button" data-toggle="dropdown" href="#">[% cells.cell | $raw %] <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu"> >- <li><a target="_blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% cells.cell | $raw %]"><i class="fa fa-eye"></i> View patron</a></li> >+ <li><a id="lientype" target="_blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% cells.cell | $raw %]"><i class="fa fa-eye"></i> View patron</a></li> > <li role="separator" class="divider"></li> >- <li><a target="_blank" href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% cells.cell | $raw %]"><i class="fa fa-pencil"></i> Edit patron</a></li> >+ <li><a id="lientype" target="_blank" href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% cells.cell | $raw %]"><i class="fa fa-pencil"></i> Edit patron</a></li> > <li role="separator" class="divider"></li> >- <li><a target="_blank" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% cells.cell | $raw %]"><i class="fa fa-barcode"></i> Check out</a></li> >+ <li><a id="lientype" target="_blank" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% cells.cell | $raw %]"><i class="fa fa-barcode"></i> Check out</a></li> > </ul> > </div> > </td> >@@ -1187,7 +1187,7 @@ > <span class="data-plain">[% cells.cell | $raw %]</span> > <div id="cardnumber_autolink" class="btn-group dropup autolink"><a class="btn btn-link dropdown-toggle" role="button" data-toggle="dropdown" href="#">[% cells.cell | $raw %] <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu"> >- <li><a target="_blank" href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cells.cell | $raw %]"><i class="fa fa-barcode"></i> Check out</a></li> >+ <li><a id="lientype" target="_blank" href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cells.cell | $raw %]"><i class="fa fa-barcode"></i> Check out</a></li> > </ul> > </div> > </td> >@@ -1209,7 +1209,7 @@ > [% END #/IF ( execute ) %] > > [% IF ( create ) %] >- <h1>Create from SQL</h1> >+ <h2>Create from SQL</h2> > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" id="sql_report_form"> > <fieldset class="rows"> > <h3>Create report from SQL</h3> >@@ -1295,7 +1295,7 @@ > [% END # /IF saved_results %] > > [% IF ( showsql ) %] >- <h1>Saved reports - SQL</h1> >+ <h2>Saved reports - SQL</h2> > <fieldset class="rows"> > <h3>[% reportname | html %]</h3> > <ol> >@@ -1405,7 +1405,7 @@ > [% ELSE %] > [% END %] > <div id="onerror_actions"> >- <a href="#" class="button goback">Return to previous page</a> >+ <a id="lientype" href="#" class="button goback">Return to previous page</a> > </div> > [% END %] > </div> >@@ -1446,7 +1446,7 @@ > </ol> > <fieldset class="action"> > <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> >+ <a id="resetReportsFilter" class="lientype" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&clear_filters=1">Clear</a> > </fieldset> > </fieldset> <!-- /.brief --> > </form> >@@ -1485,7 +1485,7 @@ > </div> <!-- /.modal-body --> > <div class="modal-footer"> > <button type="submit" id="sendParam" class="btn btn-default approve">Insert parameter</button> >- <button type="button" class="btn btn-default deny" data-dismiss="modal">Cancel</button> >+ <button type="button" class="btn btn-default deny cancel" data-dismiss="modal">Cancel</button> > </div> <!-- /.modal-footer --> > </form> <!-- /#send_runtime_parameter --> > </div> <!-- /.modal-content --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt >index 1533ec524b..8b3155efa2 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 >@@ -51,10 +51,9 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Average checkout period</h1> >+<h2>Average checkout period</h2> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >- <h2>Average checkout period</h2> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on:</p> > [% FOREACH loopfilte IN mainloo.loopfilter %] >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 7979f4a0b4..f66fa31b8e 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 >@@ -54,10 +54,9 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Circulation statistics</h1> >+<h2>Circulation statistics</h2> > [% IF ( do_it ) %] > [% FOREACH mainloo IN mainloop %] >- <h2>Circulation statistics</h2> > [% IF ( mainloo.loopfilter ) %] > <p>Filtered on:</p> > <ul> >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 973e2657c1..61be3ddedd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >@@ -58,8 +58,8 @@ > > > [% IF ( do_it ) %] >-[% FOREACH mainloo IN mainloop %] > <h2>Reports on item types [% IF branch %] held at [% Branches.GetName( branch ) | html %][% END %]</h2> >+[% FOREACH mainloo IN mainloop %] > <table id="itemtypest"> > <thead> > <tr> >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 945afc97dc..91f1b3b271 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 >@@ -40,7 +40,7 @@ > > [% IF ( CAN_user_reports_execute_reports || CAN_user_reports_create_reports ) %] > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get"> >- <fieldset class="brief"> >+ <fieldset> > <h2>Guided reports</h2> > <input name="phase" value="Use saved" type="hidden"> > <input name="filter_set" value="1" type="hidden"> >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 85c6f161cc..bd81143a53 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 >@@ -55,10 +55,9 @@ > <main> > > >-<h1>Holds statistics</h1> >+<h2>Holds statistics</h2> > [% IF ( do_it ) %] > [% IF ( mainloop ) %] >- <h2>Holds statistics</h2> > [% IF ( loopfilter ) %] > <p>Filtered on:</p> > <ul> >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 24b6e54dd4..5db71c319d 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 >@@ -87,7 +87,7 @@ > [% ELSE %] > <form method="post" action="/cgi-bin/koha/reports/serials_stats.pl"> > >- <fieldset class="brief"> >+ <fieldset class="rows"> > <ol> > <li> > >@@ -118,7 +118,7 @@ > </fieldset> > > >- <fieldset class="brief"> >+ <fieldset class="rows"> > <h3>Output</h3> > <ol> > <li> >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 fe2af86c92..b487718449 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >@@ -45,7 +45,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >-<h1>Comments</h1> >+<h2>Comments</h2> > > <!-- The manual invoice and credit buttons --> > <div class="statictabs"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >index 5891aef225..23d7db419e 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 >@@ -44,15 +44,16 @@ > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> >- <h1>Add/remove items from collection</h1> > > [% IF ( ! colId ) %] >+ <h1>Add/remove items from collection</h1> > <div class="dialog message"> > <p>Invalid collection id</p> >- <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> >+ <p><a id="lientype" href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> > </div> > [% ELSE %] > [% INCLUDE 'rotating-collections-toolbar.inc' %] >+ <h1>Add/remove items from collection</h1> > <h2>Collection <em>[% colTitle | html %]</em></h2> > > [% IF ( previousActionAdd ) %] >@@ -98,7 +99,7 @@ > <div> > <form action="addItems.pl" method="post"> > <fieldset class="brief"> >- <legend>Add or remove items</legend> >+ <h3>Add or remove items</h3> > <ol> > <li> > <label for="barcode">Barcode: </label> >@@ -113,7 +114,7 @@ > <p> > <input type="hidden" id="colId" name="colId" value="[% colId | html %]" /> > <input type="hidden" name="action" value="addItem" /> >- <input type="submit" value="Submit" /> >+ <input type="submit" class="principal" value="Submit" /> > </p> > </fieldset> > >@@ -136,7 +137,7 @@ > <td>[% INCLUDE 'biblio-title.inc' biblio=collectionItemsLoo link = 1 %]</td> > <td>[% collectionItemsLoo.itemcallnumber | html %]</td> > <td>[% collectionItemsLoo.barcode | html %]</td> >- <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId | uri %]&barcode=[% collectionItemsLoo.barcode | uri %]&removeItem=1&action=addItem">Remove</a></td> >+ <td><a id="lientype" href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId | uri %]&barcode=[% collectionItemsLoo.barcode | uri %]&removeItem=1&action=addItem">Remove</a></td> > </tr> > [% END %] > </table> >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 e1bb261d12..71e196b84a 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 >@@ -63,7 +63,7 @@ > [% IF ( createSuccess ) %] > <div class="dialog message"> > <p>Collection <em>[% createdTitle | html %]</em> added successfully</p> >- <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> >+ <p><a id="lientype" href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> > </div> > [% ELSE %] > <div class="dialog alert"> >@@ -120,9 +120,9 @@ > > [% IF action == "new" || action == "edit" %] > [% IF ( previousActionEdit ) %] >- <h1>Edit collection <em>[% editColTitle | html %]</em></h1> >+ <h2>Edit collection <em>[% editColTitle | html %]</em></h2> > [% ELSE %] >- <h1>Add new collection</h1> >+ <h2>Add new collection</h2> > [% END %] > > <form action="editCollections.pl" method="post" class="validated"> >@@ -154,9 +154,8 @@ > [% END %] > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <p><input type="submit" value="Submit" /> <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl" class="cancel">Cancel</a></p> >+ >+ <p><input type="submit" class="principal" value="Submit" /> <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl" class="cancel">Cancel</a></p> > </fieldset> > </form> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >index 3fd7b39854..582b6f14eb 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 >@@ -42,9 +42,10 @@ > > [% INCLUDE 'rotating-collections-toolbar.inc' %] > >- <h1>Rotating collections</h1> >+ <h2>Rotating collections</h2> > <div> > [% IF ( collectionsLoop ) %] >+ <fieldset id="searchresults"> > <table id="rotating-collections-table"> > <thead> > <tr> >@@ -62,7 +63,7 @@ > <td>[% Branches.GetName( collectionsLoo.colBranchcode ) | html %]</td> > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs" dropdown-toggle" id="collectionsactions[% collectionsLoo.colId | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs" id="lientype" dropdown-toggle" id="collectionsactions[% collectionsLoo.colId | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="collectionsactions[% collectionsLoo.colId | html %]"> > <li><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-plus"></i> Add or remove items</a></li> >@@ -76,6 +77,7 @@ > [% END %] > </tbody> > </table> >+ </fieldset> > [% ELSE %] > <div class="dialog message">There are no collections currently defined.</div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt >index 7cd5b3edf0..164a59a44d 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 >@@ -45,7 +45,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Transfer collection <em>[% colTitle | html %]</em></h1> >+ <h2>Transfer collection <em>[% colTitle | html %]</em></h2> > > [% IF ( messages ) %] > [% FOREACH message IN messages %] >@@ -63,12 +63,12 @@ > [% IF ( transferSuccess ) %] > <div class="dialog message"> > <p>Collection transferred successfully</p> >- <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> >+ <p><a id="lientype" href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> > </div> > [% ELSIF ( transferFailure ) %] > <div class="dialog alert"> > <p>Failed to transfer collection</p> >- <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> >+ <p><a id="lientype" href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> > </div> > [% END %] > >@@ -86,9 +86,8 @@ > </select> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="submit" value="Transfer collection"> <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl" class="cancel">Cancel</a> >+ >+ <input type="submit" class="principal" value="Transfer collection"> <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl" class="cancel">Cancel</a> > </fieldset> > </form> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 3d11186e2a..f5e8df34b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -8,7 +8,7 @@ > [% USE TablesSettings %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'circ-search.inc' %] >+ [% INCLUDE 'cat-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >@@ -118,9 +118,10 @@ > <div class="col-md-8 col-md-offset-2"> > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="editsuggestion" href="suggestion.pl?op=edit&suggestionid=[% suggestionid | html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default deletesuggestion" href="suggestion.pl?op=delete&suggestionid=[% suggestionid | html %]"><i class="fa fa-trash"></i> Delete</a> >- </div> >+ <div> >+ <a class="btn btn-default pat" id="editsuggestion" href="suggestion.pl?op=edit&suggestionid=[% suggestionid | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default deletesuggestion pat" href="suggestion.pl?op=delete&suggestionid=[% suggestionid | html %]"><i class="fa fa-trash"></i> Delete</a> >+ </div></div> > > <fieldset class="rows"> > <h3>Bibliographic information</h3> >@@ -203,22 +204,22 @@ > <span class="label">Status:</span> > [% SET status_found = 0 %] > [% IF ( STATUS == 'ASKED' ) %] >- <span>Pending</span> >+ Pending > [% SET status_found = 1 %] > [% ELSIF ( STATUS == 'ACCEPTED' ) %] >- <span>Accepted</span> >+ Accepted > [% SET status_found = 1 %] > [% ELSIF ( STATUS == 'CHECKED' ) %] >- <span>Checked</span> >+ Checked > [% SET status_found = 1 %] > [% ELSIF ( STATUS == 'REJECTED' ) %] >- <span>Rejected</span> >+ Rejected > [% SET status_found = 1 %] > [% ELSIF ( STATUS == 'ORDERED' ) %] >- <span>Ordered</span> >+ Ordered > [% SET status_found = 1 %] > [% ELSIF ( STATUS == 'AVAILABLE' ) %] >- <span>Available</span> >+ Available > [% SET status_found = 1 %] > [% ELSE %] > [% FOREACH s IN SuggestionStatuses %] >@@ -321,7 +322,7 @@ > </fieldset> > > <fieldset class="action"> >- <a href="suggestion.pl"><< Back to suggestions</a> >+ <a href="suggestion.pl" id="lientype"><< Back to suggestions</a> > </fieldset> > > </div> <!-- /.col-md-8 col-md-offset-2 --> >@@ -343,11 +344,11 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'biblio_exists' %] >- <span>A similar document already exists: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message.</span> >+ A similar document already exists: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message. > [% CASE 'manager_not_enough_permissions' %] >- <span>The manager you selected does not have sufficient permissions.</span> >+ The manager you selected does not have sufficient permissions. > [% CASE %] >- <span>[% m.code | html %]</span> >+ [% m.code | html %] > [% END %] > </div> <!-- /.dialog --> > [% END %] >@@ -488,7 +489,7 @@ > [% ELSE %] > <input type="text" size="31" id="select-other_reason" name="other_reason" placeholder="please note your reason here..." /> > [% END %] >- <a href="#back">Cancel</a> >+ <a class="cancel" href="#back">Cancel</a> > </span> > </li> > [% END %] >@@ -517,7 +518,7 @@ > [% END %] > </td> > <td> >- <a href="#" id="edit_suggester" class="btn btn-default">Set to patron</a> >+ <a href="#" id="edit_suggester" class="btn btn-default lientype">Set to patron</a> > </td> > </tr> > <tr> >@@ -567,9 +568,9 @@ > | Previously was [% INCLUDE 'patron-title.inc' patron=managedby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( managedby_patron.branchcode ) | html %] ([% managedby_patron.category.description | html %]) > [% END %] > <br /> >- <a id="edit_manager" class="new_window" href="#"><i class="fa fa-search"></i> Select manager</a> >+ <a id="edit_manager" class="new_window lientype" href="#"><i class="fa fa-search"></i> Select manager</a> > [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %] >- <a id="restore_previous_manager" href="#"><i class="fa fa-trash"></i> Keep existing manager</a> >+ <a id="restore_previous_manager" class="lientype" href="#"><i class="fa fa-trash"></i> Keep existing manager</a> > [% END %] > <input type="hidden" name="managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" /> > >@@ -646,7 +647,7 @@ > [% IF ( suggestionid ) %] > [% IF ( need_confirm ) %] > <input type="hidden" name="save_confirmed" value="1" /> >- <input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" /> >+ <input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" class="principal" value="Confirm your suggestion" /> > [% ELSE %] > <input type="submit" class="principal" value="Save" /> > [% END %] >@@ -654,7 +655,7 @@ > [% ELSE %] > [% IF ( need_confirm ) %] > <input type="hidden" name="save_confirmed" value="1" /> >- <input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" /> >+ <input onclick="this.form.op.value = 'save'; this.form.submit();" class="principal" type="submit" value="Confirm your suggestion" /> > [% ELSE %] > <input type="submit" class="principal" value="Submit your suggestion" /> > [% END %] >@@ -666,10 +667,9 @@ > > [% IF op == 'else' %] > <div id="toolbar" class="btn-toolbar"> >- <div> >- <a class="pat" id="newsuggestion" href="suggestion.pl?op=add&branchcode=[% branchcode | uri %]"><i class="fa fa-plus"></i> New purchase suggestion</a> >- </div> >- </div> >+ <div> >+ <a class="btn btn-default pat" id="newsuggestion" href="suggestion.pl?op=add&branchcode=[% branchcode | uri %]"><i class="fa fa-plus"></i> New purchase suggestion</a> >+ </div></div> > > <h2>Suggestions management</h2> > >@@ -685,37 +685,37 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'already_exists' %] >- <span>The suggestion has not been added. A suggestion with this title already exists (<a href='/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% m.id | html %]&op=show'>suggestion #[% m.id | html %]</a>)</span> >+ The suggestion has not been added. A suggestion with this title already exists (<a href='/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% m.id | html %]&op=show'>suggestion #[% m.id | html %]</a>) > [% CASE 'biblio_exists' %] >- <span>A similar document already exists: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message.</span> >+ A similar document already exists: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message. > [% CASE %] >- <span>[% m.code | html %]</span> >+ [% m.code | html %] > [% END %] > </div> <!-- /.dialog --> > [% END # /FOR m %] > > [% UNLESS ( notabs ) %] > <div id="suggestiontabs" class="toptabs"> >- <fieldset id="searchresults"> >- <ul class="ui-tabs-nav" role="tablist"> >+ <div id="searchresults"> >+ <ul class="ui-tabs-nav"> > [% FOREACH suggestion IN suggestions %] >- <li role="presentation"> >- <a href="#[% suggestion.suggestiontype | uri %]" aria-controls="[% suggestion.suggestiontype | uri %]" role="tab" data-toggle="tab"> >+ <li> >+ <a href="#[% suggestion.suggestiontype | uri %]"> > [% IF ( suggestion.suggestiontypelabel ) %] >- [% IF (suggestion.suggestiontypelabel == "Pending") %]<span>Pending</span> >- [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]<span>Accepted</span> >- [% ELSIF (suggestion.suggestiontypelabel == "Checked") %]<span>Checked</span> >- [% ELSIF (suggestion.suggestiontypelabel == "Rejected") %]<span>Rejected</span> >- [% ELSIF (suggestion.suggestiontypelabel == "Available") %]<span>Available</span> >- [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]<span>Ordered</span> >- [% ELSIF (suggestion.suggestiontypelabel == "Unknown") %]<span>Status unknown</span> >- [% ELSIF (suggestion.suggestiontypelabel == "__ANY__") %]<span>Any</span> >+ [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending >+ [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]Accepted >+ [% ELSIF (suggestion.suggestiontypelabel == "Checked") %]Checked >+ [% ELSIF (suggestion.suggestiontypelabel == "Rejected") %]Rejected >+ [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available >+ [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered >+ [% ELSIF (suggestion.suggestiontypelabel == "Unknown") %]Status unknown >+ [% ELSIF (suggestion.suggestiontypelabel == "__ANY__") %]Any > [% ELSE %][% suggestion.suggestiontypelabel | html %][% END %] > [% ELSE %] > [% IF ( suggestion.suggestiontype ) %] > [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.suggestiontype ) | html %] > [% ELSE %] >- <span>No name</span> >+ No name > [% END %] > [% END %] > ([% suggestion.suggestions.size| html %]) >@@ -723,7 +723,6 @@ > > [% END # /FOREACH suggestion %] > </ul> <!-- /.ui-tabs-nav --> >- <div class="tab-content"> > [% END # /UNLESS notabs %] > > [% FOREACH suggestion IN suggestions %] >@@ -736,11 +735,29 @@ > > [% IF suggestion.suggestions.size %] > <p> >- <a class="checkall" id="lientype" href="#">Check all</a> | <a class="uncheckall" id="lientype" href="#">Uncheck all</a> >+ <a class="checkall" href="#">Check all</a> | <a class="uncheckall" href="#">Uncheck all</a> > </p> > >- <table id="table_[% loop.count | html %]" class="sorted"> >- <thead> >+ <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>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> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH suggestions_loo IN suggestion.suggestions_loop %] > <tr> > <td> > <input type="checkbox" name="suggestionid" value="[% suggestions_loo.suggestionid | html %]" /> >@@ -834,7 +851,7 @@ > </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> >+ <a class="btn btn-default btn-xs" role="button" href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | html %]&op=edit" id="lientype"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle lientype" id="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 %] >@@ -946,7 +963,7 @@ > </td> > <td class="actions"> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs" role="button" href="suggestion.pl?suggestionid=[% s.suggestionid | html %]&op=edit"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" id="more_actions_[% s.suggestionid | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> >+ <a class="btn btn-default btn-xs" id="lientype" role="button" href="suggestion.pl?suggestionid=[% s.suggestionid | html %]&op=edit"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" id="lientype" id="more_actions_[% s.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_[% s.suggestionid | html %]"> > <li><a class="deletesuggestion" href="suggestion.pl?op=delete&suggestionid=[% s.suggestionid | html %]"><i class="fa fa-trash"></i> Delete</a></li> > [% UNLESS s.archived %] >@@ -977,39 +994,42 @@ > <option value="ASKED">Pending</option> > [% END %] > >- [% IF (statusselected_ACCEPTED ) %] >- <option value="ACCEPTED" selected="selected">Accepted</option> >- [% ELSE %] >- <option value="ACCEPTED">Accepted</option> >- [% END %] >+ [% IF ( statusselected_REJECTED ) %] >+ <option value="REJECTED" selected="selected">Rejected</option> >+ [% ELSE %] >+ <option value="REJECTED">Rejected</option> >+ [% END %] > >- [% IF (statusselected_CHECKED ) %] >- <option value="CHECKED" selected="selected">Checked</option> >- [% ELSE %] >- <option value="CHECKED">Checked</option> >- [% END %] >+ [% IF ( statusselected_ORDERED ) %] >+ <option value="ORDERED" selected="selected">Ordered</option> >+ [% ELSE %] >+ <option value="ORDERED">Ordered</option> >+ [% END %] > >- [% IF ( statusselected_REJECTED ) %] >- <option value="REJECTED" selected="selected">Rejected</option> >- [% ELSE %] >- <option value="REJECTED">Rejected</option> >- [% END %] >+ [% FOREACH s IN SuggestionStatuses %] >+ <option value="[% s.authorised_value | html %]">[% s.lib | html %]</option> >+ [% END %] >+ </select> > >- [% IF ( statusselected_ORDERED ) %] >- <option value="ORDERED" selected="selected">Ordered</option> >- [% ELSE %] >- <option value="ORDERED">Ordered</option> >- [% END %] >+ <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> > >- [% FOREACH s IN SuggestionStatuses %] >- <option value="[% s.authorised_value | html %]">[% s.lib | html %]</option> >- [% END %] >- </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" id="lientype" value="update_status">Submit</button> >+ <button type="submit" class="btn btn-default btn-xs principal" value="update_status">Submit</button> > </fieldset> > </fieldset> > </div> <!-- /.col-sm-4 --> >@@ -1023,7 +1043,7 @@ > <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> >+ <button type="submit" class="btn btn-default btn-xs principal" value="update_itemtype">Submit</button> > </fieldset> > </fieldset> > </div> <!-- /.col-sm-4 --> >@@ -1031,13 +1051,13 @@ > <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> >+ <a id="set_manager_[% loop.count | html %]" data-tab="[% loop.count | html %]" class="set_manager lientype" 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> >+ <button type="submit" class="btn btn-default btn-xs principal" value="update_manager">Submit</button> > </fieldset> > </fieldset> > </div> <!-- /.col-sm-2 --> >@@ -1048,22 +1068,30 @@ > <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> > <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> > <fieldset class="action"> >+<<<<<<< HEAD > <button type="submit" class="btn btn-default btn-xs" id="lientype" value="delete">Delete</button> > </fieldset> > </div> <!-- /.col-sm-2 --> > </div> <!-- /.row --> >+======= >+ <button type="submit" class="btn btn-default btn-xs cancel" value="delete">Delete</button> >+ </fieldset> >+ </fieldset> >+ </div> <!-- /.col-sm-2 --> >+ </div> <!-- /.row --> >+>>>>>>> Bug 30952: update patron and suggestion > >- [% ELSE %] >- <strong>No results.</strong> >- [% END # /IF ( suggestion.suggestions_loop ) %] >- </form> <!-- /.update_suggestions --> >- </div> <!-- /#[% suggestion.suggestiontype | html %] --> >- [% END # /FOREACH suggestion %] >+ [% ELSE %] >+ <strong>No results.</strong> >+ [% END # /IF ( suggestion.suggestions_loop ) %] >+ </form> <!-- /.update_suggestions --> >+ </div> <!-- /#[% suggestion.suggestiontype | html %] --> >+ [% END # /FOREACH suggestion %] > [% UNLESS ( notabs ) %] >- </fieldset> > </div> <!-- /.notabs --> > [% END # /UNLESS notabs %] > [% END # /IF op == 'else' %] >+ </div> > > [% UNLESS op == 'save' %] > [% UNLESS ( op == 'show' ) %] >@@ -1071,7 +1099,6 @@ > > <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"> >@@ -1104,8 +1131,8 @@ > [% ELSE %] > <option value="acceptedby">Accepted by</option> > [% END %] >- </select> >- <input class="principal" type="submit" value="Go" /></p> >+ </select></p> >+ <input type="submit" class="principal" value="Go" /> > </li> > </ol> > </fieldset> <!-- /.brief --> >@@ -1114,7 +1141,7 @@ > > <div id="limits"> > <fieldset class="brief"> >- <h4 class="local_collapse"><a href="#">Bibliographic information <span class="caret"></span></a></h4> >+ <h4 class="local_collapse"><a href="#">Bibliographic information</a></h4> > <ol> > <li> > <p for="title"> Title: >@@ -1138,22 +1165,28 @@ > </li> > <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" /> >+ <input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle | html %]" /></li><li><input type="submit" class="principal" value="Go" /> > </p></li> > </ol> > </fieldset> <!-- /.brief --> > > <fieldset class="brief"> >- <h4 class="local_collapse"><a href="#">Suggestion information <span class="caret"></span></a></h4> >+ <h4 class="local_collapse"><a href="#">Suggestion information</a></h4> > <ol> > <li> > <p for="archived" style="display: inline;">Include archived: > [% IF filter_archived %] > <input type="checkbox" id="archived" value="1" name="filter_archived" checked="checked" title="Include archived suggestions in the search" /> > [% ELSE %] >+<<<<<<< HEAD > <input type="checkbox" id="archived" value="1" name="filter_archived" title="Include archived suggestions in the search" /> > [% END %] > </li> >+======= >+ <input type="checkbox" id="archived" name="filter_archived" title="Include archived suggestions in the search" /> >+ [% END %] >+ </p></li> >+>>>>>>> Bug 30952: update patron and suggestion > <li> > <p for="STATUS[% loop.index | html %]"> Status: > <select name="STATUS" id="STATUS[% loop.index | html %]"> >@@ -1209,8 +1242,8 @@ > <option value="[% suggestedby_loo.code | html %]">[% suggestedby_loo.desc | html %]</option> > [% END %] > [% END %] >- </select></p> >- </li> >+ </select> >+ </p></li> > <li> > <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" /> >@@ -1251,8 +1284,8 @@ > <option value="[% acceptedby_loo.code | html %]">[% acceptedby_loo.desc | html %]</option> > [% END %] > [% END %] >- </select> >- </p></li> >+ </select></p> >+ </li> > <li> > <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" /> >@@ -1262,14 +1295,14 @@ > <input type="text" id="accepteddate_to" size="10" name="accepteddate_to" value="[% accepteddate_to | html %]" class="flatpickr" /> > </p></li> > <li> >- <input class="principal" type="submit" value="Go" /> >+ <input type="submit" class="principal" value="Go" /> > </li> > </ol> > </fieldset> > > <fieldset class="brief"> > <h4 class="local_collapse"> >- <a href="#">Acquisition information <span class="caret"></span></a> >+ <a href="#">Acquisition information</a> > </h4> > <ol> > <li> >@@ -1291,7 +1324,7 @@ > </select></p> > </li> > <li> >- <input class="principal" type="submit" value="Go" /> >+ <input type="submit" class="principal" value="Go" /> > </li> > </ol> > </fieldset> >@@ -1299,7 +1332,7 @@ > </form> <!-- /suggestionsfilter --> > > [% INCLUDE 'acquisitions-menu.inc' %] >- </div> >+ > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > [% END # /UNLESS ( op == 'show' ) %] >@@ -1315,9 +1348,9 @@ > var tab = ''; > function editManagerPopup(selected_tab) { > tab = selected_tab; >- window.open("/cgi-bin/koha/members/search.pl?columns=cardnumber,name,branch,category,action&selection_type=select&callback=select_manager&filter=suggestions_managers", >+ window.open("/cgi-bin/koha/suggestion/add_user_search.pl?selection_type=select&callback=select_manager&permissions=suggestions.suggestions_manage", > 'PatronPopup', >- 'width=1024,height=768,scrollbars=yes,toolbar=no,' >+ 'width=740,height=450,location=yes,toolbar=no,' > + 'scrollbars=yes,resize=yes' > ); > } >@@ -1352,9 +1385,9 @@ > } > > function editSuggesterPopup() { >- window.open("/cgi-bin/koha/members/search.pl?columns=cardnumber,name,branch,category,action&selection_type=select&callback=select_suggester", >+ window.open("/cgi-bin/koha/suggestion/add_user_search.pl?selection_type=select&callback=select_suggester", > 'PatronPopup', >- 'width=1024,height=768,scrollbars=yes,toolbar=no,' >+ 'width=740,height=450,location=yes,toolbar=no,' > + 'scrollbars=yes,resize=yes' > ); > } >@@ -1400,17 +1433,23 @@ > [% INCLUDE 'columns_settings.inc' %] > <script> > $(document).ready(function() { >+<<<<<<< HEAD > if( $("#suggestiontabs .tab-pane.active").length < 1 ){ > $("#suggestiontabs a:first").tab("show"); > } > > table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'suggestions', 'suggestions', 'json' ) | $raw %] >+======= >+ $('#suggestiontabs').tabs(); >+ >+ columns_settings = [% TablesSettings.GetColumns( 'acqui', 'suggestions', 'suggestions', 'json' ) | $raw %] >+>>>>>>> Bug 30952: update patron and suggestion > [% FOREACH suggestion IN suggestions %] > [% IF suggestion.suggestions.size %] > KohaTable("table_[% loop.count| html %]", { > "sorting": [[ 3, "asc" ]], > "autoWidth": false, >- }, table_settings ); >+ }, columns_settings ); > [% END %] > [% END %] > >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 e72cb839c9..c994340999 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -49,7 +49,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > > <div class="row"> > <div class="col-sm-8 col-sm-push-2"> >-<h1>Tags</h1> >+<h2>Tags</h2> > <form method="post" action="/cgi-bin/koha/tags/review.pl"> > <h4><span>Displaying</span> > [% IF ( filter_approved_all ) %]<span>all</span>[% END %] >@@ -199,7 +199,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > <div class="description">Enter a word or phrase to check against approved/rejected lists: </div> > <form method="post" action="/cgi-bin/koha/tags/review.pl"> > <input type="text" size="14" name="test" id="test" /> >- <fieldset class="action"><button type="submit" value="Test" class="approval_btn btn btn-default btn-sm" id="test_button" name="op-test"><i class="fa fa-check-square-o" aria-hidden="true"></i> Test</button></fieldset> >+ <fieldset class="action"><button type="submit" value="Test" class="approval_btn btn btn-default btn-sm principal" id="test_button" name="op-test"><i class="fa fa-check-square-o" aria-hidden="true"></i> Test</button></fieldset> > <div id="verdict"> > [% IF ( test_term ) %] > [% IF ( verdict_ok ) %] >@@ -217,13 +217,14 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > </div> > <div class="col-sm-2 col-sm-pull-10"> > <aside> >+ <div id="filters"> > <form method="post" action="/cgi-bin/koha/tags/review.pl"> > <fieldset class="brief"> > <h4>Filters</h4> > <ol> >- <li><label for="tag">Term:</label> <input type="text" name="tag" id="tag" value="[% filter_tag | html %]" /> >+ <li><p for="tag">Term:<input type="text" name="tag" id="tag" value="[% filter_tag | html %]" /></p> > </li> >- <li><label for="approved">Status:</label> >+ <li><p for="approved">Status: > <select name="approved" id="approved"> > [% IF ( filter_approved_all ) %]<option selected="selected" value="all">all</option> > [% ELSE %]<option value="all">all</option>[% END %] >@@ -233,23 +234,24 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > [% ELSE %]<option value="0">pending</option>[% END %] > [% IF ( filter_approved_rej ) %]<option selected="selected" value="-1">rejected</option> > [% ELSE %]<option value="-1">rejected</option>[% END %] >- </select> >+ </select></p> > </li> >- <li><label for="approver">Reviewer:</label> <input type="text" name="approver" id="approver" value="[% filter_approver | html %]" /> >+ <li><p for="approver">Reviewer: <input type="text" name="approver" id="approver" value="[% filter_approver | html %]" /></p> > </li> > <li> >- <label for="from">Date: from </label> >+ <p for="from">Date: from > <input type="text" size="10" id="from" name="from" value="[% filter_date_approved_from | html %]" class="flatpickr" data-date_to="to" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> > >- <label for="to">...to </label> >+ <p for="to">...to > <input type="text" size="10" id="to" name="to" value="[% filter_date_approved_to | html %]" class="flatpickr" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> > </li> > </ol> >- <fieldset class="action"><button type="submit" class="btn btn-default btn-sm"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset> >+ <fieldset class="action"><button type="submit" class="btn btn-default btn-sm principal"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset> > </fieldset> > </form> >+</div> > </aside> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >index d8860a331d..21934481b0 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 >@@ -261,6 +261,7 @@ > > [% IF languages.size %] > <div id="tabs" class="toptabs"> >+ <fieldset id="searchresults"> > <ul class="nav nav-tabs" role="tablist"> > [% FOR language IN languages %] > [% IF language.lang == 'default' %] >@@ -273,7 +274,7 @@ > <div class="tab-content"> > [% FOR language IN languages %] > <div id="lang_[% language.lang | uri %]" class="lang clearfix tab-pane" data-lang="[% language.description | html %]"> >- <fieldset class="rows"> >+ <fieldset> > <ol> > <li> > <label for="title_[% language.lang | html %]">Title: </label> >@@ -289,6 +290,7 @@ > </div> > [% END %] > </div> <!-- /.tab-content --> >+ </fieldset> > </div> > [% ELSE %] > <div id="lang_default"> >@@ -393,7 +395,7 @@ > [% c.content | $raw %] > </div> > <div class="modal-footer"> >- <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> >+ <button type="button" class="btn btn-secondary cancel" data-dismiss="modal">Close</button> > </div> > </div> > </div> >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 6c24140838..abaa46592a 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 >@@ -53,21 +53,19 @@ > > [% IF ( op == 'edit_form' ) %] > <form method="post" id="rules_form" action="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"> >- <h2>Rules for automatic item modifications by age</h2> > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> > <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="pat"><i class="fa fa-save"></i> Save</button> >+ <button type="submit" id="save_rules" class="principal"><i class="fa fa-save"></i> Save</button> > </div> > <div class="btn-group"> >- <a class="pat" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"><i class="fa fa-remove"></i> Cancel</a> >+ <a class="cancel" 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 %] >- <h2>Automatic item modifications by age</h2> > [% IF ( rules ) %] > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >@@ -134,8 +132,8 @@ > </select> > = > <input type="text" value="[% condition.value | html %]" name="condition_value_[% id | html %]" /> >- <a class="add_block" href="#"><i class="fa fa-plus"></i> Add a condition</a> >- <a class="remove_block" href="#"><i class="fa fa-trash"></i> Remove condition</a> >+ <a class="add_block" href="#" id="lientype"><i class="fa fa-plus"></i> Add a condition</a> >+ <a class="remove_block" href="#" id="lientype"><i class="fa fa-trash"></i> Remove condition</a> > </div> > [% END %] > </div> >@@ -155,8 +153,8 @@ > </select> > = > <input type="text" value="[% substitution.value | html %]" name="substitution_value_[% id | html %]" /> >- <a class="add_block" href="#"><i class="fa fa-plus"></i> Add a substitution</a> >- <a class="remove_block" href="#"><i class="fa fa-trash"></i> Remove substitution</a> >+ <a class="add_block" href="#" id="lientype"><i class="fa fa-plus"></i> Add a substitution</a> >+ <a class="remove_block" href="#" id="lientype"><i class="fa fa-trash"></i> Remove substitution</a> > <span class="required">A field name is required</span> > </div> > [% END %] >@@ -200,8 +198,8 @@ > </select> > = > <input type="text" value="" name="condition_value" /> >- <a class="add_block" href="#"><i class="fa fa-plus"></i> Add a condition</a> >- <a class="remove_block" href="#"><i class="fa fa-trash"></i> Remove condition</a> >+ <a class="add_block" href="#" id="lientype"><i class="fa fa-plus"></i> Add a condition</a> >+ <a class="remove_block" href="#" id="lientype"><i class="fa fa-trash"></i> Remove condition</a> > </div> > </div> > <div class="blocks"> >@@ -215,8 +213,8 @@ > </select> > = > <input type="text" value="" name="substitution_value" /> >- <a class="add_block" href="#"><i class="fa fa-plus"></i> Add a substitution</a> >- <a class="remove_block" href="#"><i class="fa fa-trash"></i> Remove substitution</a> >+ <a class="add_block" href="#" id="lientype"><i class="fa fa-plus"></i> Add a substitution</a> >+ <a class="remove_block" href="#" id="lientype"><i class="fa fa-trash"></i> Remove substitution</a> > <span class="required">A field name is required</span> > </div> > </div> >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 833e4bda59..d302d81563 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 >@@ -40,25 +40,25 @@ > > <div class="main container-fluid"> > >- <h1>Batch item modification</h1> >+ <h2>Batch item modification</h2> > [% IF op == 'enqueued' %] > <div class="dialog message"> > <p>The job has been enqueued! It will be processed as soon as possible.</p> >- <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> >- | <a href="/cgi-bin/koha/tools/batchMod.pl" title="New batch item modification">New batch item modification</a></p> >+ <p><a id="lientype" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> >+ | <a id="lientype" href="/cgi-bin/koha/tools/batchMod.pl" title="New batch item modification">New batch item modification</a></p> > </div> > > <fieldset class="action"> > [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] > [% IF searchid %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]">Return to the record</a> >+ <a id="lientype" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]">Return to the record</a> > [% ELSE %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a> >+ <a id="lientype" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a> > [% END %] > [% ELSIF src %] >- <a href="[% src | url %]">Return to where you were</a> >+ <a id="lientype" href="[% src | url %]">Return to where you were</a> > [% ELSE %] >- <a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a> >+ <a id="lientype" href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a> > [% END %] > </fieldset> > [% END %] >@@ -179,15 +179,16 @@ > > [% UNLESS (too_many_items_process) %] > <div id="cataloguing_additem_newitem"> >- <h2>Edit items</h2> >- <div class="hint">Checking the box right next to the subfield label will disable the entry and delete the subfield on all selected items. Leave fields blank to make no change.</div> >+ > <fieldset class="rows"> >+ <h3>Edit items</h3> >+ <div class="hint">Checking the box right next to the subfield label will disable the entry and delete the subfield on all selected items. Leave fields blank to make no change.</div> > [%# no_plugin from batchMod-edit, jQuery is included at the end of the template and cataloguing plugins are not working in this situation %] > [% PROCESS subfields_for_item subfields => subfields, add_regex => 1, add_delete_checkbox => 1, no_plugin => 1 %] > </fieldset> > > <fieldset class="rows"> >- <legend>Other attributes</legend> >+ <h3>Other attributes</h3> > <ol> > <li> > <div class="subfield_line"> >@@ -203,25 +204,25 @@ > </fieldset> > > <fieldset class="action"> >- <input type="submit" id="mainformsubmit" value="Save" /> >+ <input type="submit" class="principal" id="mainformsubmit" value="Save" /> > <a href="/cgi-bin/koha/tools/batchMod.pl" class="cancel">Cancel</a> > </fieldset> > </div> <!-- /#cataloguing_additem_newitem --> > [% ELSE %] >- <p><a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a></p> >+ <p><a id="lientype" href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a></p> > [% END # /UNLESS too_many_items_process %] > [% ELSE # IF show %] > <fieldset class="action"> > [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] > [% IF searchid %] >- <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> >+ <a id="lientype" class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> > [% ELSE %] >- <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> >+ <a id="lientype" class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> > [% END %] > [% ELSIF src %] >- <a class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square-o"></i> Return to where you were</a> >+ <a id="lientype"class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square-o"></i> Return to where you were</a> > [% ELSE %] >- <a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a> >+ <a id="lientype" class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a> > [% END %] > </fieldset> <!-- /.action --> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >index a381c580e8..4ddc01b033 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 >@@ -82,7 +82,7 @@ > </li> > [% IF lists.count %] > <li id="show_list_option" role="presentation"> >- <a href="#shelves_tab" aria-controls="shelves_tab" role="tab" data-toggle="tab">Select a list of records</a> >+ <a href="#shelves_tab" aria-controls="shelves_tab" role="tab" data-toggle="tab">Select a list of records</a> > </li> > [% END %] > <li role="presentation"> >@@ -92,7 +92,7 @@ > > <div class="tab-content"> > <div id="uploadfile_tab" role="tabpanel" class="tab-pane active"> >- <fieldset class="rows"> >+ <fieldset> > <h3>Use a file</h3> > <ol> > <li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li> >@@ -103,7 +103,7 @@ > > [% IF lists.count %] > <div id="shelves_tab" role="tabpanel" class="tab-pane"> >- <fieldset class="rows"> >+ <fieldset> > <h3>Or select a list of records</h3> > <ol> > <li> >@@ -122,7 +122,7 @@ > [% END %] > > <div id="enterlist_tab" role="tabpanel" class="tab-pane"> >- <fieldset class="rows"> >+ <fieldset> > <h3>Or enter a list of record numbers</h3> > <ol> > <li> >@@ -149,9 +149,9 @@ > <div id="toolbar"> > <a id="selectall" href="#"><i class="fa fa-check"></i> Select all</a> > | <a id="clearall" href="#"><i class="fa fa-remove"></i> Clear all</a> >- | <a id="selectwithoutitems" href="#">Select without items</a> >- | <a id="selectnotreserved" href="#">Select without holds</a> >- | <a id="selectwithoutsubscriptions" href="#">Select without subscriptions</a> >+ | <a class="lientype" id="selectwithoutitems" href="#">Select without items</a> >+ | <a class="lientype" id="selectnotreserved" href="#">Select without holds</a> >+ | <a class="lientype" id="selectwithoutsubscriptions" href="#">Select without subscriptions</a> > </div> > <form action="/cgi-bin/koha/tools/batch_delete_records.pl" method="post" id="selectrecords"> > <table id="biblios" class="records"> >@@ -185,7 +185,7 @@ > <div id="toolbar"> > <a id="selectall" href="#"><i class="fa fa-check"></i> Select all</a> > | <a id="clearall" href="#"><i class="fa fa-remove"></i> Clear all</a> >- | <a id="clearlinkedtobiblio" href="#">Clear used authorities</a> >+ | <a class="lientype" id="clearlinkedtobiblio" href="#">Clear used authorities</a> > </div> > <form action="/cgi-bin/koha/tools/batch_delete_records.pl" method="post" id="selectauths"> > <table id="authorities" class="records"> >@@ -223,8 +223,8 @@ > [% ELSIF op == 'enqueued' %] > <div class="dialog message"> > <p>The job has been enqueued! It will be processed as soon as possible.</p> >- <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> >- | <a href="/cgi-bin/koha/tools/batch_delete_records.pl" title="New batch record deletion">New batch record deletion</a></p> >+ <p><a id="lientype" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> >+ | <a id="lientype" href="/cgi-bin/koha/tools/batch_delete_records.pl" title="New batch record deletion">New batch record deletion</a></p> > </div> > [% ELSE %] > No action defined for the template. >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 42988e13f4..474e21d59b 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 >@@ -12,7 +12,7 @@ > </head> > > <body id="tools_batch_record_modification" class="tools"> >- [% INCLUDE 'header.inc' form=formulaire %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -83,59 +83,37 @@ > <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> >- </li> >- [% IF lists.count %] >- <li id="show_list_option"> >- <a href="#shelves_tab" aria-controls="shelves_tab" role="tab" data-toggle="tab">Select a list of records</a> >- </li> >- [% END %] >- <li role="presentation"> >- <a href="#enterlist_tab" aria-controls="enterlist_tab" role="tab" data-toggle="tab">Enter a list of record numbers</a> >- </li> >+ <fieldset id="searchresults"> >+ <ul> >+ <li><a href="#uploadfile_tab">Upload a file</a></li> >+ [% IF lists.count %]<li id="show_list_option"><a href="#shelves_tab">Select a list of records</a></li>[% END %] >+ <li><a href="#enterlist_tab">Enter a list of record numbers</a></li> > </ul> > >- <div class="tab-content"> >- <div id="uploadfile_tab" role="tabpanel" class="tab-pane active"> >- <fieldset class="rows"> >- <ol> >- <li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li> >- </ol> >- </fieldset> >- >- </div> >- >- [% IF lists.count %] >- <div id="shelves_tab" role="tabpanel" class="tab-pane"> >- <fieldset class="rows"> >- <ol> >- <li> >- <label for="shelf_number">List: </label> >- <select name="shelf_number" id="shelf_number"> >- <option value="">Select a list</option> >- [% FOREACH list IN lists %] >- <option value="[% list.shelfnumber | html %]">[% list.shelfname | html %]</option> >- [% END %] >- </option> >- </select> >- </li> >- </ol> >- </fieldset> >- >- </div> >- [% END %] >+ <div id="uploadfile_tab"> >+ <fieldset class="rows"> >+ <h3>Use a file</h3> >+ <ol> >+ <li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li> >+ </ol> >+ </fieldset> >+ >+ </div> > >- <div id="enterlist_tab" role="tabpanel" class="tab-pane"> >+ [% IF lists.count %] >+ <div id="shelves_tab"> > <fieldset class="rows"> > <h3>Or select a list of records</h3> > <ol> > <li> >- <label for="recordnumber_list">Record numbers: </label> >- <textarea rows="10" cols="30" id="recordnumber_list" name="recordnumber_list"></textarea> >- <div class="hint">Enter a list of biblionumbers or authority IDs, one per line.</div> >+ <label for="shelf_number">Use records from the following list: </label> >+ <select name="shelf_number" id="shelf_number"> >+ <option value="">Select a list</option> >+ [% FOREACH list IN lists %] >+ <option value="[% list.shelfnumber | html %]">[% list.shelfname | html %]</option> >+ [% END %] >+ </option> >+ </select> > </li> > </ol> > </fieldset> >@@ -162,7 +140,7 @@ > <h3>Use MARC modification template:</h3> > <ol> > <li> >- <label for="marc_modification_template_id" class="required">Template: </label> >+ <label for="marc_modification_template_id" class="required">Modify record using the following template: </label> > <select name="marc_modification_template_id" id="marc_modification_template_id" required="required"> > <option value="">Select a template</option> > [% FOREACH mmt IN MarcModificationTemplatesLoop %] >@@ -174,7 +152,7 @@ > </fieldset> > <fieldset class="action"> > <input type="hidden" name="op" value="list" /> >- <input class="principal" type="submit" value="Continue" class="button" /> >+ <input type="submit" class="principal" value="Continue" class="button" /> > <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> > </fieldset> > </form> <!-- /#record_ids_selection --> >@@ -229,7 +207,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 %]" id="lientype" 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 %]" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a> > </td> > </tr> > [% END %] >@@ -245,7 +223,7 @@ > <thead> > <tr> > <th></th> >- <th>AuthID</th> >+ <th>Authid</th> > <th>Summary</th> > <th> </th> > </tr> >@@ -266,12 +244,12 @@ > <fieldset class="action"> > <input type="hidden" name="op" value="modify" /> > <input type="hidden" name="recordtype" value="[% recordtype | html %]" /> >- <input type="submit" class="principal" id="mainformsubmit" value="Modify selected records" class="button" /> >+ <input type="submit" id="mainformsubmit" value="Modify selected records" class="button principal" /> > </fieldset> > </form> <!-- /#process --> > [% ELSE %] > <div class="dialog message"> >- No records were modified. [% IF recordtype != 'biblio' %]<a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a>[% END %] >+ No records were modified. [% IF recordtype != 'biblio' %]<a id="lientype" href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a>[% END %] > </div> > [% END %] > [% ELSIF view == 'errors' %] >@@ -285,8 +263,8 @@ > [% ELSIF view == 'enqueued' %] > <div class="dialog message"> > <p>The job has been enqueued! It will be processed as soon as possible.</p> >- <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> >- | <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a></p> >+ <p><a id="lientype" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> >+ | <a id="lientype" href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a></p> > </div> > [% ELSE %] > <div class="dialog alert"> >@@ -310,6 +288,8 @@ > <script> > $(document).ready(function() { > >+ $("#batch_mod_form").tabs(); >+ > $("input[type='radio']").click(function() { > if ($(this).attr('id') == 'authority_type') { > $("#show_list_option").hide(); >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 c6aa2e078c..57a30c086a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >@@ -32,12 +32,6 @@ > </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,19 +39,16 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Export data</h1> >- > [% FOR m IN messages %] > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] >- [% CASE 'invalid_mimetype' %]<span>The file used does not have a valid format. Only csv and txt are allowed.</span> >+ [% CASE 'invalid_mimetype' %]The file used does not have a valid format. Only csv and txt are allowed. > [% CASE %][% m.code | html %] > [% END %] > </div> > [% END %] > > <div id="exporttype" class="toptabs"> >-<fieldset id="searchresults"> > <ul> > <li><a href="#bibs">Export bibliographic records</a></li> > <li><a href="#auths">Export authority records</a></li> >@@ -95,8 +86,10 @@ > [% END %] > </select> > </li> >- <li role="presentation"> >- <a href="#auths" aria-controls="auths" role="tab" data-toggle="tab">Export authority records</a> >+ >+ <li> >+ <label>With items owned by the following libraries: </label> >+ [% INCLUDE 'branch-selector.inc' branches = libraries %] > </li> > </ol> > >@@ -107,18 +100,12 @@ > <label for="startcn">From item call number: </label> > <input id="startcn" type="text" name="start_callnumber" size="15" /> > </li> >- [% END %] >- [% IF ( allow_conf_export ) %] >- <li role="presentation"> >- <a href="#conf" aria-controls="conf" role="tab" data-toggle="tab">Export configuration</a> >+ <li> >+ <label for="endcn">To item call number: </label> >+ <input id="endcn" type="text" name="end_callnumber" size="15" /> > </li> >- [% END %] >- </ul> >- <div class="tab-content"> >- <div id="bibs" role="tabpanel" class="tab-pane active"> >- <p> >- <strong>Note : The items are exported by this tool unless specified.</strong> >- </p> >+ </ol> >+ </fieldset> > > <fieldset class="rows"> > <h3>Accession date (inclusive)</h3> >@@ -191,7 +178,7 @@ > <input type="hidden" name="op" value="export" /> > <input type="hidden" name="record_type" value="bibs" /> > >- <fieldset class="action"><input type="submit" class="principal" value="Export bibliographic records" class="button" /></fieldset> >+ <fieldset class="action"><input type="submit" value="Export bibliographic records" class="button" id="principal" /></fieldset> > </form> > </div> > >@@ -250,21 +237,11 @@ > </li></ol> > </fieldset> > <input type="hidden" name="op" value="export" /> >- <inpexporttyut type="hidden" name="record_type" value="auths" /> >+ <input type="hidden" name="record_type" value="auths" /> > >- <fieldset class="rows"> >- <legend>Accession date (inclusive)</legend> >- <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> >+ <fieldset class="action"><input type="submit" value="Export authority records" class="button" id="principal" /></fieldset> >+</form> >+</div> > > [% IF ( allow_db_export ) %] > <div id="db"> >@@ -283,70 +260,14 @@ > [% END %] > </fieldset> > >- <fieldset class="action"><input type="submit" value="Export bibliographic records" class="button" /></fieldset> >- </form> >- </div> >- >- <div id="auths" role="tabpanel" class="tab-pane"> >- <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 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"> >- <legend> >- Use a file >- </legend> >- <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"> >- <legend>Options</legend> >- <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"> >- <legend>Output format</legend> >- <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" /> >- <input type="hidden" name="record_type" value="auths" /> >- >- <fieldset class="action"><input type="submit" value="Export authority records" class="button" /></fieldset> >- </form> >- </div> >+ [% 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" id="principal" /></fieldset> >+ [% END %] >+</form> >+</div> >+[% END %] > > [% IF ( allow_conf_export ) %] > <div id="conf"> >@@ -359,16 +280,21 @@ > [% 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> >+ <fieldset class="action"><input type="submit" value="Download configuration" class="button" id="principal" /></fieldset> > [% END %] > </form> > </div> > [% END %] >-</fieldset> >+ > </div> > > </main> >@@ -386,6 +312,7 @@ > [% INCLUDE 'calendar.inc' %] > <script> > $(document).ready(function() { >+ $('#exporttype').tabs(); > > $("li.csv_profiles").hide(); > >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 058d739b60..6e05719f8c 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 >@@ -351,7 +351,7 @@ > [% END %] > > <fieldset class="rows"> >- <legend>Welcome email</legend> >+ <h3>Welcome email</h3> > <ul> > <li> > <input class="welcome_new" type="checkbox" id="welcome_new" name="welcome_new"/> >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 266ce58ab5..cf5ccb6bb6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -134,8 +134,8 @@ > </div> > </div> > <div class="modal-footer"> >- <!-- TODO <a href="#" class="btn btn-default" id="preview_template_button" role="button" data-toggle="modal">Convert using the Template Toolkit syntax</a>--> >- <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ <!-- TODO <a href="#" class="btn btn-default principal" id="preview_template_button" role="button" data-toggle="modal">Convert using the Template Toolkit syntax</a>--> >+ <button class="btn btn-default cancel" data-dismiss="modal" aria-hidden="true">Close</button> > </div> > </div> <!-- /.modal-content --> > </div> <!-- /.modal-dialog --> >@@ -290,19 +290,21 @@ > [% END # /IF no_op_set %] > > [% IF add_form or copy_form %] >- <h1>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</h1> >+ <h2>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</h2> > > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <button class="btn btn-default" id="submit_form"><i class="fa fa-save"></i> Save</button> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> >+ <button class="btn btn-default principal" id="submit_form"><i class="fa fa-save"></i> Save</button> >+ <button class="btn btn-default dropdown-toggle pat" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu"> > <li><a id="saveandcontinue" href="#">Save and continue editing</a></li> > </ul> > </div> >- <a class="btn btn-default cancel" href="/cgi-bin/koha/tools/letter.pl"><i class="fa fa-remove"></i> Cancel</a> >+ <div> >+ <a class="btn btn-default cancel" href="/cgi-bin/koha/tools/letter.pl"><i class="fa fa-remove"></i> Cancel</a> >+ </div> > </div> <!-- /#toolbar --> > > <form id="add_notice" name="Aform" method="post" enctype="multipart/form-data" class="validate"> >@@ -455,7 +457,7 @@ > <!-- Nav tabs --> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation"> >- <a href="#lang_default" aria-controls="lang_default" role="tab" data-toggle="tab">Default</a> >+ <a id="lientype" href="#lang_default" aria-controls="lang_default" role="tab" data-toggle="tab">Default</a> > </li> > [% FOR language IN languages %] > [% FOR sublanguage IN language.sublanguages_loop %] >@@ -502,10 +504,10 @@ > <div id="[% letter.message_transport_type | html %]_[% lang | html %]" class="panel-collapse collapse" role="tabpanel" aria-labelledby="[% letter.message_transport_type | html %]_[% lang | html %]Heading"> > <div class="panel-body"> > [% IF letter.message_transport_type == "sms" and not Koha.Preference("SMSSendDriver") %] >- <fieldset class="rows mtt" disabled="disabled"> >+ <fieldset class="rows mtt" style="box-shadow:none" disabled="disabled"> > <div class="dialog message">You should enable the SMSSendDriver preference to use the SMS templates.</div> > [% ELSE %] >- <fieldset class="rows mtt"> >+ <fieldset class="rows mtt" style="box-shadow:none"> > [% END %] > <ol> > [% IF ( letter.updated_on ) %] >@@ -547,7 +549,7 @@ > </select> > </td> > <td class="actions"> >- <button type="button" data-containerid="[% letter.message_transport_type | html %]_[% lang | html %]" class="btn btn-default btn-sm insert">Insert <i class="fa fa-long-arrow-right"></i></button> >+ <button id="lientype" type="button" data-containerid="[% letter.message_transport_type | html %]_[% lang | html %]" class="btn btn-default btn-sm insert">Insert <i class="fa fa-long-arrow-right"></i></button> > </td> > <td> > <textarea name="content" data-lang="[% lang | html %]" class="content_[% letter.message_transport_type | html %]" id="content_[% letter.message_transport_type | html %]_[% lang | html %]" cols="80" rows="15">[% letter.content | html %]</textarea> >@@ -591,7 +593,7 @@ > > [% IF ( delete_confirm ) %] > <div class="dialog alert"> >- <h1>Delete notice?</h1> >+ <h2>Delete notice?</h2> > <table> > <thead> > <tr> >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 2cc57b3890..de833a4c4d 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 >@@ -76,7 +76,7 @@ > [% IF ( label_batch_msg == "error" ) %] > <span>Error attempting to create label batch. Please ask your system administrator to check the log for more details.</span> > [% ELSE %] >- <span>Label</span> <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% label_batch_msg | uri %]" >batch #[% label_batch_msg | html %]</a> created. >+ <span>Label</span> <a id="lientype" href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% label_batch_msg | uri %]" >batch #[% label_batch_msg | html %]</a> created. > [% END %] > </strong></p> > </div> >@@ -94,7 +94,7 @@ > [% UNLESS ( batch_info ) %] > <div class="dialog message"> > <p>No records have been staged.</p> >- <p><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a>.</p> >+ <p><a id="lientype" href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a>.</p> > </div> > [% END %] > [% END %] >@@ -170,7 +170,7 @@ > [% END %] > [% END %] > </select> >- <span class="change-status">Changed. <a href="#" class="reset" id="reset_new_matcher_id">Reset</a></span> >+ <span class="change-status">Changed. <a id="lientype" href="#" class="reset" id="reset_new_matcher_id">Reset</a></span> > [% ELSE %] > <span class="label">Matching rule applied</span> > [% IF ( current_matcher_id ) %] >@@ -183,7 +183,7 @@ > <li> > [% IF ( can_commit ) %] > <label for="overlay_action">Action if matching record found:</label> >- [% INCLUDE 'tools-overlay-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_overlay_action">Reset</a></span> >+ [% INCLUDE 'tools-overlay-action.inc' %] <span class="change-status">Changed. <a id="lientype" href="#" class="reset" id="reset_overlay_action">Reset</a></span> > [% ELSE %] > <span class="label">Action if matching record found:</span> > [% IF ( overlay_action == 'replace' ) %] >@@ -200,7 +200,7 @@ > <li> > [% IF ( can_commit ) %] > <label for="nomatch_action">Action if no match found:</label> >- [% INCLUDE 'tools-nomatch-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_nomatch_action">Reset</a></span> >+ [% INCLUDE 'tools-nomatch-action.inc' %] <span class="change-status">Changed. <a id="lientype" href="#" class="reset" id="reset_nomatch_action">Reset</a></span> > [% ELSE %] > <span class="label">Action if no match found:</span> > [% IF ( nomatch_action == 'create_new' ) %] >@@ -216,7 +216,7 @@ > <li> > [% IF ( can_commit ) %] > <label for="item_action">Item processing:</label> >- [% INCLUDE 'tools-item-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_item_action">Reset</a></span> >+ [% INCLUDE 'tools-item-action.inc' %] <span class="change-status">Changed. <a id="lientype" href="#" class="reset" id="reset_item_action">Reset</a></span> > [% ELSE %] > <span class="label">Item processing:</span> > [% IF ( item_action == 'always_add' ) %] >@@ -396,7 +396,7 @@ > <td>[% batch_lis.num_records | html %]</td> > <td>[% batch_lis.num_items | html %] > [% IF ( batch_lis.num_items && batch_lis.import_status == 'imported' ) %] >- (<a href="[% batch_lis.script_name | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&op=create_labels">Create label batch</a>) >+ (<a id="lientype" href="[% batch_lis.script_name | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&op=create_labels">Create label batch</a>) > [% END %] > </td> > <td class="actions"> >@@ -410,7 +410,7 @@ > <form method="post" action="/cgi-bin/koha/tools/manage-marc-import.pl" name="delete_batch_[% batch_lis.import_batch_id | html %]" id="delete_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_delete"> > <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id | html %]" /> > <input type="hidden" name="op" value="delete-batch" /> >- <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> >+ <button id="lientype" type="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> > </form> > [% END %] > </td> >@@ -449,7 +449,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> >@@ -611,7 +611,7 @@ > '<a class="btn btn-default btn-xs" target="_blank" href="' + record_details_url > + aData['matched'] + '"><i class="fa fa-eye"></i> ' + _("View") + '</a> ' > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] >- + '<a class="btn btn-default btn-xs" target="_blank" href="' + record_edit_url >+ + '<a id="lientype" class="btn btn-default btn-xs" target="_blank" href="' + record_edit_url > + aData['matched'] + '"><i class="fa fa-pencil"></i> ' + _("Edit") + '</a>' > [% END %] > ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >index d530bb24ff..1a4f500e89 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -43,10 +43,11 @@ > <main> > > [% IF ( op == 'show_form' ) %] >- <h1>Batch patron modification</h1> >+ <h2>Batch patron modification</h2> > <form id="patron_batchmod_form" method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/modborrowers.pl"> > <input type="hidden" name="op" value="show" /> > <div id="batch_patron_options" class="toptabs"> >+ <fieldset> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation" class="active"> > <a href="#usecardnumber" aria-controls="usecardnumber" role="tab" data-toggle="tab">By card number</a> >@@ -62,8 +63,8 @@ > </ul> > <div class="tab-content"> > <div id="usecardnumber" role="tabpanel" class="tab-pane active"> >- <fieldset class="rows"> >- <legend>Use a file of card numbers</legend> >+ <fieldset> >+ <h3>Use a file of card numbers</h3> > <ol> > <li> > <label for="cardnumberuploadfile">File: </label> <input type="file" >@@ -72,8 +73,8 @@ > </li> > </ol> > </fieldset> >- <fieldset class="rows"> >- <legend>Or list card numbers one by one</legend> >+ <fieldset> >+ <h3>Or list card numbers one by one</h3> > <ol> > <li> > <label for="cardnumberlist">Card number list (one card number per line): >@@ -83,13 +84,13 @@ > </li> > </ol> > >- <input type="submit" value="Continue" class="button principal" /> >+ <input type="submit" value="Continue" class="button" id="principal" /> > <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> > </fieldset> > </div> > <div id="useborrowernumber" role="tabpanel" class="tab-pane"> >- <fieldset class="rows"> >- <legend>Use a file of borrowernumbers</legend> >+ <fieldset> >+ <h3>Use a file of borrowernumbers</h3> > <ol> > <li> > <label for="borrowernumberuploadfile">File: </label> <input type="file" >@@ -98,8 +99,8 @@ > </li> > </ol> > </fieldset> >- <fieldset class="rows"> >- <legend>List borrowernumbers one by one</legend> >+ <fieldset> >+ <h3>List borrowernumbers one by one</h3> > <ol> > <li> > <label for="borrowernumberlist">Borrowernumber list (one number per line): >@@ -110,14 +111,14 @@ > </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> > [% IF patron_lists %] > <div id="uselist" role="tabpanel" class="tab-pane"> >- <fieldset class="rows"> >- <legend>Use a patron list</legend> >+ <fieldset> >+ <h3>Use a patron list</h3> > <ol> > <li> > <label for="patron_list_id">Patron list: </label> >@@ -131,12 +132,13 @@ > </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> > [% END %] > </div> <!-- /.tab-content --> >+ </fieldset> > </div><!-- /#batch_patron_options --> > </form> > [% END %] >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 a0935c757f..31642a3c75 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 >@@ -56,16 +56,16 @@ > [% IF ( ERRORS ) %] > [% IF ( TCOUNTS ) %] > <div class="dialog alert"> >- <h1>Patron image(s) uploaded with some errors</h1> >+ <h2>Patron image(s) uploaded with some errors</h2> > </div> > [% ELSE %] > <div class="dialog alert"> >- <h1>Patron image failed to upload</h1> >+ <h2>Patron image failed to upload</h2> > </div> > [% END %] > [% ELSE %] > <div class="dialog message"> >- <h1>Patron image(s) successfully uploaded</h1> >+ <h2>Patron image(s) successfully uploaded</h2> > </div> > [% END %] > <ul class="data"> >@@ -117,7 +117,7 @@ > <li><a id="doneupload" href="/cgi-bin/koha/tools/tools-home.pl">Return to tools</a></li> > [% END %]</ul> > [% ELSE %] >- <h1>Upload patron images</h1> >+ <h2>Upload patron images</h2> > [% IF ( ERRORS ) %] > <div class="dialog alert"> > [% FOREACH ERROR IN ERRORS %] >@@ -157,11 +157,10 @@ > <span class="required">Required</span> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >+ > <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" /> > <input type="hidden" name="op" value="Upload" /> >- <input type="submit" value="Upload" class="submit" /> >+ <input type="submit" value="Upload" class="principal" /> > <a href="/cgi-bin/koha/tools/tools-home.pl" class="cancel">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >index 88ee022fad..869a5211f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >@@ -86,8 +86,7 @@ > <span class="required">Required</span> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >+ > <input type="hidden" name="id" value="[% quote.id | html %]" /> > <input class="principal" type="submit" value="Submit" /> > <a class="cancel" href="/cgi-bin/koha/tools/quotes.pl">Cancel</a> >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 882e2c5f00..0a25d1ebea 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 >@@ -65,7 +65,6 @@ > > <h2>Stage MARC records for import</h2> > [% IF ( uploadmarc ) %] >-<h1>MARC staging results</h1> > <ul> > [% SWITCH (record_type) %] > [% CASE 'biblio' %] >@@ -99,7 +98,6 @@ > </p> > [% END %] > [% ELSE %] >-<h1>Stage MARC records for import</h1> > <ul> > <li>Select a MARC file to stage in the import reservoir. It will be parsed, and each valid record staged for later import into the catalog.</li> > <li>You can enter a name for this import. It may be useful, when creating a record, to remember where the suggested MARC data comes from!</li> >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 7efa0fbfe0..b818fc03e3 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 >@@ -141,7 +141,7 @@ > <h2>Upload local cover image</h2> > [% ELSIF biblio %] > <h2> >- Upload local cover image for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><em>[% INCLUDE 'biblio-title.inc' %]</em></a> >+ Upload local cover image for <a id="lientype" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><em>[% INCLUDE 'biblio-title.inc' %]</em></a> > [% IF ( itemnumber ) %], Item number: [% itemnumber | html %][% END %] > </h2> > [% ELSIF itemnumber %] >@@ -171,7 +171,7 @@ > <h3>[% total | html %] images found</h3> > <ul> > [% FOREACH result IN results %] >- <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% result.biblionumber | uri %]">[% result.title | html %]</a></li> >+ <li><a id="lientype" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% result.biblionumber | uri %]">[% result.title | html %]</a></li> > [% END %] > </ul> > <hr /> >@@ -201,7 +201,7 @@ > </div> > > <div id="filedrag"> >- <a id="click_to_select" href="#">Drop files here or click to select a file</a> >+ <a id="click_to_select" class="lientype" href="#">Drop files here or click to select a file</a> > <div id="messages"></div> > </div> > >@@ -292,7 +292,7 @@ > <img id="thumbnail_[% img.imagenumber | html %]" src="/cgi-bin/koha/catalogue/image.pl?imagenumber=[% img.imagenumber | html %]&thumbnail=1" alt="Thumbnail" /> > [% END %] > </a> >- <a href="#" class="remove" data-coverimg="[% img.imagenumber | html %]"><i class="fa fa-trash"></i> Delete image</a> >+ <a href="#" id="lientype" class="remove" data-coverimg="[% img.imagenumber | html %]"><i class="fa fa-trash"></i> Delete image</a> > </li> > [% END # /IF img %] > [% END # /FOREACH img %] >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 c7262bcd47..c9750e6e57 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >@@ -87,7 +87,11 @@ > <div class="hint"> > Note: No upload categories are defined. > [% IF ( CAN_user_parameters_manage_auth_values ) -%] >+<<<<<<< HEAD > <span>Add values to the <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=UPLOAD">UPLOAD authorized value category</a> otherwise all uploads will be marked as temporary.</span> >+======= >+ Add values to the <a id="lientype" href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=UPLOAD">UPLOAD authorized value category</a> otherwise all uploads will be marked as temporary. >+>>>>>>> Bug 30952: update patron and suggestion > [% ELSE -%] > <span>An administrator must add values to the UPLOAD authorized value category otherwise all uploads will be marked as temporary.</span> > [% END %] >@@ -158,8 +162,8 @@ > <h3>Search uploads by name or hashvalue</h3> > <ol> > <li> >- <label for="term">Search term: </label> >- <input type="text" id="term" name="term" value=""/> >+ <p for="term">Search term: >+ <input type="text" id="term" name="term" value=""/></p> > </li> > </ol> > <fieldset class="action"> >@@ -180,7 +184,7 @@ > > [% BLOCK closer %] > [% IF plugin %] >- <div id="closewindow"><a class="btn btn-default btn-default close" href="#">Close</a></div> >+ <div id="closewindow"><a class="btn btn-default btn-default close cancel" href="#">Close</a></div> > [% END %] > [% END %] > >@@ -197,11 +201,11 @@ > [% BLOCK newsearch %] > <form id="newsearch"> > <fieldset class="action"> >- <button id="new_search">New search</button> >+ <button id="new_search" class="cancel">New search</button> > </fieldset> > </form> > [% IF plugin %] >- <div id="closewindow"><a class="btn btn-default btn-default close" href="#">Close</a></div> >+ <div id="closewindow"><a class="btn btn-default btn-default close cancel" href="#">Close</a></div> > [% END %] > [% END %] > >@@ -301,7 +305,7 @@ > [% PROCESS closer %] > [% ELSIF mode == 'report' %] > <div id="toolbar" class="btn-toolbar"> >- <a href="/cgi-bin/koha/tools/upload.pl" class="btn btn-default">Upload file</a> >+ <a href="/cgi-bin/koha/tools/upload.pl" class="btn btn-default principal">Upload file</a> > </div> > [% IF uploads %] > <h3>Your request gave the following results:</h3> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt >index 785a0d43ba..6782554a18 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt >@@ -109,7 +109,7 @@ > <!-- SAVE --> > <fieldset class="action"> > <input type="hidden" name="sortfield" value="title" /> >- <input type="submit" value="Save" class="submit" /> <a class="close cancel" href="#">Cancel</a> >+ <input type="submit" value="Save" class="principal" /> <a class="close cancel" href="#">Cancel</a> > </fieldset> > </form> > <!-- /SAVE --> >-- >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=136969">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