Bugzilla – Attachment 137419 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: renaming classes
Bug-30952-renaming-classes.patch (text/plain), 525.58 KB, created by
Solene D
on 2022-07-08 13:35:10 UTC
(
hide
)
Description:
Bug 30952: renaming classes
Filename:
MIME Type:
Creator:
Solene D
Created:
2022-07-08 13:35:10 UTC
Size:
525.58 KB
patch
obsolete
>From 63dcebc6cf9c92379bc8d08baacd3774d3344b81 Mon Sep 17 00:00:00 2001 >From: Solene Desvaux <sdesvaux@biblibre.com> >Date: Fri, 8 Jul 2022 14:01:52 +0200 >Subject: [PATCH] Bug 30952: renaming classes > >--- > .../prog/css/src/_flatpickr.scss | 2 +- > .../intranet-tmpl/prog/css/src/_tables.scss | 19 +- > .../prog/css/src/staff-global.scss | 1965 ++++++++--------- > .../prog/en/modules/acqui/acqui-home.tt | 4 +- > .../prog/en/modules/acqui/addorderiso2709.tt | 4 +- > .../prog/en/modules/acqui/basket.tt | 2 +- > .../prog/en/modules/acqui/basketgroup.tt | 20 +- > .../prog/en/modules/acqui/booksellers.tt | 16 +- > .../prog/en/modules/acqui/duplicate_orders.tt | 2 +- > .../prog/en/modules/acqui/invoice.tt | 14 +- > .../prog/en/modules/acqui/invoices.tt | 4 +- > .../prog/en/modules/acqui/lateorders.tt | 20 +- > .../en/modules/acqui/newordersubscription.tt | 2 - > .../prog/en/modules/acqui/parcel.tt | 4 +- > .../prog/en/modules/acqui/parcels.tt | 4 +- > .../prog/en/modules/acqui/supplier.tt | 10 +- > .../prog/en/modules/acqui/uncertainprice.tt | 2 +- > .../en/modules/admin/additional-fields.tt | 4 +- > .../prog/en/modules/admin/admin-home.tt | 2 +- > .../prog/en/modules/admin/aqbudgetperiods.tt | 6 +- > .../prog/en/modules/admin/aqbudgets.tt | 18 +- > .../prog/en/modules/admin/aqcontract.tt | 10 +- > .../prog/en/modules/admin/aqplan.tt | 37 +- > .../prog/en/modules/admin/audio_alerts.tt | 8 +- > .../en/modules/admin/authorised_values.tt | 17 +- > .../prog/en/modules/admin/authtypes.tt | 6 +- > .../prog/en/modules/admin/background_jobs.tt | 4 +- > .../prog/en/modules/admin/biblio_framework.tt | 12 +- > .../modules/admin/branch_transfer_limits.tt | 11 +- > .../prog/en/modules/admin/branches.tt | 8 +- > .../prog/en/modules/admin/cash_registers.tt | 2 +- > .../prog/en/modules/admin/categories.tt | 10 +- > .../prog/en/modules/admin/cities.tt | 8 +- > .../prog/en/modules/admin/classsources.tt | 30 +- > .../prog/en/modules/admin/clone-rules.tt | 2 +- > .../prog/en/modules/admin/columns_settings.tt | 2 +- > .../prog/en/modules/admin/credit_types.tt | 12 +- > .../prog/en/modules/admin/currency.tt | 10 +- > .../prog/en/modules/admin/debit_types.tt | 14 +- > .../prog/en/modules/admin/desks.tt | 2 +- > .../prog/en/modules/admin/edi_accounts.tt | 8 +- > .../prog/en/modules/admin/edi_ean_accounts.tt | 10 +- > .../modules/admin/item_circulation_alerts.tt | 4 +- > .../en/modules/admin/items_search_fields.tt | 10 +- > .../prog/en/modules/admin/itemtypes.tt | 16 +- > .../prog/en/modules/admin/koha2marclinks.tt | 8 +- > .../prog/en/modules/admin/library_groups.tt | 14 +- > .../modules/admin/marc_subfields_structure.tt | 10 +- > .../prog/en/modules/admin/marctagstructure.tt | 8 +- > .../prog/en/modules/admin/matching-rules.tt | 30 +- > .../prog/en/modules/admin/oai_sets.tt | 18 +- > .../en/modules/admin/patron-attr-types.tt | 10 +- > .../searchengine/elasticsearch/mappings.tt | 6 +- > .../prog/en/modules/admin/smart-rules.tt | 64 +- > .../prog/en/modules/admin/sms_providers.tt | 2 +- > .../prog/en/modules/admin/smtp_servers.tt | 6 +- > .../en/modules/admin/systempreferences.tt | 10 +- > .../prog/en/modules/admin/transfer_limits.tt | 12 +- > .../en/modules/admin/transport-cost-matrix.tt | 2 +- > .../prog/en/modules/admin/z3950servers.tt | 10 +- > .../en/modules/authorities/authorities.tt | 6 +- > .../modules/authorities/searchresultlist.tt | 2 +- > .../prog/en/modules/catalogue/advsearch.tt | 8 +- > .../prog/en/modules/catalogue/detail.tt | 6 +- > .../prog/en/modules/catalogue/issuehistory.tt | 4 +- > .../prog/en/modules/catalogue/itemsearch.tt | 20 +- > .../prog/en/modules/catalogue/moredetail.tt | 8 +- > .../prog/en/modules/catalogue/results.tt | 38 +- > .../prog/en/modules/cataloguing/addbiblio.tt | 45 +- > .../prog/en/modules/cataloguing/addbooks.tt | 8 +- > .../prog/en/modules/cataloguing/additem.tt | 8 +- > .../prog/en/modules/cataloguing/editor.tt | 20 +- > .../modules/cataloguing/z3950_auth_search.tt | 4 +- > .../en/modules/cataloguing/z3950_search.tt | 4 +- > .../prog/en/modules/circ/branchoverdues.tt | 2 +- > .../prog/en/modules/circ/branchtransfers.tt | 2 +- > .../prog/en/modules/circ/circulation.tt | 35 +- > .../prog/en/modules/circ/overdue.tt | 61 +- > .../prog/en/modules/circ/pendingreserves.tt | 18 +- > .../prog/en/modules/circ/renew.tt | 2 +- > .../prog/en/modules/circ/reserveratios.tt | 24 +- > .../prog/en/modules/circ/returns.tt | 4 +- > .../prog/en/modules/circ/set-library.tt | 6 +- > .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- > .../prog/en/modules/clubs/clubs.tt | 10 +- > .../prog/en/modules/clubs/patron-clubs-tab.tt | 4 +- > .../en/modules/clubs/templates-add-modify.tt | 8 +- > .../modules/course_reserves/course-details.tt | 10 +- > .../course_reserves/course-reserves.tt | 4 +- > .../prog/en/modules/ill/ill-requests.tt | 2 +- > .../prog/en/modules/intranet-main.tt | 42 +- > .../en/modules/labels/label-edit-batch.tt | 18 +- > .../en/modules/labels/label-edit-template.tt | 2 +- > .../prog/en/modules/labels/label-manage.tt | 7 +- > .../prog/en/modules/labels/label-print.tt | 18 +- > .../prog/en/modules/labels/result.tt | 2 +- > .../prog/en/modules/members/boraccount.tt | 12 +- > .../prog/en/modules/members/files.tt | 2 +- > .../prog/en/modules/members/holdshistory.tt | 2 + > .../prog/en/modules/members/member-flags.tt | 2 +- > .../prog/en/modules/members/member.tt | 6 +- > .../prog/en/modules/members/memberentrygen.tt | 6 +- > .../prog/en/modules/members/merge-patrons.tt | 4 +- > .../prog/en/modules/members/moremember.tt | 42 +- > .../prog/en/modules/members/notices.tt | 4 +- > .../modules/members/purchase-suggestions.tt | 2 +- > .../prog/en/modules/members/statistics.tt | 3 +- > .../en/modules/offline_circ/process_koc.tt | 2 +- > .../en/modules/patron_lists/add-modify.tt | 2 +- > .../prog/en/modules/patron_lists/list.tt | 6 +- > .../prog/en/modules/patron_lists/lists.tt | 8 +- > .../prog/en/modules/patroncards/edit-batch.tt | 18 +- > .../en/modules/patroncards/image-manage.tt | 4 +- > .../prog/en/modules/patroncards/manage.tt | 6 +- > .../prog/en/modules/plugins/plugins-home.tt | 6 +- > .../prog/en/modules/pos/register.tt | 2 +- > .../prog/en/modules/pos/registers.tt | 2 +- > .../prog/en/modules/reports/dictionary.tt | 6 +- > .../modules/reports/guided_reports_start.tt | 68 +- > .../prog/en/modules/reports/reports-home.tt | 6 +- > .../prog/en/modules/reserve/request.tt | 28 +- > .../modules/rotating_collections/addItems.tt | 4 +- > .../rotating_collections/editCollections.tt | 2 +- > .../rotatingCollections.tt | 2 +- > .../transferCollection.tt | 4 +- > .../prog/en/modules/serials/serials-search.tt | 46 +- > .../en/modules/serials/subscription-add.tt | 16 +- > .../serials/subscription-frequencies.tt | 4 +- > .../serials/subscription-numberpatterns.tt | 6 +- > .../prog/en/modules/suggestion/suggestion.tt | 102 +- > .../prog/en/modules/tags/review.tt | 6 +- > .../en/modules/tools/additional-contents.tt | 50 +- > .../automatic_item_modification_by_age.tt | 22 +- > .../prog/en/modules/tools/batchMod-del.tt | 2 +- > .../prog/en/modules/tools/batchMod-edit.tt | 22 +- > .../en/modules/tools/batch_delete_records.tt | 12 +- > .../tools/batch_record_modification.tt | 18 +- > .../prog/en/modules/tools/csv-profiles.tt | 8 +- > .../prog/en/modules/tools/export.tt | 2 +- > .../prog/en/modules/tools/import_borrowers.tt | 2 +- > .../prog/en/modules/tools/inventory.tt | 10 +- > .../prog/en/modules/tools/letter.tt | 16 +- > .../en/modules/tools/manage-marc-import.tt | 25 +- > .../tools/marc_modification_templates.tt | 24 +- > .../prog/en/modules/tools/modborrowers.tt | 2 +- > .../prog/en/modules/tools/quotes.tt | 10 +- > .../prog/en/modules/tools/upload-images.tt | 6 +- > .../prog/en/modules/virtualshelves/shelves.tt | 2 +- > 148 files changed, 1793 insertions(+), 1932 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_flatpickr.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_flatpickr.scss >index 5d7baac93b..46d6adb1fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/_flatpickr.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_flatpickr.scss >@@ -526,7 +526,7 @@ > > .flatpickr-monthDropdown-months { > appearance: none; >- background-image: url('data:image/svg+xml;charset=utf8,%3csvg fill="%23000000" fill-opacity="0.54" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"%3e%3cpath d="M7 10l5 5 5-5z"/%3e%3cpath d="M0 0h24v24H0z" fill="none"/%3e%3c/svg%3e'); >+ // background-image: url('data:image/svg+xml;charset=utf8,%3csvg fill="%23000000" fill-opacity="0.54" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"%3e%3cpath d="M7 10l5 5 5-5z"/%3e%3cpath d="M0 0h24v24H0z" fill="none"/%3e%3c/svg%3e'); > background-position: 100% 50%; > background-repeat: no-repeat; > background-size: 24px 24px; >diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss >index abf322c520..5eb7969780 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss >@@ -93,7 +93,6 @@ table { > border-right: none; > border: none; > padding: .5em; >- > } > > tr { >@@ -194,6 +193,24 @@ td { > white-space: nowrap; > } > >+ button, a{ >+ &.btn-default{ >+ color: #71B443; >+ padding: .3em; >+ border: none; >+ background-color: transparent; >+ border: none; >+ box-shadow: none; >+ font-size: 100%; >+ >+ &:hover, &:active, &:focus, &:active:hover, &:active:focus{ >+ background-color: transparent; >+ color: #71B443; >+ text-decoration: underline; >+ } >+ } >+ } >+ > &.borderless { > border: 0 none; > border-collapse: separate; >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 7cb12ce6f4..0395a8e182 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -10,14 +10,23 @@ > a { > &:link, > &:visited { >- color: #000; >- text-decoration: none; >+ color: #71B443; >+ padding: .3em; >+ border: none; >+ background-color: transparent; >+ box-shadow: none; >+ font-size: 100%; > } > > &:hover, >- &:active { >- color: #000; >+ &:active, &:focus { > text-decoration: underline; >+ color: #71B443; >+ padding: .3em; >+ border: none; >+ background-color: transparent; >+ box-shadow: none; >+ font-size: 100%; > } > > &:hover { >@@ -35,12 +44,6 @@ a { > } > > &.btn { >- &:link, >- &:visited { >- //color: #71B443; >- // padding: 6px 25px; >- } >- > &.btn-link { > &:link, > &:visited { >@@ -54,26 +57,11 @@ a { > } > > } >- >- &.lientype{ >- color: #71B443; >- padding: .3em; >- border: none; >- background-color: transparent; >- border: none; >- box-shadow: none; >- font-size: 100%; >- >- &: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%; >- } >+ >+ &.edit-patronimage{ >+ color: #333; >+ background-color: #e6e6e6; >+ border-color: #adadad; > } > > &.cancel { >@@ -83,9 +71,7 @@ a { > border: #696969 double 1px; > margin: 5px; > >- //font-family: $font-main; > font-family: 'Poppins', sans-serif; >- //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%); > display: inline-block; > font-weight: normal; > text-align: center; >@@ -127,12 +113,6 @@ a { > } > } > >- &.close { >- &:hover { >- //color: #418940; >- } >- } >- > &.csv { > background-image: url("../img/famfamfam/silk/page_white_excel.png"); > } >@@ -145,6 +125,24 @@ a { > color: #666; > } > >+ &.principal{ >+ background-color: #FEC32C; >+ color: #000; >+ text-shadow: 0 1px 0 #fff; >+ padding: 6px 25px; >+ border: none; >+ background-image: none; >+ margin: 5px; >+ >+ &:hover, >+ &:active, >+ &:focus{ >+ background-color: #fec22c9f; >+ color: #000; >+ border: none; >+ } >+ } >+ > &.disabled { > color: #999999; > } >@@ -194,7 +192,7 @@ a { > background-image: url("../img/famfamfam/silk/page_white_code.png"); > } > >- &.pat{ >+ &.toolbar-btn{ > font-family: 'Poppins', sans-serif; > font-weight: normal; > text-align: center; >@@ -206,7 +204,6 @@ a { > background-image: none; > padding: 6px 12px; > font-size: 12px; >- //line-height: 1.42857143; > border-radius: 4px; > -webkit-user-select: none; > -moz-user-select: none; >@@ -219,13 +216,47 @@ a { > margin: 5px 10px; > color: #696969; > >- &:hover{ >+ &:hover, &:focus{ > text-decoration: none; >+ background-color: #dadada; > } > > &:active{ > border: none; > } >+ >+ &.word{ >+ margin-right: 0; >+ padding-right: .1em; >+ } >+ >+ &.arrow{ >+ margin-left: 0; >+ border-radius: 4px; >+ padding-left: .1em; >+ >+ &:active{ >+ border: 1px solid #000; >+ border-radius: 4px; >+ } >+ } >+ } >+ >+ &.more_link{ >+ color: #71B443; >+ background-color: transparent; >+ >+ display: block; >+ position: absolute; >+ right: 45px; >+ bottom: 10px; >+ line-height: 15px; >+ >+ &:hover{ >+ text-decoration: none; >+ color:#71B443; >+ background-color: transparent; >+ } > } > } > >@@ -235,51 +266,24 @@ a { > color: #71B443; > } > >-#plus{ >- color: #71B443; >- background-color: transparent; >- >- display: block; >- position: absolute; >- right: 45px; >- bottom: 10px; >- line-height: 15px; >- >- &:hover{ >- text-decoration: none; >- color:#71B443; >- background-color: transparent; >- } >-} >- > a.ctrl_link { > display: inline-block; > padding-right: 1rem; > } >- >-aside { >- h5 { >- font-size: 100%; >- margin: .5em 0; >- } > >- .radio, .checkbox { >- margin: 0; >- } > >- p{ >- margin: 0; >- } >+aside { >+ position: absolute; >+ left: 0px; >+ width: 100%; > >- fieldset { >- &.brief { >- padding: 1.4em 1.7em; >- //height: auto; >+ fieldset{ >+ &.sidebar{ >+ box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); >+ padding: 0.9em; > width: 100%; > left: 0px; >- > overflow: auto; >- //white-space: nowrap; > height: auto; > max-height: 500px; > >@@ -290,9 +294,6 @@ aside { > > &::-webkit-scrollbar-track { > background: #eeeeee; >- //border-color: #696969; >- //border-radius: 20px; >- > } > > &::-webkit-scrollbar-thumb { >@@ -301,6 +302,228 @@ aside { > border: 3px solid #eeeeee; > } > >+ button + button, >+ input + input { >+ margin-left: 5px; >+ } >+ >+ input{ >+ &.cancel { >+ >+ background-color: transparent; >+ color: #696969; >+ border: #696969 double 1px; >+ margin: 5px; >+ >+ font-family: 'Poppins', sans-serif; >+ display: inline-block; >+ font-weight: normal; >+ text-align: center; >+ white-space: nowrap; >+ vertical-align: middle; >+ touch-action: manipulation; >+ width: 90px; >+ cursor: pointer; >+ background-image: none; >+ padding: 6px 12px; >+ font-size: 12px; >+ line-height: 1.42857143; >+ border-radius: 4px; >+ user-select: none; >+ >+ &:hover{ >+ font-weight: bold; >+ background-color: #f1f1f1; >+ border: #696969 double 1px; >+ text-decoration: none; >+ } >+ } >+ } >+ >+ fieldset.brief{ >+ width: 100%; >+ >+ legend{ >+ color: #696969; >+ font-weight: bold; >+ font-size: 13px; >+ margin: 0; >+ border-bottom: 0; >+ } >+ >+ li{ >+ margin-top: 0; >+ padding: 0; >+ >+ &.radio{ >+ padding: 0; >+ } >+ >+ label { >+ color: #696969; >+ font-size: 13px; >+ padding: 0.5em 0.3em 0 0; >+ margin: 0; >+ font-weight: normal; >+ } >+ >+ input, select { >+ height: calc(1.5em + .75rem + 2px); >+ width: calc(100% - 20px); >+ } >+ } >+ } >+ >+ ol{ >+ padding: 0; >+ li { >+ list-style: none; >+ left: 0px; >+ flex-direction: row; >+ width: 100%; >+ height: auto; >+ padding: 0.9em 0; >+ >+ fieldset{ >+ width: 100%; >+ >+ legend{ >+ color: #696969; >+ font-weight: bold; >+ font-size: 13px; >+ margin: 0; >+ border-bottom: 0; >+ } >+ >+ li{ >+ margin-top: 0; >+ padding: 0; >+ >+ label { >+ color: #696969; >+ font-size: 13px; >+ padding: 0.5em 0.3em 0 0; >+ margin: 0; >+ font-weight: normal; >+ } >+ >+ input, select { >+ height: calc(1.5em + .75rem + 2px); >+ width: calc(100% - 20px); >+ } >+ } >+ >+ } >+ >+ label { >+ color: #696969; >+ padding: 0.5em 0.3em 0 0; >+ margin: 0; >+ } >+ >+ input, select { >+ height: calc(1.5em + .75rem + 2px); >+ width: calc(100% - 20px); >+ >+ >+ &[type="checkbox"], >+ &[type="radio"] { >+ width: auto; >+ margin: 0; >+ vertical-align: middle; >+ } >+ } >+ >+ >+ >+ &.checkbox { >+ label { >+ display: inline; >+ margin-left: 0; >+ } >+ } >+ >+ &.dateinsert { >+ label { >+ display: inline; >+ } >+ >+ span { >+ &.label { >+ display: inline; >+ } >+ } >+ } >+ >+ &.radio { >+ // padding: .3em 0; >+ >+ input { >+ padding: .3em 0; >+ } >+ >+ label { >+ display: inline; >+ } >+ >+ span { >+ &.label { >+ display: inline; >+ } >+ } >+ >+ select, >+ [type="text"] { >+ width: 100%; >+ } >+ >+ .flatpickr-input { >+ margin-right: 3px; >+ width: calc(100% - 20px); >+ } >+ >+ &+.action { >+ margin-left: 0; >+ padding: 0; >+ } >+ >+ .radio, .checkbox { >+ margin: 0; >+ } >+ >+ select, >+ [type="text"] { >+ width: 100%; >+ } >+ >+ .flatpickr-input { >+ margin-right: 3px; >+ width: calc(100% - 20px); >+ } >+ >+ &.action { >+ margin-left: 0; >+ padding: 0; >+ } >+ } >+ } >+ } >+ } >+ } >+ >+ >+ /* >+ >+ >+ >+ >+ ol { >+ margin: 0; >+ padding: 0; >+ } >+ >+ >+ > button + button, > input + input { > margin-left: 5px; >@@ -342,11 +565,124 @@ aside { > } > > &.dateinsert { >- label { >+ label {goto > display: inline; > } > >- span { >+ &.menu { >+ padding: 1.4em 1.7em; >+ width: 100%; >+ left: 0px; >+ overflow: auto; >+ height: auto; >+ max-height: 500px; >+ >+ >+ &::-webkit-scrollbar { >+ width: 12px; >+ } >+ >+ &::-webkit-scrollbar-track { >+ background: #eeeeee; >+ } >+ >+ &::-webkit-scrollbar-thumb { >+ background: #696969; >+ border-radius: 20px; >+ border: 3px solid #eeeeee; >+ } >+ >+ button + button, >+ input + input { >+ margin-left: 5px; >+ } >+ >+ fieldset { >+ border-width: 1px; >+ border-radius: 0; >+ margin: 0 0 .5em 0; >+ padding: .5em; >+ >+ legend { >+ font-size: 95%; >+ margin: 0; >+ border-bottom: none; >+ } >+ >+ &.action { >+ margin-left: 0; >+ padding: .5em 0; >+ } >+ } >+ >+ input, select { >+ height: calc(1.5em + .75rem + 2px); >+ } >+ >+ label { >+ margin: .5em 0 0 0; >+ border-top : 1px inset #999999; >+ } >+ >+ li { >+ &.checkbox { >+ label { >+ display: inline; >+ margin-left: 0; >+ } >+ } >+ >+ &.dateinsert { >+ label { >+ display: inline; >+ } >+ >+ span { >+ &.label { >+ display: inline; >+ } >+ } >+ } >+ >+ &.radio { >+ padding: .3em 0; >+ >+ input { >+ padding: .3em 0; >+ } >+ >+ label { >+ display: inline; >+ } >+ >+ span { >+ &.label { >+ display: inline; >+ } >+ } >+ } >+ } >+ >+ ol { >+ margin: 0; >+ padding: 0; >+ } >+ >+ select, >+ [type="text"] { >+ width: 100%; >+ } >+ >+ .flatpickr-input { >+ margin-right: 3px; >+ width: calc(100% - 20px); >+ } >+ >+ &+.action { >+ margin-left: 0; >+ padding: 0; >+ } >+ } span { > &.label { > display: inline; > } >@@ -391,32 +727,119 @@ aside { > margin-left: 0; > padding: 0; > } >+ } >+*/ >+} >+ >+#navmenulist{ >+ background-color: #e6e6e6; >+ width: 100%; >+ overflow: auto; >+ display: block; >+ // position: absolute; >+ // left: 0px; >+ max-height: 700px; >+ height: auto; >+ >+ &::-webkit-scrollbar { >+ width: 12px; >+ } >+ >+ &::-webkit-scrollbar-track { >+ background: #eeeeee; >+ >+ } >+ >+ &::-webkit-scrollbar-thumb { >+ background: #696969; >+ border-radius: 20px; >+ border: 3px solid #eeeeee; >+ } >+ >+ h2{ >+ width: 100%; >+ text-align: center; >+ >+ a, a:link, a:visited{ >+ text-align: center; >+ color: #000; >+ >+ &:hover, &.current{ >+ text-decoration: none; >+ } >+ } >+ } >+ >+ h4 { >+ margin: .5em 0; >+ padding-left: 0.5em; >+ padding-bottom: 0.2em; >+ color: #696969; >+ border-bottom: 1px solid #696969; >+ font-weight: normal; >+ } >+ >+ ul { >+ margin-bottom: 10px; >+ padding-left: 0px; >+ >+ &.goto{ >+ margin-bottom: 13px; >+ margin-left: 0; >+ margin-right: 0; >+ padding-left: 0px; >+ position: relative; >+ top: 0px; >+ >+ li{ >+ a{ >+ font-size: 75%; >+ } >+ } >+ } >+ >+ li { >+ list-style: none; >+ left: 0px; >+ flex-direction: row; >+ width: 100%; >+ height: auto; >+ >+ a, a:link, a:visited { >+ color: #000; >+ width: 100%; >+ display: block; >+ text-decoration: none; >+ padding: 0.7em 0.3em 0.7em 1.2em; >+ >+ &.current, &:hover, &:active, &:focus { >+ background-color: #F3F4F4; >+ text-decoration: none; >+ color: #418940; >+ border-left: solid 5px #418940; >+ font-weight: bold; >+ } >+ } > } > } > } > >+ > div { > display: block; > >- &.menuspe{ >+ &.mainmenu{ > display: inline; >- //align-items: center; >- //justify-content: center; > } > > >- &.menuspebas{ >- ///display: inline; >+ &.koha-mainpage{ > display: flex; >- //-webkit-box-align: center; >- //-ms-flex-align: center; > align-items: center; >- //-webkit-box-pack: center; >- //-ms-flex-pack: center; > justify-content: center; > } > >- &.vert{ >+ &.settings-links{ > display: block; > float: right; > top: 0px; >@@ -430,24 +853,25 @@ div { > height: 150px; > margin-right: auto; > margin-left: auto; >+ >+ a, a:visited, a:link{ >+ color: #000; >+ } > } > } > >- &.bas{ >+ &.koha-bottom{ > background: transparent url(../img/koha-logo-medium.png) no-repeat center; > width: 150px; > background-size: 70%; > height: 50px; > margin: 25px; >- // position: inherit; > bottom: 0px; > text-align: center; > display: flex; > align-items: center; > justify-content: center; > position: fixed; >- //right: 0; >- //left: 0; > z-index: 1030; > > a{ >@@ -455,46 +879,97 @@ div { > height: 100%; > } > } >+} > >- /* &.plus{ >- display: block; >- background-color: #352C2E; >- padding: 10px; >- border-radius: 4px; >- padding: 10px; >- border-radius: 4px; >- position: absolute; >+.settings{ >+ i, img{ > text-align: center; >- right: 0px; >- bottom: -80px; >- >- label{ >- color: #fff; >- font-weight: bold; >+ color: #71B443; >+ border: solid 3px #71B443; >+ border-radius: 50%; >+ background-color: transparent; >+ width: 40px; >+ height: 40px; >+ margin-bottom: 5px; >+ margin-left: auto; >+ margin-right: auto; >+ padding: 5px; >+ align-items: center; >+ justify-content: center; >+ -webkit-box-sizing: content-box; >+ box-sizing: content-box; >+ display: flex; >+ >+ } >+ >+ &:hover{ >+ color: #418940; >+ text-decoration: none; >+ font-weight: bold; >+ >+ i, img{ >+ border-color: #418940; >+ color: #418940; > } >- }*/ >-} >+ >+ } > >-#filters{ >- width: 100%; >- display: block; >- position: absolute; >- left: 0px; >- height: 500px; >+ img{ >+ max-width: 30px; >+ height: auto; >+ padding: 10px; >+ } > } > >-#filtres{ >- width: 100%; >- display: block; >- position: absolute; >- left: 0px; >- height: 500px; >+.home-page{ >+ text-align: center; >+ text-decoration: none; >+ font-family: 'Poppins', sans-serif; >+ >+ h1 { >+ font-size: 150%; >+ font-weight: normal; >+ color: #000; >+ } >+ >+ i{ >+ text-align: center; >+ color: #fff; >+ border: solid 3px #71B443; >+ border-radius: 50%; >+ background-color: #71B443; >+ width: 40px; >+ height: 40px; >+ margin-bottom: 5px; >+ margin-left: auto; >+ margin-right: auto; >+ padding: 5px; >+ align-items: center; >+ justify-content: center; >+ -webkit-box-sizing: content-box; >+ box-sizing: content-box; >+ display: flex; >+ >+ } >+ >+ &:hover{ >+ text-decoration: none; >+ >+ i{ >+ background-color: #418940; >+ border-color: #418940; >+ } >+ >+ h1{ >+ color: #418940; >+ } >+ } > } > > button { >- //@include default-button; >+ @include default-button; > >- &:active { >+ &:active, &:hover { > border: 1px inset #999999; > } > >@@ -590,26 +1065,6 @@ h1 { > font-weight: bold; > } > >-#logo { >- background: transparent url("../img/koha-logo-medium.png") no-repeat 50% 50%; >- border: 0 none; >- margin: 2rem 1rem; >- padding: 0; >- width: 180px; >- >- a { >- border: 0; >- cursor: pointer; >- display: block; >- height: 0 !important; >- margin: 0; >- overflow: hidden; >- padding: 44px 0 0; >- text-decoration: none; >- width: 180px; >- } >-} >- > h2 { > font-size: 150%; > font-weight: bold; >@@ -629,7 +1084,6 @@ h4 { > > h5 { > font-size: 100%; >- //font-weight: bold; > } > > h6 { >@@ -637,15 +1091,6 @@ h6 { > font-weight: bold; > } > >-h7 { >- font-size: 93%; >- font-weight: bold; >- text-align: center; >- //padding: 5px; >- position: relative; >- left: 0px; >- bottom: 0px; >-} > > > h1, >@@ -653,9 +1098,12 @@ h2, > h3, > h4, > h5, >-h6, >-h7 { >+h6 { > margin: .5em 0; >+ >+ a, a:link, a:visited{ >+ color: #000; >+ } > } > > hr { >@@ -666,12 +1114,19 @@ hr { > p { > margin: .7em 0; > >- &.plus{ >- background-color: #352C2E; >+ &.more{ > height: 100% !important; > top: 30px; >- border-bottom-left-radius: 17px; >- border-bottom-right-radius: 17px; >+ width: 100%; >+ display: block; >+ position: absolute; >+ left: 0px; >+ background-color: #352C2E; >+ padding: 10px; >+ border-radius: 4px; >+ text-align: center; >+ right: 0px; >+ bottom: -70px; > > input{ > outline-offset: 0px; >@@ -687,7 +1142,7 @@ p { > top: -5px; > right: 30px; > z-index: 100; >- display: inline-block !important; >+ display: inline !important; > letter-spacing: normal; > word-spacing: normal; > text-transform: none; >@@ -699,7 +1154,7 @@ p { > } > } > >- &.plusdessous{ >+ &.more_bottom{ > background-color: #352C2E; > height: auto !important; > padding: 0 5px 10px 5px; >@@ -707,6 +1162,10 @@ p { > border-bottom-left-radius: 17px; > border-bottom-right-radius: 17px; > >+ label{ >+ color: #fff; >+ } >+ > input{ > outline-offset: 0px; > outline: 1px black; >@@ -732,6 +1191,12 @@ p { > } > } > >+#patron_search { >+ .address { >+ font-size: 100%; >+ } >+} >+ > strong { > font-weight: bold; > >@@ -774,7 +1239,6 @@ input { > //font-family: $font-main; > font-family: 'Poppins', sans-serif; > text-shadow: 0 1px 0 #fff; >- //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%); > display: inline-block; > margin-bottom: 0; > font-weight: normal; >@@ -802,7 +1266,6 @@ input { > display: inline-block; > font-size: inherit; > line-height: 1.42857143; >- //padding: .3em .8em; > margin: 5px; > text-align: center; > text-shadow: 0 1px 0 #fff; >@@ -829,6 +1292,24 @@ input { > @include disabled-button; > } > } >+ >+ &.principal{ >+ background-color: #FEC32C; >+ color: #000; >+ text-shadow: 0 1px 0 #fff; >+ border: none; >+ background-image: none; >+ margin: 5px; >+ padding: 6px 25px; >+ >+ &:hover, >+ &:active, >+ &:focus{ >+ background-color: #fec22c9f; >+ color: #000; >+ border: none; >+ } >+ } > } > > .input-warning { >@@ -837,7 +1318,6 @@ input { > } > > >-//a suppr > label, > .label { > color: #000; >@@ -858,299 +1338,70 @@ label, > } > > &.circ_barcode { >- display: inline-block; >- font-size: 105%; >- font-weight: bold; >- margin-bottom: 1rem; >- max-width: 75%; >- } >- >- &.required { >- color: #C00; >- } >-} >- >-.subfield-label { >- font-style: italic; >- >- span { >- &.subfield-code { >- font-weight: bold; >- } >- } >-} >- >-.members-update-table { >- padding-top: 10px; >-} >- >-.col-sm-3 { >- width: 25%; >-} >- >-.col-sm-6 { >- width: 100%; >-} >- >-#area-news{ >- background-color: #FFF; >- color: #696969; >- margin: 0em 0em 1em 0em; >- display: block; >- padding: 1em; >- >- h3{ >- background-color: #fff; >- } >-} >- >-.col-sm-9 { >- width: 75%; >-} >- >- >-.biglinks-list{ >- padding: 0px; >- margin: 10px 30px; >- align-items: center; >- height: 150px; >- >- li{ >- list-style-type: none; >- display: flex; >- float: left; >- text-align: center; >- margin-bottom: 5px; >- padding: 10px; >- //display: flex; >- align-items: center; >- justify-content: center; >- flex-wrap: wrap; >- width: 200px; >- height: 150px; >- margin-right: auto; >- margin-left: auto; >- } >-} >- >-.accueil{ >- text-align: center; >- //display: block; >- text-decoration: none; >- font-family: verdana, arial; >- >- h1 { >- font-size: 150%; >- font-weight: normal; >- } >- >- i{ >- text-align: center; >- //max-height: 100%; >- //max-width: 100%; >- color: #fff; >- border: solid 3px #71B443; >- border-radius: 50%; >- background-color: #71B443; >- width: 40px; >- height: 40px; >- margin-bottom: 5px; >- margin-left: auto; >- margin-right: auto; >- padding: 5px; >- align-items: center; >- justify-content: center; >- -webkit-box-sizing: content-box; >- box-sizing: content-box; >- //font-weight: bold; >- //font-size: large; >- display: flex; >- >- } >- >- &:hover{ >- color: #418940; >- //border-color: #418940; >- text-decoration: none; >- //font-weight: bold; >- >- i{ >- background-color: #418940; >- border-color: #418940; >- } >- >- } >-} >- >-#reglages{ >- i, img{ >- text-align: center; >- //max-height: 100%; >- //max-width: 100%; >- color: #71B443; >- border: solid 3px #71B443; >- border-radius: 50%; >- background-color: transparent; >- width: 40px; >- height: 40px; >- margin-bottom: 5px; >- margin-left: auto; >- margin-right: auto; >- padding: 5px; >- align-items: center; >- justify-content: center; >- -webkit-box-sizing: content-box; >- box-sizing: content-box; >- //font-weight: bold; >- //font-size: large; >- display: flex; >- >- } >- >- &:hover{ >- color: #418940; >- //border-color: #418940; >- text-decoration: none; >- font-weight: bold; >- >- i, img{ >- border-color: #418940; >- color: #418940; >- } >- >- } >- >- img{ >- max-width: 30px; >- height: auto; >- padding: 10px; >- } >-} >- >- >- >-#navmenulist { >- background-color: #e6e6e6; >- width: 100%; >- overflow: auto; >- //white-space: nowrap; >- display: block; >- position: absolute; >- left: 0px; >- max-height: 700px; >- height: auto; >- >- &::-webkit-scrollbar { >- width: 12px; >- } >- >- &::-webkit-scrollbar-track { >- background: #eeeeee; >- //border-color: #696969; >- //border-radius: 20px; >- >- } >- >- &::-webkit-scrollbar-thumb { >- background: #696969; >- border-radius: 20px; >- border: 3px solid #eeeeee; >- } >- >- >- >- >- ul { >- margin-bottom: 8.5px; >- margin-left: 0; >- margin-right: 0; >- padding-left: 0px; >- // position: relative; >- // top: 30px; >- >- h5{ >- padding-left: 0.5em; >- padding-bottom: 0.5em; >- font-size: 120%; >- margin-top: 15px; >- margin-left: 0; >- margin-right: 0; >- margin-bottom: 5px; >- color: #696969; >+ display: inline-block; >+ font-size: 105%; >+ font-weight: bold; >+ margin-bottom: 1rem; >+ max-width: 75%; >+ } > >- border-bottom: 1px solid #696969; >- //position: absolute; >- //top: 0px; >- } >- >- &.sousmenu{ >- margin-bottom: 13px; >- margin-left: 0; >- margin-right: 0; >- padding-left: 0px; >- position: relative; >- top: 0px; >+ &.required { >+ color: #C00; >+ } >+} > >- li{ >- a{ >- font-size: 75%; >- } >- } >+.subfield-label { >+ font-style: italic; >+ >+ span { >+ &.subfield-code { >+ font-weight: bold; > } >+ } >+} > >- li { >- //border-bottom: 1px solid #352C2E; >- list-style: $nav-menu-bullet; >- list-style: none; >- //padding: .2em 0; >- //background-color: #a8a8a8; >- //position: block; >- //position: absolute; >- left: 0px; >- flex-direction: row; >- width: 100%; >- height: auto; >+.members-update-table { >+ padding-top: 10px; >+} > >- a { >- //text-decoration: none; >- color: #000; >- width: 100%; >- display: block; >- //margin: .5em 0; >- //padding: .4em .3em; >- text-decoration: none; >- padding: 0.5em 0.3em 0.5em 1.2em; >+#area-news{ >+ background-color: #FFF; >+ color: #696969; >+ margin: 0em 0em 1em 0em; >+ display: block; >+ padding: 1em; > >- &.current, &:hover { >- background-color: #F3F4F4; >- color: #418940; >- border-left: solid 5px #418940; >- font-weight: bold; >- } >+ h3{ >+ background-color: #fff; >+ } >+} > >- &.titre{ >- width: 100%; >- font-size: 146.5%; >- font-weight: bold; >- text-align: center; >- color: #000; >+.biglinks-list{ >+ padding: 0px; >+ margin: 10px 30px; >+ align-items: center; >+ height: 150px; > >- &:hover, &.current{ >- background-color: #e6e6e6; >- color: #000; >- border-left: none; >- font-weight: bold; >- } >- } >- } >- } >+ li{ >+ list-style-type: none; >+ display: flex; >+ float: left; >+ text-align: center; >+ margin-bottom: 5px; >+ padding: 10px; >+ //display: flex; >+ align-items: center; >+ justify-content: center; >+ flex-wrap: wrap; >+ width: 200px; >+ height: 150px; >+ margin-right: auto; >+ margin-left: auto; > } > } > >- > .main { > margin-bottom: $language-footer-min-height * 1.5; >- //display: block; > margin-top: 1em; > } > >@@ -1162,7 +1413,6 @@ label, > > ul { > padding-left: 1.1em; >- //height: 50px; > > li { > list-style-type: none; >@@ -1183,7 +1433,6 @@ ul { > padding-left: 0; > > button { >- //font-family: $font-main; > font-family: 'Poppins', sans-serif; > padding-bottom: 2px; > } >@@ -1199,8 +1448,6 @@ ul { > padding: .2em 1.4em 0 1.4em; > } > >- >- > &.budget_hierarchy { > margin-left: 0; > padding-left: 0; >@@ -1226,7 +1473,6 @@ ul { > } > } > >- // For Font Awesome icon bullets > &.fa-ul { > li { > list-style-type: none; >@@ -1271,9 +1517,6 @@ ol { > font-weight: bold; > } > >- >- >- > .strong { > font-weight: bold; > } >@@ -1284,16 +1527,15 @@ ol { > } > > fieldset { >- //overflow: auto; >+ width: 100%; >+ color: #71B443; > background-color: #FFF; > position: relative; > color: #696969; > left: 0px; > top: 0px; >- //border: 2px solid #bfd9b9; >- //border-radius: 5px; > margin: 0em 1em 1em 0em; >- //display: block; >+ box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); > padding: 1em; > > + fieldset { >@@ -1302,6 +1544,16 @@ fieldset { > } > } > >+ legend{ >+ position: relative; >+ top: 1.5em; >+ margin: .5em 0; >+ font-size: 131%; >+ font-weight: bold; >+ color: #696969; >+ border-bottom: none; >+ } >+ > &.lastchecked { > border-bottom-left-radius: 0; > border-bottom-right-radius: 0; >@@ -1310,11 +1562,11 @@ fieldset { > margin-right: 0; > } > >- .standard { >+ &.standard { > background-color:#F4F8F9 !important; > } > >- .contrast { >+ &.contrast { > background-color:#F3F3F3 !important; > } > >@@ -1322,22 +1574,16 @@ fieldset { > background-color: transparent; > border: 0; > clear: both; >+ box-shadow: none; > float: none; > margin: .9em 0 0; > padding: .4em; > width: auto; > } > >- &.briefgr { >- box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); >- display: inline-block; >- } >- > > &.brief { >- //border: 2px solid #bfd9b9; > width: 50%; >- box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); > overflow: visible; > > div { >@@ -1347,7 +1593,6 @@ fieldset { > } > > label { >- //display: block; > font-weight: bold; > padding: .3em 0; > >@@ -1388,7 +1633,6 @@ fieldset { > ol, > li { > list-style-type: none; >- //margin-bottom: 1.9em; > } > > span { >@@ -1414,7 +1658,6 @@ fieldset { > > &.rows { > border: none; >- box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); > clear: left; > float: left; > font-size: 90%; >@@ -1519,11 +1762,11 @@ fieldset { > } > } > >- legend { >+ /*legend { > font-size: 110%; > font-weight: bold; > margin-left: 1em; >- } >+ }*/ > > li { > clear: left; >@@ -1559,8 +1802,6 @@ fieldset { > } > > fieldset { >- //margin-left: 10em; >- > label { > width: 6em; > } >@@ -1677,14 +1918,9 @@ fieldset { > } > } > >-} >- >-#select-libs{ >- box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); >-} >- >-#searchterms{ >- box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); >+ fieldset{ >+ box-shadow: none; >+ } > } > > #multi_receiving { >@@ -1697,19 +1933,6 @@ fieldset { > } > } > >- >-/* >-legend { >- background-color: #FFFFFF; >- border: 2px solid #bfd9b9; >- border-radius: 3px; >- font-size: 123.1%; >- font-weight: bold; >- margin-bottom: 0; >- padding: .2em .5em; >- width: auto; >-}*/ >- > details { > > summary { > cursor: pointer; >@@ -1747,7 +1970,7 @@ details[open] { > } > > #breadcrumbs { >- background-color: transparent;//derrière la maison >+ background-color: transparent; > clear: both; > margin: 0; > padding: .8em .5em .8em 10px; >@@ -1782,7 +2005,6 @@ div { > > .renew_formfield { > margin-bottom: 1em; >- //itemtype > } > > .circmessage { >@@ -1823,7 +2045,6 @@ div { > } > } > >- // Tools > automatic_item_modification_by_age > &.rules { > display: block; > } >@@ -1986,145 +2207,8 @@ div { > } > } > >- >-/* >-#header_search { >- //position : relative; >- //right : - 500px; >- //top: -45px; >- //line-height: 40px; >- //width: 500px; >- padding: 0px 50px; >- border-radius: 28px; >- background-color: #71B443; >- height: 2.2em; >- background-position: .2em .5em; >- background-repeat: no-repeat; >- float: left; >- margin: .3em 0 .5em; >- >- input { >- &[type="submit"] { >- border-radius: 3px; >- padding: .2em .8em; >- position: relative; >- right: .2em; >- >- } >- } >- >- div { >- &.residentsearch { >- border: 0; >- //border-bottom: 1px solid #85CA11; >- padding: 0 0 .2em; >- } >- } >- >- ul { >- &.ui-tabs-nav { >- margin-left: 1em; >- padding-top: 0; >- >- >- li { >- >- &.ui-state-default { >- //background: transparent none; >- //border: 0; >- //top: 0; >- >- //position: absolute; >- // line-height: 40px; >- top: 0; >- left: 0; >- display: flex; >- justify-content: space-around; >- align-items: center; >- color: white; >- box-shadow: 0px 0px 3px 0px #0000004d; >- >- //padding: 10px 20px; >- border-radius: 28px; >- background: #71B443; >- height: 1.5em; >- >- a { >- padding: .3em .6em; >- } >- } >- >- &.ui-tabs-active { >- background-color: #FFFFF1; >- border: 1px solid #85CA11; >- border-top-width: 0; >- top: -2px; >- >- a { >- text-decoration: none; >- } >- } >- } >- } >- } >- >- .ui-corner-top { >- border-radius: 0 0 4px 4px; >- } >- >- > div, >- > ul { >- display: none; >- >- > li { >- display: none; >- >- &:first-of-type { >- display: block; >- } >- } >- >- &:first-of-type { >- display: block; >- } >- } >- >- .head-searchbox { >- font-size: 1.3em; >- //width: 30em; >- >- //min-height: 2.5em; >- border-radius: 17px; >- padding-left: 1.5em; >- border: none; >- margin-left: 0px; >- transition: 0.5s; >- >- //-webkit-writing-mode: horizontal-tb !important; >- text-rendering: auto; >- //color: -internal-light-dark(black, white); >- letter-spacing: normal; >- word-spacing: normal; >- text-transform: none; >- text-indent: 10px; >- text-shadow: none; >- display: inline-block; >- text-align: start; >- appearance: auto; >- //background-color: -internal-light-dark(rgb(255, 255, 255), rgb(59, 59, 59)); >- -webkit-rtl-ordering: logical; >- cursor: text; >- margin: 0em; >- font: 400 13.3333px Arial; >- padding: 1px 2px; >- } >-} >- >-*/ >- > #reserves, > #checkouts { >- //border-top: 3px solid #418940; > padding: 1em; > } > >@@ -2162,26 +2246,69 @@ dd { > border-radius: 5px 5px 0 0; > margin: 0; > padding: 5px; >- //height: 50px; > display: block; >+ // width: 851px !important; > >- div{ >+ /*a{ >+ font-family: 'Poppins', sans-serif; >+ font-weight: normal; >+ text-align: center; >+ white-space: nowrap; >+ vertical-align: middle; >+ -ms-touch-action: manipulation; >+ touch-action: manipulation; >+ cursor: pointer; >+ background-image: none; >+ padding: 6px 12px; >+ font-size: 12px; >+ border-radius: 4px; >+ -webkit-user-select: none; >+ -moz-user-select: none; >+ -ms-user-select: none; >+ user-select: none; >+ font-size: 105%; >+ background-color: transparent; >+ border: none; > display: inline-block; >+ margin: 5px 10px; >+ color: #696969; >+ >+ &:hover{ >+ text-decoration: none; >+ background-color: #dadada; >+ } >+ >+ &:active{ >+ border: none; >+ } >+ }*/ >+ >+ div{ > position: relative; >- float: right; > height: 100%; >- // padding: 0.3em; >+ float: right; > >- .dropdown-menu { >- /*border-top-width: 1px; >- font-size: 13px; >- background-color: #F3F4F4; >- border: none; >- box-shadow: none; >- position: absolute;*/ >- //right: 10px; >- //top: 30px; >+ a{ >+ &.principal{ >+ background-color: #FEC32C; >+ color: #000; >+ text-shadow: 0 1px 0 #fff; >+ border: none; >+ background-image: none; >+ margin: 5px; >+ padding: 6px 25px; >+ >+ &:hover, >+ &:active, >+ &:focus{ >+ background-color: #fec22c9f; >+ color: #000; >+ border: none; >+ } >+ } >+ } > >+ .dropdown-menu { > border-top-width: 1px; > text-align: center; > padding: 0; >@@ -2203,10 +2330,6 @@ dd { > right: 0; > > a{ >- //color: #696969; >- //float: right; >- //padding: .2em .5em; >- //border-bottom: 1px solid #000; > color: #000; > display: block; > padding: 3px 20px; >@@ -2214,20 +2337,11 @@ dd { > font-weight: normal; > line-height: 1.42857143; > white-space: nowrap; >- border-bottom: none; >- float: left; >- >- &:hover, >- &:focus{ >- //text-decoration: none; >- //background-color: #F3F4F4; >- //background-image: none; >- //font-weight: bold; >- //border: 1px solid #696969; >- //border-radius: 4px; >- >- >+ border-bottom: none; >+ float: left; > >+ &:hover, >+ &:focus{ > text-decoration: none; > font-weight: bold; > background-color: #fff; >@@ -2288,7 +2402,7 @@ dd { > border-radius: 0; > margin-top: 0; > z-index: 300; >- left: auto !important; >+ // left: auto !important; > width: 851px; > } > >@@ -2311,15 +2425,6 @@ dd { > } > } > >-.btn-toolbar-pat{ >- border: none; >- background-color: transparent; >- position: relative; >- right: 0px; >- height: 50px; >- line-height: 25px; >-} >- > #disabled { > a { > color: #999; >@@ -2338,18 +2443,14 @@ dd { > > > .patroninfo { >- //margin-top: -.5em; > margin-right: .5em; >- //padding-bottom: 2em; > padding-top: 1em; > background-color: #e6e6e6; >- //position: absolute; > left: -10px; > width: 100%; > padding-bottom: 25px; > > h5 { >- //border-right: 1px solid #bfd9b9; > margin-bottom: 0; > padding: .5em .9em; > font-weight: bold; >@@ -2364,7 +2465,6 @@ dd { > font-size: 75%; > font-weight: normal; > list-style-type: none; >- //display: table; > text-align: center; > } > } >@@ -2387,15 +2487,8 @@ dd { > } > > > div { >- //border-right: 1px solid #bfd9b9; > width: 100%; > } >- >- &.is-staff { >- h5 { >- //background-color: #EEE; >- } >- } > } > > .patroninfo-section { >@@ -2408,7 +2501,6 @@ dd { > } > > .patroninfo-heading { >- // background-color: rgba(237, 244, 246, .4); > padding: .5em; > margin-bottom: .3em; > clear: both; >@@ -2422,8 +2514,6 @@ dd { > } > } > >-/* Patron image */ >- > .patronimage-container { > padding: .2em; > position: relative; >@@ -2495,6 +2585,7 @@ dd { > background-color: #F3F4F4; > li { > list-style-type: none; >+ display: flex; > > a{ > color: #000; >@@ -2514,7 +2605,7 @@ dd { > fieldset { > &.action { > margin-top: 0; >- float: left; >+ float: right; > } > } > >@@ -2624,9 +2715,7 @@ i { > } > > .circ-settings { >- //background-color: #F4F8F9; > border-radius: 0; >- //border-top: 2px solid #bfd9b9; > display: none; > margin-left: -1em; > margin-right: -1em; >@@ -2638,11 +2727,11 @@ i { > margin-top: .5em; > display: inline; > background: transparent url("../img/UIKit/setting.svg") no-repeat scroll 0%; >- background-size: 100%; >+ background-size: 70%; > position: relative; > margin: 3px; > align-items: center; >- right: 25px; >+ right: 35px; > opacity: 0.3; > > &:hover{ >@@ -2701,11 +2790,11 @@ i { > } > > .dialog { >- //border: 1px solid #BCBCBC; > border-radius: 2px; > margin: 1em auto; > padding: .5em; > text-align: center; >+ display: table; > width: 65%; > max-width: 600px; > >@@ -2743,7 +2832,6 @@ i { > > input { > background-color: #FFFFFF; >- //border: 1px solid #BCBCBC; > margin: .4em; > padding: .4em; > >@@ -2776,9 +2864,7 @@ i { > margin-top: 5px; > margin-left: 5px; > >- //font-family: $font-main; > font-family: 'Poppins', sans-serif; >- //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%); > display: inline-block; > margin-bottom: 0; > font-weight: normal; >@@ -2786,7 +2872,6 @@ i { > white-space: nowrap; > vertical-align: middle; > touch-action: manipulation; >- //width: 90px; > cursor: pointer; > background-image: none; > padding: 6px 12px; >@@ -2833,12 +2918,9 @@ i { > } > > &.message { >- //background: linear-gradient(to bottom, #FFFFFF 0%, #F4F6FA 2%, #EAEEF5 23%, #E8EDF6 94%, #CDDBF2 100%); >- //border: 1px solid #BCBCBC; > color: #000000; > text-align: center; > background-color: transparent; >- // box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); > > > ul, >@@ -2854,8 +2936,6 @@ i { > > &.alert, > &.error { >- //background: linear-gradient(to bottom, #FEF8D3 0%, #FFEC91 9%, #FFED87 89%, #F9DC00 100%); >- //border: 1px solid #E0C726; > color: inherit; > background-color: #fff; > text-align: center; >@@ -2985,38 +3065,8 @@ i { > } > } > } >- >- >- >- /* a { >- //text-decoration: none; >- color: #000; >- width: 100%; >- display: block; >- margin: .5em 0; >- //padding: .4em .3em; >- text-decoration: none; >- padding: 0.5em 0.3em 0.5em 1.2em; >- >- >- >- &.current, &.hover { >- background-color: #F3F4F4; >- color: #418940; >- border-left: solid 5px #418940; >- font-weight: bold; >- } >- }*/ >- >- >- >- >- >- >- >- >+/* > #menu-side { >- //border-right: 1px solid #B9D8D9; > margin-right: .5em; > padding-bottom: 2em; > padding-top: 1em; >@@ -3036,12 +3086,6 @@ i { > left: 0px; > color: #000; > display: block; >- //margin: .5em 0; >- //padding: .4em .3em; >- //padding: 0.5em 0.3em 0.5em 1.2em; >- //flex-direction: row; >- //width: 100%; >- //height: 2.1em; > > &:hover { > background-color: #F3F4F4; >@@ -3073,8 +3117,7 @@ i { > list-style-type: none; > } > } >-} >- >+}*/ > > #closewindow { > margin-top: 2em; >@@ -3089,35 +3132,13 @@ i { > font-size: 100%; > vertical-align: middle; > font-style: italic; >- >- //background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%; >- //position: absolute;20px >- //right : 0px; >- //top: 0px; > width: 250px; > height: 30px; >- //border: none; > padding-left: 5px; > padding-right: 30px; > border-radius: 0; > } > >-.petit-barcode{ >- background-repeat: no-repeat; >- background-position: 3px; >- background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='#369' class='bi bi-calendar3'%3E%3Cg stroke-width='1.333'%3E%3Cpath d='M10.5 0h-9A1.5 1.5 0 0 0 0 1.5v9A1.5 1.5 0 0 0 1.5 12h9a1.5 1.5 0 0 0 1.5-1.5v-9A1.5 1.5 0 0 0 10.5 0zM.75 2.893c0-.355.336-.643.75-.643h9c.414 0 .75.288.75.643v7.714c0 .355-.336.643-.75.643h-9c-.414 0-.75-.288-.75-.643z'/%3E%3Cpath d='M4.875 5.25a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zM2.625 7.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm-6.75 2.25a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5zm2.25 0a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5z'/%3E%3C/g%3E%3C/svg%3E"); >- border-style: inset; >- border-width: 1px; >- padding: 5px; >- font-style: italic; >- border-radius: 0; >- >- font-size: 90%; >- vertical-align: middle; >- height: 25px; >- margin-right: 5px; >-} >- > li { > &.email { > overflow: hidden; >@@ -3198,10 +3219,12 @@ li { > margin-top: 20px; > min-width: 100%; > width: fit-content; >- // overflow: auto; >- box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); > padding: 20px; > >+ fieldset{ >+ box-shadow: none; >+ } >+ > h3{ > padding-bottom: .7em; > margin: 0; >@@ -3211,6 +3234,25 @@ li { > td { > border: none; > >+ >+ button, a{ >+ &.btn-default{ >+ color: #71B443; >+ padding: .3em; >+ border: none; >+ background-color: transparent; >+ border: none; >+ box-shadow: none; >+ font-size: 100%; >+ >+ &:hover, &:active, &:focus, &:active:hover, &:active:focus{ >+ background-color: transparent; >+ color: #71B443; >+ text-decoration: underline; >+ } >+ } >+ } >+ > ul { > li { > clear: left; >@@ -3278,8 +3320,6 @@ li { > } > > .dropdown-menu { >- //position: absolute; >- //top: 50px; > background-color: #fff; > color: #000; > height: fit-content; >@@ -3307,7 +3347,6 @@ li { > margin-bottom: .5em; > padding: 5px; > width: 100%; >- //padding: .4em 1em .4em 1em; > color: #696969; > display: block; > >@@ -3350,9 +3389,6 @@ li { > > > #search-facets { >- //border: 3px solid #71B443; >- //border-radius: 4px; >- > h4 { > background-color: #71B443; > border-bottom: 1px solid #71B443; >@@ -3459,6 +3495,7 @@ td { > } > } > >+/* > #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, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #add_manual_restriction{ > color: #71B443; > padding: .3em; >@@ -3471,7 +3508,7 @@ td { > &:hover, &:active, &:focus, &:active:hover, &:active:focus{ > text-decoration: underline; > } >-} >+}*/ > > .highlight_toggle{ > color: #71B443; >@@ -3633,7 +3670,6 @@ td { > > #cartDetails { > background-color: #352C2E; >- //border: 1px solid #739ACF; > box-shadow: 1px 1px 3px 0 #666; > color: #fff; > display: none; >@@ -3645,14 +3681,9 @@ td { > } > > #cartmenulink { >- //padding-left: 15px; > position: relative; > left: 0px; > top: 0px; >- >- /* i.fa.fa-shopping-cart { >- //padding-right: 7px; >- }*/ > } > > #basketcount { >@@ -3711,7 +3742,7 @@ td { > } > > .container { >- border: 1px solid #EEE; >+ // border: 1px solid #EEE; > margin: 1em 0; > padding: 1em; > } >@@ -3803,8 +3834,6 @@ td { > } > > .advsearch { >- //margin: 0; >- //box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); > margin: 0em 1em 1em 0em; > > table { >@@ -3939,7 +3968,6 @@ td { > .ui-state-default, > .ui-widget-content .ui-state-default, > .ui-widget-header .ui-state-default { >- // background: #F4F8F9 none; > border: 1px solid #bfd9b9; > color: #555555; > font-weight: normal; >@@ -3957,15 +3985,6 @@ td { > font-weight: normal; > } > >-// .ui-state-active, >-// .ui-widget-content .ui-state-active, >-// .ui-widget-header .ui-state-active { >-// background: #FFFFFF none; >-// border: 1px solid #AAAAAA; >-// color: #212121; >-// font-weight: normal; >-// } >- > .ui-state-highlight, > .ui-widget-content .ui-state-highlight, > .ui-widget-header .ui-state-highlight { >@@ -4030,7 +4049,6 @@ td { > > .ui-tabs-nav { > >- > .ui-tabs-active a, > a:hover, > a:focus, >@@ -4062,7 +4080,6 @@ td { > background: #71B443; > border: none; > margin-right: .4em; >- //top: 1px; > border-radius: 4px 4px 0 0; > > &.ui-tabs-active, &.ui-state-hover { >@@ -4074,7 +4091,6 @@ td { > > a { > color: #FFF; >- //font-weight: bold; > } > > >@@ -4087,7 +4103,7 @@ td { > border: 0; > } > >- .ui-state-default {//le menu de la barre de recherche du haut >+ .ui-state-default { > a { > color: #fff; > >@@ -4178,10 +4194,6 @@ td { > > ul { > background: none repeat scroll 0 0 transparent; > border: 0 none; >- // border-bottom-left-radius: 4px; >- // border-bottom-right-radius: 4px; >- //border-top-left-radius: 4px; >- // border-top-right-radius: 4px; > color: #222222; > font-size: 100%; > font-weight: bold; >@@ -4203,15 +4215,10 @@ td { > } > > li { >- //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; > border-bottom-right-radius: 0; > border-bottom-left-radius: 0; >- // border-radius: 0; >- //color: #555555; > float: left; > font-weight: normal; > list-style: none outside none; >@@ -4221,29 +4228,19 @@ td { > position: relative; > top: 1px; > white-space: nowrap; >- > background: #71B443; >- // border: none; >- //margin-right: .4em; >- //top: 1px; >- // border-radius: 4px; > > &.active, &:hover { >- //background-color: #FFFFFF; >- //color: #212121; > font-weight: normal; > padding-bottom: 1px; > > background-color: #418940; > border: none; > border-bottom-width: 0; >- //padding-bottom: 0; > > a { > background: none repeat scroll 0 0 transparent; > color: #fff; >- // cursor: text; >- //font-weight: bold; > outline: 0 none; > top: 1px; > } >@@ -4257,10 +4254,8 @@ td { > text-decoration: none; > > &:hover { >- //background-color: #EDF4F5; > border-top-left-radius: 4px; > border-top-right-radius: 4px; >- //color: #418940; > } > } > } >@@ -4446,7 +4441,6 @@ nav { > background-color: transparent; > clear: both; > margin: 0; >- //padding: .8em .5em .8em 10px; > position: absolute; > top: 0px; > left: Opx; >@@ -4477,7 +4471,6 @@ nav { > > [aria-current="page"] { > color: #696969; >- //font-weight: 700; > text-decoration: none; > } > } >@@ -4485,36 +4478,21 @@ nav { > > .navbar{ > background-color: #352C2E; >- //display: inline-block; >- // float: left; > width: 100%; >- // overflow: hidden; > } > > .navbar-header, .collapse{ >- /* //background-image: linear-gradient(to right, #352C2E , #3A4F2A); >- //background-color: #352C2E; >- box-shadow: none; >- height: 50px; >- // width: 100%;*/ > padding-left: 10px; > padding-right: 10px; >- /*display: inline-block;*/ > float: left; > > a{ > color: #fff; >- // display: inline-block; > line-height: 40px; > } > } > > .navbar-head{ >- // top: 0px; >- //position: absolute; >- //right: 5px; >- //overflow-x: hidden; >- //overflow-y: visible; > display: block !important; > height: auto !important; > } >@@ -4546,7 +4524,6 @@ nav { > #toplevelmenu{ > background-color: transparent; > box-shadow: none; >- //height: 50px; > position: relative; > left: 0px; > top: 0px; >@@ -4556,7 +4533,7 @@ nav { > li { > list-style: none; > >- .haut{ >+ .upper{ > position: relative; > bottom: 3px; > left: 300px; >@@ -4580,7 +4557,6 @@ nav { > > &:hover, &:active{ > background-color: transparent; >- //font-weight: bold; > text-decoration: none; > color: #71B443; > } >@@ -4590,7 +4566,6 @@ nav { > > .residentsearch { > border: 0; >- //border-bottom: 1px solid #85CA11; > cursor: text; > padding: 0 0 .2em; > background-color: transparent; >@@ -4603,23 +4578,16 @@ nav { > #buttonssearch,#header_search{ > padding: 10px; > border-radius: 28px; >- //height: 2.2em; > height: 30px; > background-image: linear-gradient(to right, #418940, #71B443); > z-index: 1; > } > > #header_search{ >- //position: relative; >- //top : 10px; >- //left: 0px; >- > position: relative; > left: 0px; > top: 0px; > width: 500px; >- //line-height: 40px; >- // overflow: hidden; > display: block; > margin: 10px 0; > } >@@ -4642,12 +4610,6 @@ nav { > #header_search{ > width: 500px; > } >- >- >- >- >- >- > > .ui-tabs-nav { > background-image: linear-gradient(to right, #418940, #71B443); >@@ -4665,8 +4627,6 @@ nav { > li { > background: transparent; > border: none; >- // margin-right: .4em; >- //top: 1px; > border-radius: 0; > > &.ui-tabs-active, &.ui-state-hover { >@@ -4678,13 +4638,10 @@ nav { > > a { > color: #FFF; >- //font-weight: bold; > cursor: pointer; > padding: 3px; > font-size: .9em; > } >- >- > } > } > } >@@ -4694,7 +4651,7 @@ nav { > border: 0; > } > >- .ui-state-default {//le menu de la barre de recherche du haut >+ .ui-state-default { > a { > color: #fff; > cursor: pointer; >@@ -4713,7 +4670,6 @@ nav { > .ui-state-hover, .ui-state-active { > a { > font-size: 1em; >- // box-shadow: inset 0px 0px 8px 0px rgba(0, 0, 0, 0.10); > cursor: pointer; > padding: 3px; > font-size: .9em; >@@ -4726,43 +4682,30 @@ nav { > } > } > >- >- .ui-widget { >- font-family: inherit; >- font-size: inherit; >- >- input, >- select, >- textarea, >- button { >+ .ui-widget { > font-family: inherit; > font-size: inherit; >+ >+ input, >+ select, >+ textarea, >+ button { >+ font-family: inherit; >+ font-size: inherit; >+ } > } >- } >- > >- >- >- >- >- >- >- >- > .buttonsearch{ > display: none; > } >- >+ > .buttonsearch:hover, > .buttonsearch.active{ >- // border-bottom: 2px solid white; > margin-right: 0; > font-size: 0.85em; > cursor: text; > padding: 0.25em; >- //border-bottom: 2px solid transparent; > margin: 0; >- // transition: 0.25s; > display: inline-block; > overflow: hidden; > opacity: 1; >@@ -4770,33 +4713,22 @@ nav { > > input{ > display: none; >- } >- >- input{ >- >- >+ > &.focus{ > outline-offset: 0px; > outline: 1px black; > float: right; >- // width: calc(301px); >- >- >- // width: 0%; > height: 30px; > border-radius: 17px; > padding-left: 2em; > padding-right: 1.5em; > border: none ; > margin-left: 0px; >- // transition: 0.5s; >- > position:absolute; > top: 0px; > right: 30px; > z-index : -2; >- display: inline-block; >- >+ display: inline; > letter-spacing: normal; > word-spacing: normal; > text-transform: none; >@@ -4818,10 +4750,8 @@ nav { > bottom: 15px; > right: -115px; > } >- > } > >- > #header_search.fold .buttonsearch:not(.active){ > width: 0px; > opacity: 0; >@@ -4834,32 +4764,12 @@ nav { > font-size: 1em; > > } >- >- /* .iconsearch{ >- display: none; >- font-size: 1em; >- }*/ > > #header_search.fold #backsearch{ > display: inline-block; > cursor: pointer; > } > >- /* .iconsearch{ >- display: inline-block; >- cursor: pointer; >- padding: 3px; >- font-size: .9em; >- >- &:hover{ >- font-size: 1em; >- box-shadow: inset 0px 0px 8px 0px rgba(0, 0, 0, 0.10); >- // border: 1px solid #fff; >- // border-radius: 50%; >- >- } >- }*/ >- > .description{ > opacity: 0.6; > max-width: 50em; >@@ -4873,7 +4783,6 @@ nav { > &.open { > li { > background-color: #352C2E; >- //padding: 2px; > > a { > font-weight: normal; >@@ -4891,9 +4800,6 @@ nav { > } > > a { >- //font-weight: bold; >- //padding-bottom: .4em; >- //padding-top: .4em; > line-height: 40px; > overflow: hidden; > color: #fff; >@@ -4914,15 +4820,10 @@ nav { > > > #logged-in-menu{ >- // background-color: #352C2E; >- //z-index: 999; > position: relative; > left: 0px; > top: 0px; >- //white-space: pre; >- //flex-direction: column; > height: 50px; >- //display: block; > > &:hover{ > text-decoration: none; >@@ -4930,19 +4831,12 @@ nav { > } > > .loggedinusername{ >- /* font-size: 0.85em; */ >- /* font-weight: normal; */ >- /* position: relative; */ >- /* left: 135px; */ > bottom: 5px; >- /* height: 20px; */ >- /* width: 100%; */ > text-decoration: none; > position: relative; > float: right; > right: 0px; > height: 20px; >- /* top: 10px; */ > width: 100%; > } > >@@ -4950,9 +4844,6 @@ nav { > position: relative; > right: 0px; > height: 20px; >- //line-height: normal; >- //padding-bottom: 10px; >- //padding-right: 10px; > top: 10px; > width: 100%; > >@@ -4971,7 +4862,6 @@ nav { > .nav > li > a:hover, > .nav > li > a:focus { > background-color: transparent; >- //text-decoration: none; > } > > .pagination { >@@ -4979,24 +4869,24 @@ nav { > > .active { > a { >- background-color: #5A9EAA; >- border-color: #5A9EAA; >+ background-color: #6daa5a; >+ border-color: #6daa5a; > > &:hover, > &:focus { >- background-color: #5A9EAA; >- border-color: #5A9EAA; >+ background-color: #6daa5a; >+ border-color: #6daa5a; > } > } > > span { >- background-color: #5A9EAA; >- border-color: #5A9EAA; >+ background-color: #6daa5a; >+ border-color: #6daa5a; > > &:hover, > &:focus { >- background-color: #5A9EAA; >- border-color: #5A9EAA; >+ background-color: #6daa5a; >+ border-color: #6daa5a; > } > } > } >@@ -5004,9 +4894,7 @@ nav { > > button, > .btn { >- //font-family: $font-main; > font-family: 'Poppins', sans-serif; >- //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%); > display: inline-block; > margin-bottom: 0; > font-weight: normal; >@@ -5022,21 +4910,68 @@ button, > border-radius: 4px; > user-select: none; > >+ &.toolbar-btn{ >+ font-family: 'Poppins', sans-serif; >+ font-weight: normal; >+ text-align: center; >+ white-space: nowrap; >+ vertical-align: middle; >+ -ms-touch-action: manipulation; >+ touch-action: manipulation; >+ cursor: pointer; >+ background-image: none; >+ padding: 6px 12px; >+ font-size: 12px; >+ border-radius: 4px; >+ -webkit-user-select: none; >+ -moz-user-select: none; >+ -ms-user-select: none; >+ user-select: none; >+ font-size: 105%; >+ background-color: transparent; >+ border: none; >+ display: inline-block; >+ margin: 5px 10px; >+ color: #696969; >+ >+ &:hover, &:focus{ >+ text-decoration: none; >+ background-color: #dadada; >+ } >+ >+ &:active{ >+ border: none; >+ } >+ >+ &.word{ >+ margin-right: 0; >+ padding-right: .1em; >+ } >+ >+ &.arrow{ >+ margin-left: 0; >+ border-radius: 4px; >+ padding-left: .1em; >+ >+ &:active{ >+ border: 1px solid #000; >+ border-radius: 4px; >+ } >+ } >+ } >+ > &.btn-link { > border: 0; > } > > &.cancel { >- > background-color: transparent; > color: #696969; > border: #696969 double 1px; > margin-top: 5px; > margin-left: 5px; > >- //font-family: $font-main; > font-family: 'Poppins', sans-serif; >- //box-shadow: inset 0 1px 0 rgb(255 255 255 / 15%), 0 1px 1px rgb(0 0 0 / 8%); > display: inline-block; > margin-bottom: 0; > font-weight: normal; >@@ -5062,15 +4997,15 @@ button, > } > } > } >+ > #merge-patrons{ > padding: 0 25px; >- //float: right; > } > > #patronlist-menu{ > padding: 0 25px; > } >- >+/* > .pat{ > /* background-color: transparent; > border: none; >@@ -5092,7 +5027,7 @@ button, > > &:focus{ > background-color: #d8d8d8; >- }*/ >+ } > > > >@@ -5128,47 +5063,15 @@ button, > &:active{ > border: none; > } >-} >- >-.mot{ >- margin-right: 0; >- //padding-right: 0; >-} >- >-.fleche{ >- margin-left: 0; >- //border: 1px solid #000; >- border-radius: 4px; >- padding: 0 5px 0 3px; >- >- &:active{ >- >- border: 1px solid #000; >- border-radius: 4px; >- } >-} >- >- >-#principal{ >- background-color: #FEC32C; >- color: #000; >- text-shadow: 0 1px 0 #fff; >- border: none; >- background-image: none; >- margin: 5px; >+}*/ > >- &:hover, >- &:active, >- &:focus{ >- background-color: #fec22c9f; >- } >-} > > .principal{ > background-color: #FEC32C; > color: #000; > text-shadow: 0 1px 0 #fff; > border: none; >+ padding: 6px 25px; > background-image: none; > margin: 5px; > >@@ -5177,6 +5080,7 @@ button, > &:focus{ > background-color: #fec22c9f; > color: #000; >+ border: none; > } > } > >@@ -5455,6 +5359,10 @@ label { > > .modal-content { > background-color: rgb(211, 223, 204); >+ >+ fieldset{ >+ box-shadow: none; >+ } > } > > .btn-group { >@@ -5499,7 +5407,6 @@ code { > border: 3px solid #418940; > border-radius: 4px; > overflow: auto; >- //border-top-width: 0; > padding: 1em; > } > >@@ -5507,8 +5414,6 @@ code { > > li { > > a { > background-color: #71B443; >- //border: none; >- // border-radius: 4px; > color: #fff; > line-height: 1.42857143; > margin-right: .4em; >@@ -5530,9 +5435,6 @@ code { > background-color: #418940; > border-radius: 4px 4px 0 0; > color: #fff; >- //border: none; >- //border-bottom-color: transparent; >- //color: #000; > cursor: default; > font-weight: bold; > } >@@ -5800,7 +5702,6 @@ input.renew { > > .date-select { > label { >- //display: inline-block; > width: 40%; > } > } >@@ -5924,7 +5825,6 @@ input.renew { > } > } > >- > .form-message { > background-color: #FFF; > border: 1px solid #A4BEDD; >@@ -5943,31 +5843,6 @@ input.renew { > } > } > >-#patron_search { >- #filters { >- display: none; >- //display: block; >- background-color: #352C2E; >- padding: 10px; >- //border-radius: 4px; >- padding: 10px; >- border-radius: 4px; >- position: absolute; >- text-align: center; >- right: 0px; >- height: 70px; >- bottom: -70px; >- >- label{ >- color: #fff; >- } >- } >- >- .address { >- font-size: 100%; >- } >-} >- > #fixedlengthbuilderaction { > border: 3px solid #e3f1df; > left: 80%; >@@ -6261,9 +6136,7 @@ input.renew { > } > > .lastborrower { >- //background-color: #71B443; > background-image: linear-gradient(to left, #418940, #71B443); >- //@at-root: 1px solid #95C6D0; > box-shadow: 1px 1px 1px 0 #999; > color: #fff; > margin: .4em 0; >@@ -6286,7 +6159,6 @@ input.renew { > } > > #lastborrower-remove { >- //border-radius: 0px 5px 5px 0px; > cursor: pointer; > float: right; > margin: .0em .4em .0em .4em; >@@ -6329,7 +6201,6 @@ input.renew { > display: block; > height: 60px; > margin: 5px; >- //font-size: 150%; > > i{ > >@@ -6369,12 +6240,16 @@ input.renew { > font-size: 150%; > font-weight: normal; > display: inline; >+ color: #000; > } > >- &:hover{ >- color: #418940; >+ &:hover, &:active, &:focus{ > text-decoration: none; > >+ h1{ >+ color: #418940; >+ } >+ > i{ > &.fa{ > background-color: #418940; >@@ -6394,10 +6269,6 @@ input.renew { > padding: 0; > } > } >- >- h1{ >- //font-weight: bold; >- } > } > } > } >@@ -6427,13 +6298,6 @@ input.renew { > > // ==== MODULE LINKS - End ==== > >-/*#catalog-search-link { >- //color : #fff; >- //border-right: 1px solid lighten( #e3f1df, 15% ); >- //padding-right: .3em; >- >-}*/ >- > #tools_holidays { > .radio, > .checkbox { >@@ -6533,30 +6397,14 @@ input.renew { > } > > .header-menu-link { >- // background-color: #352C2E; > display: none; >- // font-weight: bold; > padding: .4em .6em; > } > > #user-menu { >- //position: absolute; >- //right: 5px; >- //top: 0; >- // position: relative; >- //left: 0px; > top: 0px; > position: absolute; > right: 5px; >- >- //background-color: #352C2E; >- // box-shadow: none; >- // height: 50px; >- // width: 100%; >- // padding-left: 10px; >- //padding-right: 10px; >- // display: inline-block; >- //float: left; > } > > div#makechart ol li { >@@ -6592,7 +6440,6 @@ div .suggestion_note { > } > > .currentlibrary { >- //background-color: #E6FCB7; > display: inline-block; > padding: 2px 4px; > } >@@ -6697,7 +6544,6 @@ div .suggestion_note { > > #header { > background-color: #352C2E; >- // border: 1px solid #352C2E; > margin-bottom: 1em; > > a { >@@ -6722,16 +6568,13 @@ div .suggestion_note { > > &.dropdown-menu { > display: block; >- // background-color : #352C2E; > } > } > > .dropdown-menu-brown { > li { >- // background-color: #352C2E; > > a { >- //color: #fff; > &:hover { > color: #FFF; > text-decoration: underline; >@@ -6767,7 +6610,6 @@ div .suggestion_note { > .open { > .dropdown-menu { > background-color: #352c35; >- // border: 1px solid #ccc; > position: absolute; > } > } >@@ -6819,10 +6661,9 @@ div .suggestion_note { > i {background-color: #352C2E; > box-shadow: none; > height: 50px; >- // width: 100%; > padding-left: 10px; > padding-right: 10px; >- display: inline-block; >+ display: inline; > float: left; > display: none; > } >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 8fb8be7d3b..ac68643325 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 >@@ -96,7 +96,7 @@ > > [% IF ( loop_budget ) %] > >- <div id="searchresults"> >+ <fieldset id="searchresults"> > > <h3>All available funds</h3> > >@@ -208,7 +208,7 @@ > [% END %] > </tbody> > </table> >- </div></div> >+ </div></fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index 3394a5369b..ca0e7bef32 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -124,7 +124,7 @@ > <span class="citation">[% biblio.citation | html %]</span> > </label> > <span class="links" style="font-weight: normal;"> >- ( <a id="lientype" href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | uri %]" class="previewData">MARC</a> | <a id="lientype" href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% biblio.import_record_id | html %]" class="previewData">Card</a> | <a id="lientype" href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]&breedingid=[% biblio.import_record_id | html %]&import_batch_id=[% biblio.import_batch_id | html %]&biblionumber=[% biblio.match_biblionumber | html %]">Add order</a> ) >+ ( <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | uri %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% biblio.import_record_id | html %]" class="previewData">Card</a> | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]&breedingid=[% biblio.import_record_id | html %]&import_batch_id=[% biblio.import_batch_id | html %]&biblionumber=[% biblio.match_biblionumber | html %]">Add order</a> ) > </span> > </h3> > <div style="float:left"> >@@ -515,7 +515,7 @@ > </td> > <td>[% batch_lis.num_records | html %]</td> > <td class="actions"> >- <a id="lientype" href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add orders</a> >+ <a href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add orders</a> > </td> > </tr> > [% END # /FOREACH batch_lis %] >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 ee83208529..d694b8a62e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -264,7 +264,7 @@ > </li> > [% END %] > <li> >- <a id="lientype" href="#" id="add_user"><i class="fa fa-plus"></i> Add user</a> >+ <a 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/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index dce01995f6..afdfe80852 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -171,7 +171,7 @@ > [% UNLESS (closedbg) %] > <div class="col-xs-6 col-xs-push-6"> > >- <div id="searchresults"> >+ <fieldset id="searchresults"> > <div id="groups"> > <div class="workarea_alt" > > <h3>Ungrouped baskets</h3> >@@ -212,7 +212,7 @@ > </table> > </div> > </div> >- </div> >+ </fieldset> > </div> > [% END %] > [% IF ( closedbg ) %] >@@ -376,10 +376,10 @@ > <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td> > <td>[% basketgroup.basketsqty | html %]</td> > <td> >- <input type="button" onclick="closeandprint('[% basketgroup.id | html %]');" id="lientype" value="Close and export as PDF" /> >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Edit" /></form> >+ <input type="button" onclick="closeandprint('[% basketgroup.id | html %]');" value="Close and export as PDF" /> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Edit" /></form> > [% UNLESS basketgroup.basketsqty %] >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Delete" /></form> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Delete" /></form> > [% END %] > </td> > </tr> >@@ -416,12 +416,12 @@ > <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td> > <td>[% basketgroup.basketsqty | html %]</td> > <td> >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="View" /></form> >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Reopen" /></form> >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Export as PDF" /></form> >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Export as CSV" /></form> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="View" /></form> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Reopen" /></form> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as PDF" /></form> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as CSV" /></form> > [% IF (ediaccount) %] >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Generate EDIFACT order" /></form> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Generate EDIFACT order" /></form> > [% ELSE %] > <div>No EDIFACT configuration for [% booksellername | html %]</div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index 54d2359a86..be19e9debd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -66,9 +66,9 @@ > </select> > </p> > [% IF ( allbaskets ) %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&booksellerid=[% booksellerid | uri %]" id="lientype">Show active baskets only</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&booksellerid=[% booksellerid | uri %]">Show active baskets only</a> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&booksellerid=[% booksellerid | uri %]&allbaskets=1" id="lientype">Show all baskets</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&booksellerid=[% booksellerid | uri %]&allbaskets=1">Show all baskets</a> > [% END %] > [% END %] > [% UNLESS booksellerid %] >@@ -114,9 +114,9 @@ > [% IF ( supplier.basketcount > 0 ) %] > <div> > [% IF ( allbaskets ) %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&booksellerid=[% booksellerid | uri %]" id="lientype">Show active baskets only</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&booksellerid=[% booksellerid | uri %]">Show active baskets only</a> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&booksellerid=[% booksellerid | uri %]&allbaskets=1" id="lientype">Show all baskets</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&booksellerid=[% booksellerid | uri %]&allbaskets=1">Show all baskets</a> > [% END %] > </div> > [% END %] >@@ -189,18 +189,18 @@ > <div class="dropup"> > <div class="btn-group"> > [%# There should be no space between these two buttons, it would render badly %] >- <a class="btn btn-default btn-xs lientype" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a><a class="btn btn-default lientype btn-xs dropdown-toggle" id="basketactions[% basket.basknetno | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> >+ <a class="btn btn-default btn-xs" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a><a class="btn btn-default btn-xs dropdown-toggle" id="basketactions[% basket.basknetno | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="basketactions[% basketn.basketno | html %]"> > [% IF basket.uncertainprices %] >- <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% basket.booksellerid | uri %]&owner=1" id="lientype"><i class="fa fa-usd"></i> Uncertain prices</a></li> >+ <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% basket.booksellerid | uri %]&owner=1"><i class="fa fa-usd"></i> Uncertain prices</a></li> > [% ELSIF basket.total_items && !basket.is_standing %] >- <li><a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basket.basketno | uri %]&booksellerid=[% basket.booksellerid | uri %]" id="lientype"><i class="fa fa-times-circle"></i> Close this basket</a></li> >+ <li><a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basket.basketno | uri %]&booksellerid=[% basket.booksellerid | uri %]"><i class="fa fa-times-circle"></i> Close this basket</a></li> > [% END %] > </ul> > </div> > </div> > [% ELSE %] >- <a class="btn btn-default btn-xs lientype" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a> >+ <a class="btn btn-default btn-xs" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a> > [% END %] > <!-- Modal --> > <div id="addtoBasket[% basket.basketno | html %]" class="modal" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno | html %]" aria-hidden="true" data-basketno="[% basket.basketname | html %]"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >index d1c39d1a67..193bf4b296 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >@@ -297,7 +297,7 @@ Acquisitions › Koha > [% END %] > </tbody> > </table> >- <a class="btn btn-default" id="lientype" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"><i class="fa fa-fw fa-arrow-left"></i> Return to the basket</a >+ <a class="btn btn-default" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"><i class="fa fa-fw fa-arrow-left"></i> Return to the basket</a > [% ELSE %] > <span>No order has been duplicated. Maybe something wrong happened?</span> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index 6dd4b2d61b..dddce51f8b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -341,8 +341,8 @@ > </fieldset> > </form> > <p> >- <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]" id="lientype">Go to receipt page</a> >- [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]" id="lientype">Manage invoice files</a>[% END %] >+ <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]">Go to receipt page</a> >+ [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]">Manage invoice files</a>[% END %] > </p> > <h2>Invoice details</h2> > <fieldset> >@@ -477,11 +477,11 @@ > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> > >- <aside> >- <div class="col-sm-2 col-sm-pull-10"> >- [% INCLUDE 'acquisitions-menu.inc' %] >- </div> >- </aside> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'acquisitions-menu.inc' %] >+ </aside> >+ </div> > </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index aa1b3e6422..e369c133e6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -308,9 +308,8 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- <div id="filters"> > <form action="" method="get"> >- <fieldset class="sidebar brief"> >+ <fieldset class="sidebar"> > <h3>Search filters</h3> > <ol> > <li> >@@ -401,7 +400,6 @@ > <input type="hidden" name="op" id="op" value="do_search" /> > </form> > [% INCLUDE 'acquisitions-menu.inc' %] >- </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index a6c111db01..d6f46e42fe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -231,25 +231,24 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- <div id="filters"> > <form action="lateorders.pl" method="get"> >-<fieldset class="brief"> >-<h4>Filter results:</h4> >+<fieldset class="sidebar"> >+<h3>Filter results</h3> > [% FOREACH ERROR_LOO IN ERROR_LOOP %] > [% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay | html %]) must be a number between 0 and 999.</p>[% END %] > [% END %] > <ol> >- <li><p for="delay">Order date:<input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay | html %]" /> days ago</p></li> >- <li><p for="from">Estimated delivery date from: >+ <li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay | html %]" /> days ago</li> >+ <li><label for="from">Estimated delivery date from: </label> > <input type="text" size="10" id="from" name="estimateddeliverydatefrom" value="[% estimateddeliverydatefrom | html %]" class="flatpickr" data-date_to="to"/> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> >- <li><p for="to">To: >+ <li><label for="to">To: </label> > <input type="text" size="10" id="to" name="estimateddeliverydateto" value="[% estimateddeliverydateto | html %]" class="flatpickr" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > >- <li><p for="booksellerid">Vendor: >+ <li><label for="booksellerid">Vendor:</label> > <select id="booksellerid" tabindex="" name="booksellerid"> > <option value=""></option> > [% FOREACH bookseller IN booksellers %] >@@ -259,14 +258,13 @@ > <option value="[% bookseller.id | html %]">[% bookseller.name | html %]</option> > [% END %] > [% END %] >- </select></p> >+ </select> > </li> > </ol> > <fieldset class="action"><input type="submit" class="principal" value="Filter" /></fieldset> > </fieldset> > </form> > [% INCLUDE 'acquisitions-menu.inc' %] >-</div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >index e1051c533d..728122b9e8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -119,10 +119,8 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- <div id="filters"> > [% INCLUDE 'subscriptions-search.inc' %] > [% INCLUDE 'acquisitions-menu.inc' %] >- > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index c4f53a433f..173ca3cd30 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -120,7 +120,7 @@ > </div> > [% UNLESS (invoiceclosedate) %] > <div id="acqui_receive_search"> >- <div id="searchresults"> >+ <fieldset id="searchresults"> > <h3>Pending orders</h3> > <table id="pending_orders" class="table table-bordered table-striped"> > <thead> >@@ -140,7 +140,7 @@ > </tr> > </thead> > </table> >- </div></div> >+ </fieldset></div> > [% ELSE %] > <p> > <span>Invoice is closed, so you can't receive orders anymore.</span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >index 79da1ac88c..8760af9d11 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -205,8 +205,8 @@ > <div class="col-sm-2 col-sm-pull-10"> > <aside> > <form method="get" action="parcels.pl"> >- <fieldset class="brief"> >- <h4>Filter</h4> >+ <fieldset class="sidebar"> >+ <h3>Filter</h3> > <ol> > <li> <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /></li> > <li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter | html %]" id="filter" /></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index f18316489d..840ebfb8d0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -54,7 +54,7 @@ > [% END %] > <input type="hidden" class="contact_claimissues_hidden" name="contact_claimissues" value="[% contact.claimissues | html %]"></input> > </li> >- [% IF contact.id %]<li><button class="btn btn-default delete-contact" id="lientype"><i class="fa fa-trash"></i> Delete contact</li>[% END %] >+ [% IF contact.id %]<li><button class="btn btn-default delete-contact"><i class="fa fa-trash"></i> Delete contact</li>[% END %] > </ol> > [% END %] > >@@ -324,7 +324,7 @@ > <h1>[% name | html %]</h1> > <div class="row"> > <div id="supplier-company-details" class="col-sm-6"> >- <div id="searchresults"> >+ <fieldset> > <h2>Vendor details</h2> > <p><span class="label">Company name: </span>[% name | html %]</p> > <p><span class="label">Postal address: </span>[% postal | html %]</p> >@@ -365,7 +365,7 @@ > [% IF ( notes ) %]<p><strong>Notes: </strong> > [% notes | html %]</p>[% END %] > </div> <!-- .supplier-ordering-information --> >- </div> >+ </fieldset> > </div> <!-- /.col-sm-6 --> > > <div class="col-sm-6"> >@@ -417,8 +417,8 @@ > <td data-order="[% contract.contractenddate | html %]">[% contract.contractenddate | $KohaDates %]</td> > [% IF CAN_user_acquisition_contracts_manage %] > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber | html %]&booksellerid=[% contract.booksellerid | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&contractnumber=[% contract.contractnumber | html %]&booksellerid=[% contract.booksellerid | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber | html %]&booksellerid=[% contract.booksellerid | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&contractnumber=[% contract.contractnumber | html %]&booksellerid=[% contract.booksellerid | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > [% END %] > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >index 7f6b8f0fcb..3f47a135d2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -101,7 +101,7 @@ > <option value="1">me</option> > [% END %] > </select> >- <input type="submit" id="lientype" value="Filter" /> >+ <input type="submit" value="Filter" /> > </form> > <form action="[% scriptname | html %]" method="post" id="uncertainprices"> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >index 061ed4ee95..3c799989f8 100755 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >@@ -157,8 +157,8 @@ > [% IF field.searchable %]Yes[% ELSE %]No[% END %] > </td> > <td class="actions"> >- <a class="btn btn-default btn-xs" id="lientype" href="?op=add_form&field_id=[% field.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="confirmdelete btn btn-default btn-xs" id="lientype" href="?op=delete&field_id=[% field.id | uri %]&tablename=[% tablename | uri %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="?op=add_form&field_id=[% field.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="confirmdelete btn btn-default btn-xs" href="?op=delete&field_id=[% field.id | uri %]&tablename=[% tablename | uri %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >index efaa338180..d3cf5bb94a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >@@ -48,7 +48,7 @@ > [% IF ( Koha.Preference('Mana') == 2 ) %] > <div class="dialog message"> > <h4>Share content with Mana KB?</h4> >- <p> You haven't decided if you want to activate Mana Knowledge Base. <a href=/cgi-bin/koha/admin/share_content.pl id="lientype">Change your Mana KB settings</a>.</p> >+ <p> You haven't decided if you want to activate Mana Knowledge Base. <a href=/cgi-bin/koha/admin/share_content.pl>Change your Mana KB settings</a>.</p> > </div> > [% END %] > [% END %] >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 9b0e1905be..a7ed262d2f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -8,7 +8,7 @@ > [% END %] > [%- BLOCK action_menu %] > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle lientype" id="budgetmenu_[% block_budget.budget_period_id | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="budgetmenu_[% block_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="budgetmenu_[% block_budget.budget_period_id | html %]"> >@@ -469,7 +469,7 @@ > > [% INCLUDE 'budgets-active-currency.inc' %] > >-<div id="searchresults"> >+<fieldset id="searchresults"> > <div id="budgetsTabs" class="toptabs"> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation" class="active"> >@@ -550,7 +550,7 @@ > </div> > </div> <!-- /.tab-content --> > </div> >- </div> >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >index 8775921377..b6543074ee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -122,7 +122,6 @@ > </span> > </div> > [% END %] >-<div id="searchresults"> > <table id="budgeth" class="group"> > <thead> > <tr> >@@ -221,7 +220,7 @@ > [% ELSE %] > <td> > <div class="btn-group dropup"> >- <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="#"> >+ <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="#"> > 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 +239,6 @@ > [% END %] > </tbody> > </table> >-</div> > </fieldset > [% ELSE %] > <p>No fund found</p> >@@ -309,8 +307,8 @@ > [% ELSE %] > <span id="budget_owner_name"></span> > [% END %] >- <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> >+ <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> > <input type="hidden" name="budget_owner_id" id="budget_owner_id" > value="[% budget_owner.borrowernumber | html %]" /> > </li> >@@ -334,10 +332,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" id="lientype" data-borrowernumber="[% user.borrowernumber | html %]"><i class="fa fa-trash"></i> Remove</a> >+ • <a href="#" class="del_user" data-borrowernumber="[% user.borrowernumber | html %]"><i class="fa fa-trash"></i> Remove</a> > </li> > [% END %] >- <li><a class="lientype" href="#" id="add_user_button"><i class="fa fa-plus"></i> Add users</a></li> >+ <li><a 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> >@@ -448,12 +446,11 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- <div id="filters"> > > [% IF op == 'list' %] > <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get"> >- <fieldset class="brief" id="fundfilters"> >- <h4>Fund filters</h4> >+ <fieldset class="sidebar" id="fundfilters"> >+ <h3>Fund filters</h3> > <ol> > <li> > <label for="filter_budgetbranch2">Library: </label> >@@ -495,7 +492,6 @@ > </form>[% END %] > > [% INCLUDE 'acquisitions-menu.inc' %] >- </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >index a82d47c18c..bb9253ed7c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >@@ -193,8 +193,8 @@ > [% END %] > [% IF ( else ) %] > <h1>Contract(s) of [% booksellername | html %]</h1> >+ <fieldset id="searchresults"> > [% IF ( loop ) %] >- <div id="searchresults"> > <table> > <tr> > <th scope="col">Name</th> >@@ -212,21 +212,21 @@ > <td>[% loo.contractstartdate | html %]</td> > <td>[% loo.contractenddate | html %]</td> > <td class="actions"> >- <a id="lientype" href="[% loo.script_name | url %]?op=add_form&contractnumber=[% loo.contractnumber | uri %]&booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a id="lientype" href="[% loo.script_name | url %]?op=delete_confirm&contractnumber=[% loo.contractnumber | uri %]&booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >+ <a href="[% loo.script_name | url %]?op=add_form&contractnumber=[% loo.contractnumber | uri %]&booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="[% loo.script_name | url %]?op=delete_confirm&contractnumber=[% loo.contractnumber | uri %]&booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >- </div> > </table> > [% ELSE %] > <div class="dialog message"> > There are no contracts with this vendor. > [% IF active %] >- <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid | uri %]" id="lientype">Add a contract</a>. >+ <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid | uri %]">Add a contract</a>. > [% END %] > </div> > [% END %] >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >index 850d835b71..0d03235cae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >@@ -161,8 +161,8 @@ > > <td class="actions"> > [% UNLESS ( budget_line.budget_lock ) %] >- <input type="button" class="auto_fill_row btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" id="lientype" value="Auto-fill row"/> >- <input type="button" class="clear_fields btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" id="lientype" value="Clear"> >+ <input type="button" class="auto_fill_row btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" value="Auto-fill row"/> >+ <input type="button" class="clear_fields btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" value="Clear"> > [% ELSE %] > <div style="color:red;">not owned</div> > [% END %] >@@ -208,12 +208,10 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- <div id="filters"> >- > <form method="post" action="/cgi-bin/koha/admin/aqplan.pl"> > <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> >-<fieldset class="brief"> >-<h4>Filter</h4> >+<fieldset class="sidebar"> >+<h3>Filter</h3> > [% BLOCK planning_types %] > [% SWITCH type %] > [% CASE 'MONTHS' %]<span>by months</span> >@@ -224,7 +222,7 @@ > [% END %] > <ol> > <li> >- <p for="authcat"> Select planning type: >+ <label for="authcat"> Select planning type:</label> > <select name="authcat" id="authcat"> > [% FOREACH value IN authcat_dropbox.values %] > [% IF ( value == authcat_dropbox.default ) %] >@@ -233,34 +231,34 @@ > <option value="[% value | html %]">[% PROCESS planning_types type=value %]</option> > [% END %] > [% END %] >- </select></p> >+ </select> > </li> >- <li class="radio"><p for="show_mine"> >+ <li class="radio"><label for="show_mine"> > [% IF ( show_mine ) %] > <input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" /> > [% ELSE %] > <input type="checkbox" id="show_mine" name="show_mine" value="1" /> > [% END %] >- Show my funds only</p> >+ Show my funds only</label> > </li> > >- <li class="radio"><p for="show_active"> >+ <li class="radio"><label for="show_active"> > [% IF ( show_active ) %] > <input type="checkbox" id="show_active" name="show_active" value="1" checked="checked" /> > [% ELSE %] > <input type="checkbox" id="show_active" name="show_active" value="1" /> > [% END %] >- Show active funds only</p> >+ Show active funds only</label> > </li> > > >- <li class="radio"><p for="show_actual"> >+ <li class="radio"><label for="show_actual"> > [% IF ( show_actual ) %] > <input type="checkbox" id="show_actual" name="show_actual" value="1" checked="checked" /> > [% ELSE %] > <input type="checkbox" id="show_actual" name="show_actual" value="1" /> > [% END %] >- Show actual/estimated values</p> >+ Show actual/estimated values</label> > </li> > </ol> > <fieldset class="action"> >@@ -271,11 +269,11 @@ > </form> > [% IF ( budget_lines ) %] > <form method="post" action="/cgi-bin/koha/admin/aqplan.pl"> >-<fieldset class="brief"> >-<h4>Export</h4> >+<fieldset class="sidebar"> >+<h3>Export</h3> > <ol> >- <li><p for="basename">Output to a file named: <input type="text" name="basename" id="basename" value="Export" /></p></li> >- <li><p class="inline" for="MIME">Into an application >+ <li><label for="basename">Output to a file named: </label><input type="text" name="basename" id="basename" value="Export" /></li> >+ <li><label class="inline" for="MIME">Into an application</label> > <select name="MIME" id="MIME"> > [% FOREACH value IN CGIextChoice %] > <option value="[% value | html %]">[% value | html %]</option> >@@ -285,7 +283,7 @@ > [% FOREACH value IN CGIsepChoice %] > <option value="[% value | html %]">[% value | html %]</option> > [% END %] >- </select></p> >+ </select> > </li> > </ol> > <fieldset class="action"> <input type="submit" class="principal" value="Submit"/> >@@ -299,7 +297,6 @@ > [% END %] > > [% INCLUDE 'acquisitions-menu.inc' %] >- </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >index aa5585cff3..ae8c275bb6 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 >@@ -99,13 +99,13 @@ > <div class="dialog alert"> > <h3>Audio alerts are disabled</h3> > [% IF ( CAN_user_parameters_manage_sysprefs ) %] >- <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> >+ <p>Please enable system preference <a 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 %] > </div> > [% END %] >- <div id="searchresults"> >+ <fieldset id="searchresults"> > <table id="audio-alerts-table"> > <thead id="audio-alerts-table-head"> > <tr> >@@ -143,17 +143,17 @@ > <td>[% a.selector | html %]</td> > <td>[% a.sound | html %]</td> > <td> >- <a class="btn btn-default btn-xs edit" data-soundid="[% a.id | html %]" data-precedence="[% a.precedence | html %]" data-selector="[% a.selector | html %]" data-sound="[% a.sound | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a></td> >+ <a class="btn btn-default btn-xs edit" data-soundid="[% a.id | html %]" data-precedence="[% a.precedence | html %]" data-selector="[% a.selector | html %]" data-sound="[% a.sound | html %]"><i class="fa fa-pencil"></i> Edit</a></td> > </tr> > [% END %] > </tbody> > </table> >+ </fieldset> > </form> > > <p> > <button id="delete-alerts" type="submit" class="btn btn-default disabled principal"><i class="fa fa-trash"></i> Delete selected alerts</button> > </p> >- </div> > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index 481b184070..e034e9c20d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -312,9 +312,9 @@ > </div> > [% END # /FOR m IN messages %] > >- <div id="searchresults"> > [% IF ( searchfield ) %] > <form action="/cgi-bin/koha/admin/authorised_values.pl" method="get" id="category"> >+ <fieldset> > <p> > <label for="category_search">Show category: </label> > <select name="searchfield" id="category_search"> >@@ -327,8 +327,10 @@ > [% END %] > </select> > </p> >+ </fieldset> > </form> <!-- /#category --> > >+ <fieldset id="searchresults"> > [% IF loop %] > <table id="categoriest" class="authorized_values_table"> > <thead> >@@ -369,8 +371,8 @@ > <span>No limitation</span> > [% END # /IF loo.branches.size > 0 %] > </td> >- <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&id=[% loo.id | uri %]" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/authorised_values.pl?op=delete&searchfield=[% searchfield | uri %]&id=[% loo.id | uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a></td> >+ <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&id=[% loo.id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/authorised_values.pl?op=delete&searchfield=[% searchfield | uri %]&id=[% loo.id | uri %]"><i class="fa fa-trash"></i> Delete</a></td> > </tr> > [% END # /FOREACH loop %] > </tbody> >@@ -381,20 +383,21 @@ > <form action="/cgi-bin/koha/admin/authorised_values.pl" method="get"> > <input type="hidden" name="op" value="add_form" /> > <input type="hidden" name="category" value="[% category.category_name | html %]" /> >- <button type="submit" id="lientype"><i class="fa fa-plus"></i> Add a new authorized value</button> >+ <button type="submit"><i class="fa fa-plus"></i> Add a new authorized value</button> > </form> > [% UNLESS category.is_system %] > <form id="delete_category" action="/cgi-bin/koha/admin/authorised_values.pl" method="post"> > <input type="hidden" name="op" value="delete_category" /> > <input type="hidden" name="category_name" value="[% category.category_name | html %]" /> >- <button type="submit" id="lientype"><i class="fa fa-plus"></i> Delete category '[% category.category_name | html %]' </button> >+ <button type="submit"><i class="fa fa-plus"></i> Delete category '[% category.category_name | html %]' </button> > </form> > [% END %] > </div> > [% END # /IF loop %] >+ </fieldset> > > [% ELSE # category was selected %] >- >+ <fieldset> > <table id="categoriest" class="authorized_values_table"> > <thead> > <tr> >@@ -417,7 +420,7 @@ > [% END # /FOR c %] > </tbody> > </table> <!-- /#categoriest --> >- </div> >+ </fieldset> > [% END # /IF ( searchfield )%] > > [% END # /IF op == 'list' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >index dcfb7b71b0..54279d03d4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -177,7 +177,7 @@ Authority types › Administration › Koha > > <h2>Authority types</h2> > <p>Define authority types, then authority MARC structure in the same way you define itemtypes and bibliographic MARC tag structure. Authority values are managed through plugins</p> >- <div id="searchresults"> >+ <fieldset id="searchresults"> > <table id="authtypes"> > <thead> > <tr> >@@ -197,7 +197,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 lientype" id="authtypeactions[% authority_type.authtypecode | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" 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> >@@ -264,7 +264,7 @@ Authority types › Administration › Koha > [% END %] > <tbody> > </table> >- </div> >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt >index f1a0ff8cbe..661fd9c92b 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 >@@ -164,8 +164,8 @@ > > <h2>Background jobs</h2> > >+ <fieldset id="searchresults"> > [% IF jobs.count %] >- <div id="searchresults"> > <table id="table_background_jobs"> > <thead> > <tr> >@@ -203,12 +203,12 @@ > [% END %] > </tbody> > </table> >- </div> > [% ELSE %] > <div class="dialog message"> > There are no background jobs yet. > </div> > [% END %] >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >index b4bd08131d..0b5c601f39 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -107,7 +107,7 @@ MARC frameworks › Administration › Koha > [% IF op == 'list'%] > <div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form"><i class="fa fa-plus"></i> New framework</a> >+ <a class="toolbar-btn" id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form"><i class="fa fa-plus"></i> New framework</a> > </div></div> > [% END %] > >@@ -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" id="lientype"><i class="fa fa-fw fa-arrow-left"></i> Return to frameworks</button> >+ <button type="submit"><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> >@@ -169,7 +169,7 @@ MARC frameworks › Administration › Koha > [% IF op == 'list' %] > <h2>MARC frameworks</h2> > >-<div id="searchresults"> >+<fieldset id="searchresults"> > <table id="table_biblio_frameworks"> > <thead> > <tr> >@@ -184,7 +184,7 @@ MARC frameworks › Administration › Koha > <td>Default framework</td> > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="frameworkactions[% loo.frameworkcode | html %]" role="button" data-toggle="dropdown" href="#" id=""lientype"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="frameworkactions[% loo.frameworkcode | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode | html %]"> >@@ -252,7 +252,7 @@ MARC frameworks › Administration › Koha > <td>[% loo.frameworktext | html %]</td> > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="lientype" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode | html %]"> >@@ -318,7 +318,7 @@ MARC frameworks › Administration › Koha > > [% END %] > </table> >-</div> >+</fieldset> > > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >index 22ea436dda..851c2784de 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 >@@ -51,14 +51,14 @@ > </form> > > <p class="help">Check the boxes for the libraries you allow your items to be transferred to.</p> >-<div id="searchresults"> >+ > <fieldset> > [% IF ( limitType == 'ccode' ) %]<strong>For all collection codes: </strong>[% ELSE %]<strong>For all item types: </strong>[% END %] >- <a id="CheckAll" href="#" class="lientype"><i class="fa fa-check"></i> Select all</a> >+ <a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a> > | >- <a id="UncheckAll" href="#" class="lientype"><i class="fa fa-remove"></i> Clear all</a> >+ <a id="UncheckAll" href="#"><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> >+ <a href="/cgi-bin/koha/admin/transfer_limits.pl">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 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> >+ <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> > > <table id="[% codes_loo.code | html %]table" class="sorted"> > <thead> >@@ -113,7 +113,6 @@ > <a class="cancel" href="/cgi-bin/koha/admin/admin-home.pl">Cancel</a> > </fieldset> > </form> >- </div> > </div> > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index 668ebca25e..a8222a8ca3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -137,14 +137,14 @@ Libraries › Administration › Koha > > [% IF op == 'list' || op == 'view' %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default pat" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> New library</a> >+ <a class="btn btn-default toolbar-btn" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> New library</a> > [% IF op == 'view' && library %] >- <a class="btn btn-default pat" id="editbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form&branchcode=[% library.branchcode | uri %]"><i class="fa fa-pencil"></i> Edit library</a> >+ <a class="btn btn-default toolbar-btn" id="editbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form&branchcode=[% library.branchcode | uri %]"><i class="fa fa-pencil"></i> Edit library</a> > [% END %] > </div> > [% END %] > >-<div id="searchresults"> >+<fieeldset id="searchresults"> > [% IF op == 'add_form' %] > <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"> >@@ -345,7 +345,7 @@ Libraries › Administration › Koha > <div class="dialog message">There are no libraries defined. <a href="/cgi-bin/koha/admin/branches.pl?op=add_form">Start defining libraries</a>.</div> > [% END %] > [% END %] >-</div> >+</fieldset> > > [% IF op == 'view' && library %] > <h1>[% library.branchname | html %]</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >index 1ed17ec8ca..db3de83eab 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >@@ -160,7 +160,7 @@ Cash registers › Administration › Koha > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newcashregister" href="/cgi-bin/koha/admin/cash_registers.pl?op=add_form"><i class="fa fa-plus"></i> New cash register</a> >+ <a class="btn btn-default toolbar-btn" id="newcashregister" href="/cgi-bin/koha/admin/cash_registers.pl?op=add_form"><i class="fa fa-plus"></i> New cash register</a> > </div> > > <h1>Cash registers</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >index 7aaf8390c2..eed8ddf236 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >@@ -530,11 +530,11 @@ > > <div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="newcategory" href="/cgi-bin/koha/admin/categories.pl?op=add_form"><i class="fa fa-plus"></i> New category</a> >+ <a class="toolbar-btn" id="newcategory" href="/cgi-bin/koha/admin/categories.pl?op=add_form"><i class="fa fa-plus"></i> New category</a> > </div></div> > > <h1>Patron categories</h1> >- <div id="searchresults"> >+ <fieldset id="searchresults"> > [% IF searchfield %] > You searched for [% searchfield | html %]</span> > [% END %] >@@ -697,8 +697,8 @@ > [% END %] > </td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=add_form&categorycode=[% category.categorycode |uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&categorycode=[% category.categorycode |uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=add_form&categorycode=[% category.categorycode |uri %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&categorycode=[% category.categorycode |uri %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -707,7 +707,7 @@ > [% ELSE %] > <div class="dialog alert">No categories have been defined. <a href="/cgi-bin/koha/admin/categories.pl?op=add_form">Create a new category</a>.</div> > [% END %] >- </div> >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index b8aec5179b..79bdd3ead8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -178,7 +178,7 @@ > > <div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="newcity" href="/cgi-bin/koha/admin/cities.pl?op=add_form"><i class="fa fa-plus"></i> New city</a> >+ <a class="toolbar-btn" id="newcity" href="/cgi-bin/koha/admin/cities.pl?op=add_form"><i class="fa fa-plus"></i> New city</a> > </div></div> > > <h1>Cities</h1> >@@ -186,8 +186,8 @@ > Searching: [% city_name_filter | html %] > [% END %] > >+ <fieldset id="searchresults"> > [% IF cities_count > 0 %] >- <div id="searchresults"> > <div class="table_cities_table_controls"></div> > <table id="table_cities"> > <thead> >@@ -201,12 +201,12 @@ > </tr> > </thead> > </table> >- </div> > [% ELSE %] > <div class="dialog message"> >- There are no cities defined. <a href="/cgi-bin/koha/admin/cities.pl?op=add_form" id="lientype">Create a new city</a>. >+ There are no cities defined. <a href="/cgi-bin/koha/admin/cities.pl?op=add_form">Create a new city</a>. > </div> > [% END %] >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >index 9d3b61c4e9..8fc85b48df 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >@@ -346,12 +346,12 @@ Classification sources › Administration › Koha > [% IF op == 'list' %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default pat" id="newsource" href="[% script_name | url %]?op=add_source"><i class="fa fa-plus"></i> New classification source</a> >- <a class="btn btn-default pat" id="newrule" href="[% script_name | url %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a> >- <a class="btn btn-default pat" id="newrule" href="[% script_name | url %]?op=add_split_rule"><i class="fa fa-plus"></i> New splitting rule</a> >+ <a class="btn btn-default toolbar-btn" id="newsource" href="[% script_name | url %]?op=add_source"><i class="fa fa-plus"></i> New classification source</a> >+ <a class="btn btn-default toolbar-btn" id="newrule" href="[% script_name | url %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a> >+ <a class="btn btn-default toolbar-btn" id="newrule" href="[% script_name | url %]?op=add_split_rule"><i class="fa fa-plus"></i> New splitting rule</a> > </div> > <h1>Classification configuration</h1> >-<div id="searchresults"> >+<fieldset> > <h2>Classification sources</h2> > <table> > <tr> >@@ -370,15 +370,15 @@ Classification sources › Administration › Koha > <td>[% class_source.class_sort_rule | html %]</td> > <td>[% class_source.class_split_rule | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=add_source&cn_source=[% class_source.cn_source | uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs delete_class_source" href="[% script_name | url %]?op=delete_source_confirmed&cn_source=[% class_source.cn_source | uri%]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=add_source&cn_source=[% class_source.cn_source | uri %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete_class_source" href="[% script_name | url %]?op=delete_source_confirmed&cn_source=[% class_source.cn_source | uri%]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >-</div> >+</fieldset> > >-<div id="searchresults"> >+<fieldset> > <h3>Classification filing rules</h3> > <table> > <tr> >@@ -393,15 +393,15 @@ Classification sources › Administration › Koha > <td>[% rule.description |html | html %]</td> > <td>[% rule.sort_routine | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% script_name | html %]?op=add_sort_rule&class_sort_rule=[% rule.class_sort_rule |url %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs delete_sort_rule" href="[% script_name | html %]?op=delete_sort_rule&class_sort_rule=[% rule.class_sort_rule |url %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% script_name | html %]?op=add_sort_rule&class_sort_rule=[% rule.class_sort_rule |url %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete_sort_rule" href="[% script_name | html %]?op=delete_sort_rule&class_sort_rule=[% rule.class_sort_rule |url %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >-</div> >+</fieldset> > >-<div id="searchresults"> >+<fieldset> > <h3>Classification splitting rules</h3> > <table> > <tr> >@@ -416,13 +416,13 @@ Classification sources › Administration › Koha > <td>[% rule.description | html %]</td> > <td>[% rule.split_routine | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=add_split_rule&class_split_rule=[% rule.class_split_rule | uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs delete_split_rule" href="[% script_name | url %]?op=delete_split_rule&class_split_rule=[% rule.class_split_rule | uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=add_split_rule&class_split_rule=[% rule.class_split_rule | uri %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete_split_rule" href="[% script_name | url %]?op=delete_split_rule&class_split_rule=[% rule.class_split_rule | uri %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >-</div> >+</fieldset> > > > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >index 0274eb6377..d133cf46a1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >@@ -53,7 +53,7 @@ > [% ELSE %] > <div class="dialog message"><p>The rules have been cloned.</p></div> > [% END %] >- <a href="/cgi-bin/koha/admin/smart-rules.pl" id="lientype">Return to circulation and fine rules</a> >+ <a href="/cgi-bin/koha/admin/smart-rules.pl">Return to circulation and fine rules</a> > [% ELSE %] > > <p class="help">Use carefully! If the destination library already has circulation and fine rules, they will be deleted without warning!</p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >index 5da34f460e..b42c9f92aa 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 id="lientype" 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 href="/cgi-bin/koha/admin/koha2marclinks.pl?tablename=items">Go to Koha to MARC mapping</a></div> > [% END %] > <table> > <caption> >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 77de826cc3..f453c59d80 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 >@@ -163,12 +163,12 @@ > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="newcredittype" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form"><i class="fa fa-plus"></i> New credit type</a> >+ <a class="toolbar-btn" id="newcredittype" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form"><i class="fa fa-plus"></i> New credit type</a> > </div></div> > > <h2>Account credit types</h2> >+ <fieldset id="searchresults"> > [% IF credit_types.count %] >- <div id="searchresults"> > <table id="table_credit_types"> > <thead> > <th>Archived</th> >@@ -208,27 +208,27 @@ > </td> > <td class="actions"> > [% IF !credit_type.archived %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form&code=[% credit_type.code | uri %]&type=credit" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=add_form&code=[% credit_type.code | uri %]&type=credit"><i class="fa fa-pencil"></i> Edit</a> > [% END %] > [% IF !credit_type.is_system && !credit_type.archived %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=archive&code=[% credit_type.code | uri %]" id="lientype"><i class="fa fa-archive"></i> Archive</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=archive&code=[% credit_type.code | uri %]"><i class="fa fa-archive"></i> Archive</a> > [% END %] > > [% IF !credit_type.is_system && credit_type.archived %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=unarchive&code=[% credit_type.code | uri %]" id="lientype"><i class="fa fa-undo"></i> Restore</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/credit_types.pl?op=unarchive&code=[% credit_type.code | uri %]"><i class="fa fa-undo"></i> Restore</a> > [% END %] > </td> > </tr> > [% END %] > </tbody> > </table> >- </div> > [% ELSE %] > <div class="dialog message"> > There are no account credit types defined. > <a href="/cgi-bin/koha/admin/credit_types.pl?op=add_form">Create new credit type</a> > </div> > [% END %] >+ </fieldset> > [% END %] > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >index 83084ac70d..5b652deae7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -73,7 +73,7 @@ > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form"><i class="fa fa-plus"></i> New currency</a> >+ <a class="toolbar-btn" id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form"><i class="fa fa-plus"></i> New currency</a> > </div></div> > [% END %] > >@@ -220,7 +220,7 @@ > You searched for [% searchfield | html %]</span> > [% END %] > >- <div id="searchresults"> >+ <fieldset id="searchresults"> > > <table id='currencies-table'> > <thead> >@@ -246,14 +246,14 @@ > <td style="color:green;">[% IF currency.active %]â[% END %]</td> > <td>[% IF currency.archived %]Yes[% END %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=add_form&currency_code=[% currency.currency | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=delete_confirm&currency_code=[% currency.currency | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=add_form&currency_code=[% currency.currency | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=delete_confirm&currency_code=[% currency.currency | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </tbody> > </table> >- </div> >+ </fieldset> > > <br /> > <div class="hint"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt >index 1ec5cc2aef..8da3a0b809 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 >@@ -154,12 +154,12 @@ > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="newdebittype" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form"><i class="fa fa-plus"></i> New debit type</a> >+ <a class="toolbar-btn" id="newdebittype" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form"><i class="fa fa-plus"></i> New debit type</a> > </div></div> > > <h2>Account debit types</h2> >+ <fieldset id="searchresults"> > [% IF debit_types.count %] >- <div id="searchresults"> > <table id="table_debit_types"> > <thead> > <th>Archived</th> >@@ -209,22 +209,22 @@ > </td> > <td class="actions"> > [% IF !debit_type.is_system && !debit_type.archived %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form&code=[% debit_type.code | uri %]&type=debit" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=archive&code=[% debit_type.code | uri %]" id="lientype"><i class="fa fa-archive"></i> Archive</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form&code=[% debit_type.code | uri %]&type=debit"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=archive&code=[% debit_type.code | uri %]"><i class="fa fa-archive"></i> Archive</a> > [% ELSIF debit_type.archived %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=unarchive&code=[% debit_type.code | uri %]" id="lientype"><i class="fa fa-undo"></i> Restore</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=unarchive&code=[% debit_type.code | uri %]"><i class="fa fa-undo"></i> Restore</a> > [% END %] > </td> > </tr> > [% END %] > </tbody> > </table> >- </div> > [% ELSE %] > <div class="dialog message"> >- There are no account debit types defined. <a href="/cgi-bin/koha/admin/debit_types.pl?op=add_form" id="lientype">Create new debit type</a> >+ There are no account debit types defined. <a href="/cgi-bin/koha/admin/debit_types.pl?op=add_form">Create new debit type</a> > </div> > [% END %] >+ </fieldset> > [% END %] > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >index 45a9254c25..edf66884a8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >@@ -178,7 +178,7 @@ > [% IF op == 'list' %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="newdesk" href="/cgi-bin/koha/admin/desks.pl?op=add_form"><i class="fa fa-plus"></i> New desk</a> >+ <a class="btn btn-default toolbar-btn" id="newdesk" href="/cgi-bin/koha/admin/desks.pl?op=add_form"><i class="fa fa-plus"></i> New desk</a> > </div> > > <h1>Desks</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >index 848c732fd4..6936d8c6b8 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 >@@ -89,7 +89,7 @@ EDI accounts › Administration › Koha > > [% IF display %] > <div id="toolbar" class="btn-toolbar"><div> >- <a class="pat" id="newediacct" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form"><i class="fa fa-plus"></i> New account</a> >+ <a class="toolbar-btn" id="newediacct" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form"><i class="fa fa-plus"></i> New account</a> > </div></div> > [% END %] > >@@ -304,10 +304,10 @@ EDI accounts › Administration › Koha > </div> > [% END %] > [% IF display %] >+<fieldset id="searchresults"> > [% IF ( ediaccounts ) %] > <h2>Vendor EDI accounts</h2> > >-<div id="searchresults"> > > <table> > <tr> >@@ -377,17 +377,17 @@ EDI accounts › Administration › Koha > <td>No</td> > [% END %] > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form&id=[% account.id | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=delete_confirm&id=[% account.id | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form&id=[% account.id | html %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=delete_confirm&id=[% account.id | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >- </div> > [% ELSE %] > <div class="dialog message"> > There are no EDI accounts. > </div> > [% END %] >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt >index c5ab23cfc5..fa998369f0 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 >@@ -77,7 +77,7 @@ Library EANs › Administration › Koha > > [% IF display %] > <div id="toolbar" class="btn-toolbar"><div> >- <a class="pat" id="newediean" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form"><i class="fa fa-plus"></i> New EAN</a> >+ <a class="toolbar-btn" id="newediean" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form"><i class="fa fa-plus"></i> New EAN</a> > </div></div> > [% END %] > >@@ -163,8 +163,8 @@ Library EANs › Administration › Koha > [% END %] > > [% IF display %] >+ <fieldset id="searchresults"> > [% IF ( eans ) %] >- <div id="searchresults"> > <table> > <tr> > <th>Library</th> >@@ -190,18 +190,18 @@ Library EANs › Administration › Koha > [% END %] > </td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&id=[% ean.id | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&id=[% ean.id | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&id=[% ean.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&id=[% ean.id | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >- </div> > [% ELSE %] > <div class="dialog message"> > There are no library EANs. > </div> > [% END %] >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >index f1cd92fbab..d4ee24d82f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >@@ -115,7 +115,7 @@ > </div> <!-- /.col-sm-6 --> > </div> <!-- /.row --> > >- <div id="searchresults"> >+ <fieldset> > <h3>Circulation alerts for [% Branches.GetName( branch ) || 'Default' | html %]</h3> > <p>Click on the grid to toggle the settings.</p> > >@@ -178,7 +178,7 @@ > </div> <!-- /.tab-content --> > > </div> <!-- /#alerttabs --></div> >- >+ </fieldset> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >index ef7512f737..0a55e25d81 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 >@@ -42,7 +42,7 @@ > > <div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> New search field</a> >+ <a class="toolbar-btn" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> New search field</a> > </div></div> > > [% IF field_added %] >@@ -77,7 +77,7 @@ > <div id="search_fields_list"> > <h2>Item search fields</h2> > >- <div id="searchresults"> >+ <fieldset id="searchresults"> > > <table id="search_fields_table"> > <thead> >@@ -99,14 +99,14 @@ > <td>[% field.tagsubfield | html %]</td> > <td>[% field.authorised_values_category | html %]</td> > <td> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_field.pl?name=[% field.name | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="field-delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_field.pl?name=[% field.name | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="field-delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </tbody> > </table> >- </div></div> >+ </fieldset></div> > [% ELSE %] > <h2>Item search fields</h2> > <div class="dialog message"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >index 60010e44c6..5e2b769ed3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -133,7 +133,7 @@ Item types › Administration › Koha > > [% IF op == 'list' %]<div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="fa fa-plus"></i> New item type</a> >+ <a class="toolbar-btn" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="fa fa-plus"></i> New item type</a> > </div></div>[% END %] > > [% FOREACH m IN messages %] >@@ -446,8 +446,8 @@ Item types › Administration › Koha > > [% IF op == 'delete_confirm' %] > <div class="dialog alert"> >- <div id="searchresults"> > <h1>Delete item type '[% itemtype.itemtype | html %]'?</h1> >+ <fieldset> > <table> > <tr> > <th scope="row">Item type</th> >@@ -465,20 +465,20 @@ Item types › Administration › Koha > [% END %] > <tr><th scope="row">Rental charge</th><td>[% itemtype.rentalcharge | $Price %]</td></tr> > </table> >+ </fieldset> > <form action="/cgi-bin/koha/admin/itemtypes.pl" method="post"> > <input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="itemtype" value="[% itemtype.itemtype | html %]" /> > <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this item type</button> > </form> > <form action="/cgi-bin/koha/admin/itemtypes.pl" method="post"> > <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button> >- </form> >- </div></div> >+ </form></div> > [% END %] > > [% IF op == 'list' %] > <h1>Item types administration</h1> >+<fieldset> > [% IF itemtypes %] >-<div id="searchresults"> > <table id="table_item_type"> > <thead> > [% UNLESS Koha.Preference('noItemTypeImages') && Koha.Preference('OpacNoItemTypeImages') %]<th class="noExport">Image</th>[% END %] >@@ -596,16 +596,16 @@ Item types › Administration › Koha > </td> > <td>[% IF ( itemtype.automatic_checkin ) %]Yes[% ELSE %] [% END %]</td> > <td class="actions"> >- <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype | uri %]" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&itemtype=[% itemtype.itemtype | uri %]" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&itemtype=[% itemtype.itemtype | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >- </div> > [% ELSE %] > <div class="dialog message">There are no itemtypes defined</div> > [% END %] >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >index e403278594..d4fe97f9b7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >@@ -46,7 +46,7 @@ > <div class="dialog alert">Failed to add mapping for [% error_info | html %]</div> > [% END %] > >-<div id="searchresults"> >+<fieldset id="searchresults"> > <table id="kohafields"> > <thead><tr> > <th>Koha field</th> >@@ -64,8 +64,8 @@ > <td>[% loo.liblibrarian | html %]</td> > <td class="actions"> > [% IF !loo.readonly %] >- <a onclick="AddFld('[% loo.kohafield | html %]');" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> Add</a> >- [% IF loo.tagfield %] <a onclick="RemFld('[% loo.tagfield | html %]','[% loo.tagsubfield | html %]');" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-remove"></i> Remove</a> [% END %] >+ <a onclick="AddFld('[% loo.kohafield | html %]');" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</a> >+ [% IF loo.tagfield %] <a onclick="RemFld('[% loo.tagfield | html %]','[% loo.tagsubfield | html %]');" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Remove</a> [% END %] > [% END %] > </td> > </td> >@@ -73,7 +73,7 @@ > [% END %] > </tbody> > </table> >-</div> >+</fieldset> > > <input id="remove_field" name="remove_field" type="hidden" value=""/> > <input id="add_field" name="add_field" type="hidden" value=""/> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >index 15bb31ff0a..80d2c32052 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,7 +74,7 @@ > > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a id="add-group-root" class="btn btn-default add-group pat" href="#"> >+ <a id="add-group-root" class="btn btn-default add-group toolbar-btn" href="#"> > <i class="fa fa-plus"></i> Add group > </a> > </div> >@@ -420,25 +420,25 @@ > </td> > <td> > [% IF group.branchcode %] >- <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> >+ <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> > [% ELSE %] > <div class="btn-group"> >- <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> >+ <button 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 lientype" data-group-id="[% group.id | html %]"> >+ <a id="add-group-[% group.id | html %]" href="#" class="add-group" data-group-id="[% group.id | html %]"> > <i class="fa fa-plus"></i> Add sub-group > </a> > </li> > > <li> >- <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 %]" > >+ <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 %]" > > <i class="fa fa-pencil"></i> Edit > </a> > </li> > > <li> >- <a class="delete-group lientype" id="delete-group-[% group.id | html %]" href="#" data-group-id="[% group.id | html %]" data-group-title="[% group.title | html %]"> >+ <a class="delete-group" 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" id="lientype" 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" 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_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >index 897edc173b..7517fbaf50 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 >@@ -144,7 +144,7 @@ > [% END %][% END %] > > <div id="subfieldtabs" class="toptabs numbered"> >- <fieldset id="searchresults"> >+ <fieldset> > <ul class="nav nav-tabs" role="tablist"> > [% FOREACH loo IN loop %] > <li id="tab_subfield_[%- PROCESS outputsubfield subfieldanchor = loo.subfieldcode -%]" class="tab-item" role="presentation"> >@@ -382,7 +382,7 @@ > <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"> >+ <fieldset> > <table id="table_marcsubfieldstructure"> > <thead> > <tr> >@@ -422,13 +422,14 @@ > [% END %] > </td> > <td class="actions"> >- <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> >+ <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> > </td> > </tr> > [% END %] > </tbody> > </table> <!-- /#table_marcsubfieldstructure --> >+ </fieldset> > > <form action="[% script_name | html %]" method="get"> > <fieldset class="action"><input type="hidden" name="op" value="add_form" /> >@@ -438,7 +439,6 @@ > <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 96c765515b..5af500ffa9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -118,7 +118,7 @@ MARC frameworks › Administration › Koha > > [% IF ( else ) %] > <div id="toolbar" class="btn-toolbar"><div> >- <a class="pat" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&frameworkcode=[% framework.frameworkcode | uri %]"><i class="fa fa-plus"></i> New tag</a> >+ <a class="toolbar-btn" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&frameworkcode=[% framework.frameworkcode | uri %]"><i class="fa fa-plus"></i> New tag</a> > </div></div>[% END %] > > <h2>MARC Framework for [% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]default MARC framework[% END %]</h2> >@@ -260,7 +260,7 @@ MARC frameworks › Administration › Koha > </fieldset> > </form> > >-<div id="searchresults"> >+<fieldset id="searchresults"> > <table id="table_marctagstructure"> > <thead> > <tr> >@@ -298,7 +298,7 @@ MARC frameworks › Administration › Koha > <td>[% loo.ind2_defaultvalue | html %]</td> > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="lientype" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield | html %]"> > <li><a href="?op=add_form&searchfield=[% loo.tagfield | uri %]&frameworkcode=[% framework.frameworkcode | uri %]"><i class="fa fa-pencil"></i> Edit tag</a></li> >@@ -312,7 +312,7 @@ MARC frameworks › Administration › Koha > [% END %] > </tbody> > </table> >- </div> >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >index 66775012d2..1d9d875d16 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 >@@ -170,10 +170,10 @@ > [% ELSE %] > <p id="addMatchPoint"> > [% END %] >- <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;" id="lientype">Add match point</a> >+ <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a> > </p> > [% ELSE %] >- <p id="addMatchPoint" style="display:none;"><a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;" id="lientype"> >+ <p id="addMatchPoint" style="display:none;"><a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;"> > 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="#" 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> >+ <h3>Match point [% matchpoint.mp_num | html %] | <a href="#" class="button" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num | html %]', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></h3> > <ol> > <li> > <label for="mp_[% matchpoint.mp_num | html %]_search_index">Search index: </label> >@@ -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;" id="lientype">Add match point</a> | <a href="#" id="lientype" 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;" >Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></h3> > <ol> > <li> > <label for="mp_1_search_index">Search index: </label> >@@ -283,16 +283,16 @@ > [% ELSE %] > <p id="addMatchCheck"> > [% END %] >- <a id="lientype" href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"> Add match check</a></p> >+ <a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"> Add match check</a></p> > [% ELSE %] >- <p id="addMatchCheck" style="display:none;"><a id="lientype" href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"> Add match check</a></p> >+ <p id="addMatchCheck" style="display:none;"><a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"> Add match check</a></p> > [% END %] > > [% IF ( edit_matching_rule ) %] > [% FOREACH matchcheck IN matchchecks %] > <div id="mc_[% matchcheck.mc_num | html %]" class="matchgroup"> > <fieldset> >- <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> >+ <h3>Match check [% matchcheck.mc_num | html %]<a href="#" class="button" onclick="InsertMatchcheck('mc_[% matchcheck.mc_num | html %]', 'mc_template'); return false;"> Add match check</a> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></h3> > <input type="hidden" id="mc_[% matchcheck.mc_num | html %]_id" name="mc_[% matchcheck.mc_num | html %]_id" value="1" /> > [% FOREACH src_component IN matchcheck.src_components %] > <fieldset 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 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> >+ <h3>Match check 1 | <a href="#" class="button" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;">Add match check</a> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></h3> > <input type="hidden" id="mc_1_id" name="mc_1_id" value="1" /> > <fieldset id="mc_1_src_c_1"> > <h3>Source (incoming) record check field</h3> >@@ -449,11 +449,12 @@ > > <div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="newrule" href="[% script_name | url %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a> >+ <a class="toolbar-btn" id="newrule" href="[% script_name | url %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a> > </div></div> > > <h2>Record matching rules</h2> > >+ <fieldset id="searchresults"> > [% IF ( added_matching_rule ) %] > <div class="dialog message">Added record matching rule "[% added_matching_rule | html %]"</div> > [% END %] >@@ -464,7 +465,6 @@ > <div class="dialog message">Deleted record matching rule "[% deleted_matching_rule | html %]"</div> > [% END %] > [% IF ( available_matching_rules ) %] >- <div id="searchresults"> > <table> > <tr> > <th>#</th> >@@ -478,16 +478,16 @@ > <td>[% available_matching_rule.code | html %]</td> > <td>[% available_matching_rule.description | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=edit_matching_rule&matcher_id=[% available_matching_rule.matcher_id | uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=delete_matching_rule&matcher_id=[% available_matching_rule.matcher_id | uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=edit_matching_rule&matcher_id=[% available_matching_rule.matcher_id | uri %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=delete_matching_rule&matcher_id=[% available_matching_rule.matcher_id | uri %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table> >- </div> > [% ELSE %] > <p>There are no saved matching rules.</p> > [% END # /IF ( available_matching_rules ) %] >+ </fieldset> > > <div class="pages">[% pagination_bar | $raw %]</div> > [% END # /IF ( display_list ) %] >@@ -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 id="lientype" href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></h3> >+ <h3>Match point <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></h3> > <ol> > <li> > <label for="mp_num_search_index">Search index: </label> >@@ -537,7 +537,7 @@ > > <div id="mc_template" class="matchgroup" style="display:none"> > <fieldset> >- <h3>Match check <span class="counter"></span> | <a id="lientype" href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></h3> >+ <h3>Match check <span class="counter"></span> | <a href="#" class="button" onclick="DeleteMatchcheck(this); return false;">Remove this match check</a></h3> > <input type="hidden" id="mc_num_id" name="mc_num_id" value="1" /> > <fieldset 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 9827757059..c08cbe79a7 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 >@@ -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="#" id="lientype"><i class="fa fa-fw fa-trash"></i> Remove</a> >+ <a class="remove_description" href="#"><i class="fa fa-fw fa-trash"></i> Remove</a> > </li> > [% END %] >- <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> >+ <li id="adddescription"><span class="label"> </span><a href="#" class="add_description"><i class="fa fa-fw fa-plus"></i> Add description</a></li> > > </ol> > <fieldset class="action"> >@@ -107,13 +107,13 @@ > > <div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="newoaiset" href="/cgi-bin/koha/admin/oai_sets.pl?op=new"><i class="fa fa-plus"></i> New set</a> >+ <a class="toolbar-btn" id="newoaiset" href="/cgi-bin/koha/admin/oai_sets.pl?op=new"><i class="fa fa-plus"></i> New set</a> > </div></div> > > <h2>OAI sets</h2> > [% IF sets_loop %] >- <div id="searchresults"> > <div> >+ <fieldset id="searchresults"> > <table> > <thead> > <tr> >@@ -141,12 +141,12 @@ > </td> > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle lientype" id="oaisetsactions[% set.id | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="oaisetsactions[% set.id | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="oaisetsactions[% set.id | html %]"> >- <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&id=[% set.id | uri %]" id="lientype"><i class="fa fa-fw fa-pencil"></i> Edit</a></li> >- <li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&id=[% set.id | html %]" id="lientype"><i class="fa fa-fw fa-trash"></i> Delete</a></li> >- <li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id | uri %]" id="lientype"><i class="fa fa-fw fa-info"></i> Define mappings</a></li> >+ <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&id=[% set.id | uri %]"><i class="fa fa-fw fa-pencil"></i> Edit</a></li> >+ <li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&id=[% set.id | html %]"><i class="fa fa-fw fa-trash"></i> Delete</a></li> >+ <li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id | uri %]"><i class="fa fa-fw fa-info"></i> Define mappings</a></li> > </ul> > </div> > </td> >@@ -154,7 +154,7 @@ > [% END %] > </tbody> > </table> >- </div> >+ </fieldset> > </div> > [% ELSE %] > <div class="dialog message"><p>There are no sets defined.</p></div> >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 4ca9b24b06..eaf6d59145 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 >@@ -275,7 +275,7 @@ Patron attribute types › Administration › Koha > > <div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="newrule" href="[% script_name | url %]?op=add_attribute_type"><i class="fa fa-plus"></i> New patron attribute type</a> >+ <a class="toolbar-btn" id="newrule" href="[% script_name | url %]?op=add_attribute_type"><i class="fa fa-plus"></i> New patron attribute type</a> > </div></div> > > >@@ -298,7 +298,7 @@ Patron attribute types › Administration › Koha > — it was already absent from the database.</div> > [% END %] > [% IF ( available_attribute_types ) %] >-<div id="searchresults"> >+<fieldset id="searchresults"> > [% FOREACH attribute IN available_attribute_types %] > [% IF attribute.class %] > <h4>[% attribute.lib | html %]</h4> >@@ -351,8 +351,8 @@ Patron attribute types › Administration › Koha > [% END %] > </td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=edit_attribute_type&code=[% item.code | uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=delete_attribute_type&code=[% item.code | uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=edit_attribute_type&code=[% item.code | uri %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="[% script_name | url %]?op=delete_attribute_type&code=[% item.code | uri %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -361,7 +361,7 @@ Patron attribute types › Administration › Koha > [% END %] > [% ELSE %] > <p>There are no saved patron attribute types.</p> >-</div> >+</fieldset> > [% END %] > > <div class="pages">[% pagination_bar | $raw %]</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >index ed5d67dbef..96e1a6579c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >@@ -337,9 +337,9 @@ a.add, a.delete { > <input name="mapping_marc_field" type="text" value="[% mapping.marc_field | html %]" /> > </td> > [% IF mapping.search_field_mandatory %] >- <td><a class="btn btn-default btn-xs delete mandatory" data-field_name="[% mapping.search_field_name | html %]" style="cursor: pointer;" id="lientype"><i class="fa fa-trash"></i> Delete</a></td> >+ <td><a class="btn btn-default btn-xs delete mandatory" data-field_name="[% mapping.search_field_name | html %]" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td> > [% ELSE %] >- <td><a class="btn btn-default btn-xs delete" style="cursor: pointer;" id="lientype"><i class="fa fa-trash"></i> Delete</a></td> >+ <td><a class="btn btn-default btn-xs delete" style="cursor: pointer;""><i class="fa fa-trash"></i> Delete</a></td> > [% END %] > </tr> > [% END %] >@@ -396,7 +396,7 @@ a.add, a.delete { > </select> > </td> > <td><input data-id="mapping_marc_field" type="text" /></td> >- <td><a id="lientype" class="btn btn-default btn-xs add"><i class="fa fa-plus"></i> Add</a></td> >+ <td><a class="btn btn-default btn-xs add"><i class="fa fa-plus"></i> Add</a></td> > </tr> > </tfoot> > </table> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >index 7b8d5bf0c8..7eb928b41c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >@@ -108,7 +108,7 @@ > [% END %] > > <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >- <div id="searchresults"> >+ <fieldset> > <input type="hidden" name="op" value="add" /> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> > <table id="default-circulation-rules"> >@@ -237,8 +237,8 @@ > [% END %] > </td> > <td class="actions"> >- <a href="#" class="editrule btn btn-default btn-xs" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% i || '*' | html %]&categorycode=[% c || '*' | html %]&branch=[% current_branch | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% i || '*' | html %]&categorycode=[% c || '*' | html %]&branch=[% current_branch | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > <td> > [% IF note.defined && note != '' %] >@@ -391,8 +391,8 @@ > <td>[% recall_shelf_time | html %]</td> > [% END %] > <td class="actions"> >- <a href="#" class="editrule btn btn-default btn-xs" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% i || '*' | uri %]&categorycode=[% c || '*' | uri %]&branch=[% current_branch | uri %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% i || '*' | uri %]&categorycode=[% c || '*' | uri %]&branch=[% current_branch | uri %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -430,8 +430,8 @@ > </td> > <td class="actions"> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> >- <button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-save"></i> Save</button> >- <button name="cancel" class="clear_edit btn btn-default btn-xs" id="lientype"><i class="fa fa-undo"></i> Clear</button> >+ <button type="submit" class="btn btn-default btn-xs" ><i class="fa fa-save"></i> Save</button> >+ <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button> > </td> > <td><input type="text" name="note" id="note" size="15" value="" maxlength="100"></td> > <td><input type="text" name="maxissueqty" id="maxissueqty" size="3" /></td> >@@ -534,7 +534,7 @@ > [% END %] > <td class="actions"> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> >- <button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-save"></i> Save</button> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button> > <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button> > </td> > </tr> >@@ -591,14 +591,14 @@ > </tfoot> > </tbody> > </table> >- </div> >+ </fieldset> > </form> > </div> > <div id="defaults-for-this-library" class="container"> >- <div id=searchresults> > <h3>Default checkout, hold and return policy[% IF humanbranch %] for [% Branches.GetName( humanbranch ) | html %][% END %]</h3> > <p>You can set a default maximum number of checkouts, hold policy and return policy that will be used if none is defined below for a particular item type or category.</p> > <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >+ <fieldset> > <input type="hidden" name="op" value="set-branch-defaults" /> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> > <table> >@@ -766,18 +766,17 @@ > </select> > </td> > <td class="actions"> >- <button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-save"></i> Save</button> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button> > [% IF ( default_checkout_hold_and_return_policy ) %] > <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&categorycode=*&branch=[% current_branch | html %]" id="unset"><i class="fa fa-undo"></i> Unset</a> > [% END %] > </td> > </tr> >- </table> >+ </table></fieldset> > </form> >- </div></div> >+ </div> > [% IF ( show_branch_cat_rule_form ) %] > <div id="holds-policy-by-patron-category" class="container"> >- <div id=searchresults> > <h3>[% IF humanbranch %]Checkout, hold policy by patron category for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default checkout, hold policy by patron category[% END %]</h3> > <p>For this library, you can specify the maximum number of loans that > a patron of a given category can make, regardless of the item type. >@@ -786,6 +785,7 @@ > no limit applies, except possibly for a limit you define for a specific item type. > </p> > <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >+ <fieldset> > <input type="hidden" name="op" value="add-branch-cat" /> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> > <table> >@@ -850,16 +850,15 @@ > <td><input name="patron_maxissueqty" size="3" type="text" /></td> > <td><input name="patron_maxonsiteissueqty" size="3" type="text" /></td> > <td><input name="max_holds" size="3" type="text" /></td> >- <td class="actions"><button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> Add</td> >+ <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td> > </tr> >- </table> >+ </table></fieldset> > </form> >- </div></div> >+ </div> > [% END %] > > [% IF Koha.Preference('ArticleRequests') %] > <div id="open-article-requests-limit-patron-category" class="container"> >- <div id=searchresults> > [% IF humanbranch %] > <h3>Daily open article requests limit for [% Branches.GetName( humanbranch ) | html %]</h3> > [% ELSE %] >@@ -867,6 +866,7 @@ > [% END %] > <p>Specify the maximum number simultaneous current article requests a patron of a given category can have.</p> > <form id="set-article-requests-daily-limit" method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >+ <fieldset> > <input type="hidden" name="op" value="add-open-article-requests-limit" /> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> > <table> >@@ -909,11 +909,10 @@ > <td><input name="open_article_requests_limit" size="3" type="text" /></td> > <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td> > </tr> >- </table> >+ </table></fieldset> > </form> >- </div></div> >+ </div> > <div id="article-request-fee-category" class="container"> >- <div id=searchresults> > [% IF humanbranch %] > <h3>Article request fees for [% Branches.GetName( humanbranch ) | html %]</h3> > [% ELSE %] >@@ -921,6 +920,7 @@ > [% END %] > <p>Specify the article request fee for a given patron category.</p> > <form id="set-article-request-fee" method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >+ <fieldset> > <input type="hidden" name="op" value="set-article-request-fee" /> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> > <table> >@@ -966,16 +966,15 @@ > </select> > </td> > <td><input name="article_request_fee" size="3" type="text" /></td> >- <td class="actions"><button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> Add</td> >+ <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td> > </tr> >- </table> >+ </table></fieldset> > </form> >- </div></div> >+ </div> > > [% END %] > > <div id="refund-lost-item-fee-on-return" class="container"> >- <div id=searchresults> > [% IF current_branch == '*' %] > <h3>Default lost item fee refund on return policy</h3> > [% ELSE %] >@@ -984,6 +983,7 @@ > <p>Specify the default policy for lost item fees on return. > </p> > <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >+ <fieldset> > <input type="hidden" name="op" value="mod-refund-lost-item-fee-rule" /> > <input type="hidden" name="branch" value="[% current_branch | html %]" /> > <table> >@@ -1071,16 +1071,15 @@ > </select> > </td> > <td class="actions"> >- <button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-save"></i> Save</button> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button> > </td> > </td> > </tr> >- </table> >+ </table></fieldset> > </form> >- </div></div> >+ </div> > > <div id="holds-policy-by-item-type" class="container"> >- <div id=searchresults> > <h3>[% IF humanbranch %]Holds policy by item type for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default holds policy by item type[% END %]</h3> > <p> > For this library, you can edit rules for given itemtypes, regardless >@@ -1101,6 +1100,7 @@ > </p> > > <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl"> >+ <fieldset> > <input type="hidden" name="op" value="add-branch-item" /> > <input type="hidden" name="branch" value="[% current_branch | html %]"/> > <table> >@@ -1206,11 +1206,11 @@ > <option value="noreturn">Item floats</option> > </select> > </td> >- <td class="actions"><button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> Add</button></td> >+ <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</button></td> > </tr> >- </table> >+ </table></fieldset> > </form> >- </div></div> >+ </div> > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >index 321b400223..976f30bf66 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >@@ -40,7 +40,7 @@ > <main> > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-default" id="new_provider" href="#"><i class="fa fa-plus"></i> New SMS provider</a> >+ <a class="btn btn-default toolbar-btn" id="new_provider" href="#"><i class="fa fa-plus"></i> New SMS provider</a> > </div> > > <h1>SMS cellular providers</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >index 3c5063a5f2..cb1b792bbf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >@@ -236,7 +236,7 @@ > [% IF op == 'list' %] > > <div id="toolbar" class="btn-toolbar"><div> >- <a class="pat" id="new_smtp_server" href="/cgi-bin/koha/admin/smtp_servers.pl?op=add_form"><i class="fa fa-plus"></i> New SMTP server</a> >+ <a class="toolbar-btn" id="new_smtp_server" href="/cgi-bin/koha/admin/smtp_servers.pl?op=add_form"><i class="fa fa-plus"></i> New SMTP server</a> > </div></div> > > <h1>SMTP servers</h1> >@@ -254,7 +254,7 @@ > </div> > > [% IF servers_count > 0 %] >- <div id="searchresults"> >+ <fieldset id="searchresults"> > <table id="smtp_servers"> > <thead> > <tr> >@@ -268,7 +268,7 @@ > </tr> > </thead> > </table> >- </div> >+ </fieldset> > [% END %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >index 1e37a8c026..c4e79bbcc5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -337,11 +337,11 @@ > > [% IF ( tab != 'local_use' ) %] > <p>Please click on one of the tabs at the left side of this form.</p> >- <div id="searchresults"> >+ <fieldset id="searchresults"> > <table> > [% ELSE %] > <h2>Local use preferences</h2> >- <div id="searchresults"> >+ <fieldset id="searchresults"> > <table width="80%" id="sysprefst"> > <thead><tr> > <th>Preference</th> >@@ -459,15 +459,15 @@ > <input type="hidden" name="prefoptions" value="[% loo.prefoptions | html %]" /> > <input type="hidden" name="preftype" value="[% loo.type | html %]" /> > <input type="hidden" name="explanation" value="[% loo.explanation | html %]" /> >- <button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-save"></i> Save</button> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button> > </form> > </td> > >- <td class="actions"><a class="btn btn-default btn-xs" href="[% loo.edit | url %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.delete | url %]" id="lientype"><i class="fa fa-trash"></i> Delete</a></td> >+ <td class="actions"><a class="btn btn-default btn-xs" href="[% loo.edit | url %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.delete | url %]"><i class="fa fa-trash"></i> Delete</a></td> > </tr> > [% END %]</tbody> > </table> >- </div> >+ </fieldset> > > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt >index 84ce787e41..7277d70695 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 >@@ -79,9 +79,9 @@ > <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 lientype" href="#"><i class="fa fa-remove"></i> Uncheck all</a> >+ <a id="uncheck-all" class="limit-action" href="#"><i class="fa fa-remove"></i> Uncheck all</a> > | >- <a href="/cgi-bin/koha/admin/branch_transfer_limits.pl" id="lientype">Switch to basic editor</a> >+ <a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Switch to basic editor</a> > </fieldset> > > <table id="transfer_limits" class="table table-striped table-bordered table-hover table-condensed"> >@@ -92,8 +92,8 @@ > <td> </td> > [% FOREACH to IN branches %] > <td> >- <p><a class="btn btn-default btn-xs check-all-col limit-action" data-to="[% to.branchcode | html %]" href="#" id="lientype"<i class="fa fa-check"></i> Check</a></p> >- <p><a class="btn btn-default btn-xs uncheck-all-col limit-action" data-to="[% to.branchcode | html %]" href="#" id="lientype"><i class="fa fa-remove"></i> Uncheck</a></p> >+ <p><a class="btn btn-default btn-xs check-all-col limit-action" data-to="[% to.branchcode | html %]" href="#"<i class="fa fa-check"></i> Check</a></p> >+ <p><a class="btn btn-default btn-xs uncheck-all-col limit-action" data-to="[% to.branchcode | html %]" href="#"><i class="fa fa-remove"></i> Uncheck</a></p> > </td> > [% END %] > </tr> >@@ -111,8 +111,8 @@ > [% FOREACH from IN branches %] > <tr> > <td> >- <p><a class="btn btn-default btn-xs check-all-row limit-action" data-from="[% from.branchcode | html %]" href="#" id="lientype"><i class="fa fa-check"></i> Check</a></p> >- <p><a class="btn btn-default btn-xs uncheck-all-row limit-action" data-from="[% from.branchcode | html %]" href="#" id="lientype"><i class="fa fa-remove"></i> Uncheck</a></p> >+ <p><a class="btn btn-default btn-xs check-all-row limit-action" data-from="[% from.branchcode | html %]" href="#"><i class="fa fa-check"></i> Check</a></p> >+ <p><a class="btn btn-default btn-xs uncheck-all-row limit-action" data-from="[% from.branchcode | html %]" href="#"><i class="fa fa-remove"></i> Uncheck</a></p> > </td> > <th>[% from.branchname | html %]</th> > [% FOREACH to IN branches %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >index ccaff55fa8..a15493e1c9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >@@ -49,7 +49,7 @@ > Defining transport costs between libraries > </h2> > [% IF ( WARNING_transport_cost_matrix_off ) %] >-<div class="dialog message">Because the "UseTransportCostMatrix" system preference is currently not enabled, the transport cost matrix is not being used. <br/>Go to the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=UseTransportCostMatrix" id="lientype">UseTransportCostMatrix</a> system preference if you wish to enable this feature.</div> >+<div class="dialog message">Because the "UseTransportCostMatrix" system preference is currently not enabled, the transport cost matrix is not being used. <br/>Go to the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=UseTransportCostMatrix">UseTransportCostMatrix</a> system preference if you wish to enable this feature.</div> > [% END %] > > [% IF ( errors ) %]<div class="dialog alert"> >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 a1ee95222a..3b3385cf7f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -212,8 +212,8 @@ > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a id="newserver" class="btn btn-default pat" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="fa fa-plus"></i> New Z39.50 server</a> >- <a id="newserver" class="btn btn-default pat" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="fa fa-plus"></i> New SRU server</a> >+ <a id="newserver" class="btn btn-default toolbar-btn" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="fa fa-plus"></i> New Z39.50 server</a> >+ <a id="newserver" class="btn btn-default toolbar-btn" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="fa fa-plus"></i> New SRU server</a> > </div> > <h1>Z39.50/SRU servers administration</h1> > [% IF id %] >@@ -221,7 +221,7 @@ > [% ELSIF searchfield %] > You searched for [% searchfield | html %] > [% END %] >- <div id="searchresults"> >+ <fieldset id="searchresults"> > <table id="serverst"> > > <thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Preselected</th><th>Rank</th><th>Syntax</th><th>Encoding</th><th>Timeout</th><th>Record type</th><th>Attributes</th><th class="noExport">Actions</th> >@@ -240,7 +240,7 @@ > <td>[% loo.attributes | html %]</td> > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle lientype" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" 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 %]"> >@@ -254,7 +254,7 @@ > [% END %] > </tbody> > </table> >- </div> >+ </fieldset> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >index 765800fe30..9cff5f5cb6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -313,12 +313,12 @@ > <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> > > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="#" id="addauth" class="btn btn-default principal" accesskey="w"><i class="fa fa-save"></i> Save</a></div> >+ <div class="btn-group"><a href="#" id="addauth" class="btn btn-default toolbar-btn principal" accesskey="w"><i class="fa fa-save"></i> Save</a></div> > <div class="btn-group"> > [% IF ( authid ) %] >- <a class="btn btn-default pat" id="z3950submit" href="#"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a> >+ <a class="btn btn-default toolbar-btn" id="z3950submit" href="#"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a> > [% ELSE %] >- <a class="btn btn-default pat" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a> >+ <a class="btn btn-default toolbar-btn" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a> > [% END %] > </div> > <div class="btn-group"> >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 1b4c89f50f..a9e8659049 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 lientype" id="authactions[% resul.authid | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" 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/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >index 5b0ce1cdec..1f3fd5961a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -68,17 +68,17 @@ > </div> > <div class="btn-group"> > [% IF ( expanded_options ) %] >- <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="btn btn-link pat"><i class="fa fa-search-minus"></i> Fewer options</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="btn toolbar-btn"><i class="fa fa-search-minus"></i> Fewer options</a> > </div> > [% ELSE %] >- <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="btn btn-link pat"><i class="fa fa-search-plus"></i> More options</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="btn toolbar-btn"><i class="fa fa-search-plus"></i> More options</a> > </div> > [% END %] > <div class="btn-group"> >- <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn btn-link pat"><i class="fa fa-trash"></i> Clear fields</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn toolbar-btn"><i class="fa fa-trash"></i> Clear fields</a> > </div> > <div class="btn-group"> >- <a href="/cgi-bin/koha/catalogue/itemsearch.pl" class="btn btn-default pat"><i class="fa fa-search-minus"></i> Go to item search</a> >+ <a href="/cgi-bin/koha/catalogue/itemsearch.pl" class="btn btn-default toolbar-btn"><i class="fa fa-search-minus"></i> Go to item search</a> > </div> > [% IF searchid %] > <div id="previous_search_link"></div> >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 6b38a863a2..30fa0e1aa6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -618,13 +618,13 @@ Note that permanent location is a code, and location may be an authval. > [% UNLESS item.cannot_be_edited %] > [% IF Koha.Preference('LocalCoverImages') OR Koha.Preference('OPACLocalCoverImages') %] > <div class="btn-group"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]#edititem" id="lientype"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="lientype"><span class="caret"></span></a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]#edititem"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a> > <ul class="dropdown-menu pull-right"> > <li><a href="/cgi-bin/koha/tools/upload-cover-image.pl?itemnumber=[% item.itemnumber | uri %]&filetype=image"><i class="fa fa-upload"></i> Upload image</a></li> > </ul> > </div> > [% ELSE %] >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]#edititem" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]#edititem"><i class="fa fa-pencil"></i> Edit</a> > [% END %] > [% END %] > </td> >@@ -981,7 +981,7 @@ Note that permanent location is a code, and location may be an authval. > <span class="noimagesuploaded">No images have been uploaded for this bibliographic record yet.</span> > [% END %] > [% IF ( CAN_user_tools_upload_local_cover_images ) %] >- <p>Upload an image file: <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber | uri %]&filetype=image" id="lientype"><i class="fa fa-upload" aria-hidden="true"></i> Upload</a> >+ <p>Upload an image file: <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber | uri %]&filetype=image"><i class="fa fa-upload" aria-hidden="true"></i> Upload</a> > </p> > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index c45f8e8f59..c173773eb6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -52,7 +52,7 @@ > > [% SET show_patron_column = Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %] > >-<div class="searchresults"> >+<fildset id="searchresults"> > [% IF checkouts %] > <h4>Checked out [% checkouts.size | html %] times</h4> > <table id="table_issues"> >@@ -122,7 +122,7 @@ > <strong>[% biblio.title | html %][% IF biblio.author %], by [% biblio.author | html %][% END %]</strong> has never been checked out.</p></div> > > [% END %] >-</div> >+</fildset> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >index e7e07e41cf..db04386b96 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -181,9 +181,9 @@ > <div class="row"> > <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> > >+ <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform"> > <div id="item-search-block"> > <h2>Item search</h2> >- <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform"> > <div id="toolbar" class="btn-toolbar"> > <div> > <div class="btn-group"> >@@ -273,13 +273,15 @@ > <input type="radio" id="format-barcodes" name="format" value="barcodes"/> <label for="format-barcodes">Barcodes file</label> > </div> > </fieldset> >- </form> > </div> >+ </form> > </div> > </div> > <div class="row"> > <div class="col-md-12"> >+ <fieldset id="searchresults"> > <div id="results-wrapper"></div> >+ </fieldset> > </div> > </div> > >@@ -354,10 +356,10 @@ > + ' <tbody></tbody>' > + '</table>'; > >- var advSearchLink = $('<a id="lientype">') >+ var advSearchLink = $('<a>') > .attr('href', '/cgi-bin/koha/catalogue/search.pl') > .html(_("Go to advanced search")); >- var editSearchLink = $('<a id="lientype">') >+ var editSearchLink = $('<a>') > .attr('href', '#') > .html(_("Edit search")) > .addClass('btn btn-default btn-xs') >@@ -390,14 +392,14 @@ > } > } > >- var csvExportLink = $('<a id="lientype">') >+ var csvExportLink = $('<a>') > .attr('href', '#') > .html("CSV") > .on('click', function(e) { > e.preventDefault(); > exportItems('csv'); > }); >- var barcodesExportLink = $('<a id="lientype">') >+ var barcodesExportLink = $('<a>') > .attr('href', '#') > .html(_("Barcodes file")) > .on('click', function(e) { >@@ -419,7 +421,7 @@ > .append($('<li>').append(csvExportLink)) > .append($('<li>').append(barcodesExportLink))); > >- var selectVisibleRows = $('<a id="lientype">') >+ var selectVisibleRows = $('<a>') > .attr('href', '#') > .append('<i class="fa fa-check"></i> ') > .append(_("Select visible rows")) >@@ -427,7 +429,7 @@ > e.preventDefault(); > $('#results input[type="checkbox"]').prop('checked', true).change(); > }); >- var clearSelection = $('<a id="lientype">') >+ var clearSelection = $('<a>') > .attr('href', '#') > .append('<i class="fa fa-remove"></i> ') > .append(_("Clear selection")) >@@ -594,7 +596,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 id="lientype" href="#" class="button-field-new" id="lientype" title="Add a new field"><i class="fa fa-plus"></i> ' + NEW_FIELD + '</a>'); >+ var button_field_new = $('<a href="#" class="button-field-new" 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 58f95568d8..c00a090025 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -72,7 +72,7 @@ > <li><span class="label">Physical details:</span> [% pages | html %] [% illus | html %] [% size | html %] </li> > [% IF ( bnotes ) %]<li><span class="label">Notes:</span> [% bnotes | html %]</li>[% END %] > <li><span class="label">No. of items:</span> [% count | html %] [% IF ( hiddencount ) %]total ([% showncount | html %] shown / [% hiddencount | html %] hidden) >-<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&showallitems=1" id="lientype">Show all items</a>[% END %]</li> >+<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&showallitems=1">Show all items</a>[% END %]</li> > </ol> > </div> > </div> >@@ -82,7 +82,7 @@ > [% END %] > > [% IF ( ONLY_ONE ) %] >- <div class="dialog message">You are only viewing one item. <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&bi=[% biblioitemnumber | uri %]#item[% itemnumber | uri %]" id="lientype">View all</a></div> >+ <div class="dialog message">You are only viewing one item. <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&bi=[% biblioitemnumber | uri %]#item[% itemnumber | uri %]">View all</a></div> > [% END %] > > [% IF updated_exclude_from_local_holds_priority.defined %] >@@ -101,7 +101,7 @@ > > <h4>Item information [% UNLESS ( ITEM_DAT.nomod ) %] > [% IF ( CAN_user_editcatalogue_edit_items ) %] >- <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% ITEM_DAT.biblionumber | uri %]&itemnumber=[% ITEM_DAT.itemnumber | uri %]" id="lientype"><i class="fa fa-pencil"></i> Edit item</a> >+ <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% ITEM_DAT.biblionumber | uri %]&itemnumber=[% ITEM_DAT.itemnumber | uri %]"><i class="fa fa-pencil"></i> Edit item</a> > [% END %] > [% END %]</h4> > <div class="rows"> >@@ -319,7 +319,7 @@ > [% ITEM_DAT.issues | html %] > [% ELSE %] > 0 >- [% END %] (<a href="/cgi-bin/koha/circ/bookcount.pl?&biblionumber=[% ITEM_DAT.biblionumber | uri %]&itm=[% ITEM_DAT.itemnumber | uri %]" id="lientype">View item's checkout history</a>)</li> >+ [% END %] (<a href="/cgi-bin/koha/circ/bookcount.pl?&biblionumber=[% ITEM_DAT.biblionumber | uri %]&itm=[% ITEM_DAT.itemnumber | uri %]">View item's checkout history</a>)</li> > > <li><span class="label">Last seen:</span>[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen | $KohaDates %] [%END %] </li> > <li><span class="label">Last borrowed:</span>[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %] </li> >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 41c670ca30..92ef2e0dc7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -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 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> >+ <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> > > <div class="searchheader" id="searchheader"> > <div id="selection_ops"> >@@ -97,7 +97,7 @@ > > [% IF Koha.Preference('virtualshelves') %] > <div class="btn-group"> >- <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="lientype"> >+ <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" > > <i class="fa fa-list"></i> Add to list <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -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 id="lientype" href="#" class="addtolist morelists">More lists</a> >+ <a href="#" class="addtolist morelists">More lists</a> > </li> > [% END %] > <li> >- <a id="lientype" href="#" class="addtolist newlist">New list</a> >+ <a href="#" class="addtolist newlist">New list</a> > </li> > </ul> > </div> >@@ -143,8 +143,8 @@ > [% IF ( CAN_user_reserveforothers_place_holds && DisplayMultiPlaceHold ) %] > [% IF ( holdfor or holdforclub ) %] > <div id="placeholdc" class="btn-group"> >- <button class="btn btn-default btn-xs placehold" id="lientype"><i class="fa fa-sticky-note-o"></i> Place hold</button> >- <button class="btn btn-default btn-xs dropdown-toggle" id="lientype" data-toggle="dropdown"> >+ <button class="btn btn-default btn-xs placehold" ><i class="fa fa-sticky-note-o"></i> Place hold</button> >+ <button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -163,20 +163,20 @@ > </div> > [% ELSE %] > <div id="placeholdc" class="btn-group"> >- <a class="btn btn-default btn-xs placehold" href="#" id="lientype"><i class="fa fa-sticky-note-o"></i> Place hold</a> >+ <a class="btn btn-default btn-xs placehold" href="#" ><i class="fa fa-sticky-note-o"></i> Place hold</a> > </div> > [% END # /IF holfor %] > [% END # /IF CAN_user_reserveforothers_place_holds %] > > [% IF Koha.Preference('BrowseResultSelection') %] > <div id="browse_selection" class="btn-group"> >- <a class="btn btn-default btn-xs browse_selection" href="#" id="lientype"><i class="fa fa-sticky-note-o"></i> Browse selected records</a> >+ <a class="btn btn-default btn-xs browse_selection" href="#" ><i class="fa fa-sticky-note-o"></i> Browse selected records</a> > </div> > [% END %] > > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] > <div class="btn-group"> >- <a class="btn btn-default btn-xs lientype" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a> >+ <a class="btn btn-default btn-xs" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a> > </div> > <div class="btn-group"> > <button type="button" id="results_batch_ops" class="btn btn-default btn-xs dropdown-toggle disabled" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> >@@ -208,7 +208,7 @@ > [% END %] > > <div class="btn-group"> >- <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="lientype"> >+ <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" > > Sort <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -337,9 +337,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 id="lientype" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% searchtoorder_basketno | uri %]">View basket<a></p> >+ <p><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% searchtoorder_basketno | uri %]">View basket<a></p> > [% END %] >- <a 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> >+ <a href="/cgi-bin/koha/catalogue/search.pl?advsearch=1&edit_search=1&[% query_cgi | $raw %]&[% limit_cgi | $raw %]&sort_by=[% sort_by | $raw %]">Edit this search</a> > [% ELSE %] > <p>You did not specify any search criteria.</p> > [% END %] >@@ -541,32 +541,32 @@ > > [% IF Koha.Preference('intranetbookbag') == 1 %] > [% IF ( SEARCH_RESULT.incart ) %] >- | <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> >+ | <a class="addtocart" id="cart[% SEARCH_RESULT.biblionumber | html %]" href="#">In your cart</a> <a class="cartRemove" id="cartR[% SEARCH_RESULT.biblionumber | html %]" href="#">(remove)</a> > [% ELSE %] >- | <a 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> >+ | <a class="addtocart" id="cart[% SEARCH_RESULT.biblionumber | html %]" href="#">Add to cart</a> <a style="display:none;" class="cartRemove" id="cartR[% SEARCH_RESULT.biblionumber | html %]" href="#">(remove)</a> > [% END %] > [% END # / IF intranetbookbag %] > > [% IF Koha.Preference('ArticleRequests') %] >- | <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> >+ | <a 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 id="lientype" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit record</a> >+ | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit record</a> > [% END %] > [% IF ( CAN_user_editcatalogue_edit_items ) %] >- | <a id="lientype" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit items</a> >+ | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit items</a> > [% END %] > > [% IF ( CAN_user_acquisition_order_manage ) %] > [% IF ( searchtoorder_basketno && searchtoorder_vendorid ) %] >- | <a 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> >+ | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&basketno=[% searchtoorder_basketno | uri %]&biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Add order</a> > [% END %] > [% END %] > > [% IF ( OPACBaseURL ) %] > <span class="view-in-opac"> >- | <a id="lientype" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]" target="_blank">OPAC view</a> >+ | <a href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]" target="_blank">OPAC view</a> > </span> > [% END %] > </p> <!-- /.holds --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >index 100c302937..2064ba89f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -854,6 +854,19 @@ function PopupMARCFieldDoc(field) { > [% END %] > > <div id="toolbar" class="btn-toolbar"> >+ >+ [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %] >+ [% IF (biblionumber) %] >+ <div class="btn-group"> >+ <a href="[% PROCESS biblio_a_href biblionumber => biblionumber %]" class="btn btn-default cancel" id="cancel">Cancel</a> >+ </div> >+ [% ELSE %] >+ <div class="btn-group"> >+ <a class="btn btn-default cancel" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a> >+ </div> >+ [% END %] >+ <div id="show-errors" class="btn-group"></div> >+ [% END # /UNLESS circborrowernumber %] > [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] > [% IF (circborrowernumber) %][%# fast cataloging must lead to items %] > <!-- Action is under fast cataloging - Save button redirecting to items --> >@@ -879,17 +892,17 @@ function PopupMARCFieldDoc(field) { > > [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %] > [% IF biblionumber %] >- <div class="btn-group"><a class="btn btn-default pat" href="#" id="z3950search"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a></div> >+ <div class="btn-group"><a class="btn btn-default toolbar-btn" href="#" id="z3950search"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a></div> > [% ELSE %] >- <div class="btn-group"><a class="btn btn-default pat" href="#" id="z3950search"><i class="fa fa-search"></i> Z39.50/SRU search</a></div> >+ <div class="btn-group"><a class="btn btn-default toolbar-btn" href="#" id="z3950search"><i class="fa fa-search"></i> Z39.50/SRU search</a></div> > [% END %] > [% IF ( CAN_user_editauthorities ) %] >- <div class="btn-group"><a class="btn btn-default pat" href="#" id="linkerbutton"><i class="fa fa-refresh"></i> Link authorities automatically</a></div> >+ <div class="btn-group"><a class="btn btn-default toolbar-btn" href="#" id="linkerbutton"><i class="fa fa-refresh"></i> Link authorities automatically</a></div> > [% END %] > [% END %] > > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle pat" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button> >+ <button class="btn btn-default dropdown-toggle toolbar-btn" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button> > <ul id="settings-menu" class="dropdown-menu"> > [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %] > <li><a href="#" id="switcheditor">Switch to advanced editor</a></li> >@@ -914,7 +927,7 @@ function PopupMARCFieldDoc(field) { > </li> > [% FOREACH framework IN frameworks%] > <li> >- <a href="#" id="lientype" class="change-framework" data-frameworkcode="[% framework.frameworkcode | html %]"> >+ <a href="#" class="change-framework" data-frameworkcode="[% framework.frameworkcode | html %]"> > [% IF framework.frameworkcode == frameworkcode %] > <i class="fa fa-fw fa-check"></i> > [% ELSE %] >@@ -926,21 +939,9 @@ function PopupMARCFieldDoc(field) { > [% END %]</li> > </ul> <!-- /#settings-menu --> > </div> <!-- /.btn-group --> >- [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %] >- [% IF (biblionumber) %] >- <div class="btn-group"> >- <a href="[% PROCESS biblio_a_href biblionumber => biblionumber %]" class="btn btn-default cancel" id="cancel">Cancel</a> >- </div> >- [% ELSE %] >- <div class="btn-group"> >- <a class="btn btn-default cancel" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a> >- </div> >- [% END %] >- <div id="show-errors" class="btn-group"></div> >- [% END # /UNLESS circborrowernumber %] > <div class="toolbar-tabs-container"> >- <div id="searchresults"> > [% IF ( BIG_LOOP && BIG_LOOP.size > 1 ) %] >+ <fieldset> > <ul class="toolbar-tabs"> > [%- FOREACH BIG_LOO IN BIG_LOOP -%] > [% IF loop.first %] >@@ -965,7 +966,7 @@ function PopupMARCFieldDoc(field) { > [% END %] > [% END %] > </ul> >- </div></div> >+ </fieldset></div> > </div> <!-- /#toolbar.btn-toolbar --> > > [% IF bib_doesnt_exist %] >@@ -985,8 +986,8 @@ function PopupMARCFieldDoc(field) { > <input type="hidden" name="breedingid" value="[% breedingid | html %]" /> > <input type="hidden" name="changed_framework" value="" /> > >- <div id="searchresults"> > <div id="addbibliotabs" class="toptabs numbered"> >+ <fieldset> > <ul> > [% FOREACH BIG_LOO IN BIG_LOOP %] > <li><a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a></li> >@@ -1185,8 +1186,8 @@ function PopupMARCFieldDoc(field) { > [% END # /FOREACH BIG_LOO.innerloop %] > </ul> <!-- /.sortable_field --> > </div> <!-- /#tabXXX --> >- [% END # /FOREACH BIG_LOOP %] >- </div></div><!-- /#addbibliotabs --> >+ [% END # /FOREACH BIG_LOOP %]</fieldset> >+ </div><!-- /#addbibliotabs --> > > [%# Fields for fast cataloging %] > <input type="hidden" name="barcode" value="[% barcode | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >index 7cb8454101..f701a4fe5f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -58,10 +58,10 @@ > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] > <div id="toolbar" class="btn-toolbar"> > [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %] >- <a id="useadvanced" href="/cgi-bin/koha/cataloguing/editor.pl" class="pat"><i class="fa fa-pencil"></i> Advanced editor</a> >+ <a id="useadvanced" href="/cgi-bin/koha/cataloguing/editor.pl" class="toolbar-btn"><i class="fa fa-pencil"></i> Advanced editor</a> > [% END %] > <div class="btn-group"> >- <button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New record<span class="caret"></span> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-plus"></i> New record<span class="caret"></span> > </button> > <ul class="dropdown-menu"> > <li><a id="newRecordDefault" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li> >@@ -72,8 +72,8 @@ > </div> > [% IF servers.count > 0 %] > <div class="btn-group"> >- <button class="pat mot" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button> >- <button class="pat fleche" data-toggle="dropdown"> >+ <button class="toolbar-btn" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button> >+ <button class="toolbar-btn" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >index 579d87dd07..fb7d1a6e4a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -73,7 +73,7 @@ > > <div id="cataloguing_additem_itemlist"> > [% IF items %] >- <div id="searchresults"> >+ <fieldset id="searchresults"> > [% SET date_fields = [ 'dateaccessioned', 'onloan', 'datelastseen', 'datelastborrowed', 'replacementpricedate' ] %] > <div> > <table id="itemst"> >@@ -108,7 +108,7 @@ > [% ELSE %] > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle lientype" id="itemactions[% item.itemnumber | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="itemactions[% item.itemnumber | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu" role="menu" aria-labelledby="itemactions[% item.itemnumber | html %]"> >@@ -141,7 +141,7 @@ > </tbody> > </table> > </div> >- </div> >+ </fieldset> > [% END %] > > <div class="row"> >@@ -199,7 +199,7 @@ > <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" /> > [% END %] > <input type="submit" class="principal" value="Save changes" onclick="return Check(this.form)"> >- <input type="button" class="lientype" id="addnewitem" value="Add a new item"> >+ <input type="button" id="addnewitem" value="Add a new item"> > <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Cancel</a> > [% END %]</fieldset> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >index e5db589384..e61b9167b9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -53,7 +53,7 @@ > <div id="editor"> > <input id="import-records-input" type="file" style="display: none"> > <div id="toolbar" class="btn-toolbar"> >- <button class="btn btn-default" id="new-record" title="Open fresh record"><i class="fa fa-plus"></i> <span>New record</span></button> >+ <button class="btn btn-default toolbar-btn" id="new-record" title="Open fresh record"><i class="fa fa-plus"></i> <span>New record</span></button> > <div class="btn-group"> > <button class="btn btn-default" id="save-record" title="Save current record (Ctrl-S)"><i class="fa fa-hdd-o"></i> <span>Save</span></button> > <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"> >@@ -62,10 +62,10 @@ > <ul class="dropdown-menu" id="save-dropdown"> > </ul> > </div> >- <button class="btn btn-default" id="import-records" title="Import an MARC (ISO 2709) or MARCXML record"><i class="fa fa-download"></i> <span>Import record...</span></button> >- <button class="btn btn-default" id="open-macros" title="Run and edit macros"><i class="fa fa-play"></i> <span>Macros...</span></button> >+ <button class="btn btn-default toolbar-btn" id="import-records" title="Import an MARC (ISO 2709) or MARCXML record"><i class="fa fa-download"></i> <span>Import record...</span></button> >+ <button class="btn btn-default toolbar-btn" id="open-macros" title="Run and edit macros"><i class="fa fa-play"></i> <span>Macros...</span></button> > <div class="btn-group"> >- <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button> >+ <button class="btn btn-default dropdown-toggle toolbar-btn" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button> > <ul id="prefs-menu" class="dropdown-menu"> > <li><a id="switch-editor" href="#">Switch to basic editor</a></li> > <li><a id="set-field-widgets" href="#"></a></li> >@@ -100,9 +100,9 @@ > <li><a class="set-font" style="font-family: Monaco" href="#">Monaco</a></li> > </ul> > </div> >- <button class="btn btn-default" id="show-alerts" title="Previous alerts"><i class="fa fa-bell"></i> Alerts <span class="caret"></span></button> >- <button class="btn btn-default" id="show-shortcuts" title="Supported keyboard shortcuts"><i class="fa fa-keyboard-o"></i> Keyboard shortcuts <span class="caret"></span></button> >- <button class="btn btn-default hide" id="set-keyboard-layout" data-target="#keyboard-layout" data-toggle="modal" title="Set virtual keyboard layout"><i class="fa fa-keyboard-o"></i> Keyboard layout </button> >+ <button class="btn btn-default toolbar-btn" id="show-alerts" title="Previous alerts"><i class="fa fa-bell"></i> Alerts <span class="caret"></span></button> >+ <button class="btn btn-default toolbar-btn" id="show-shortcuts" title="Supported keyboard shortcuts"><i class="fa fa-keyboard-o"></i> Keyboard shortcuts <span class="caret"></span></button> >+ <button class="btn btn-default hide toolbar-btn" id="set-keyboard-layout" data-target="#keyboard-layout" data-toggle="modal" title="Set virtual keyboard layout"><i class="fa fa-keyboard-o"></i> Keyboard layout </button> > </div> > [%# CodeMirror instance will be inserted here %] > <div id="statusbar"> >@@ -119,7 +119,7 @@ > <aside> > <h3>Search</h3> > <form id="quicksearch"> >- <fieldset class="brief"> >+ <fieldset class="sidebar"> > <ol> > <li><label for="search-by-keywords">Keywords:</label></li> > <li><input class="search-box" data-qualifier="term" id="search-by-keywords" placeholder="(Ctrl-Alt-K)" /></li> >@@ -244,7 +244,7 @@ > </div> > <div class="col-md-9"> > <!-- tabindex attribute allows JS-controlled focus --> >- <div id="searchresults" tabindex="-1"> >+ <fieldset id="searchresults" tabindex="-1"> > <div id="search-top-pages"> > <nav aria-label="Search results navigation"> > </nav> >@@ -261,7 +261,7 @@ > <nav aria-label="Search results navigation"> > </nav> > </div> >- </div> >+ </fieldset> > </div> > </div> > <div id="search-overlay"><span>Loading...</span><div class="progress"><div class="progress-bar progress-bar-striped active" style="width: 100%"></div></div></div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >index a9232e202e..a4231ca2cd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >@@ -68,7 +68,7 @@ > </div> > <nav class="navbar navbar-default navbar-fixed-bottom"> > <div class="container-fluid"> >- <fieldset class="action"><input type="submit" id="principal" class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset> >+ <fieldset class="action"><input type="submit principal" class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset> > </div> > </nav> > </form> >@@ -90,7 +90,7 @@ > <td>[% breeding_loo.heading_code | html %]</td> > <td class="actions"> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs z3950actions" id="lientype" href="#">MARC</a><button class="btn-xs dropdown-toggle" id="lientype" data-toggle="dropdown"><span class="caret"></span></button> >+ <a class="btn btn-default btn-xs z3950actions" href="#">MARC</a><button class="btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]"> > <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa fa-eye"></i> MARC preview</a></li> > <li><a href="/cgi-bin/koha/authorities/authorities.pl?breedingid=[% breeding_loo.breedingid | uri %]&authtypecode=[% breeding_loo.heading_code | uri %]&authid=[% breeding_loo.authid | uri %]&index=[% index | uri %]" class="chosen" title="Import" data-action="import"><i class="fa fa-download"></i> Import</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >index 2bcf7eba60..d36cf96b84 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >@@ -108,7 +108,7 @@ > > <nav class="navbar navbar-default navbar-fixed-bottom"> > <div class="container-fluid"> >- <fieldset class="action"><input type="submit" id="principal" class="submit" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset> >+ <fieldset class="action"><input type="submit" class="submit principal" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset> > </div> > </nav> > </form> <!-- /.checkboxed --> >@@ -188,7 +188,7 @@ > [% END %] > <td class="actions"> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs z3950actions" id="lientype" href="#">MARC</a><button class="btn-xs dropdown-toggle" id="lientype" data-toggle="dropdown"><span class="caret"></span></button> >+ <a class="btn btn-default btn-xs z3950actions" href="#">MARC</a><button class="btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]"> > <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa fa-eye"></i> MARC preview</a></li> > <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData" data-action="show_card"><i class="fa fa-eye"></i> Card preview</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >index 99dca420b0..2593a0e99d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >@@ -50,7 +50,7 @@ > [% IF ( locationsloo.selected ) %]<option value="[% locationsloo.authorised_value | html %]" selected="selected">[% locationsloo.lib | html %]</option>[% ELSE %]<option value="[% locationsloo.authorised_value | html %]">[% locationsloo.lib | html %]</option>[% END %] > [% END %] > </select> >- <input type="submit" name="location" class="submit" value="OK" id="principal" /> >+ <input type="submit" name="location" class="submit" value="OK" /> > </form> > > [% IF ( overduesloop ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >index b29941f5ea..f98843593e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >@@ -187,7 +187,7 @@ > </select></p> > </li> > <li> >- <input name="barcode" size="15" class="petit-barcode" type="text" placeholder="Enter barcode" /><button type="submit" class="submit" id="principal">Submit</button> >+ <input name="barcode" size="15" type="text" placeholder="Enter barcode" /><button type="submit" class="submit">Submit</button> > </li></ol> > > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index f433448406..a382c90fa0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -10,6 +10,9 @@ > [% USE Price %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %] > [% SET destination = "circ" %] >@@ -24,8 +27,7 @@ > > <body id="circ_circulation" class="circ"> > >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'circ-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -53,6 +55,12 @@ > </li> > [% END %] > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -588,7 +596,7 @@ > <input type="hidden" name="barcode" value="[% item.barcode | html %]" /> > <input type="hidden" name="onsite_checkout" value="[% onsite_checkout | html %]" /> > <input type="hidden" name="auto_renew" value="[% auto_renew | html %]" /> >- <button class="btn btn-default btn-xs" type="submit" name="x"><i class="fa fa-check"></i> Check out</button> >+ <button class="btn btn-default principal btn-xs" type="submit" name="x"><i class="fa fa-check"></i> Check out</button> > </form> > </td> > </tr> >@@ -655,24 +663,23 @@ > > <label class="circ_barcode" for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label> > >- [% IF Koha.Preference('itemBarcodeFallbackSearch') %] >- <div class="hint">Enter item barcode or keyword:</div> >- [% ELSE %] >- <div class="hint">Enter item barcode:</div> >- [% END %] >- >+ <div></div> > [% IF NEEDSCONFIRMATION %] > <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" disabled="disabled" /> > [% ELSE %] >- <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" /> >+ [% IF Koha.Preference('itemBarcodeFallbackSearch') %] >+ <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" placeholder="Enter item barcode or keyword" /> >+ [% ELSE %] >+ <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" placeholder="Enter item barcode" /> >+ [% END %] > [% END %] > >- <button type="submit" class="btn btn-default">Check out</button> >- > <div id="show-circ-settings"> >- <a href="#"><i class="fa fa-caret-right circ-settings-icon"></i> Checkout settings</a> >+ <a href="#"><i class="fa-sign-out"></i></a> > </div> > >+ <button type="submit" class="btn btn-default principal">Check out</button> >+ > <div class="circ-settings"> > > [% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %] >@@ -807,7 +814,9 @@ > <div id="circmessages" class="circmessage attention"> > [% END %] > >+ <fieldset> > [% INCLUDE 'patron_messages.inc' %] >+ </fieldset> > > </div> <!-- /#circmessages --> > </div> <!-- /div or div.col-sm-6 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index aabc6835f2..4ff41224be 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -148,32 +148,34 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- <div id="filters"> > <form method="post" action="/cgi-bin/koha/circ/overdue.pl"> >- <fieldset class="brief"> >- <h4>Filter on</h4> >+ <fieldset class="sidebar"> >+ <h3>Filter on</h3> > >- <fieldset><label>Date due:</label> >+ <fieldset class="brief"><legend>Date due:</legend> >+ <ol> > <li class="radio"> >- <p for="showall">Show any items currently checked out: >+ <label for="showall">Show any items currently checked out: >+ </label> > [% IF ( showall ) %] > <input type="checkbox" id="showall" name="showall" value="show" checked="checked" /> > [% ELSE %] > <input type="checkbox" id="showall" name="showall" value="show" /> >- [% END %] >- </p> >+ [% END %]</li> > >- <p>From: <input type="text" id="from" name="dateduefrom" size="10" value="[% filters.dateduefrom | $KohaDates %]" class="flatpickr" data-date_to="to" /></p> >- <p>To:<input type="text" id="to" name="datedueto" size="10" value="[% filters.datedueto | $KohaDates %]" class="flatpickr" /></p> >+ <li><label>From: </label><input type="text" id="from" name="dateduefrom" size="10" value="[% filters.dateduefrom | $KohaDates %]" class="flatpickr" data-date_to="to" /></li> >+ <li><label>To:</label><input type="text" id="to" name="datedueto" size="10" value="[% filters.datedueto | $KohaDates %]" class="flatpickr" /></li> > </li> >- >- <li><p>Name or cardnumber:<input type="text" name="borname" value="[% filters.borname | html %]" /></p> >- <p>Patron category:<select name="borcat" id="borcat"><option value="">Any</option> >+ </ol> >+ </fieldset> >+ <ol> >+ <li><label>Name or cardnumber:</label><input type="text" name="borname" value="[% filters.borname | html %]" /></i> >+ <li><label>Patron category:</label><select name="borcat" id="borcat"><option value="">Any</option> > [% FOREACH borcatloo IN borcatloop %] > [% IF ( borcatloo.selected ) %]<option value="[% borcatloo.value | html %]" selected="selected">[% borcatloo.catname | html %]</option>[% ELSE %]<option value="[% borcatloo.value | html %]">[% borcatloo.catname | html %]</option>[% END %] > [% END %] >- </select></p> >- <p>Patron flags: >+ </select></li> >+ <li><label>Patron flags:</label> > <select name="borflag" id="borflag"> > <option value="">None</option> > [% IF ( borflag_gonenoaddress ) %]<option value="gonenoaddress" selected="selected">Address in question</option> >@@ -182,12 +184,12 @@ > [% ELSE %]<option value="debarred">Restricted</option>[% END %] > [% IF ( borflag_lost ) %]<option value="lost" selected="selected">Lost card</option> > [% ELSE %]<option value="lost">Lost card</option>[% END %] >- </select> >- </p> >+ </select></li> >+ > > [% FOREACH patron_attr_filter_loo IN patron_attr_filter_loop %] > <!-- domid cgivalue ismany isclone ordinal code description repeatable authorised_value_category --> >- <p>[% patron_attr_filter_loo.description | html %]: >+ <li><label>[% patron_attr_filter_loo.description | html %]:</label> > [% IF ( patron_attr_filter_loo.authorised_value_category ) %] > [% SET authvals = AuthorisedValues.GetAuthValueDropbox( patron_attr_filter_loo.authorised_value_category ) %] > <select id="pattrodue-input-[% patron_attr_filter_loo.domid | html %]" name="patron_attr_filter_[% patron_attr_filter_loo.code | html %]" class="pattrodue-input"> >@@ -212,39 +214,40 @@ > [% ELSE %] > <a href="#" class="btn btn-link delete_clone" style="display:none"><i class="fa fa-remove"></i> Delete</a> > [% END %] >- [% END %]</p> >+ [% END %] >+ </li> > [% END %] > >- <p> >- Item type:<select name="itemtype" id="itemtype"><option value="">Any</option> >+ <li><label> >+ Item type:</label><select name="itemtype" id="itemtype"><option value="">Any</option> > [% FOREACH itemtypeloo IN itemtypeloop %][% IF ( itemtypeloo.selected ) %] > <option value="[% itemtypeloo.value | html %]" selected="selected">[% itemtypeloo.itemtypename | html %]</option>[% ELSE %] > <option value="[% itemtypeloo.value | html %]">[% itemtypeloo.itemtypename | html %]</option>[% END %] > [% END %] >- </select> >- </p> >+ </select></li> >+ > >- <p>Item home library: >+ <li><label>Item home library:</label> > <select name="homebranch" id="homebranch"> > <option value="">Any</option> > [% PROCESS options_for_libraries libraries => Branches.all( selected => filters.homebranch ) %] >- </select></p> >+ </select></li> > >- <p>Item holding library: >+ <li><label>Item holding library:</label> > <select name="holdingbranch" id="holdingbranch"> > <option value="">Any</option> > [% PROCESS options_for_libraries libraries => Branches.all( selected => filters.holdingbranch ) %] >- </select></p> >+ </select></li> > >- <p>Library of the patron: >+ <li><label>Library of the patron:</label> > <select name="branch" id="branch"> > <option value="">Any</option> > [% PROCESS options_for_libraries libraries => Branches.all( selected => filters.branch, only_from_group => 1 ) %] >- </select></p> >+ </select> > </li> > </ol> > <fieldset class="action"> >- <button type="submit" class="submit" id="principal">Apply filter</button> >+ <button type="submit" class="submit principal">Apply filter</button> > <input type="hidden" name="op" value="apply filter" /> > </fieldset> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index 52486c8693..afbd659ae9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -268,19 +268,17 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- <div id="filters"> > <form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" > >- <fieldset class="brief"> >- <h4>Refine results</h4> >- <fieldset> >+ <fieldset class="sidebar"> >+ <h3>Refine results</h3> > <ol> > <li> >- <p>Start date: >- <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" /></p> >+ <label>Start date:</label> >+ <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" /> > </li> > <li> >- <p>End date: >- <input type="text" size="10" id="to" name="to" value="[% to | $KohaDates %]" class="flatpickr" /></p> >+ <label>End date:</label> >+ <input type="text" size="10" id="to" name="to" value="[% to | $KohaDates %]" class="flatpickr" /> > </li> > </ol> > >@@ -290,11 +288,9 @@ > <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to today. Set other date ranges as needed.)</em></p> > [% END %] > >- <button type="submit" class="submit" id="principal">Submit</button> >- </fieldset> >+ <button type="submit" class="submit principal">Submit</button> > </fieldset> > </form> >- </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >index 04c1785cd9..4ae84ebac9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >@@ -219,7 +219,7 @@ > <input name="barcode" size="14" class="barcode focus" type="text" placeholder="Enter item barcode" /> > > [% END %] >- <button type="submit" class="submit" id="principal">Submit</button> >+ <button type="submit" class="submit principal">Submit</button> > > <div class="circ-settings show"> > <div class="date-select" id="renew_date_override_fields"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index 69fc9b5a41..6e627ea342 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -142,16 +142,13 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- <div id="filters"> > <form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" > >- <fieldset class="brief"> >- <h4>Refine results</h4> >- >- <fieldset> >+ <fieldset class="sidebar"> >+ <h3>Refine results</h3> > <ol> > <li> >- <p>Hold ratio (greater than or equal to): >- <input type="text" size="5" id="ratio" name="ratio" value="[% ratio | html %]" /></p> >+ <label>Hold ratio (greater than or equal to):</label> >+ <input type="text" size="5" id="ratio" name="ratio" value="[% ratio | html %]" /> > </li> > > <li class="checkbox"> >@@ -175,18 +172,17 @@ > </li> > > <li> >- <p>Start date: >- <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" /></p> >+ <label>Start date:</label> >+ <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" /> > </li> > > <li> >- <p>End date: >- <input size="10" id="to" name="to" value="[% to | $KohaDates %]" type="text" class="flatpickr" /></p> >+ <label>End date:</label> >+ <input size="10" id="to" name="to" value="[% to | $KohaDates %]" type="text" class="flatpickr" />(inclusive) > </li> > </ol> >- <p>(inclusive)</p> >- <button type="submit" class="submit" id="principal">Go</button> >- </fieldset> >+ >+ <button type="submit" class="submit principal">Go</button> > </fieldset> > > [% IF ( CAN_user_acquisition && basketno && booksellerid ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 133342635b..af71b9b26e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -963,7 +963,7 @@ > <div id="show-circ-settings"> > <a href="#"><i class="fa-sign-out"></i></a> > </div> >- <button class="submit" id="principal" type="submit" >Check in</button> >+ <button class="submit principal" type="submit" >Check in</button> > [% FOREACH inputloo IN inputloop %] > <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" /> > <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" /> >@@ -1147,7 +1147,7 @@ > </span> > </span> > [% END %] >- <a class="btn btn-default btn-xs printcheckinslip" id="lientype" href="#" data-borrowernumber="[% riloo.patron.borrowernumber | html %]"><i class="fa fa-print"></i> Print checkin slip</a> >+ <a class="btn btn-default btn-xs printcheckinslip" href="#" data-borrowernumber="[% riloo.patron.borrowernumber | html %]"><i class="fa fa-print"></i> Print checkin slip</a> > [% ELSE %] > Not checked out > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >index 887c7ade80..21221e6328 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >@@ -100,7 +100,7 @@ Updated:<ul> > </select></p></li> > > <li> >- <button class="submit" id="principal" type="submit" >Submit</button> >+ <button class="submit principal" type="submit" >Submit</button> > <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a> > </li> > </ol> >@@ -121,7 +121,7 @@ Updated:<ul> > </select></li> > > <li> >- <button class="submit" id="principal" type="submit" >Submit</button> >+ <button class="submit principal" type="submit" >Submit</button> > <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a> > </li> > </ol> >@@ -140,7 +140,7 @@ Updated:<ul> > </select> > </li> > <li> >- <button class="submit" id="principal" type="submit" >Submit</button> >+ <button class="submit principal" type="submit" >Submit</button> > <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a> > </li> > </ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >index c55f4aa4ae..bcb641de95 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >@@ -278,7 +278,7 @@ > [% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'LOC' ), selected_av => locationslimit %] > </select></p> > </li> >- <button type="submit" class="submit" id="principal">Submit</button> >+ <button type="submit" class="submit principal">Submit</button> > <input type="hidden" name="run_report" value="1" /> > </ol> > </fieldset> >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 87fb31a9ad..976f8f6510 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >@@ -46,16 +46,16 @@ > <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> >+ <a class="btn btn-default toolbar-btn" href="templates-add-modify.pl"><i class="fa fa-plus"></i> New club template</a> > </div> > [% END %] > > [% IF CAN_user_clubs_edit_clubs %] > <div class="btn-group"> > [% IF club_templates.count %] >- <button class="btn btn-default dropdown-toggle pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button> >+ <button class="btn btn-default dropdown-toggle toolbar-btn" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button> > [% ELSE %] >- <button disabled="disabled" class="btn btn-default dropdown-toggle pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button> >+ <button disabled="disabled" class="btn btn-default dropdown-toggle toolbar-btn" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button> > [% END %] > <ul class="dropdown-menu"> > [% FOREACH t IN club_templates %] >@@ -124,10 +124,10 @@ > <td>[% Branches.GetName( t.branchcode ) | html %]</td> > <td class="actions"> > [% IF CAN_user_clubs_edit_templates %] >- <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 %]"> >+ <a 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 id="lientype" class="btn btn-xs btn-default delete_template" href="#" data-id="[% t.id | html %]" data-name="[% t.name | html %]"> >+ <a 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 %] >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 a91d71031a..ddfe228327 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 id="lientype" class="btn btn-xs btn-default" onclick="cancelEnrollment( [% e.id | html %] )"> >+ <button 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" id="lientype" onclick="loadEnrollmentForm([% c.id | html %])"> >+ <button class="btn btn-xs btn-default" 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/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt >index 4f423a9687..0481b0c1fc 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 >@@ -149,7 +149,7 @@ > [% END %] > </div> > <fieldset class="action"> >- <a id="lientype" href="#" class="add_club_field"> >+ <a href="#" class="add_club_field"> > <i class="fa fa-plus"></i> Add new field > </a> > </fieldset> >@@ -194,7 +194,7 @@ > [% END %] > </div> > <fieldset class="action"> >- <a id="lientype" href="#" class="add_enrollment_field"> >+ <a href="#" class="add_enrollment_field"> > <i class="fa fa-plus"></i> Add new field > </a> > </fieldset> >@@ -234,7 +234,7 @@ > </select> > </li> > </ol> >- <fieldset class="action"><a id="lientype" href="#" class="delete_club_field"><i class="fa fa-trash"></i> Delete field</a></fieldset> >+ <fieldset class="action"><a 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 id="lientype" href="#" class="delete_enrollment_field"><i class="fa fa-trash"></i> Delete field</a></fieldset> >+ <fieldset class="action"><a 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/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index 6bab663f7e..f7f9fa9e62 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >@@ -58,17 +58,17 @@ > [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %] > <div id="toolbar"> > [% IF CAN_user_coursereserves_add_reserves %] >- <a class="btn btn-default" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id | html %]"><i class="fa fa-plus"></i> Add reserves</a> >- <a class="btn btn-default" id="add_items" href="/cgi-bin/koha/course_reserves/batch_add_items.pl?course_id=[% course.course_id | html %]"><i class="fa fa-plus"></i> Batch add reserves</a> >+ <a class="btn btn-default toolbar-btn" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id | html %]"><i class="fa fa-plus"></i> Add reserves</a> >+ <a class="btn btn-default toolbar-btn" id="add_items" href="/cgi-bin/koha/course_reserves/batch_add_items.pl?course_id=[% course.course_id | html %]"><i class="fa fa-plus"></i> Batch add reserves</a> > [% END %] > [% IF CAN_user_coursereserves_delete_reserves && course_reserves %] >- <a class="btn btn-default" id="rm_items" href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]&action=rm_all"><i class="fa fa-minus"></i> Remove all reserves</a> >+ <a class="btn btn-default toolbar-btn" id="rm_items" href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]&action=rm_all"><i class="fa fa-minus"></i> Remove all reserves</a> > [% END %] > [% IF ( CAN_user_coursereserves_manage_courses ) %] >- <a class="btn btn-default" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id | html %]"><i class="fa fa-pencil"></i> Edit course</a> >+ <a class="btn btn-default toolbar-btn" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id | html %]"><i class="fa fa-pencil"></i> Edit course</a> > [% END %] > [% IF ( CAN_user_coursereserves_manage_courses ) %] >- <a class="btn btn-default" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id | html %]&action=del"><i class="fa fa-trash"></i> Delete course</a> >+ <a class="btn btn-default toolbar-btn" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id | html %]&action=del"><i class="fa fa-trash"></i> Delete course</a> > [% END %] > </div><!-- /toolbar --> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >index bce35d3d2b..a39805ed64 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >@@ -41,10 +41,10 @@ > [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_delete_reserves %] > <div id="toolbar"> > [% IF ( CAN_user_coursereserves_manage_courses ) %] >- <a class="btn btn-default" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl"><i class="fa fa-plus"></i> New course</a> >+ <a class="btn btn-default toolbar-btn" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl"><i class="fa fa-plus"></i> New course</a> > [% END %] > [% IF ( CAN_user_coursereserves_delete_reserves ) %] >- <a class="btn btn-default" id="batch_rm" href="/cgi-bin/koha/course_reserves/batch_rm_items.pl"><i class="fa fa-minus"></i> Batch remove reserves</a> >+ <a class="btn btn-default toolbar-btn" id="batch_rm" href="/cgi-bin/koha/course_reserves/batch_rm_items.pl"><i class="fa fa-minus"></i> Batch remove reserves</a> > [% END %] > </div><!-- /toolbar --> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index e83e40542c..b5c1b0bf76 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -66,7 +66,7 @@ > <div class="col-sm-2"> > <aside> > <form method="get" id="illfilter_form"> >- <fieldset class="brief"> >+ <fieldset class="sidebar"> > <h3>Filters</h3> > <ol> > <li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >index b7627fb9dd..ebb57bb3dd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -147,68 +147,68 @@ > > <div class="col-sm-9"> > <div class="row"> >- <div class="menuspe"><ul class="biglinks-list"> >+ <div class="mainmenu"><ul class="biglinks-list"> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li><a class="accueil" href="/cgi-bin/koha/circ/circulation-home.pl"><i class="fa fa-fw fa-exchange fa-2x"></i><h1>Circulation</h1></a></li> >+ <li><a class="home-page" href="/cgi-bin/koha/circ/circulation-home.pl"><i class="fa fa-fw fa-exchange fa-2x"></i><h1>Circulation</h1></a></li> > [% END %] > > [% IF CAN_user_borrowers_edit_borrowers %] >- <li><a class="accueil" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-fw fa-id-card-o fa-2x"></i><h1>Patrons</h1></a></li> >+ <li><a class="home-page" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-fw fa-id-card-o fa-2x"></i><h1>Patrons</h1></a></li> > [% END %] > > </ul></div> >- <div class="menuspe"><ul class="biglinks-list"> >+ <div class="mainmenu"><ul class="biglinks-list"> > > [% IF ( CAN_user_catalogue ) %] >- <li><a class="accueil" href="/cgi-bin/koha/catalogue/search.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Advanced search</h1></a></li> >- <li><a class="accueil" href="/cgi-bin/koha/catalogue/itemsearch.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Item search</h1></a></li> >+ <li><a class="home-page" href="/cgi-bin/koha/catalogue/search.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Advanced search</h1></a></li> >+ <li><a class="home-page" href="/cgi-bin/koha/catalogue/itemsearch.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Item search</h1></a></li> > [% END %] > >- <li><a class="accueil" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt fa-2x"></i><h1>Lists</h1></a></li> >+ <li><a class="home-page" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt fa-2x"></i><h1>Lists</h1></a></li> > > [% IF ( UseCourseReserves ) %] >- <li><a class="accueil" href="/cgi-bin/koha/course_reserves/course-reserves.pl"><i class="fa fa-fw fa-book fa-2x"></i><h1>Course reserves</h1></a></li> >+ <li><a class="home-page" href="/cgi-bin/koha/course_reserves/course-reserves.pl"><i class="fa fa-fw fa-book fa-2x"></i><h1>Course reserves</h1></a></li> > [% END %] > > </ul></div> >- <div class="menuspe"><ul class="biglinks-list"> >+ <div class="mainmenu"><ul class="biglinks-list"> > >- <li><a class="accueil" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-fw fa-link fa-2x"></i><h1>Authorities</h1></a></li> >+ <li><a class="home-page" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-fw fa-link fa-2x"></i><h1>Authorities</h1></a></li> > [% IF Koha.Preference('ILLModule') && CAN_user_ill %] >- <li><a class="accueil" href="/cgi-bin/koha/ill/ill-requests.pl"><i class="fa fa-fw fa-retweet fa-2x"></i><h1>ILL requests</h1></a></li> >+ <li><a class="home-page" href="/cgi-bin/koha/ill/ill-requests.pl"><i class="fa fa-fw fa-retweet fa-2x"></i><h1>ILL requests</h1></a></li> > [% END %] > > [% IF ( Koha.Preference('EnablePointOfSale') && Koha.Preference('UseCashRegisters') && CAN_user_cash_management_takepayment ) %] >- <li><a class="accueil" href="/cgi-bin/koha/pos/pay.pl"><i class="fa fa-fw fa-shopping-cart fa-2x"></i><h1>Point of sale</h1></a></li> >+ <li><a class="home-page" href="/cgi-bin/koha/pos/pay.pl"><i class="fa fa-fw fa-shopping-cart fa-2x"></i><h1>Point of sale</h1></a></li> > [% END %] > > [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %] >- <li><a class="accueil" href="/cgi-bin/koha/cataloguing/addbooks.pl"><i class="fa fa-fw fa-tag fa-2x"></i><h1>Cataloging</h1></a></li> >+ <li><a class="home-page" href="/cgi-bin/koha/cataloguing/addbooks.pl"><i class="fa fa-fw fa-tag fa-2x"></i><h1>Cataloging</h1></a></li> > [% END %] > > [% IF ( CAN_user_serials ) %] >- <li><a class="accueil" href="/cgi-bin/koha/serials/serials-home.pl"><i class="fa fa-fw fa-newspaper-o fa-2x"></i><span class="biglink"></span><h1>Serials</h1></a></li> >+ <li><a class="home-page" href="/cgi-bin/koha/serials/serials-home.pl"><i class="fa fa-fw fa-newspaper-o fa-2x"></i><span class="biglink"></span><h1>Serials</h1></a></li> > [% END %] > > [% IF ( CAN_user_acquisition ) %] >- <li><a class="accueil" href="/cgi-bin/koha/acqui/acqui-home.pl"><i class="fa fa-fw fa-gift fa-2x"></i><span class="biglink"></span><h1>Acquisitions</h1></a></li> >+ <li><a class="home-page" href="/cgi-bin/koha/acqui/acqui-home.pl"><i class="fa fa-fw fa-gift fa-2x"></i><span class="biglink"></span><h1>Acquisitions</h1></a></li> > [% END %] > </ul></div> >- <div class="vert"><ul class="biglinks-list"> >+ <div class="settings-links"><ul class="biglinks-list"> > [% IF ( CAN_user_reports ) %] >- <li><a class="accueil" id="reglages" href="/cgi-bin/koha/reports/reports-home.pl"><i class="fa fa-fw fa-pie-chart fa-2x"></i><h1>Reports</h1></a></li> >+ <li><a class="home-page settings" href="/cgi-bin/koha/reports/reports-home.pl"><i class="fa fa-fw fa-pie-chart fa-2x"></i><h1>Reports</h1></a></li> > [% END %] > > > [% IF ( CAN_user_tools ) %] >- <li><a class="accueil" id="reglages" href="/cgi-bin/koha/tools/tools-home.pl"><i class="fa fa-fw fa-wrench fa-2x"></i><h1>Tools</h1></a></li> >+ <li><a class="home-page settings" href="/cgi-bin/koha/tools/tools-home.pl"><i class="fa fa-fw fa-wrench fa-2x"></i><h1>Tools</h1></a></li> > [% END %] > > [% IF ( CAN_user_parameters ) %] >- <li><a class="accueil" id="reglages" href="/cgi-bin/koha/admin/admin-home.pl"><i class="fa fa-fw fa-cogs fa-2x"></i><h1>Administration</h1></a></li> >+ <li><a class="home-page settings" href="/cgi-bin/koha/admin/admin-home.pl"><i class="fa fa-fw fa-cogs fa-2x"></i><h1>Administration</h1></a></li> > [% END %] > >- <li><a class="accueil" id="reglages" href="/cgi-bin/koha/about.pl"><img src="/intranet-tmpl/prog/img/koha-egg.svg" alt="Koha Logo SVG"><h1>About Koha</h1></a></li> >+ <li><a class="home-page settings" href="/cgi-bin/koha/about.pl"><img src="/intranet-tmpl/prog/img/koha-egg.svg" alt="Koha Logo SVG"><h1>About Koha</h1></a></li> > </div> > </ul></div> > </div> <!-- /.row --> >@@ -230,7 +230,7 @@ > > </div> <!-- /.row --> > </div> <!-- /.container-fluid --> >- <div class="menuspebas"><div class="bas"><a target="_blank" href="https://koha-community.org/"></a></div></div> >+ <div class="koha-mainpage"><div class="koha-bottom"><a target="_blank" href="https://koha-community.org/"></a></div></div> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >index 2387339e20..33078e54db 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >@@ -131,14 +131,14 @@ > </div> > </form> > <div id="batch-manage" class="btn-toolbar"> >- <a class="btn btn-default lientype" id="additems" href="#"><i class="fa fa-plus"></i> Add item(s)</a> >+ <a class="btn btn-default" id="additems" href="#"><i class="fa fa-plus"></i> Add item(s)</a> > [% IF ( table_loop ) %] >- <a class="btn btn-default lientype" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a> >- <a class="btn btn-default lientype" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected items</a> >- <a class="btn btn-default lientype" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a> >- <a class="btn btn-default lientype" id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a> >- <a class="btn btn-default lientype" id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected items</a> >- <a class="btn btn-default lientype" id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export full batch</a> >+ <a class="btn btn-default" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a> >+ <a class="btn btn-default" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected items</a> >+ <a class="btn btn-default" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a> >+ <a class="btn btn-default" id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a> >+ <a class="btn btn-default" id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected items</a> >+ <a class="btn btn-default" id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export full batch</a> > [% END %] > </div> > [% IF ( table_loop ) %] >@@ -175,8 +175,8 @@ > [% FOREACH text_field IN table_loo.text_fields %] > [% IF ( text_field.select_field ) %] > <td> >- <a id="lientype" class="btn btn-default btn-xs delete" href="/cgi-bin/koha/labels/label-edit-batch.pl?op=remove&batch_id=[% batch_id |url %]&label_id=[% text_field.field_value |url %]"><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> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/labels/label-edit-batch.pl?op=remove&batch_id=[% batch_id |url %]&label_id=[% text_field.field_value |url %]"><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> > </td> > <td><input type="checkbox" name="action" value="[% text_field.field_value | html %]"></td> > [% ELSE %] >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 5526d9234e..0d191170c0 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 >@@ -169,7 +169,7 @@ > [% END %] > [% IF ( profile_list.size == 1 ) %] > <br> >- <a href="/cgi-bin/koha/labels/label-edit-profile.pl?op=new" id="lientype">Make a new printer profile.</a> >+ <a href="/cgi-bin/koha/labels/label-edit-profile.pl?op=new"Make a new printer profile.</a> > [% END %] > </li> > </ol> >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 40c2b33e73..81a792da53 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 >@@ -66,8 +66,8 @@ > > <div id="manage-label-layouts"> > [% IF ( table_loop ) %] >- <div id="searchresults"> > <form name="layouts" action="/cgi-bin/koha/label-manage.pl?label_element=[% label_element | html %]"> >+ <fieldset id="searchresults"> > [% IF ( label_element == 'layout' ) %] > <h3>Currently available layouts</h3> > [% ELSIF ( label_element == 'template' ) %] >@@ -108,8 +108,8 @@ > [% FOREACH text_field IN table_loo.text_fields %] > [% IF ( text_field.select_field ) %] > <td class="actions"> >- <a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/labels/label-edit-[% label_element |url %].pl?op=edit&element_id=[% text_field.field_value |url %]"><i class="fa fa-edit"></i> Edit</a> >- <a id="lientype" class="btn btn-default btn-xs delete" href="/cgi-bin/koha/labels/label-manage.pl?op=delete&label_element=[% label_element | html %]&element_id=[% text_field.field_value |url %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/labels/label-edit-[% label_element |url %].pl?op=edit&element_id=[% text_field.field_value |url %]"><i class="fa fa-edit"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/labels/label-manage.pl?op=delete&label_element=[% label_element | html %]&element_id=[% text_field.field_value |url %]"><i class="fa fa-trash"></i> Delete</a> > </td> > [% IF label_element == 'batch' %] <td><input type="checkbox" name="action" value="[% text_field.field_value | html %]" /></td>[% END %] > [% ELSIF ( text_field.field_value ) %] >@@ -125,7 +125,6 @@ > [% IF ( print ) %]<button type="button" class="btn btn-default" id="print">Export selected</button>[% END %] > </fieldset> > </form> >- </div> > [% ELSE %] > <div class="dialog message"> > <h4>There are no >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 040abcf7c7..eaf94eb312 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >@@ -24,29 +24,29 @@ > <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 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 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 xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.label_ids | html %]">Download as XML</a></p> >+ <p><a class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.label_ids | html %]">Download as XML</a></p> > [% ELSIF ( batche.item_numbers ) %] > <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 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 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 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 xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.item_numbers | html %]">Download as XML</a></p> >+ <p><a class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %][% batche.item_numbers | html %]">Download as XML</a></p> > [% ELSIF ( batche.batch_id) %] > <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><a class="document pdf" href="/cgi-bin/koha/labels/label-create-pdf.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %]">Download as PDF</a> > </p> > <p> >- <a 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> >+ <a class="document csv" href="/cgi-bin/koha/labels/label-create-csv.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]">Download as CSV</a> > </p> > <p> >- <a 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> >+ <a class="document xml" href="/cgi-bin/koha/labels/label-create-xml.pl?batch_id=[% batche.batch_id | html %]&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]">Download as XML</a></p> > [% ELSIF (batche.from && batche.to) %] > <h3>Barcodes from [% batche.from | html %] to [% batche.to | html %]</h3> > <p> >- <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> >+ <a class="document pdf" href="/cgi-bin/koha/labels/label-create-pdf.pl?batch_id=0&template_id=[% batche.template_id | html %]&layout_id=[% batche.layout_id | html %]&start_label=[% batche.start_label | html %]&from=[% batche.from | html %]&to=[% batche.to | html %]&barcode_length=[% batche.barcode_length | html %]">Download as PDF</a> > </p> > [% END %] > </fieldset> >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 4df9bba6ab..f4f9284dee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >@@ -83,7 +83,7 @@ > <td><input type="checkbox" name="action" value="[% text_field.field_value | html %]"></td> > [% ELSIF ( text_field.link_field ) %] > <td> >- <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> >+ <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> > </td> > [% ELSE %] > <td>[% text_field.field_value | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index bafed4d12d..8216f0db4b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -115,16 +115,16 @@ > [% IF account.amountoutstanding <= 0 %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding | $Price %]</td> > <td class="actions"> > [% IF ( account.is_credit ) %] >- <a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs receipt-print-action" id="lientype"><i class="fa fa-print"></i> Print</a> >+ <a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs receipt-print-action" ><i class="fa fa-print"></i> Print</a> > [% ELSE %] >- <a target="_blank" href="printinvoice.pl?action=print&accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs invoice-print-action" id="lientype"><i class="fa fa-print"></i> Print</a> >+ <a target="_blank" href="printinvoice.pl?action=print&accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs invoice-print-action" ><i class="fa fa-print"></i> Print</a> > [% END %] >- <a href="accountline-details.pl?accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs details-action" id="lientype"><i class="fa fa-list"></i> Details</a> >+ <a href="accountline-details.pl?accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs details-action" ><i class="fa fa-list"></i> Details</a> > [% IF account.is_debit && account.amountoutstanding > 0 %] > <a class="btn btn-default btn-xs pay-action" href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% account.borrowernumber | html %]&pay_individual=1&debit_type_code=[% account.debit_type_code | html %]&amount=[% account.amount | html %]&amountoutstanding=[% account.amountoutstanding | html %]&description=[% account.description | html %]&itemnumber=[% account.itemnumber | html %]&accountlines_id=[% account.accountlines_id | html %]"><i class="fa fa-money"></i> Pay</a> > [% END %] > [% IF account.is_credit && account.status != 'VOID' %] >- <a href="boraccount.pl?action=void&accountlines_id=[% account.accountlines_id | uri %]&borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs void-action" id="lientype"><i class="fa fa-ban"></i> Void payment</a> >+ <a href="boraccount.pl?action=void&accountlines_id=[% account.accountlines_id | uri %]&borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs void-action" ><i class="fa fa-ban"></i> Void payment</a> > [% END %] > [% IF account.is_debit && account.amount == account.amountoutstanding && account.status != 'CANCELLED' && !(account.debit_type_code == 'PAYOUT') %] > <form method="post" action="/cgi-bin/koha/members/cancel-charge.pl"> >@@ -138,7 +138,7 @@ > </form> > [% END %] > [% IF CAN_user_updatecharges_payout && account.is_credit && ( account.amountoutstanding < 0 ) %] >- <button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-account="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id | html %]" data-amount="[% account.amountoutstanding | $Price %]" class="btn btn-default btn-xs payout-action" id="lientype"><i class="fa fa-money"></i> Issue payout</button> >+ <button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-account="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id | html %]" data-amount="[% account.amountoutstanding | $Price %]" class="btn btn-default btn-xs payout-action" ><i class="fa fa-money"></i> Issue payout</button> > [% END %] > [% IF CAN_user_updatecharges_refund && account.is_debit && ( account.amountoutstanding != account.amount ) && !(account.status == 'REFUNDED') && !(account.debit_type_code == 'PAYOUT') %] > <button type="button" class="btn btn-default btn-xs refund-action" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id | html %]" data-amount="[% account.amount | $Price %]" data-amountoutstanding="[% account.amountoutstanding | $Price %]" data-member="[% account.borrowernumber | html %]"><i class="fa fa-money"></i> Issue refund</button> >@@ -157,7 +157,7 @@ > <td class="credit" style="text-align: right;">[% total | $Price %]</td> > <td> > [% IF CAN_user_updatecharges_payout %] >- <button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-amount="[% total | $Price %]" class="btn btn-default btn-xs payout-amount-action" id="lientype"><i class="fa fa-money"></i> Payout amount</button> >+ <button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-amount="[% total | $Price %]" class="btn btn-default btn-xs payout-amount-action" ><i class="fa fa-money"></i> Payout amount</button> > [% END %] > </td> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >index 1fcd25daa3..e4dc2ce847 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >@@ -73,7 +73,7 @@ > <td>[% f.file_type | html %]</td> > <td>[% f.file_description | html %]</td> > <td>[% f.date_uploaded | $KohaDates %]</td> >- [% IF CAN_user_borrowers_edit_borrowers %]<td><a class="btn btn-default btn-xs confirmdelete" href="?borrowernumber=[% patron.borrowernumber | html %]&op=delete&file_id=[% f.file_id | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a></td>[% END %] >+ [% IF CAN_user_borrowers_edit_borrowers %]<td><a class="btn btn-default btn-xs confirmdelete" href="?borrowernumber=[% patron.borrowernumber | html %]&op=delete&file_id=[% f.file_id | html %]"><i class="fa fa-trash"></i> Delete</a></td>[% END %] > </tr> > [% END %] > </tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >index 353118b6d0..0999c09bd0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >@@ -60,6 +60,7 @@ > [% SET show_itemtype_column = Koha.Preference('AllowHoldItemTypeSelection') %] > > <div id="holdshistory"> >+<fieldset> > <table id="table_holdshistory"> > <thead> > <tr> >@@ -125,6 +126,7 @@ > [% END %] > </tbody> > </table> >+ </fieldset> > </div> > > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >index 55a9f52916..13d1e9730e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >@@ -100,7 +100,7 @@ > [% IF ( loo.flag == "superlibrarian" ) %]<div class="hint superlibrarian-hint">This permission grants access to all areas. If selected, specific sub-permissions cannot be selected.</div>[% END %] > [% IF ( loo.sub_perm_loop ) %] > <a class="toggle-[% loo.bit | html %] togglechildren_off" href="#" data-bit="[% loo.bit | html %]"><i class="fa fa-minus-square-o"></i> Hide details</a> >- <a class="toggle-[% loo.bit | html %] togglechildren_on" href="#" data-bit="[% loo.bit | html %]" id="lientype"><i class="fa fa-plus-square-o"></i> Show details</a> >+ <a class="toggle-[% loo.bit | html %] togglechildren_on" href="#" data-bit="[% loo.bit | html %]"><i class="fa fa-plus-square-o"></i> Show details</a> > <div class="children" id="flag-[% loo.bit | html %]-children"> > [% FOREACH sub_perm_loo IN loo.sub_perm_loop %] > <div class="child-flags"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >index 2310dd51e7..aeafb533f4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -57,7 +57,7 @@ > <main> > > [% IF CAN_user_tools_manage_patron_lists %] >- <div id="patron_list_dialog" class="dialog message lientype"> >+ <div id="patron_list_dialog" class="dialog message"> > Added <span class="patrons-length"></span> patrons to <a></a>. > </div> > [% END %] >@@ -72,7 +72,7 @@ > </div> > [% END %] > >- <div id="searchresults"> >+ <fieldset id="searchresults"> > [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %] > <div class="searchheader fh-fixedHeader" id="searchheader"> > <div> >@@ -111,7 +111,7 @@ > [% columns.unshift('checkbox') | html %] > [% END %] > [% PROCESS patron_search_table table_id => 'memberresultst' columns => columns %] >- </div> >+ </fieldset> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >index b7854bd231..f585a55893 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -12,9 +12,6 @@ > [% formulaire = BLOCK %] > [% INCLUDE 'patron-search-header.inc' %] > [% END %] >-[% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >-[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% UNLESS blocking_error %] >@@ -39,7 +36,6 @@ h3:hover { > > <body id="pat_memberentrygen"s> > [% INCLUDE 'header.inc' form= formulaire %] >- [% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -1509,7 +1505,7 @@ h3:hover { > [% END %] > [% END # /IF ( patron_attribute.use_dropdown ) %] > <input type="hidden" id="[% patron_attribute.form_id | html %]_code" name="[% patron_attribute.form_id | html %]_code" value="[% patron_attribute.code | html %]" /> >- <a href="#" class="clear_attribute" id="lientype"><i class="fa fa-fw fa-trash"></i> Clear</a> >+ <a href="#" class="clear_attribute"><i class="fa fa-fw fa-trash"></i> Clear</a> > [% IF ( patron_attribute.repeatable ) %] > <a href="#" class="clone_attribute"><i class="fa fa-fw fa-plus"></i> New</a> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >index c8a6391db1..4905d5d340 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >@@ -112,7 +112,7 @@ > [% IF ( patrons.count == 2 ) %] > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <button class="btn btn-default pat" id="compare_patrons"> >+ <button class="btn btn-default toolbar-btns" id="compare_patrons"> > <i class="fa fa-arrows-h"></i> Compare patrons > </button> > </div> >@@ -206,7 +206,7 @@ > [% END %] > > [% UNLESS error %] >- <a class="btn btn-default" href="moremember.pl?borrowernumber=[% keeper.id | html %]" id="lientype">View patron record</a> >+ <a class="btn btn-default" href="moremember.pl?borrowernumber=[% keeper.id | html %]">View patron record</a> > [% END %] > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 449400109b..bd8e1bb8fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -95,7 +95,10 @@ > <div> > > >- <div id="searchresults"> >+ >+ <h1>[% INCLUDE 'patron-title.inc' no_html = 1 %]</h1> >+ <div class="col-sm-6"> >+ <fieldset> > [% IF ( was_renewed ) %] > <div class="dialog message"> > Patron's account has been renewed until [% patron.dateexpiry | $KohaDates %] >@@ -105,10 +108,7 @@ > <div id="patron_messages" class="circmessage attention"> > [% INCLUDE 'patron_messages.inc' %] > </div> >- </div> >- >- <h1>[% INCLUDE 'patron-title.inc' no_html = 1 %]</h1> >- <div class="col-sm-6"> >+ </fieldset> > <fieldset class="rows"> > > <div id="patron-information" class="patroninfo-section"> >@@ -116,9 +116,9 @@ > <div class="patroninfo-heading"> > <h3>Contact information</h3> > [% IF ( guarantor.borrowernumber ) %] >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=1&guarantorid=[% guarantor.borrowernumber | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=1&guarantorid=[% guarantor.borrowernumber | html %]" ><i class="fa fa-pencil"></i> Edit</a> > [% ELSE %] >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=1" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=1" ><i class="fa fa-pencil"></i> Edit</a> > [% END %] > </div> > >@@ -268,7 +268,7 @@ > [% IF ( housebound_role.housebound_chooser == 1 OR housebound_role.housebound_deliverer == 1 ) %] > <div class="patroninfo-heading"> > <h3>Housebound roles</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=7" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=7" ><i class="fa fa-pencil"></i> Edit</a> > </div> > <div class="rows"> > <ol> >@@ -293,7 +293,7 @@ > [% ELSE %] > <div class="patroninfo-heading"> > <h3>Housebound roles</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=7" id="lientype"><i class="fa fa-plus"></i> Add</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=7" ><i class="fa fa-plus"></i> Add</a> > </div> > [% END %] > </div> [% #/ div#houseboundroles %] >@@ -305,7 +305,7 @@ > [% IF ( attributes_loop ) %] > <div class="patroninfo-heading"> > <h3>Additional attributes and identifiers</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=4" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=4" ><i class="fa fa-pencil"></i> Edit</a> > </div> > [% FOREACH attribute IN attributes_loop %] > [% IF attribute.class %] >@@ -329,7 +329,7 @@ > [% ELSE %] > <div class="patroninfo-heading"> > <h3>Additional attributes and identifiers</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=4" id="lientype"><i class="fa fa-plus"></i> Add</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=4" ><i class="fa fa-plus"></i> Add</a> > </div> > [% END %] > </div> [% # /div#patron-extended-attributes %] >@@ -340,7 +340,7 @@ > <div id="patron-messaging-prefs" class="patroninfo-section"> > <div class="patroninfo-heading"> > <h3>Patron messaging preferences</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=5" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=5" ><i class="fa fa-pencil"></i> Edit</a> > </div> > [% INCLUDE 'messaging-preference-form.inc' %] > [% IF Koha.Preference('SMSSendDriver') %] >@@ -369,7 +369,7 @@ > <div id="patron-library-details" class="patroninfo-section"> > <div class="patroninfo-heading"> > <h3>Library use</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=3" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=3" ><i class="fa fa-pencil"></i> Edit</a> > </div> > <div class="rows"> > <ol> >@@ -405,12 +405,12 @@ > <span class="blocker"> > [% patron.dateexpiry | $KohaDates %] > <strong><em>Expired</em></strong> >- <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a> >+ <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]" >Edit details</a> > </span> > [% ELSIF ( patron.is_going_to_expire ) %] > [% patron.dateexpiry | $KohaDates %] > <strong><em>Patron expires soon</em></strong> >- <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a> >+ <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]" >Edit details</a> > [% ELSE %] > [% patron.dateexpiry | $KohaDates %] > [% END %] >@@ -511,7 +511,7 @@ > [% IF ( patron.B_phone || patron.B_email || patron.contactnote || patron.B_address || patron.B_address2 || patron.B_city || patron.B_zipcode || patron.B_country ) %] > <div class="patroninfo-heading"> > <h3>Alternate address</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=6" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=6" ><i class="fa fa-pencil"></i> Edit</a> > </div> > <div class="address"> > <ul> >@@ -545,7 +545,7 @@ > [% ELSE %] > <div class="patroninfo-heading"> > <h3 class="inline">Alternate address</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=6" id="lientype"><i class="fa fa-plus"></i> Add</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=6" ><i class="fa fa-plus"></i> Add</a> > </div> > [% END %] > </div> [% # /div#patron-alternate-address %] >@@ -554,7 +554,7 @@ > [% IF ( patron.altcontactsurname || patron.altcontactfirstname || patron.altcontactaddress1 || patron.altcontactaddress2 || patron.altcontactaddress3 || patron.altcontactstate || patron.altcontactzipcode || patron.altcontactcountry || patron.altcontactphone ) %] > <div class="patroninfo-heading"> > <h3>Alternative contact</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=2" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=2" ><i class="fa fa-pencil"></i> Edit</a> > </div> > <div class="rows"> > <ol> >@@ -618,7 +618,7 @@ > [% ELSE %] > <div class="patroninfo-heading"> > <h3>Alternative contact</h3> >- <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=2" id="lientype"><i class="fa fa-plus"></i> Add</a> >+ <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | html %]&step=2" ><i class="fa fa-plus"></i> Add</a> > </div> > [% END %] > </div> [% # /div#patron-alternative-contact %] >@@ -627,7 +627,7 @@ > <div id="patron-files" class="patroninfo-section"> > <div class="patroninfo-heading"> > <h3>Files</h3> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | uri %]" id="lientype"><i class="fa fa-list"></i> Manage</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | uri %]" ><i class="fa fa-list"></i> Manage</a> > > [% IF ( files ) %] > <div class="rows"> >@@ -774,7 +774,7 @@ > </table> > > <fieldset class="action"> >- <input type="submit" class="cancel" name="submit" value="Cancel marked holds" /> >+ <input type="submit" class="cancel principal" name="submit" value="Cancel marked holds" /> > > [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] > [% IF hold_cancellation.count %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >index 0cc4e0b490..5294f406b9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -50,7 +50,7 @@ > [% INCLUDE 'members-toolbar.inc' %] > <h2>Sent notices for [% INCLUDE 'patron-title.inc' %]</h2> > >- <div id="searchresults"> >+ <fieldset id="searchresults"> > [% IF ( QUEUED_MESSAGES ) %] > <table id="noticestable"> > <thead> >@@ -117,7 +117,7 @@ > [% ELSE %] > <div class="dialog message">There is no record of any messages that have been sent to this patron.</div> > [% END %] >- </div> >+ </fieldset> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >index e8c804b770..2af0fa38b5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >@@ -48,7 +48,7 @@ > > <div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&suggestedby=[% patron.borrowernumber | html %]&redirect=purchase_suggestions&borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> New purchase suggestion</a> >+ <a class="toolbar-btn" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&suggestedby=[% patron.borrowernumber | html %]&redirect=purchase_suggestions&borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> New purchase suggestion</a> > </div> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >index 99d714d648..df45c5d770 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >@@ -17,8 +17,7 @@ > </head> > > <body id="pat_statistics"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search-header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > [% INCLUDE 'patron-search.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >index ccfecfa745..5b34f59d3a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >@@ -75,7 +75,7 @@ > <input class="required" required="required" type="file" id="fileToUpload" size="50" name="fileToUpload" /> > <span class="required">Required</span> > </li></ol> >- <fieldset class="action"><input type="button" id="principal" class="submit" value="Upload file" id="upload_file" /></fieldset> >+ <fieldset class="action"><input type="button" class="submit principal" value="Upload file" id="upload_file" /></fieldset> > </fieldset> > </form> > <div id="fileuploadstatus" class="progress_panel" style="display:none">Upload progress: <progress id="fileuploadprogress" max="100" value="0"></progress> <span class="fileuploadpercent">0</span>%</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt >index c21b7931c3..dbdc607d10 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt >@@ -93,7 +93,7 @@ > </ol> > > <input type="hidden" name="patron_list_id" value="[% list.patron_list_id | html %]" /> >- <button type="submit" id="principal">Save</button> >+ <button type="submit" class="principal">Save</button> > <a href="lists.pl" class="cancel">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >index b080c267b9..fa2a974b8d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >@@ -141,7 +141,7 @@ > </li> > </span> > </ol> >- <button id="principal" type="submit">Submit</button> >+ <button class="principal" type="submit">Submit</button> > </fieldset> > > <div class="clearfix"></div> >@@ -159,7 +159,7 @@ > </form> > > <form action="list.pl" id="remove_patrons" method="post"> >- <div id="searchresults"> >+ <fieldset id="searchresults"> > > > <div class="searchheader" id="searchheader"> >@@ -221,7 +221,7 @@ > </table> > > <input type="hidden" name="patron_list_id" value="[% list.patron_list_id | html %]" /> >- </div> >+ </fieldset> > </form> > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >index 53ca96d473..4bf4b5a2f8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >@@ -42,15 +42,15 @@ > > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a class="pat" class="btn btn-default" href="add-modify.pl"><i class="fa fa-plus"></i> New patron list</a> >+ <a class="toolbar-btn" class="btn btn-default" href="add-modify.pl"><i class="fa fa-plus"></i> New patron list</a> > </div> > </div> > > <h2>Your patron lists</h2> > >+ <fieldset id="searchresults"> > [% IF ( lists ) %] > >- <div id="searchresults"> > > <table id="patron-lists-table"> > <thead> >@@ -79,7 +79,7 @@ > </td> > <td> > <div class="btn-group dropup"> >- <a id="lientype" class="btn btn-default btn-xs dropdown-toggle" id="listactions[% l.patron_list_id | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="listactions[% l.patron_list_id | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]"> >@@ -134,8 +134,8 @@ > [% ELSE %] > <div class="dialog message">There are no patron lists.</div> > >- </div> > [% END %] >+ </fieldset> > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >index 1a4f86fbfb..7f8b28b353 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >@@ -84,13 +84,13 @@ > </div> > </form> > <div id="batch-manage" class="action"> >- <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 %] >+ <a id="additems" href="#"><i class="fa fa-plus"></i> Add patron(s)</a>[% IF ( table_loop ) %] >+ <a id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a> >+ <a id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected patrons</a> >+ <a ="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a> >+ <a id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a> >+ <a id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected card(s)</a> >+ <a id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export card batch</a>[% END %] > </div> > [% IF ( table_loop ) %] > <fieldset id="searchresults"> >@@ -123,8 +123,8 @@ > [% FOREACH text_field IN table_loo.text_fields %] > [% IF ( text_field.select_field ) %] > <td> >- <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> >+ <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> > </td> > <td><input type="checkbox" name="action" value="[% text_field.field_value | html %]" /></td> > [% ELSE %] >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 571c856f77..1fa0b2d2f5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >@@ -115,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 %]" id="lientype"><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 %]"><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 ) %] >@@ -130,7 +130,7 @@ > </table> > <div class="action"> > <input type="hidden" name="op" value="delete" /> >- <input class="btn btn-default btn-default lientype" type="button" id="delete" value="Delete selected" /> >+ <input class="btn btn-default btn-default" type="button" id="delete" value="Delete selected" /> > </div> > [% IF ( DELETE_SUCCESSFULL ) %] > <div id="dialog" class="dialog message"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >index 028b05b62e..512745ccb9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >@@ -102,9 +102,9 @@ > [% FOREACH text_field IN table_loo.text_fields %] > [% 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 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> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/patroncards/edit-[% card_element | html %].pl?op=edit&element_id=[% text_field.field_value | html %]"><i class="fa fa-edit"></i> Edit</a> >+ [% IF ( print ) %]<a class="btn btn-default btn-xs export" data-batch-id="[% text_field.field_value |url %]" href="/cgi-bin/koha/patroncards/print.pl?batch_id=[% text_field.field_value |url %]"><i class="fa fa-share-square-o"></i> Export</a>[% END %] >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/patroncards/manage.pl?op=delete&card_element=[% card_element | html %]&element_id=[% text_field.field_value | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > [% IF ( print ) %]<td><input type="checkbox" name="action" value="[% text_field.field_value | html %]" /></td>[% END %] > [% ELSIF ( text_field.field_value ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >index a81dd5040f..05e540fc48 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 >@@ -48,10 +48,10 @@ > [% IF ( CAN_user_plugins_manage ) %] > <div class="btn-toolbar" id="toolbar"> > <div> >- <a href="/cgi-bin/koha/plugins/plugins-upload.pl" id="upload_plugin" class="pat"><i class="fa fa-upload"></i> Upload plugin</a> >+ <a href="/cgi-bin/koha/plugins/plugins-upload.pl" id="upload_plugin" class="toolbar-btn"><i class="fa fa-upload"></i> Upload plugin</a> > > <div class="btn-group"> >- <button class="pat" data-toggle="dropdown"><i class="fa fa-eye"></i> View plugins by class <span class="caret"></span></button> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-eye"></i> View plugins by class <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/plugins/plugins-home.pl">View all plugins</a></li> > <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">View report plugins</a></li> >@@ -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 lientype" id="pluginactions[% plugin.class | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" 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/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >index 1eb5acfbdc..8cf649d45a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >@@ -72,7 +72,7 @@ > > [% IF ( CAN_user_cash_management_cashup ) %] > <div id="toolbar" class="btn-toolbar"> >- <button id="pos_cashup" type="button" class="btn btn-default" data-toggle="modal" data-target="#confirmCashupModal" ><i class="fa fa-money"></i> Record cashup</button> >+ <button id="pos_cashup" type="button" class="btn btn-default toolbar-btn" data-toggle="modal" data-target="#confirmCashupModal" ><i class="fa fa-money"></i> Record cashup</button> > </div> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt >index f4565a1791..0a1277af70 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt >@@ -63,7 +63,7 @@ > > [% IF CAN_user_cash_management_cashup %] > <div id="toolbar" class="btn-toolbar"> >- <button type="button" class="cashup_all btn btn-default" data-toggle="modal" data-target="#confirmCashupAllModal"><i class="fa fa-money"></i> Cashup all</button> >+ <button type="button" class="cashup_all btn btn-default toolbar-btn" data-toggle="modal" data-target="#confirmCashupAllModal"><i class="fa fa-money"></i> Cashup all</button> > </div> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >index c684c6c7d1..b2da26d00e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >@@ -116,7 +116,7 @@ > [% IF ( start_dictionary ) %] > <div id="toolbar"> > <div> >- <a id="newdictionary" class="pat" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="fa fa-plus"></i> New definition</a> >+ <a id="newdictionary" class="toolbar-btn" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="fa fa-plus"></i> New definition</a> > </div></div> > [% END %] > <h1>Dictionary</h1> >@@ -160,13 +160,13 @@ > <td class="actions"><form method="post" action="/cgi-bin/koha/reports/dictionary.pl"> > <input type="hidden" name="id" value="[% definition.id | html %]" /> > <input type="hidden" name="phase" value="Delete Definition" /> >- <button type="submit" name="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-trash"></i> Delete</button> >+ <button type="submit" name="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> > </form></td> > </tr> > [% END %] > </table> > [% ELSE %] >- <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> >+ <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> > [% END %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index 8e7716b457..c400945a46 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 lientype" id="update_sql_button" role="button" data-toggle="modal">Update</a> >+ <a href="#" class="btn btn-default 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 --> >@@ -191,21 +191,21 @@ > [% IF ( CAN_user_reports_create_reports ) %] > <form action="/cgi-bin/koha/reports/guided_reports.pl"> > <input type="hidden" name="phase" value="Build new" /> >- <input type="submit" name="submit" id="lientype" value="Build new"/> >+ <input type="submit" name="submit" value="Build new"/> > </form> > [% END %] > > [% IF ( CAN_user_reports_execute_reports ) %] > <form action="/cgi-bin/koha/reports/guided_reports.pl"> > <input type="hidden" name="phase" value="Use saved"/> >- <input type="submit" name="submit" id="lientype" value="Use saved"/> >+ <input type="submit" name="submit" value="Use saved"/> > </form> > [% END %] > > [% IF ( CAN_user_reports_create_reports ) %] > <form action="/cgi-bin/koha/reports/guided_reports.pl"> > <input type="hidden" name="phase" value="Create report from SQL"/> >- <input type="submit" name="submit" id="lientype" value="Create report from SQL"/> >+ <input type="submit" name="submit" value="Create report from SQL"/> > </form> > [% END %] > >@@ -213,7 +213,7 @@ > <p>Use the reports dictionary to define custom criteria to use in your reports</p> > <form action="/cgi-bin/koha/reports/dictionary.pl"> > <input type="hidden" name="phase" value="View Dictionary"/> >- <input type="submit" name="submit" id="lientype" value="View dictionary"/> >+ <input type="submit" name="submit" value="View dictionary"/> > </form> > [% END # /IF (start) %] > >@@ -245,7 +245,7 @@ > [% IF ( filters.keyword ) %] > <span class="filter_keyword"><strong>Keyword:</strong> [% filters.keyword | html %]</span> > [% END %] >- <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> >+ <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> > </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" id="lientype" 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" 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 lientype" role="button" >+ <a class="btn btn-default btn-xs" 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 lientype" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown" >+ class="btn btn-default btn-xs dropdown-toggle" 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> >@@ -422,7 +422,7 @@ > > [% IF ( CAN_user_reports_delete_reports ) %] > <fieldset class="action"> >- <input id="lientype" type="submit" value="Delete selected" /> >+ <input type="submit" value="Delete selected" /> > </fieldset> > [% END %] > </form> >@@ -437,12 +437,12 @@ > [% IF ( CAN_user_reports_create_reports ) %] > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get"> > <input type="hidden" name="phase" value="Build new" /> >- <button id="lientype" type="submit" class="new"><i class="fa fa-plus"></i> New guided report</button> >+ <button type="submit" class="new"><i class="fa fa-plus"></i> New guided report</button> > </form> > > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get"> > <input type="hidden" name="phase" value="Create report from SQL" /> >- <button id="lientype" type="submit" class="new"><i class="fa fa-plus"></i> New SQL report</button> >+ <button type="submit" class="new"><i class="fa fa-plus"></i> New SQL report</button> > </form> > > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get"> >@@ -455,7 +455,7 @@ > [% 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" id="lientype">Build a new report?</a> >+ <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new" >Build a new report?</a> > [% END %] > [% END # IF (filter_set || filters.date || filters.author || filters.keyword) %] > </div> <!-- /.dialog.message --> >@@ -936,8 +936,8 @@ > </div> > > <div> >- <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> >+ <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> > </div> > <div id="chart" class="clearfix"></div> > >@@ -1153,9 +1153,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 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><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 role="separator" class="divider"></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> >+ <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> > </ul> > </div> > </td> >@@ -1164,9 +1164,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 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><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 role="separator" class="divider"></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> >+ <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> > </ul> > </div> > </td> >@@ -1175,11 +1175,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 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><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 role="separator" class="divider"></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><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 role="separator" class="divider"></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> >+ <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> > </ul> > </div> > </td> >@@ -1188,7 +1188,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 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> >+ <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> > </ul> > </div> > </td> >@@ -1406,7 +1406,7 @@ > [% ELSE %] > [% END %] > <div id="onerror_actions"> >- <a id="lientype" href="#" class="button goback">Return to previous page</a> >+ <a href="#" class="button goback">Return to previous page</a> > </div> > [% END %] > </div> >@@ -1422,39 +1422,37 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- <div id="filters"> > [% IF ( saved1 ) %] > <div id="saved-reports-filter"> > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get"> > <input type="hidden" name="phase" value="Use saved" /> > <input type="hidden" name="filter_set" value="1" /> >- <fieldset class="brief"> >- <h4>Filter</h4> >+ <fieldset class="sidebar"> >+ <h3>Filter</h3> > <ol> > <li> >- <p for="filter_date">Date: >+ <label for="filter_date">Date:</label> > <input type="text" id="filter_date" name="filter_date" size="10" value="[% filters.date | html %]" class="flatpickr" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > <li> >- <p for="filter_author">Author: >- <input type="text" id="filter_author" name="filter_author" value="[% filters.author | html %]" size="16" /></p> >+ <label for="filter_author">Author:</label> >+ <input type="text" id="filter_author" name="filter_author" value="[% filters.author | html %]" size="16" /> > </li> > <li> >- <p for="filter_keyword">Keyword: >- <input type="text" id="filter_keyword" name="filter_keyword" value="[% filters.keyword | html %]" size="16" /></p> >+ <label for="filter_keyword">Keyword:</label> >+ <input type="text" id="filter_keyword" name="filter_keyword" value="[% filters.keyword | html %]" size="16" /> > </li> > </ol> > <fieldset class="action"> > <input type="submit" class="principal" value="Apply filter" /> > <a id="resetReportsFilter" class="lientype" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&clear_filters=1">Clear</a> > </fieldset> >- </fieldset> <!-- /.brief --> >+ </fieldset> <!-- /.sidebar --> > </form> > </div> <!-- /#saved-reports-filter --> > [% END %] > [% INCLUDE 'guided-reports-view.inc' %] >- </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >index 91f1b3b271..8b7d72340b 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 >@@ -46,14 +46,14 @@ > <input name="filter_set" value="1" type="hidden"> > [% IF ( CAN_user_reports_create_reports ) %] > <p> >- <a id="lientype" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new"><i class="fa fa-code-fork"></i> Create guided report</a> >+ <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new"><i class="fa fa-code-fork"></i> Create guided report</a> > </p> > <p> >- <a id="lientype" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL"><i class="fa fa-plus"></i> Create from SQL</a> >+ <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL"><i class="fa fa-plus"></i> Create from SQL</a> > </p> > [% END %] > <p> >- <a id="lientype" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved"><i class="fa fa-list"></i> Use saved</a> >+ <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved"><i class="fa fa-list"></i> Use saved</a> > </p> > <label for="filter_keyword">Search by keyword:</label> <input id="filter_keyword" name="filter_keyword" value="" size="16" type="text" /> <input value="Search" class="principal" type="submit" /> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 275fe90e53..4d10bc52b4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -13,6 +13,9 @@ > [% USE TablesSettings %] > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'circ-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% SET libraries = Branches.all %] > [% SET categories = Categories.all.unblessed %] >@@ -93,8 +96,7 @@ > > <body id="circ_request" class="catalog"> > >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'circ-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > [% UNLESS ( multi_hold ) %] > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -114,6 +116,12 @@ > </a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > [% ELSE %] > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >@@ -142,6 +150,12 @@ > [% END %] > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > [% END # UNLESS multi_hold %] > >@@ -336,7 +350,7 @@ > [% END %] > [% UNLESS ( multi_hold ) %] > <fieldset class="action"> >- <input type="submit" value="Place hold" /> >+ <input type="submit" class="principal" value="Place hold" /> > </fieldset> > [% ELSE %] > <table id="requesttitles"> >@@ -632,7 +646,7 @@ > [% ELSIF ( none_available ) %] > <button type="submit" disabled="disabled" class="btn btn-default btn-disabled">Place hold</button> > [% ELSE %] >- <button type="submit" class="btn btn-default">Place hold</button> >+ <button type="submit" class="btn btn-default principal">Place hold</button> > [% END %] > [% END %] > </fieldset> >@@ -961,9 +975,9 @@ > [% ELSIF ( no_bibs_available ) %] > <button type="submit" class="btn btn-default btn-disabled" disabled="disabled">Place holds</button> > [% ELSIF ( none_available ) %] >- <button type="submit" class="btn btn-default">Place holds</button> >+ <button type="submit" class="btn btn-default principal">Place holds</button> > [% ELSE %] >- <button type="submit" class="btn btn-default" id="multi_hold_submit">Place holds</button> >+ <button type="submit" class="btn btn-default principal" id="multi_hold_submit">Place holds</button> > [% END %] > [% ELSE %] > [% IF ( override_required ) %] >@@ -971,7 +985,7 @@ > [% ELSIF ( none_available ) %] > <button type="submit" class="btn btn-default btn-disabled" disabled="disabled">Place hold</button> > [% ELSE %] >- <button type="submit" class="btn btn-default">Place hold</button> >+ <button type="submit" class="btn btn-default principal">Place hold</button> > [% END %] > [% END %] > [% END # /IF patron %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >index 23d7db419e..d159cd33ea 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 >@@ -49,7 +49,7 @@ > <h1>Add/remove items from collection</h1> > <div class="dialog message"> > <p>Invalid collection id</p> >- <p><a id="lientype" href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> >+ <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> > </div> > [% ELSE %] > [% INCLUDE 'rotating-collections-toolbar.inc' %] >@@ -137,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 id="lientype" href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId | uri %]&barcode=[% collectionItemsLoo.barcode | uri %]&removeItem=1&action=addItem">Remove</a></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> > </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 71e196b84a..cc88aefa55 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 id="lientype" href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> >+ <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> > </div> > [% ELSE %] > <div class="dialog alert"> >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 582b6f14eb..b8f715fed5 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 >@@ -63,7 +63,7 @@ > <td>[% Branches.GetName( collectionsLoo.colBranchcode ) | html %]</td> > <td> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs" id="lientype" dropdown-toggle" id="collectionsactions[% collectionsLoo.colId | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs" 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> >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 164a59a44d..6c36db25bd 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 >@@ -63,12 +63,12 @@ > [% IF ( transferSuccess ) %] > <div class="dialog message"> > <p>Collection transferred successfully</p> >- <p><a id="lientype" href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> >+ <p><a 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 id="lientype" href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> >+ <p><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Return to rotating collections home</a></p> > </div> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >index b898d32899..abdcf6832d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >@@ -365,60 +365,58 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- <div id="filters"> > [% IF ( done_searched ) %] > [% UNLESS ( mana ) %] >- <div id="advsearch"> > <form action="/cgi-bin/koha/serials/serials-search.pl" method="get"> >- <fieldset class="brief"> >- <h4>Search subscriptions</h4> >+ <fieldset class="sidebr"> >+ <h3>Search subscriptions</h3> > <ol> > <li> >- <p for="issn">ISSN: >- <input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter | html %]" /></p> >+ <label for="issn">ISSN:</label> >+ <input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter | html %]" /> > </li> > <li> >- <p for="title">Title: >- <input type="text" id="title" name="title_filter" value="[% title_filter | html %]" /></p> >+ <label for="title">Title:</label> >+ <input type="text" id="title" name="title_filter" value="[% title_filter | html %]" /> > </li> > [% IF ( marcflavour == "UNIMARC" ) %] > <li> >- <p for="ean">EAN: >- <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter | html %]" /></p> >+ <label for="ean">EAN:</label> >+ <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter | html %]" /> > </li> > [% END %] > <li> >- <p for="callnumber">Call number: >- <input type="text" id="callnumber" name="callnumber_filter" value="[% callnumber_filter | html %]" /></p> >+ <label for="callnumber">Call number:</label> >+ <input type="text" id="callnumber" name="callnumber_filter" value="[% callnumber_filter | html %]" /> > </li> > <li> >- <p for="publisher">Publisher: >- <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" /></p> >+ <label for="publisher">Publisher:</label> >+ <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" /> > </li> > <li> >- <p for="bookseller">Vendor: >- <input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter | html %]" /></p> >+ <label for="bookseller">Vendor:</label> >+ <input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter | html %]" /> > </li> > <li> >- <p for="branch">Library: >+ <label for="branch">Library:</label> > <select id="branch" name="branch_filter"> > <option value="">All</option> > [%# FIXME Should not we filter the libraries? %] > [% PROCESS options_for_libraries libraries => Branches.all( selected => branch_filter, unfiltered => 1 ) %] >- </select></p> >+ </select> > </li> > <li> > <p for="location">Location: > [% PROCESS 'av-build-dropbox.inc' name="location_filter", category="LOC", default=location_filter, all=1 %]</p> > </li> > <li> >- <p for="to">Expires before: >+ <label for="to">Expires before:</label> > <input type="text" id="to" name="expiration_date_filter" value="[% expiration_date_filter | $KohaDates %]" size="10" maxlength="10" class="flatpickr" /> >- </p></li> >+ </li> > > [% FOR field IN additional_fields_for_subscription %] > <li> >- <p for="additional_field_[% field.id | html %]ID"> [% field.name | html %]: >+ <label for="additional_field_[% field.id | html %]ID"> [% field.name | html %]: </label> > [% IF field.authorised_value_category %] > <select id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]"> > <option value="">All</option> >@@ -432,7 +430,7 @@ > </select> > [% ELSE %] > <input id="additional_field_[% field.id | html %]" type="text" value="[% additional_field_filters.${field.id} | html %]" name="additional_field_[% field.id | html %]" /> >- [% END %]</p> >+ [% END %] > </li> > [% END %] > </ol> >@@ -441,13 +439,11 @@ > <input type="submit" class="principal" value="Search" /> > </fieldset> > >- </fieldset> <!-- /.brief --> >+ </fieldset> <!-- /.sidebar --> > </form> >- </div> <!-- /#advsearch --> > [% END # / UNLESS ( mana ) %] > [% END # / IF ( done_searched ) %] > [% INCLUDE 'serials-menu.inc' %] >- </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >index beb459d76a..0b260a1837 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >@@ -93,7 +93,7 @@ fieldset.rows table { clear: none; margin: 0; } > [% END %] > <li> > <label for="aqbooksellerid">Vendor: </label> >- <input type="text" name="aqbooksellerid" id="aqbooksellerid" value="[% aqbooksellerid | html %]" size="8" /> (<input type="text" name="aqbooksellername" id="aqbooksellername" value="[% aqbooksellername | html %]" disabled="disabled" readonly="readonly" />) <a id="lientype" href="#" id="vendor_search"><i class="fa fa-search"></i> Search for a vendor</a> >+ <input type="text" name="aqbooksellerid" id="aqbooksellerid" value="[% aqbooksellerid | html %]" size="8" /> (<input type="text" name="aqbooksellername" id="aqbooksellername" value="[% aqbooksellername | html %]" disabled="disabled" readonly="readonly" />) <a href="#" id="vendor_search"><i class="fa fa-search"></i> Search for a vendor</a> > </li> > <li> > <label for="biblionumber" class="required">Record:</label> >@@ -101,12 +101,12 @@ fieldset.rows table { clear: none; margin: 0; } > (<input type="text" name="title" value="[% bibliotitle | html %]" disabled="disabled" readonly="readonly" />) <span class="required" title="Subscriptions must be associated with a bibliographic record">Required</span> > <span id="error_bib_not_exist"></span> > <div class="hint">Subscriptions must be associated with a bibliographic record</div> >- <div class="inputnote"> <a class="lientype" href="#" id="record_search"><i class="fa fa-search"></i> Search for record</a> >+ <div class="inputnote"> <a href="#" id="record_search"><i class="fa fa-search"></i> Search for record</a> > [% IF ( CAN_user_editcatalogue ) %] > [% IF ( modify ) %] >- | <a class="lientype" href="#" id="biblio_add_edit" data-biblionumber="[% bibnum | html %]"><i class="fa fa-pencil"></i> Edit record</a> >+ | <a href="#" id="biblio_add_edit" data-biblionumber="[% bibnum | html %]"><i class="fa fa-pencil"></i> Edit record</a> > [% ELSE %] >- | <a class="lientype" href="#" id="biblio_add_edit"><i class="fa fa-plus"></i> Create record</a> >+ | <a href="#" id="biblio_add_edit"><i class="fa fa-plus"></i> Create record</a> > [% END %] > [% END %] > </div> >@@ -191,7 +191,7 @@ fieldset.rows table { clear: none; margin: 0; } > <div class="hint">Selecting a notice will allow patrons to subscribe to notifications when a new issue is received.</div> > [% ELSE %] > <span class="label">Patron notification: </span> >- <div class="hint">To notify patrons of new serial issues, you must <a id="lientype" href="/cgi-bin/koha/tools/letter.pl">define a notice</a>.</div> >+ <div class="hint">To notify patrons of new serial issues, you must <a href="/cgi-bin/koha/tools/letter.pl">define a notice</a>.</div> > [% END %] > </li> > <li> >@@ -419,8 +419,8 @@ fieldset.rows table { clear: none; margin: 0; } > </li> > <li> > <span class="label"> </span> >- <a id="lientype" href="#" class="toggle_advanced_pattern show_advanced_pattern"><i class="fa fa-plus-square"></i> Show advanced pattern</a> >- <a id="lientype" href="#" style="display:none;" class="toggle_advanced_pattern hide_advanced_pattern"><i class="fa fa-minus-square"></i> Hide advanced pattern</a> >+ <a href="#" class="toggle_advanced_pattern show_advanced_pattern"><i class="fa fa-plus-square"></i> Show advanced pattern</a> >+ <a href="#" style="display:none;" class="toggle_advanced_pattern hide_advanced_pattern"><i class="fa fa-minus-square"></i> Hide advanced pattern</a> > </li> > </ol> > >@@ -511,7 +511,7 @@ fieldset.rows table { clear: none; margin: 0; } > </li> > <li> > <span class="label"> </span> >- <a id="lientype" href="#" id="modifyadvancedpatternbutton"><i class="fa fa-pencil"></i> Modify pattern</a> >+ <a href="#" id="modifyadvancedpatternbutton"><i class="fa fa-pencil"></i> Modify pattern</a> > <button type="button" class="btn btn-default btn-xs principal" id="saveadvancedpatternbutton" style="display:none"><i class="fa fa-save"></i> Save as new pattern</button> > <a class="cancel" href="#" id="restoreadvancedpatternbutton" style="display:none">Cancel modifications</a> > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >index 765a71b070..46a06146ee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >@@ -165,8 +165,8 @@ > <td>[% frequency.unitsperissue | html %]</td> > <td>[% frequency.displayorder | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" id="lientype" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=modify&frequencyid=[% frequency.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="delete_frequency btn btn-default btn-xs" id="lientype" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=del&frequencyid=[% frequency.id | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=modify&frequencyid=[% frequency.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="delete_frequency btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=del&frequencyid=[% frequency.id | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt >index c440dd3813..bae62de2d3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt >@@ -65,7 +65,7 @@ > > <div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="newnumberpattern" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=new"><i class="fa fa-plus"></i> New numbering pattern</a> >+ <a class="toolbar-btn" id="newnumberpattern" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=new"><i class="fa fa-plus"></i> New numbering pattern</a> > </div> > </div> > >@@ -318,8 +318,8 @@ > <td>[% numberpattern.numberingmethod | html %]</td> > <td>[% numberpattern.displayorder | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" id="lientype" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=modify&id=[% numberpattern.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="delete_pattern btn btn-default btn-xs" id="lientype" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=del&id=[% numberpattern.id | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=modify&id=[% numberpattern.id | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="delete_pattern btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=del&id=[% numberpattern.id | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >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 b911222835..fcfd9d9067 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -34,7 +34,7 @@ > font-size: 80%; > text-decoration: none; > } >- fieldset.brief ol { >+ fieldset.sidebar ol { > display: none; > } > .overlay { >@@ -667,7 +667,7 @@ > [% 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> >+ <a class="toolbar-btn" id="newsuggestion" href="suggestion.pl?op=add&branchcode=[% branchcode | uri %]"><i class="fa fa-plus"></i> New purchase suggestion</a> > </div> > </div> > >@@ -736,7 +736,7 @@ > > [% 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"> >@@ -857,7 +857,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=[% s.suggestionid | html %]&op=edit"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle lientype" id="more_actions_[% s.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=[% 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> > <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 %] >@@ -935,12 +935,12 @@ > <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" value="update_status">Submit</button> > </fieldset> > <input type="hidden" name="branchcode" value="[% branchfilter | html %]" /> > <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" /> > <fieldset class="action"> >- <button type="submit" class="btn btn-default btn-xs" id="lientype" value="update_status">Submit</button> >+ <button type="submit" class="btn btn-default btn-xs" value="update_status">Submit</button> > </fieldset> > </div> <!-- /.col-sm-4 --> > >@@ -953,7 +953,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" value="update_itemtype">Submit</button> > </fieldset> > </fieldset> > </div> <!-- /.col-sm-4 --> >@@ -967,7 +967,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_manager">Submit</button> >+ <button type="submit" class="btn btn-default btn-xs" value="update_manager">Submit</button> > </fieldset> > </fieldset> > </div> <!-- /.col-sm-2 --> >@@ -978,7 +978,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="delete">Delete</button> >+ <button type="submit" class="btn btn-default btn-xs" value="delete">Delete</button> > </fieldset> > </fieldset> > </div> <!-- /.col-sm-2 --> >@@ -1003,10 +1003,9 @@ > > <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"> >+ <fieldset class="sidebar"> > <ol style="display:block;"> > <li> > <label for="displayby">Organize by: >@@ -1040,42 +1039,42 @@ > <input class="principal" type="submit" value="Go" /> > </li> > </ol> >- </fieldset> <!-- /.brief --> >+ </fieldset> <!-- /.sidebar --> > >- <h4>Filter by: <a id="lientype" style="font-size:80%;font-weight:normal;" href="/cgi-bin/koha/suggestion/suggestion.pl">[clear]</a></h4> >+ <h4>Filter by: <a style="font-size:80%;font-weight:normal;" href="/cgi-bin/koha/suggestion/suggestion.pl">[clear]</a></h4> > > <div id="limits"> >- <fieldset class="brief"> >+ <fieldset class="sidebar"> > <h4 class="local_collapse"><a href="#">Bibliographic information <span class="caret"></span></a></h4> > <ol> > <li> >- <p for="title"> Title: >- <input type="text" id="title" name="title" value="[% title | html %]" /></p> >+ <label for="title"> Title:</label> >+ <input type="text" id="title" name="title" value="[% title | html %]" /> > </li> > <li> >- <p for="author"> Author: >- <input type="text" id="author" name="author" value="[% author | html %]" /></p> >+ <label for="author"> Author:</label> >+ <input type="text" id="author" name="author" value="[% author | html %]" /> > </li> > <li> >- <p for="isbn"> ISBN: >- <input type="text" id="isbn" name="isbn" value="[% isbn | html %]" /></p> >+ <label for="isbn"> ISBN:</label> >+ <input type="text" id="isbn" name="isbn" value="[% isbn | html %]" /> > </li> > <li> >- <p for="publishercode"> Publisher: >- <input type="text" id="publishercode" name="publishercode" value="[% publishercode | html %]" /></p> >+ <label for="publishercode"> Publisher:</label> >+ <input type="text" id="publishercode" name="publishercode" value="[% publishercode | html %]" /> > </li> > <li> >- <p for="copyrightdate_filter"> Copyright date: >- <input type="text" id="copyrightdate_filter" name="copyrightdate" value="[% copyrightdate | html %]" /></p> >+ <label for="copyrightdate_filter"> Copyright date:</label> >+ <input type="text" id="copyrightdate_filter" name="copyrightdate" value="[% copyrightdate | html %]" /> > </li> > <li> >- <p for="collectiontitle"> Collection title: >+ <label for="collectiontitle"> Collection title:</label> > <input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle | html %]" /></li><li><input class="principal" type="submit" value="Go" /> >- </p></li> >+ </li> > </ol> >- </fieldset> <!-- /.brief --> >+ </fieldset> <!-- /.sidebar --> > >- <fieldset class="brief"> >+ <fieldset class="sidebar"> > <h4 class="local_collapse"><a href="#">Suggestion information <span class="caret"></span></a></h4> > <ol> > <li> >@@ -1088,7 +1087,7 @@ > </label> > </li> > <li> >- <p for="STATUS[% loop.index | html %]"> Status: >+ <label for="STATUS[% loop.index | html %]"> Status:</label> > <select name="STATUS" id="STATUS[% loop.index | html %]"> > <option value="">Any</option> > [% IF (statusselected_ASKED ) %] >@@ -1128,11 +1127,11 @@ > <option value="[% s.authorised_value | html %]">[% s.lib | html %]</option> > [% END %] > [% END %] >- </select></p> >+ </select> > </li> > > <li> >- <p for="suggestedby"> Suggested by: >+ <label for="suggestedby"> Suggested by:</label> > <select id="suggestedby" name="suggestedby"> > <option value="">Any</option> > [% FOREACH suggestedby_loo IN suggestedby_loop %] >@@ -1142,18 +1141,18 @@ > <option value="[% suggestedby_loo.code | html %]">[% suggestedby_loo.desc | html %]</option> > [% END %] > [% END %] >- </select></p> >+ </select> > </li> > <li> >- <p for="suggesteddate_from">Suggested date from: >+ <label for="suggesteddate_from">Suggested date from:</label> > <input type="text" id="suggesteddate_from" size="10" name="suggesteddate_from" value="[% suggesteddate_from | html %]" data-date_to="suggesteddate_to" class="flatpickr" /> >- </p></li> >+ </li> > <li> >- <p for="suggesteddate_to">To: >+ <label for="suggesteddate_to">To:</label> > <input type="text" id="suggesteddate_to" size="10" name="suggesteddate_to" value="[% suggesteddate_to | html %]" class="flatpickr" /> >- </p></li> >+ </li> > <li> >- <p for="managedby"> Managed by: >+ <label for="managedby"> Managed by:</label> > <select id="managedby" name="managedby"> > <option value="">Any</option> > [% FOREACH managedby_loo IN managedby_loop %] >@@ -1163,18 +1162,18 @@ > <option value="[% managedby_loo.code | html %]">[% managedby_loo.desc | html %]</option> > [% END %] > [% END %] >- </select></p> >+ </select> > </li> > <li> >- <p for="manageddate_from">Management date from: >+ <label for="manageddate_from">Management date from:</label> > <input type="text" id="manageddate_from" size="10" name="manageddate_from" value="[% manageddate_from | html %]" data-date_to="manageddate_to" class="flatpickr" /> >- </p></li> >+ </li> > <li> >- <p for="manageddate_to">To: >+ <label for="manageddate_to">To:</label> > <input type="text" id="manageddate_to" size="10" name="manageddate_to" value="[% manageddate_to | html %]" class="flatpickr" /> >- </p></li> >+ </li> > <li> >- <p for="acceptedby"> Accepted by: >+ <label for="acceptedby"> Accepted by:</label> > <select id="acceptedby" name="acceptedby"> > <option value="">Any</option> > [% FOREACH acceptedby_loo IN acceptedby_loop %] >@@ -1185,28 +1184,28 @@ > [% END %] > [% END %] > </select> >- </p></li> >+ </li> > <li> >- <p for="accepteddate_from">Accepted date from: >+ <label for="accepteddate_from">Accepted date from:</label> > <input type="text" id="accepteddate_from" size="10" name="accepteddate_from" value="[% accepteddate_from | html %]" data-date_to="accepteddate_to" class="flatpickr" /> >- </p></li> >+ </li> > <li> >- <p for="accepteddate_to">To: >+ <label for="accepteddate_to">To:</label> > <input type="text" id="accepteddate_to" size="10" name="accepteddate_to" value="[% accepteddate_to | html %]" class="flatpickr" /> >- </p></li> >+ </li> > <li> > <input class="principal" type="submit" value="Go" /> > </li> > </ol> > </fieldset> > >- <fieldset class="brief"> >+ <fieldset class="sidebar"> > <h4 class="local_collapse"> > <a href="#">Acquisition information <span class="caret"></span></a> > </h4> > <ol> > <li> >- <p for="budgetid"> Book fund: >+ <label for="budgetid"> Book fund:</label> > <select name="budgetid" id="budgetid"> > <option value="__ANY__">Any</option> > [% IF budgetid == '__NONE__' %] >@@ -1221,7 +1220,7 @@ > <option value="[% budgetsloo.budget_id | html %]">[% budgetsloo.budget_name | html %]</option> > [% END %] > [% END %] >- </select></p> >+ </select> > </li> > <li> > <input class="principal" type="submit" value="Go" /> >@@ -1232,7 +1231,6 @@ > </form> <!-- /suggestionsfilter --> > > [% INCLUDE 'acquisitions-menu.inc' %] >- </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > [% END # /UNLESS ( op == 'show' ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index c994340999..936bb596a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -176,7 +176,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > </div> > <div class="col-sm-2 col-sm-push-2"> > <aside> >- <fieldset class="brief"> >+ <fieldset class="sidebar"> > <h4>Terms summary</h4> > <ul> > <li><a href="/cgi-bin/koha/tags/review.pl?approved=1">Approved</a>: >@@ -194,7 +194,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > </ul> > <span id="terms_summary_status"> </span> > </fieldset> >- <fieldset class="brief"> >+ <fieldset class="sidebar"> > <h4>Check lists</h4> > <div class="description">Enter a word or phrase to check against approved/rejected lists: </div> > <form method="post" action="/cgi-bin/koha/tags/review.pl"> >@@ -219,7 +219,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > <aside> > <div id="filters"> > <form method="post" action="/cgi-bin/koha/tags/review.pl"> >-<fieldset class="brief"> >+<fieldset class="sidebar"> > <h4>Filters</h4> > <ol> > <li><p for="tag">Term:<input type="text" name="tag" id="tag" value="[% filter_tag | html %]" /></p> >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 7643e4fa9a..e56629d3c0 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 >@@ -127,44 +127,40 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- <div id="filters"> > <form action="/cgi-bin/koha/tools/additional-contents.pl" method="get"> >- <fieldset class="brief"> >- <h4>Filter</h4> >+ <fieldset class="sidebar"> >+ <h3>Filter</h3> > >- <fieldset> > <ol> > <li> >- <p for="news_keyword">Keyword: >- <input type="text" name="news_keyword" id="news_keyword" /></p> >+ <label for="news_keyword">Keyword:</label> >+ <input type="text" name="news_keyword" id="news_keyword" /> > </li> > <li> >- <p for="news_display_location">Display location: >+ <label for="news_display_location">Display location:</label> > <select name="news_display_location" id="news_display_location"> > <option value="">All</option> > [% PROCESS locations_options category => category %] >- </select></p> >+ </select> > </li> > <li> >- <p for="news_library">Library: >+ <label for="news_library">Library: </label> > <select id="news_library" name="news_library"> > <option value=""></option> > <option value="">All libraries</option> > [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %] >- </select></p> >+ </select> > </li> > <li> >- <p> >+ <label> > <input type="checkbox" name="show_expired" id="show_expired" /> Show expired >- </p> >+ </label> > </li> > </ol> >- </fieldset> > </fieldset> > </form> > > [% INCLUDE 'tools-menu.inc' %] >- </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > [% END %] >@@ -260,7 +256,6 @@ > </fieldset> > > [% IF languages.size %] >- <div id="searchresults"> > <div id="tabs" class="toptabs"> > <fieldset id="searchresults"> > <ul class="nav nav-tabs" role="tablist"> >@@ -299,7 +294,6 @@ > <textarea name="content" id="content_default" data-lang="[% language.lang | html %]" cols="75" rows="10">[% additional_content.content | html %]</textarea> > </div> > </div> >- </div> > [% END %] > </form> > [% END %] >@@ -308,8 +302,8 @@ > > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&category=[% category | uri %]&editmode=[% editmode | uri %]" class="pat" id="newentry"> <i class="fa fa-plus"></i> New entry</a> >- <button class="pat fleche dropdown-toggle" data-toggle="dropdown"> >+ <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&category=[% category | uri %]&editmode=[% editmode | uri %]" class="toolbar-btn word" id="newentry"> <i class="fa fa-plus"></i> New entry</a> >+ <button class="toolbar-btn arrow dropdown-toggle" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu pull-right"> >@@ -326,18 +320,18 @@ > > <h2>Additional contents ([% IF category == 'news' %]News[% ELSE %]HTML customizations[% END %])</h2> > [% IF category == 'news' %] >- See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations" id="lientype">HTML customizations</a> >+ See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations" >HTML customizations</a> > [% ELSE %] >- See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news" id="lientype">News</a> >+ See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news" >News</a> > [% END %] > [% IF ( CAN_user_parameters_manage_sysprefs ) %] >- <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserJS' id="lientype">OPACUserJS</a> >- <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserCSS' id="lientype">OPACUserCSS</a> >+ <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserJS' >OPACUserJS</a> >+ <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserCSS' >OPACUserCSS</a> > [% END %] > > [% IF additional_contents.count %] >- <div id="searchresults"> > <form id="del_form" method="post" action="/cgi-bin/koha/tools/additional-contents.pl"> >+ <fieldset> > <table id="table_additional_contents"> > <thead> > <tr> >@@ -384,7 +378,7 @@ > <td>[% IF ( c.author) %][% INCLUDE 'patron-title.inc' patron=c.author %][% END %]</td> > <td> > <div class="btn-group"> >- <a class="preview_news btn btn-default btn-xs" data-number="[% loop.count | html %]" id="lientype"><i class="fa fa-eye" aria-hidden="true"></i> Preview content</a> >+ <a class="preview_news btn btn-default btn-xs" data-number="[% loop.count | html %]" ><i class="fa fa-eye" aria-hidden="true"></i> Preview content</a> > </div> > <div id="contentModal[% loop.count | html %]" class="modal" tabindex="-1" role="dialog" data-number="[% loop.count | html %]"> > <div class="modal-dialog" role="document"> >@@ -403,8 +397,8 @@ > </td> > <td class="actions"> > <div class="btn-group dropup"> >- <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&id=[% c.idnew | uri %]&editmode=[% editmode | uri %]" class="btn btn-default btn-xs" id="lientype"> <i class="fa fa-pencil"></i> Edit</a> >- <button class="btn btn-default btn-xs dropdown-toggle" id="lientype" data-toggle="dropdown"> >+ <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&id=[% c.idnew | uri %]&editmode=[% editmode | uri %]" class="btn btn-default btn-xs" > <i class="fa fa-pencil"></i> Edit</a> >+ <button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu pull-right"> >@@ -418,7 +412,7 @@ > </ul> > </div> > <div class="btn-group"> >- <a href="#" class="delete_news btn btn-default btn-xs" data-idnew="[% c.idnew | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> >+ <a href="#" class="delete_news btn btn-default btn-xs" data-idnew="[% c.idnew | html %]" ><i class="fa fa-trash"></i> Delete</a> > </div> > </td> > </tr> >@@ -428,6 +422,7 @@ > <input type="hidden" name="op" value="delete_confirmed" /> > <input type="hidden" name="category" value="[% category | html %]" /> > <fieldset class="action"><input type="submit" class="button principal" value="Delete selected" /></fieldset> >+</fieldset> > </form> > <form action="/cgi-bin/koha/tools/additional-contents.pl" method="post" id="delete_single"> > <input type="hidden" id="del_op" name="op" value="delete_confirmed" /> >@@ -437,7 +432,6 @@ > [% ELSE %] > <div class="dialog message">There are no additional contents.</div> > [% END %] >-</div> > [% END %] > > [% BLOCK locations_options %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >index c26b9b92bf..5dbb3a3089 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 >@@ -55,7 +55,7 @@ > <form method="post" id="rules_form" action="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"> > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <button class="pat add_rule"><i class="fa fa-plus"></i> Add rule</button> >+ <button class="toolbar-btn add_rule"><i class="fa fa-plus"></i> Add rule</button> > </div> > <div class="btn-group"> > <button type="submit" id="save_rules" class="principal"><i class="fa fa-save"></i> Save</button> >@@ -69,12 +69,12 @@ > [% IF ( rules ) %] > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a class="pat" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-pencil"></i> Edit rules</a> >+ <a class="toolbar-btn" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-pencil"></i> Edit rules</a> > </div></div> > [% ELSE %] > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a class="pat" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-plus"></i> Add rules</a> >+ <a class="toolbar-btn" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-plus"></i> Add rules</a> > </div></div> > [% END %] > <h1>Automatic item modifications by age</h1> >@@ -132,8 +132,8 @@ > </select> > = > <input type="text" value="[% condition.value | html %]" name="condition_value_[% id | html %]" /> >- <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> >+ <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> > </div> > [% END %] > </div> >@@ -153,8 +153,8 @@ > </select> > = > <input type="text" value="[% substitution.value | html %]" name="substitution_value_[% id | html %]" /> >- <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> >+ <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> > <span class="required">A field name is required</span> > </div> > [% END %] >@@ -198,8 +198,8 @@ > </select> > = > <input type="text" value="" name="condition_value" /> >- <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> >+ <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> > </div> > </div> > <div class="blocks"> >@@ -213,8 +213,8 @@ > </select> > = > <input type="text" value="" name="substitution_value" /> >- <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> >+ <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> > <span class="required">A field name is required</span> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >index d5338b41b6..b14bf697a5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >@@ -164,7 +164,7 @@ > </fieldset> > </div> > [% ELSE %] >- <p><a href="/cgi-bin/koha/tools/batchMod.pl?del=1" id="lientype">Return to batch item deletion</a></p> >+ <p><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a></p> > [% END %] > [% END %] > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >index d302d81563..6bf83d011e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >@@ -44,21 +44,21 @@ > [% IF op == 'enqueued' %] > <div class="dialog message"> > <p>The job has been enqueued! It will be processed as soon as possible.</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> >+ <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> >+ | <a href="/cgi-bin/koha/tools/batchMod.pl" title="New batch item modification">New batch item modification</a></p> > </div> > > <fieldset class="action"> > [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] > [% IF searchid %] >- <a id="lientype" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]">Return to the record</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]">Return to the record</a> > [% ELSE %] >- <a id="lientype" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a> > [% END %] > [% ELSIF src %] >- <a id="lientype" href="[% src | url %]">Return to where you were</a> >+ <a href="[% src | url %]">Return to where you were</a> > [% ELSE %] >- <a id="lientype" href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a> >+ <a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a> > [% END %] > </fieldset> > [% END %] >@@ -209,20 +209,20 @@ > </fieldset> > </div> <!-- /#cataloguing_additem_newitem --> > [% ELSE %] >- <p><a id="lientype" href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a></p> >+ <p><a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a></p> > [% END # /UNLESS too_many_items_process %] > [% ELSE # IF show %] > <fieldset class="action"> > [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] > [% IF searchid %] >- <a 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> >+ <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&searchid=[% searchid | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> > [% ELSE %] >- <a 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> >+ <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i class="fa fa-check-square-o"></i> Return to the record</a> > [% END %] > [% ELSIF src %] >- <a id="lientype"class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square-o"></i> Return to where you were</a> >+ <a class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square-o"></i> Return to where you were</a> > [% ELSE %] >- <a 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> >+ <a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a> > [% END %] > </fieldset> <!-- /.action --> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >index 380f782edc..109a757acd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >@@ -148,9 +148,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 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> >+ | <a id="selectwithoutitems" href="#">Select without items</a> >+ | <a id="selectnotreserved" href="#">Select without holds</a> >+ | <a 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"> >@@ -184,7 +184,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 class="lientype" id="clearlinkedtobiblio" href="#">Clear used authorities</a> >+ | <a 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"> >@@ -222,8 +222,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 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> >+ <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> > </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 7710466e8f..0f2b33de49 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -1,6 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% PROCESS 'authorities-search-results.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Batch record modification › Tools › Koha</title> >@@ -9,8 +12,7 @@ > </head> > > <body id="tools_batch_record_modification" class="tools"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -24,6 +26,12 @@ > <a href="#" aria-current="page">Batch record modification</a> > </li> > </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -74,6 +82,7 @@ > > <br><br> > >+ <fieldset> > <div id="batch_mod_form" class="toptabs" style="clear:both"> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation" class="active"> >@@ -133,6 +142,7 @@ > </div> > </div> <!-- /.tab-content --> > </div> <!-- /#batch_mod_form --> >+ </fieldset> > > <fieldset class="rows"> > <legend>MARC modification template</legend> >@@ -150,7 +160,7 @@ > </fieldset> > <fieldset class="action"> > <input type="hidden" name="op" value="list" /> >- <input type="submit" value="Continue" class="button" /> >+ <input type="submit" value="Continue" class="button principal" /> > <a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a> > </fieldset> > </form> <!-- /#record_ids_selection --> >@@ -242,7 +252,7 @@ > <fieldset class="action"> > <input type="hidden" name="op" value="modify" /> > <input type="hidden" name="recordtype" value="[% recordtype | html %]" /> >- <input type="submit" id="mainformsubmit" value="Modify selected records" class="button" /> >+ <input type="submit" id="mainformsubmit" value="Modify selected records" class="button principal" /> > </fieldset> > </form> <!-- /#process --> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >index a0cc7f01d3..7f8aacd44c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >@@ -296,8 +296,8 @@ > > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a class="pat" id="newcsvprofile" href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form"><i class="fa fa-plus"></i> New CSV profile</a> >- </diiv> >+ <a class="toolbar-btn" id="newcsvprofile" href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form"><i class="fa fa-plus"></i> New CSV profile</a> >+ </div> > </div> > > <h1>CSV profiles</h1> >@@ -325,8 +325,8 @@ > <td>[% PROCESS type_description type_code = csv_profile.type %]</td> > <td>[% PROCESS used_for_description used_for_code = csv_profile.used_for %]</td> > <td class="actions"> >- <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form&export_format_id=[% csv_profile.export_format_id | uri %]" id="lientype" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=delete_confirm&export_format_id=[% csv_profile.export_format_id | uri %]" id="lientype" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >+ <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form&export_format_id=[% csv_profile.export_format_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=delete_confirm&export_format_id=[% csv_profile.export_format_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >index 38c24f741c..7e03fe97a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >@@ -257,7 +257,7 @@ > <input type="hidden" name="op" value="export" /> > <input type="hidden" name="record_type" value="auths" /> > >- <fieldset class="action"><input type="submit" value="Export authority records" class="button" /></fieldset> >+ <fieldset class="action"><input type="submit" value="Export authority records" class="button principal" /></fieldset> > </form> > </div> > >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 4505c73d08..3f1e040cc2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >@@ -364,7 +364,7 @@ > > <fieldset class="action"> > <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" /> >- <input id="principal" type="submit" value="Import" /> >+ <input class="principal" type="submit" value="Import" /> > </fieldset> > </form> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >index ad6d55ef76..ef3a06b3cf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -167,7 +167,7 @@ > <div id="statuses" style="display: block;"> > [% FOREACH status IN statuses %] > [% IF (status.values) %] >- <fieldset style="float: left; padding: 5px; margin: 5px;text-align:right"> >+ <fieldset style="float: left; padding: 5px; margin: 5px; display:inline-block; position:relative; width:auto; border-right: #696969 double 1px;"> > <h3>[% status.fieldname | html %]</h3> > <ul id="statuses-[% fieldname | html %]" style="display: inline;"> > [% FOREACH value IN status.values %] >@@ -257,10 +257,10 @@ > <input type="hidden" name="ccode" value="[% ccode | html %]" /> > > [% UNLESS uploadedbarcodesflag %] >- <div><a id="lientype" href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a id="lientype" href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div> >+ <div><a href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div> > [% END %] > >-<div id="searchresults"> >+<fieldset id="searchresults"> > <table id="inventoryt"> > <thead> > <tr> >@@ -341,15 +341,15 @@ > [% END %] > </tbody> > </table> >+</fieldset> > <div class="spacer"></div> > [% UNLESS uploadedbarcodesflag %] >- <div style="padding : .3em 0"><a id="lientype" href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a id="lientype" href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div> >+ <div style="padding : .3em 0"><a href="#" class="checkall"><i class="fa fa-check"></i> Select all</a> <a href="#" class="clearall"><i class="fa fa-remove"></i> Clear all</a></div> > <input type="submit" id="markseenandquit" class="principal" value="Mark seen and quit" /> > <input type="submit" class="principal" value="Mark seen and continue >>" id="markseenandcontinuebutton" /> > <input class="principal" type="submit" value="Continue without marking >>" id="continuewithoutmarkingbutton" class="submit" /> > [% END %] > </form> >-</div> > > > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >index beb779c42d..0562488c78 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -156,7 +156,7 @@ > > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <button class="pat" data-toggle="dropdown"><i class="fa fa-plus"></i> New notice <span class="caret"></span></button> >+ <button class="toolbar-btn" data-toggle="dropdown"><i class="fa fa-plus"></i> New notice <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=acquisition">Acquisition</a></li> > <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=catalogue">Catalog</a></li> >@@ -204,8 +204,8 @@ > [% END %] > [% END %] > >+ <fieldset id="searchresults"> > [% IF letter %] >- <div id="searchresults"> > <table id="lettert"> > <thead> > <tr> >@@ -261,16 +261,16 @@ > [% ELSE %] > [% select_for_copy | $raw %] > [% END %] >- <button id="lientype" class="btn btn-default btn-xs"><i class="fa fa-clone"></i> Copy</button> >+ <button class="btn btn-default btn-xs"><i class="fa fa-clone"></i> Copy</button> > </form> > [% END # /IF !independent_branch %] > </td> > <td class="actions"> > [% IF can_edit %] >- <a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=[% lette.branchcode | html %]&module=[% lette.module | html %]&code=[% lette.code | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=[% lette.branchcode | html %]&module=[% lette.module | html %]&code=[% lette.code | html %]"><i class="fa fa-pencil"></i> Edit</a> > [% END %] > [% IF !lette.protected && can_edit %] >- <a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&branchcode=[% lette.branchcode | html %]&module=[% lette.module | html %]&code=[% lette.code | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&branchcode=[% lette.branchcode | html %]&module=[% lette.module | html %]&code=[% lette.code | html %]"><i class="fa fa-trash"></i> Delete</a> > [% END %] > </td> > </tr> >@@ -285,9 +285,9 @@ > <p>There are no notices.</p> > [% END %] > </div> >- </div> > [% END # /IF lette %] > [% END # /IF no_op_set %] >+ </fieldset> > > [% IF add_form or copy_form %] > <h2>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</h2> >@@ -457,7 +457,7 @@ > <!-- Nav tabs --> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation"> >- <a id="lientype" href="#lang_default" aria-controls="lang_default" role="tab" data-toggle="tab">Default</a> >+ <a 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 %] >@@ -549,7 +549,7 @@ > </select> > </td> > <td class="actions"> >- <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> >+ <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> > </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> >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 de833a4c4d..89b126f1ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >@@ -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 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. >+ <span>Label</span> <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% label_batch_msg | uri %]" >batch #[% label_batch_msg | html %]</a> created. > [% END %] > </strong></p> > </div> >@@ -94,7 +94,7 @@ > [% UNLESS ( batch_info ) %] > <div class="dialog message"> > <p>No records have been staged.</p> >- <p><a id="lientype" href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a>.</p> >+ <p><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a>.</p> > </div> > [% END %] > [% END %] >@@ -170,7 +170,7 @@ > [% END %] > [% END %] > </select> >- <span class="change-status">Changed. <a id="lientype" href="#" class="reset" id="reset_new_matcher_id">Reset</a></span> >+ <span class="change-status">Changed. <a href="#" class="reset" id="reset_new_matcher_id">Reset</a></span> > [% ELSE %] > <span class="label">Matching rule applied</span> > [% IF ( current_matcher_id ) %] >@@ -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 id="lientype" href="#" class="reset" id="reset_overlay_action">Reset</a></span> >+ [% INCLUDE 'tools-overlay-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_overlay_action">Reset</a></span> > [% ELSE %] > <span class="label">Action if matching record found:</span> > [% IF ( overlay_action == 'replace' ) %] >@@ -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 id="lientype" href="#" class="reset" id="reset_nomatch_action">Reset</a></span> >+ [% INCLUDE 'tools-nomatch-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_nomatch_action">Reset</a></span> > [% ELSE %] > <span class="label">Action if no match found:</span> > [% IF ( nomatch_action == 'create_new' ) %] >@@ -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 id="lientype" href="#" class="reset" id="reset_item_action">Reset</a></span> >+ [% INCLUDE 'tools-item-action.inc' %] <span class="change-status">Changed. <a href="#" class="reset" id="reset_item_action">Reset</a></span> > [% ELSE %] > <span class="label">Item processing:</span> > [% IF ( item_action == 'always_add' ) %] >@@ -260,7 +260,7 @@ > </select> > [% END %] > <br /> >- <input type="submit" id="lientype" class="button" name="mainformsubmit" value="Import this batch into the catalog" /> >+ <input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" /> > </fieldset> > </form> <!-- /#import_batch_form --> > <div id="jobpanel"> >@@ -283,7 +283,7 @@ > [% END # /IF can_revert %] > </div> > >- <div id="searchresults"> >+ <fieldset id="searchresults"> > > [% IF ( did_commit ) %] > <div class="dialog message">Completed import of records</div> >@@ -344,6 +344,7 @@ > </tr> > </table> > [% END # /IF did_revert%] >+ </fieldset> > > > [% END # /IF batch_info %] >@@ -396,7 +397,7 @@ > <td>[% batch_lis.num_records | html %]</td> > <td>[% batch_lis.num_items | html %] > [% IF ( batch_lis.num_items && batch_lis.import_status == 'imported' ) %] >- (<a id="lientype" href="[% batch_lis.script_name | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&op=create_labels">Create label batch</a>) >+ (<a href="[% batch_lis.script_name | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&op=create_labels">Create label batch</a>) > [% END %] > </td> > <td class="actions"> >@@ -404,13 +405,13 @@ > <form method="post" action="[% batch_lis.script_name | html %]" name="clean_batch_[% batch_lis.import_batch_id | html %]" id="clean_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_clean"> > <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id | html %]" /> > <input type="hidden" name="op" value="clean-batch" /> >- <button id="lientype" type="submit" class="btn btn-default btn-xs"><i class="fa fa-eraser"></i> Clean</button> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-eraser"></i> Clean</button> > </form> > [% ELSIF ( batch_lis.import_status == 'cleaned' ) %] > <form method="post" action="/cgi-bin/koha/tools/manage-marc-import.pl" name="delete_batch_[% batch_lis.import_batch_id | html %]" id="delete_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_delete"> > <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id | html %]" /> > <input type="hidden" name="op" value="delete-batch" /> >- <button id="lientype" type="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> > </form> > [% END %] > </td> >@@ -611,7 +612,7 @@ > '<a class="btn btn-default btn-xs" target="_blank" href="' + record_details_url > + aData['matched'] + '"><i class="fa fa-eye"></i> ' + _("View") + '</a> ' > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] >- + '<a id="lientype" class="btn btn-default btn-xs" target="_blank" href="' + record_edit_url >+ + '<a class="btn btn-default btn-xs" target="_blank" href="' + record_edit_url > + aData['matched'] + '"><i class="fa fa-pencil"></i> ' + _("Edit") + '</a>' > [% END %] > ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >index 13a7b874db..04a36af5b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >@@ -74,10 +74,10 @@ > > <div id="toolbar" class="btn-toolbar"> > <div> >- <a href="#" data-toggle="modal" data-template_id="" data-target="#createTemplate" id="new_template" class="pat duplicate_template"><i class="fa fa-plus"></i> New template</a> >+ <a href="#" data-toggle="modal" data-template_id="" data-target="#createTemplate" id="new_template" class="toolbar-btn duplicate_template"><i class="fa fa-plus"></i> New template</a> > [% IF ( template_id != '' ) %] >- <a href="#" id="new_action" class="pat"><i class="fa fa-plus"></i> New action</a> >- <a class="pat delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% template_id | html %]&op=delete_template"><i class="fa fa-fw fa-trash"></i> Delete template</a> >+ <a href="#" id="new_action" class="toolbar-btn"><i class="fa fa-plus"></i> New action</a> >+ <a class="toolbar-btn delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% template_id | html %]&op=delete_template"><i class="fa fa-fw fa-trash"></i> Delete template</a> > [% END %] > </div></div> > >@@ -93,7 +93,7 @@ > > <h1>MARC modification templates [% template_id | html %]</h1> > >-<div id="searchresults"> >+<fieldset id="searchresults"> > <table id="templatest"> > <thead> > <tr> >@@ -108,22 +108,22 @@ > <td>[% TemplatesLoo.template_id | html %]</td> > <td>[% TemplatesLoo.name | html %]</td> > <td class="actions"> >- <a id="lientype" class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id | html %]&op=select_template" ><i class="fa fa-fw fa-pencil"></i> Edit actions</a> >- <a id="lientype" class="btn btn-default btn-xs duplicate_template" href="#" data-toggle="modal" data-template_id="[% TemplatesLoo.template_id | html %]" data-target="#createTemplate"><i class="fa fa-fw fa-copy"></i> Duplicate</a> >- <a id="lientype" class="btn btn-default btn-xs delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id | html %]&op=delete_template"><i class="fa fa-fw fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id | html %]&op=select_template" ><i class="fa fa-fw fa-pencil"></i> Edit actions</a> >+ <a class="btn btn-default btn-xs duplicate_template" href="#" data-toggle="modal" data-template_id="[% TemplatesLoo.template_id | html %]" data-target="#createTemplate"><i class="fa fa-fw fa-copy"></i> Duplicate</a> >+ <a class="btn btn-default btn-xs delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id | html %]&op=delete_template"><i class="fa fa-fw fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </tbody> > </table> >-</div> >+</fieldset> > > [% ELSE %] > > <h1>Actions for <em>[% template_name | html %]</em></h1> > > [% IF ( ActionsLoop ) %] >-<div id="searchresults"> >+<fieldset id="searchresults"> > <table id="template_actions" class="template_actions"> > <thead> > <tr> >@@ -203,16 +203,16 @@ > </td> > <td>[% ActionsLoo.description | html %]</td> > <td> >- <a class="btn btn-default btn-xs edit_action" id="lientype" href="#modaction" data-mmta_id="[% ActionsLoo.mmta_id | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs edit_action" href="#modaction" data-mmta_id="[% ActionsLoo.mmta_id | html %]"><i class="fa fa-pencil"></i> Edit</a> > </td> > <td> >- <a class="btn btn-default btn-xs" id="lientype" hhref="marc_modification_templates.pl?template_id=[% ActionsLoo.template_id | html %]&op=delete_action&mmta_id=[% ActionsLoo.mmta_id | html %]" onclick="return confirmDeleteAction();"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" hhref="marc_modification_templates.pl?template_id=[% ActionsLoo.template_id | html %]&op=delete_action&mmta_id=[% ActionsLoo.mmta_id | html %]" onclick="return confirmDeleteAction();"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END # /FOREACH ActionsLoo %] > </tbody> > </table> >- </div> >+ </fieldset> > [% ELSE %] > <div class="dialog message template_actions"><p>There are no defined actions for this template.</p></div> > [% END # /IF ActionsLoop %] >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 8c3f205122..78af9836bf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -150,7 +150,7 @@ > <div class="dialog alert"> > <p>No patron card numbers or borrowernumbers given.</p> > <form action="/cgi-bin/koha/tools/modborrowers.pl" method="get"> >- <button type="submit" class="approve" id="lientype"><i class="fa fa-fw fa-check"></i> OK</button> >+ <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button> > </form> > </div> > [% END #Alert if no patrons %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >index ebad597c63..54050d3c8a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >@@ -63,8 +63,8 @@ > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> > <div> >- <a class="pat" id="newquote" href="/cgi-bin/koha/tools/quotes.pl?op=add_form"><i class="fa fa-plus"></i> New quote</a> >- <a class="pat" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> Import quotes</a> >+ <a class="toolbar-btn" id="newquote" href="/cgi-bin/koha/tools/quotes.pl?op=add_form"><i class="fa fa-plus"></i> New quote</a> >+ <a class="toolbar-btn" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> Import quotes</a> > </div> > </div> > [% END %] >@@ -111,8 +111,8 @@ > > [% IF op == 'list' %] > <h1>Quotes</h1> >+ <fieldset id="searchresults"> > [% IF quotes_count > 0 %] >- <div id="searchresults"> > <table id="quotes"> > <thead> > <tr> >@@ -126,8 +126,8 @@ > </table> > [% ELSE %] > <div class="dialog message">There are no quotes defined. <a href="/cgi-bin/koha/tools/quotes.pl?op=add_form">Start defining quotes</a>.</div> >- </div> > [% END %] >+ </fieldset> > > <div id="delete_confirm_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="delete_confirm_modal_label" aria-hidden="true"> > <div class="modal-dialog"> >@@ -140,7 +140,7 @@ > <div id="delete_confirm_dialog"></div> > </div> > <div class="modal-footer"> >- <a href="#" class="btn btn-default" id="delete_confirm_modal_button" role="button" data-toggle="modal">Delete</a> >+ <a href="#" class="btn btn-default principal" id="delete_confirm_modal_button" role="button" data-toggle="modal">Delete</a> > <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> > </div> > </div> <!-- /.modal-content --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index 964d89a055..dea3712627 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >@@ -171,7 +171,7 @@ > <h3>[% total | html %] images found</h3> > <ul> > [% FOREACH result IN results %] >- <li><a id="lientype" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% result.biblionumber | uri %]">[% result.title | html %]</a></li> >+ <li><a 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" class="lientype" href="#">Drop files here or click to select a file</a> >+ <a id="click_to_select" 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="#" id="lientype" class="remove" data-coverimg="[% img.imagenumber | html %]"><i class="fa fa-trash"></i> Delete image</a> >+ <a href="#" 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/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index a0fa298b1c..f6378c10fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -402,7 +402,7 @@ > [% IF op == 'list' %] > <h1>Lists</h1> > <div id="tabs" class="toptabs"> >- <fieldset class="briefgr"> >+ <fieldset> > <ul> > <li id="privateshelves_tab" class="active"><a href="#tab_content">Your lists</a></li> > <li id="publicshelves_tab" class="active"><a href="#tab_content">Public lists</a></li> >-- >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=137419">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