Bugzilla – Attachment 136898 Details for
Bug 30952
New design for staff interface
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30952: update search-engine
Bug-30952-update-search-engine.patch (text/plain), 198.32 KB, created by
Solene D
on 2022-07-01 12:46:18 UTC
(
hide
)
Description:
Bug 30952: update search-engine
Filename:
MIME Type:
Creator:
Solene D
Created:
2022-07-01 12:46:18 UTC
Size:
198.32 KB
patch
obsolete
>From 7f4deee0568ff2d9e1172f1f61b53f59c8e491bf Mon Sep 17 00:00:00 2001 >From: Solene Desvaux <sdesvaux@biblibre.com> >Date: Tue, 28 Jun 2022 15:08:02 +0200 >Subject: [PATCH] Bug 30952: update search-engine > >--- > .../intranet-tmpl/prog/css/addbiblio.css | 30 +- > .../prog/css/src/staff-global.scss | 100 ++- > .../prog/en/includes/budgets-admin-search.inc | 7 +- > .../prog/en/includes/cat-search.inc | 60 +- > .../prog/en/includes/cities-admin-search.inc | 2 +- > .../en/includes/currencies-admin-search.inc | 2 +- > .../prog/en/includes/patron_messages.inc | 2 +- > .../prog/en/includes/z3950-admin-search.inc | 2 +- > .../prog/en/modules/admin/aqbudgetperiods.tt | 108 ++- > .../prog/en/modules/admin/didyoumean.tt | 106 +-- > .../searchengine/elasticsearch/mappings.tt | 646 ++++++++-------- > .../en/modules/authorities/authorities.tt | 726 ++++++++---------- > .../prog/en/modules/catalogue/itemsearch.tt | 14 +- > .../prog/en/modules/cataloguing/addbiblio.tt | 132 ++-- > .../prog/en/modules/circ/circulation.tt | 2 +- > .../prog/en/modules/circ/returns.tt | 2 +- > .../prog/en/modules/intranet-main.tt | 148 ++-- > .../prog/en/modules/labels/barcode-print.tt | 4 +- > .../en/modules/labels/label-edit-batch.tt | 26 +- > .../en/modules/labels/label-edit-layout.tt | 29 +- > .../en/modules/labels/label-edit-profile.tt | 5 +- > .../en/modules/labels/label-edit-range.tt | 5 +- > .../en/modules/labels/label-edit-template.tt | 2 +- > .../prog/en/modules/labels/label-manage.tt | 2 + > .../prog/en/modules/labels/search.tt | 2 +- > .../prog/en/modules/members/member.tt | 2 +- > .../modules/reports/guided_reports_start.tt | 8 +- > .../prog/en/modules/serials/claims.tt | 6 +- > .../en/modules/serials/subscription-add.tt | 36 +- > .../prog/en/modules/suggestion/suggestion.tt | 9 +- > .../prog/js/elasticsearch-mappings.js | 44 +- > 31 files changed, 1115 insertions(+), 1154 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css >index c84f399ab7..4c4ef32b66 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css >@@ -6,8 +6,7 @@ div#toolbar { > border: 0; > } > >-#addbibliotabs .ui-tabs-nav, >-#authoritytabs .ui-tabs-nav { >+#addbibliotabs .ui-tabs-nav { > display: none; > } > >@@ -223,10 +222,6 @@ a.tagnum { > width: 31em; > } > >-#cat_addbiblio .field_marceditor .flatpickr_wrapper { >- display: none; >-} >- > .mandatory_marker { > color: red; > } >@@ -277,6 +272,7 @@ tbody tr.active td { > > .toolbar-tabs-container { > margin: 3em -5px -5px -5px; >+ width: -webkit-fill-available; > } > > .toolbar-tabs { >@@ -299,30 +295,34 @@ tbody tr.active td { > } > > .toolbar-tabs li a { >- border: 1px solid #EDF4F6; >+ border: 1px solid #71B443; > border-left: 0; >- border-right: 1px solid #EDF4F6; >- border-bottom-right-radius: 5px; >- border-bottom-left-radius: 5px; >+ background-color: #71B443; >+ border-right: 1px solid #71B443; >+ border-radius: 5px; >+ margin: 5px; >+ /* border-bottom-left-radius: 5px; */ > display: block; >+ color: #fff; > font-weight: bold; > padding: .3em 1.5em; > width: 100%; > } > > .toolbar-tabs li.selected a { >- background-color: #EDF4F6; >- border-right: 1px solid #C3D6DB; >- border-bottom: 1px solid #C3D6DB; >+ background-color: #418940; >+ border-right: 1px solid #418940; >+ border-bottom: 1px solid #418940; > font-weight: bold; > } > > .toolbar-tabs li.selected a:hover { >- background-color: #EDF4F6; >+ background-color: #418940; > } > > .toolbar-tabs li a:hover { >- background-color: #F4F8F9; >+ background-color: #418940; >+ text-decoration: none; > } > > .toolbar-tabs li:first-child a { >diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >index 35f922be6f..f9d7162869 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -3,7 +3,7 @@ > @import "flatpickr"; > > ::selection { >- background: #538200; >+ background: #418940; > color: #fff; > } > >@@ -129,7 +129,7 @@ a { > > &.close { > &:hover { >- //color: #538200; >+ //color: #418940; > } > } > >@@ -229,10 +229,6 @@ a { > } > } > >-#addauth{ >- color: #fff; >- background-color: #71B443; >-} > > #resetZ3950Search{ > font-size: 110%; >@@ -750,7 +746,7 @@ cite { > input, > textarea { > &:focus { >- border-color: #538200; >+ border-color: #418940; > border-radius: 4px; > } > } >@@ -884,6 +880,10 @@ label, > width: 25%; > } > >+.col-sm-6 { >+ width: 100%; >+} >+ > #area-news{ > background-color: #FFF; > color: #696969; >@@ -1983,7 +1983,7 @@ div { > > &:hover, &:active{ > font-weight: bold; >- color: #418910; >+ color: #418940; > } > } > } >@@ -2127,7 +2127,7 @@ div { > > #reserves, > #checkouts { >- //border-top: 3px solid #418910; >+ //border-top: 3px solid #418940; > padding: 1em; > } > >@@ -2495,8 +2495,20 @@ dd { > .dropdown-menu { > position: absolute; > top: 50px; >+ background-color: #F3F4F4; > li { > list-style-type: none; >+ >+ a{ >+ color: #000; >+ >+ &:hover{ >+ background-color: #F3F4F4; >+ color: #000; >+ text-decoration: underline; >+ background-image: none; >+ } >+ } > } > > } >@@ -2654,6 +2666,7 @@ i { > border-radius: 3px; > box-shadow: 1px 1px 2px 0 rgba(102, 102, 102, .5); > margin: .5em; >+ width: fit-content; > padding: .5em; > } > >@@ -2827,7 +2840,7 @@ i { > //border: 1px solid #BCBCBC; > color: #000000; > text-align: center; >- background-color: #fff; >+ background-color: transparent; > // box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); > > >@@ -2963,7 +2976,7 @@ i { > > &:hover { > background-color: #FFFFFF; >- color: #538200; >+ color: #418940; > } > } > } >@@ -3096,6 +3109,8 @@ li { > #searchresults { > background-color: #fff; > margin-top: 20px; >+ min-width: 100%; >+ width: fit-content; > // overflow: auto; > box-shadow: 8px 8px 12px rgba(170, 170, 170, 0.356); > padding: 20px; >@@ -3359,7 +3374,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, #addauth, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #z3950submit, #add_manual_restriction{ >+#lientype, #add, #merge-patrons, #btn_batchremove, #doedit, #show_invoice_adjustment, #cancel_invoice_adjustment, #show_active_vendors, #add-contact, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #add_manual_restriction{ > color: #71B443; > padding: .3em; > border: none; >@@ -3824,7 +3839,7 @@ td { > .ui-widget-content { > background: #FFFFFF none; > border-radius: 4px; >- border: 3px solid #538200; >+ border: 3px solid #418940; > color: #222222; > } > >@@ -3950,7 +3965,7 @@ td { > .ui-tabs-panel { > background: #FFF none; > border-radius: 4px; >- border: 3px solid #538200; >+ border: 3px solid #418940; > > fieldset{ > box-shadow: none; >@@ -3965,7 +3980,7 @@ td { > border-radius: 4px 4px 0 0; > > &.ui-tabs-active, &.ui-state-hover { >- background-color: #418910; >+ background-color: #418940; > border-radius: 4px 4px 0 0; > border: none; > border-bottom-width: 0; >@@ -3999,11 +4014,11 @@ td { > > .ui-state-hover { > a { >- color: #538200; >+ color: #418940; > > &:link, > &:visited { >- color: #538200; >+ color: #418940; > } > } > } >@@ -4133,7 +4148,7 @@ td { > font-weight: normal; > padding-bottom: 1px; > >- background-color: #418910; >+ background-color: #418940; > border: none; > border-bottom-width: 0; > //padding-bottom: 0; >@@ -4159,7 +4174,7 @@ td { > //background-color: #EDF4F5; > border-top-left-radius: 4px; > border-top-right-radius: 4px; >- //color: #538200; >+ //color: #418940; > } > } > } >@@ -4167,7 +4182,7 @@ td { > > .tabs-container { > background: none repeat scroll 0 0 transparent; >- border: 3px solid #418910; >+ border: 3px solid #418940; > border-radius: 4px; > color: #222222; > display: block; >@@ -4180,7 +4195,7 @@ td { > .ui-tabs-panel { > background: #FFF none; > border-radius: 4px; >- border: 3px solid #538200; >+ border: 3px solid #418940; > > fieldset{ > box-shadow: none; >@@ -4839,10 +4854,15 @@ nav { > > &:hover, &:active{ > background-color: #352C2E; >- text-decoration: underline; >+ border-bottom: 1px 5px #fff; >+ color: #fff; > } > } > } >+ >+ ul{ >+ background-color: #352C2E; >+ } > } > > >@@ -4864,23 +4884,20 @@ nav { > } > > .loggedinusername{ >- font-size: 0.85em; >- font-weight: normal; >- //position: absolute; >- //right: 0px; >- // white-space: pre; >- //top: -10px; >- //height: 20px; >- //line-height: normal; >- //padding-top: 10px; >- //padding-right: 10px; >- //width: 100%; >- position: relative; >- left: 135px; >+ /* 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%; >- text-decoration: none; > } > > .logged-in-branch-name{ >@@ -4981,7 +4998,8 @@ button, > white-space: nowrap; > vertical-align: middle; > touch-action: manipulation; >- width: 90px; >+ min-width: 90px; >+ width: fit-content; > cursor: pointer; > background-image: none; > padding: 6px 12px; >@@ -5435,7 +5453,7 @@ code { > /* background-color: #FFF; > border: 1px solid #bfd9b9; > border-top-width: 0;*/ >- border: 3px solid #538200; >+ border: 3px solid #418940; > border-radius: 4px; > overflow: auto; > //border-top-width: 0; >@@ -5454,9 +5472,9 @@ code { > padding: .5em 1em; > > &:hover { >- background-color: #538200; >+ background-color: #418940; > border-radius: 4px 4px 0 0; >- border: 1px solid #538200; >+ border: 1px solid #418940; > text-decoration: none; > color: #fff; > } >@@ -5466,7 +5484,7 @@ code { > a, > a:hover, > a:focus { >- background-color: #538200; >+ background-color: #418940; > border-radius: 4px 4px 0 0; > color: #fff; > //border: none; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc >index db6772d99c..025fbcfefb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc >@@ -6,7 +6,7 @@ > <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post"> > <input class="query focus" type="text" name="filter_budgetname" id="filter_budgetname" value="[% filter_budgetname | html %]" style="width:150px" placeholder="Fund code" /> > >- <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;position: relative;left: 170px;bottom: 3px;"> >+ <select name="filter_budgetbranch" id="filter_budgetbranch" class="focus" style="width:10em;position: relative;left: 170px;bottom: 3px;"> > <option disabled selected hidden>Library:</option> > [% FOREACH branchloo IN Branches.all( selected => selected_branchcode ) %] > [% IF branchloo.selected %] >@@ -32,7 +32,7 @@ > > <span id="button_1" class="buttonsearch active">Search funds</span> > <span id="button_2" class="buttonsearch">Check out</span> >- <span id="button_3" class="buttonsearch"Search catalog</span> >+ <span id="button_3" class="buttonsearch">Search catalog</span> > </ul> > </div> > >@@ -71,7 +71,6 @@ > } > > for (var i = inputssearch.length - 1; i >= 0; i--) { >- inputssearch[i].classList.remove('focus'); > > if (elem == iconssearch[i]){ > inputssearch[i].classList.add('focus'); >@@ -110,4 +109,6 @@ > > </script> > >+<!-- /header_search --> >+ > <!-- End Suggestions Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >index c8fd3da791..2f221dbfe0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >@@ -6,14 +6,14 @@ > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > <div id="checkin_search" class="residentsearch"> > <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <input class="head-searchbox focus" name="barcode" id="ret_barcode" type="text" placeholder="Scan a barcode to check in:" /> >+ <input class="head-searchbox focus" name="barcode" id="ret_barcode" type="text" placeholder="Scan a barcode to check in" /> > <input value="" class="submit" id="submit" type="submit" /> > </form> > </div> > > <div id="renew_search" class="residentsearch"> > <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <input class="head-searchbox focus" name="barcode" id="ren_barcode" type="text" placeholder="Scan a barcode to renew:" /> >+ <input class="head-searchbox focus" name="barcode" id="ren_barcode" type="text" placeholder="Scan a barcode to renew" /> > <input value="" class="submit" id="submit" type="submit" /> > </form> > </div> >@@ -36,10 +36,10 @@ > > <script type="text/javascript"> > function focusInput(){ >- document.getElementById('inputsearch').focus(); >+ document.getElementsByClassName('head-searchbox').focus(); > } > >- function toggle(elem){ >+ function toggle(elem){style="width: calc(301px);" > var buttonssearch = document.getElementsByClassName('active'); > for (var i = buttonssearch.length - 1; i >= 0; i--) { > buttonssearch[i].classList.remove('active'); >@@ -50,24 +50,62 @@ > fold(); > }else{//Back > document.getElementById('button_1').classList.add('active'); >- document.getElementById('containersearch').classList.remove('fold'); >- document.getElementById('inputsearch').style = ''; >+ document.getElementById('header_search').classList.remove('fold'); >+ document.getElementsByClassName('head-searchbox').style = ''; > } > > focusInput(); > } > >- function fold(){ >+ function clique(elem){ >+ var buttonssearch = document.getElementsByClassName('buttonsearch'); >+ var iconssearch = document.getElementsByClassName('iconsearch'); >+ var inputssearch = document.getElementsByClassName('head-searchbox'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ if (elem == iconssearch[i]){ >+ buttonssearch[i].classList.add('active'); >+ } >+ } >+ >+ for (var i = inputssearch.length - 1; i >= 0; i--) { >+ inputssearch[i].classList.remove('focus'); >+ >+ if (elem == iconssearch[i]){ >+ inputssearch[i].classList.add('focus'); >+ >+ taille(inputssearch[i]) >+ } >+ } > >- document.getElementById('containersearch').classList.add('fold'); >- // document.getElementById('inputsearch').style = "width:calc(500px - 100px)"; >+ focusInput(); >+ fold(); >+ } >+ >+ function fold(){ >+ document.getElementById('header_search').classList.add('fold'); >+ // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)"; > setTimeout( > function(){ >- var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5; >- document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)"; >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)"; > } > , 250); > } > >+ function taille(el){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ el.style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ >+ $('.btn').click(function(){ >+ if($(this).hasClass('active')){ >+ $(this).removeClass('active') >+ } else { >+ $(this).addClass('active') >+ } >+}); >+ > </script> >+ > <!-- End Catalogue Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc >index 30da7f777f..a315a1679d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc >@@ -2,7 +2,7 @@ > <div id="header_search" class="fold"> > <div id="city_search" class="residentsearch"> > <form action="[% script_name | html %]" method="post"> >- <input class="head-searchbox focus" type="text" name="city_name_filter" id="city_name_filter" value="[% city_name_filter | html %]" placeholder="City search:" /> >+ <input class="head-searchbox focus" type="text" name="city_name_filter" id="city_name_filter" value="[% city_name_filter | html %]" placeholder="City search" /> > <input type="submit" name="submit" value="" id="submit" /> > </form> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc >index 7554241372..3ec15b8d26 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc >@@ -3,7 +3,7 @@ > <div id="header_search" class="fold"> > <div id="currency_search" class="residentsearch"> > <form action="[% script_name | html %]" method="post"> >- <input class="head-searchbox focus" type="text" name="description" id="description" value="[% searchfield | html %]" placeholder="Currencies search:" /> >+ <input class="head-searchbox focus" type="text" name="description" id="description" value="[% searchfield | html %]" placeholder="Currencies search" /> > <input type="submit" id="submit" name="search" value="" /> > </form> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >index 22e7af5751..94051502e6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >@@ -2,7 +2,7 @@ > [% SET return_claims = patron.return_claims %] > > [% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || charges || charges_guarantors_guarantees || charges_guarantees || credits ) %] >- <fieldset id="searchresults"> >+ <fieldset> > <h3>Attention</h3> > <ul> > [% IF ( has_modifications ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >index 8730af969b..9657714962 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >@@ -3,7 +3,7 @@ > > <div id="z3950_search" class="residentsearch"> > <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post"> >- <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Z39.50/SRU server search:" /> >+ <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Z39.50/SRU server search" /> > <input type="submit" class="submit" id="submit" name="search" value="" /> > </form> > </div> >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 eb9034e246..539641bb6e 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" id="budgetmenu_[% block_budget.budget_period_id | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle lientype" 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 %]"> >@@ -77,7 +77,6 @@ > > [% INCLUDE 'header.inc' form=formulaire %] > >- > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> > <li> >@@ -184,7 +183,7 @@ > [% END %] > > [% IF ( duplicate_form ) %] >-<h1>Duplicate budget</h1> >+<h3>Duplicate budget</h3> > <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" id="add_modify_budget" name="f" method="post"> > <fieldset class="rows"> > <input type="hidden" name="op" value="duplicate_budget" /> >@@ -235,12 +234,10 @@ > </li> > > </ol> >- <fieldset class="action"> >- <input type="submit" class="principal" value="Save" /> >+ >+ <input type="submit" value="Save" class="principal" /> > <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">Cancel</a> > </fieldset> >- </fieldset> >- > > </form> > >@@ -250,9 +247,9 @@ > <!-- add or modify a budget period --> > > [% IF ( budget_period_id ) %] >- <h1>Modify budget <em>[% budget_period_description | html %]</em></h1> >+ <h3>Modify budget <em>[% budget_period_description | html %]</em></h3> > [% ELSE %] >- <h1>Add budget</h1> >+ <h3>Add budget</h3> > [% END %] > <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" id="add_modify_budget" name="f" method="post"> > <fieldset class="rows"> >@@ -307,18 +304,14 @@ > [% IF ( budget_period_locked ) %]<input type="checkbox" checked="checked" id="budget_period_locked" name="budget_period_locked" value="1" />[% ELSE %] <input type="checkbox" id="budget_period_locked" name="budget_period_locked" value="1"/> [% END %] > </li> > </ol> >- <fieldset class="action"> >- <!-- "save changes" button --> >- <!-- ###################################### --> >- <input type="submit" class="principal" value="Save" /> >+ >+ <input type="submit" value="Save" class="principal" /> > [% IF ( budget_period_id ) %] > <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]" class="cancel">Cancel</a> > [% ELSE %] > <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a> > [% END %] > </fieldset> >- </fieldset> >- > > </form> > >@@ -331,16 +324,16 @@ > [% IF ( delete_confirm ) %] > [% IF ( total ) %] > <div class="dialog message"> >- <h1>Cannot delete budget</h1> >+ <h3>Cannot delete budget</h3> > <p><strong>This record is used [% total | html %] times</strong> > . Deletion is not possible.</p> > [% ELSIF ( funds_exist ) %] > <div class="dialog message"> >- <h1>Cannot delete budget</h1> >+ <h3>Cannot delete budget</h3> > <p>This budget has funds attached. You must delete all attached funds before you can delete this budget.</p> > [% ELSE %] > <div class="dialog alert"> >- <h1>Delete budget '[% budget_period_description | html %]'?</h1> >+ <h3>Delete budget '[% budget_period_description | html %]'?</h3> > > <!-- ############################################################# --> > <!-- "delete" and "cancel" buttons --> >@@ -360,18 +353,16 @@ > [% END %] > > [% IF close_form %] >-<h1>Close budget [% budget_period_description | html %]</h1> > [% IF budget_periods.size == 0 %] >- <span>You cannot move funds of this budget, there is no active budget. >- Please create a new active budget and retry.</span> >- <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a> >+ You cannot move funds of this budget, there is no active budget. >+ Please create a new active budget and retry. >+ <a id="lientype" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a> > [% ELSIF number_of_unreceived_orders == 0 %] >- <span>There are no unreceived orders for this budget.</span> >- <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a> >+ There are no unreceived orders for this budget. >+ <a id="lientype" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a> > [% ELSE %] >- <div id="searchresults"> > <h3>The unreceived orders from the following funds will be moved</h3> >- Fund list of budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">[% budget_period_description | html %]</a>: >+ Fund list of budget <a id="lientype" href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">[% budget_period_description | html %]</a>: > <table id="budgeth"> > <thead> > <tr> >@@ -392,7 +383,6 @@ > [% END %] > </tbody> > </table> >- </div> > <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post" id="move_form"> > <fieldset class="rows"> > <ol> >@@ -410,19 +400,15 @@ > <input type="checkbox" name="move_remaining_unspent" id="move_remaining_unspent" /> > </li> > </ol> >- <fieldset class="action"> >+ > <input type="hidden" name="op" value="close_confirmed" /> > <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> > <input type="submit" class="principal" value="Move unreceived orders" /> > <a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Cancel</a> > </fieldset> >- </fieldset> > </form> > [% END %] > [% ELSIF closed %] >- <h2>Budget [% budget_period_description | html %] closed</h2> >- <div id="searchresults"> >- > <h3>Report after moving unreceived orders from budget [% from_budget_period.budget_period_description | html %] ([% from_budget_period.budget_period_startdate | $KohaDates %] - [% from_budget_period.budget_period_enddate | $KohaDates %]) to [% to_budget_period.budget_period_description | html %] ([% to_budget_period.budget_period_startdate | $KohaDates %] - [% to_budget_period.budget_period_enddate | $KohaDates%])</h3> > > <table id="closed_report"> >@@ -468,13 +454,12 @@ > [% END %] > </tbody> > </table> >- </div> > <a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a> > [% END %] > > <!-- DEFAULT display budget periods list --> > [% IF ( else ) %] >- <h1>Budgets administration</h1> >+ <h2>Budgets administration</h2> > > [% IF ( failed_delete_funds_exist ) %] > <div class="dialog message">Failed to delete budget because funds exist.</div> >@@ -482,28 +467,41 @@ > > [% INCLUDE 'budgets-active-currency.inc' %] > >- <div id="searchresults"> >+<div id="searchresults"> > <div id="budgetsTabs" class="toptabs"> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a href="#active" aria-controls="active" role="tab" data-toggle="tab">Active budgets</a> >- </li> >- <li role="presentation"> >- <a href="#inactive" aria-controls="inactive" role="tab" data-toggle="tab">Inactive budgets</a> >- </li> >+ <ul> >+ <li><a href="#active">Active budgets</a></li> >+ <li><a href="#inactive">Inactive budgets</a></li> > </ul> >- <div class="tab-content"> >- <div id="active" role="tabpanel" class="tab-pane active"> >- [% IF ( period_active_loop ) %] >- <table id="activeperiodst"> >- <thead> >+ >+ <div id="active"> >+ [% IF ( period_active_loop ) %] >+ <table id="activeperiodst"> >+ <thead> >+ <tr> >+ <th>Budget name</th> >+ <th>Start date</th> >+ <th>End date</th> >+ <th>Locked</th> >+ <th>Total</th> >+ <th class="noExport">Actions</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH period_active IN period_active_loop %] > <tr> >- <th>Budget name</th> >- <th>Start date</th> >- <th>End date</th> >- <th>Locked</th> >- <th>Total</th> >- <th class="noExport">Actions</th> >+ <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id | uri %]" title="View funds for [% period_active.budget_period_description | html %]">[% period_active.budget_period_description | html %]</a></td> >+ <td data-order="[% period_active.budget_period_startdate | html %]">[% period_active.budget_period_startdate | $KohaDates %]</td> >+ <td data-order="[% period_active.budget_period_enddate | html %]">[% period_active.budget_period_enddate | $KohaDates %]</td> >+ <td> >+ [% IF ( period_active.budget_period_locked ) %] >+ <i class="fa fa-lock"></i> Locked</span> >+ [% END %] >+ </td> >+ <td class="data">[% period_active.budget_period_total | $Price %]</td> >+ <td> >+ [% PROCESS action_menu block_budget=period_active %] >+ </td> > </tr> > [% END %] > </tbody> >@@ -566,10 +564,10 @@ > [% Asset.js("js/acq.js") | $raw %] > <script> > $(document).ready(function() { >+ var tabs = $('#budgetsTabs').tabs(); > [% IF ( tab ) %] >- $("#budgetsTabs li:eq([% tab | html %]) a").tab("show"); >+ tabs.tabs("option", "active", [% tab | html %]); > [% END %] >- > $("#activeperiodst,#inactiveperiodst").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ > { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >index e9789bd530..81c3e0d8bf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >@@ -4,30 +4,40 @@ > [% formulaire = BLOCK %] > [% INCLUDE 'prefs-admin-search.inc' %] > [% END %] >+ > [% BLOCK pluginlist %] > <div class="pluginlist"> >-[% FOREACH plugin IN plugins %] >- <div class="plugin"> >- <div class="pluginname"> >- [% IF plugin.enabled %]<input type="checkbox" checked="checked" id="checkbox_[% type | html %][% plugin.name | html %]">[% ELSE %]<input type="checkbox" id="checkbox_[% type | html %][% plugin.name | html %]">[% END %] >- <label class='pluginlabel' for="checkbox_[% type | html %][% plugin.name | html %]">[% plugin.name | html %]</label></div> >- <div class="plugindesc"> >- [% SWITCH plugin.name %] >- [% CASE 'AuthorityFile' %] >- <span>Suggest authorities which are relevant to the term the user searched for.</span> >- [% CASE 'ExplodedTerms' %] >- <span>Suggest that patrons expand their searches to include broader/narrower/related terms.</span> >- [% CASE 'LibrisSpellcheck' %] >- <span>Use the LIBRIS spellcheck API.</span> >- [% END %] >+ [% FOREACH plugin IN plugins %] >+ <div class="plugin"> >+ <div class="pluginname"> >+ [% IF plugin.enabled %] >+ <input type="checkbox" checked="checked" id="checkbox_[% type | html %][% plugin.name | html %]"> >+ [% ELSE %] >+ <input type="checkbox" id="checkbox_[% type | html %][% plugin.name | html %]"> >+ [% END %] >+ >+ <label class='pluginlabel' for="checkbox_[% type | html %][% plugin.name | html %]">[% plugin.name | html %]</label> >+ </div> >+ >+ <div class="plugindesc"> >+ [% SWITCH plugin.name %] >+ [% CASE 'AuthorityFile' %] >+ <span>Suggest authorities which are relevant to the term the user searched for.</span> >+ [% CASE 'ExplodedTerms' %] >+ <span>Suggest that patrons expand their searches to include broader/narrower/related terms.</span> >+ [% CASE 'LibrisSpellcheck' %] >+ <span>Use the LIBRIS spellcheck API.</span> >+ [% END %] >+ </div> > </div> >- </div> >-[% END %] >+ [% END %] > </div> > [% END %] >+ > [% INCLUDE 'doc-head-open.inc' %] > <title>Did you mean? › Administration › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >+ > </head> > > <body id="admin_didyoumean" class="admin"> >@@ -47,12 +57,14 @@ > </a> > </li> > </ol> >- <ol> >- [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >- </ol> >- <ol> >- <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >- </ol> >+ >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> > </nav> > > <div class="main container-fluid"> >@@ -60,27 +72,34 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Did you mean?</h1> >- <noscript><div class="dialog alert"><strong>Please enable Javascript:</strong> >- Configuring 'Did you mean?' plugins requires Javascript. If >- you are unable to use Javascript, you may be able to enter the >- configuration (which is stored in JSON in the OPACdidyoumean system preferences) >- in the Local preferences tab in >- the system preference editor, but this is unsupported, not >- recommended, and likely will not work.</div></noscript> >- <div id="didyoumeanlegend"> >- Please put the 'Did you mean?' plugins in order by significance, from >- most significant to least significant, and check the box to enable those >- plugins that you want to use. >- </div> >- <form action="/cgi-bin/koha/admin/didyoumean.pl" method="post"> >- <fieldset id="didyoumeanopac"> >- <legend>OPAC</legend> >- [% PROCESS pluginlist plugins=OPACpluginlist type='opac' %] >- </fieldset> >- <fieldset class="action"><button class="save-all submit" type="submit">Save configuration</button> <a href="/cgi-bin/koha/admin/didyoumean.pl" class="force_reload cancel">Cancel</a></fieldset> >- </form> >+ <h2>Did you mean?</h2> >+ >+ <noscript> >+ <div class="dialog alert"> >+ <strong>Please enable Javascript:</strong> >+ Configuring 'Did you mean?' plugins requires Javascript. If >+ you are unable to use Javascript, you may be able to enter the >+ configuration (which is stored in JSON in the OPACdidyoumean system preferences) >+ in the Local preferences tab in >+ the system preference editor, but this is unsupported, not >+ recommended, and likely will not work. >+ </div> >+ </noscript> > >+ <div id="didyoumeanlegend"> >+ Please put the 'Did you mean?' plugins in order by significance, from >+ most significant to least significant, and check the box to enable those >+ plugins that you want to use. >+ </div> >+ >+ <form action="/cgi-bin/koha/admin/didyoumean.pl" method="post"> >+ <fieldset id="didyoumeanopac"> >+ <h3>OPAC</h3> >+ [% PROCESS pluginlist plugins=OPACpluginlist type='opac' %] >+ <button class="save-all submit principal" type="submit">Save configuration</button> >+ <a href="/cgi-bin/koha/admin/didyoumean.pl" class="force_reload cancel">Cancel</a> >+ </fieldset> >+ </form> > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> > >@@ -89,7 +108,7 @@ > [% INCLUDE 'admin-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> >- </div> <!-- /.row --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >@@ -139,4 +158,5 @@ > } > </script> > [% END %] >+ > [% INCLUDE 'intranet-bottom.inc' %] >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 30500f7e03..fa4a6988ed 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 >@@ -123,252 +123,237 @@ a.add, a.delete { > </div> > > <form method="post"> >- <div id=searchresults> >- <div id="tabs" class="toptabs ui-tabs" style="clear:both"> >- <ul> >+ <div id="tabs" class="toptabs" style="clear:both"> >+ <fieldset id="searchresults"> >+ <ul class="nav nav-tabs" role="tablist"> > <li><a href="#search_fields">Search fields</a></li> > [% FOREACH index IN indexes %] > [% SWITCH index.index_name %] >- [% CASE 'biblios' %] >- <li role="presentation"> >- <a href="#mapping_biblios" data-tab="mapping_biblios" aria-controls="mapping_biblios" role="tab" data-toggle="tab">Bibliographic records</a> >- </li> >- [% CASE 'authorities' %] >- <li role="presentation"> >- <a href="#mapping_authorities" data-tab="mapping_authorities" aria-controls="mapping_authorities" role="tab" data-toggle="tab">Authorities</a> >- </li> >+ [% CASE 'biblios' %]<li><a href="#mapping_biblios">Bibliographic records</a></li> >+ [% CASE 'authorities' %]<li><a href="#mapping_authorities">Authorities</a></li> > [% END %] > [% END %] > </ul> >+ > <div class="tab-content"> >- <div id="search_fields" role="tabpanel" class="tab-pane active"> >- <table class="search_fields" id="search_fields_table"> >- <thead> >- <tr> >- <th>Name</th> >- <th>Aliases</th> >- <th>Label</th> >- <th>Type</th> >- <th>Weight</th> >- <th colspan="2">Searchable</th> >- </tr> >- <tr> >- <th colspan="5" class="NoSort"> </th> >- <th class="NoSort">Staff interface</th> >- <th class="NoSort">OPAC</th> >+ <div id="search_fields" style="border:none"> >+ <table class="search_fields" id="search_fields_table"> >+ <thead> >+ <tr> >+ <th>Name</th> >+ <th>Aliases</th> >+ <th>Label</th> >+ <th>Type</th> >+ <th>Weight</th> >+ <th colspan="2">Searchable</th> >+ </tr> >+ <tr> >+ <th colspan="5" class="NoSort"> </th> >+ <th class="NoSort">Staff interface</th> >+ <th class="NoSort">OPAC</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH search_field IN all_search_fields %] >+ <tr> >+ <td data-order="[% search_field.name | html %]"> >+ [% IF search_field.mandatory %] >+ <input type="text" name="search_field_name" value="[% search_field.name | html %]" readonly /> >+ [% ELSE %] >+ <input type="text" name="search_field_name" value="[% search_field.name | html %]" /> >+ [% END %] >+ </td> >+ <td> >+ [% search_field.aliases.join(', ') | html %] >+ </td> >+ <td data-order="[% search_field.label | html %]"> >+ [% IF search_field.mandatory %] >+ <input type="text" name="search_field_label" value="[% search_field.label | html %]" readonly /> >+ [% ELSE %] >+ <input type="text" name="search_field_label" value="[% search_field.label | html %]" /> >+ [% END %] >+ </td> >+ <td data-order="[% search_field.type | html %]"> >+ [% IF search_field.mandatory %] >+ <input type="hidden" name="search_field_type" value="[% search_field.type | html %]" /> >+ <select name="search_field_type" disabled> >+ [% ELSE %] >+ <select name="search_field_type"> >+ [% END %] >+ <option value=""></option> >+ [% IF search_field.type == "string" %] >+ <option value="string" selected="selected">String</option> >+ [% ELSE %] >+ <option value="string">String</option> >+ [% END %] >+ [% IF search_field.type == "date" %] >+ <option value="date" selected="selected">Date</option> >+ [% ELSE %] >+ <option value="date">Date</option> >+ [% END %] >+ [% IF search_field.type == "year" %] >+ <option value="year" selected="selected">Year</option> >+ [% ELSE %] >+ <option value="year">Year</option> >+ [% END %] >+ [% IF search_field.type == "number" %] >+ <option value="number" selected="selected">Number</option> >+ [% ELSE %] >+ <option value="number">Number</option> >+ [% END %] >+ [% IF search_field.type == "boolean" %] >+ <option value="boolean" selected="selected">Boolean</option> >+ [% ELSE %] >+ <option value="boolean">Boolean</option> >+ [% END %] >+ [% IF search_field.type == "sum" %] >+ <option value="sum" selected="selected">Sum</option> >+ [% ELSE %] >+ <option value="sum">Sum</option> >+ [% END %] >+ [% IF search_field.type == "isbn" %] >+ <option value="isbn" selected="selected">ISBN</option> >+ [% ELSE %] >+ <option value="isbn">ISBN</option> >+ [% END %] >+ [% IF search_field.type == "stdno" %] >+ <option value="stdno" selected="selected">Std. Number</option> >+ [% ELSE %] >+ <option value="stdno">Std. Number</option> >+ [% END %] >+ </select> >+ </td> >+ <td data-order="[% search_field.weight | html %]"> >+ [% IF search_field.mapped_biblios %] >+ <input type="text" inputmode="decimal" pattern="[0-9\.]*" name="search_field_weight" value="[% search_field.weight | html %]" /> >+ [% ELSE %] >+ <input type="text" name="search_field_weight" value=""> >+ [% END %] >+ </td> >+ <td> >+ <select name="search_field_staff_client"> >+ [% IF search_field.staff_client %] >+ <option value="1" selected="selected">Yes</option> >+ <option value="0">No</option> >+ [% ELSE %] >+ <option value="1">Yes</option> >+ <option value="0" selected="selected">No</option> >+ [% END %] >+ </select> >+ </td> >+ <td> >+ <select name="search_field_opac"> >+ [% IF search_field.opac %] >+ <option value="1" selected="selected">Yes</option> >+ <option value="0">No</option> >+ [% ELSE %] >+ <option value="1">Yes</option> >+ <option value="0" selected="selected">No</option> >+ [% END %] >+ </select> >+ </td> >+ </tr> >+ [% END %] >+ </tbody> >+ </table> >+ </div> >+ [% FOREACH index IN indexes %] >+ <div id="mapping_[% index.index_name | html %]" style="border:none"> >+ <table class="mappings" data-index_name="[% index.index_name | html %]" data-ordering="false" id="mapping_[% index.index_name | html %]_table"> >+ <thead> >+ <tr class="nodrag nodrop"> >+ <th>Search field</th> >+ <th>Sortable</th> >+ <th>Facetable</th> >+ <th>Suggestible</th> >+ <th>Searchable</th> >+ <th>Mapping</th> >+ <th> </th> > </tr> >- </thead> >- <tbody> >- [% FOREACH search_field IN all_search_fields %] >- <tr> >- <td data-order="[% search_field.name | html %]"> >- [% IF search_field.mandatory %] >- <input type="text" name="search_field_name" value="[% search_field.name | html %]" readonly /> >- [% ELSE %] >- <input type="text" name="search_field_name" value="[% search_field.name | html %]" /> >- [% END %] >- </td> >- <td> >- [% search_field.aliases.join(', ') | html %] >- </td> >- <td data-order="[% search_field.label | html %]"> >- [% IF search_field.mandatory %] >- <input type="text" name="search_field_label" value="[% search_field.label | html %]" readonly /> >- [% ELSE %] >- <input type="text" name="search_field_label" value="[% search_field.label | html %]" /> >- [% END %] >- </td> >- <td data-order="[% search_field.type | html %]"> >- [% IF search_field.mandatory %] >- <input type="hidden" name="search_field_type" value="[% search_field.type | html %]" /> >- <select name="search_field_type" disabled> >- [% ELSE %] >- <select name="search_field_type"> >- [% END %] >- <option value=""></option> >- [% IF search_field.type == "string" %] >- <option value="string" selected="selected">String</option> >- [% ELSE %] >- <option value="string">String</option> >- [% END %] >- [% IF search_field.type == "date" %] >- <option value="date" selected="selected">Date</option> >- [% ELSE %] >- <option value="date">Date</option> >- [% END %] >- [% IF search_field.type == "year" %] >- <option value="year" selected="selected">Year</option> >- [% ELSE %] >- <option value="year">Year</option> >- [% END %] >- [% IF search_field.type == "number" %] >- <option value="number" selected="selected">Number</option> >- [% ELSE %] >- <option value="number">Number</option> >- [% END %] >- [% IF search_field.type == "boolean" %] >- <option value="boolean" selected="selected">Boolean</option> >- [% ELSE %] >- <option value="boolean">Boolean</option> >- [% END %] >- [% IF search_field.type == "sum" %] >- <option value="sum" selected="selected">Sum</option> >- [% ELSE %] >- <option value="sum">Sum</option> >- [% END %] >- [% IF search_field.type == "isbn" %] >- <option value="isbn" selected="selected">ISBN</option> >- [% ELSE %] >- <option value="isbn">ISBN</option> >- [% END %] >- [% IF search_field.type == "stdno" %] >- <option value="stdno" selected="selected">Std. Number</option> >- [% ELSE %] >- <option value="stdno">Std. Number</option> >- [% END %] >- </select> >- </td> >- <td data-order="[% search_field.weight | html %]"> >- [% IF search_field.mapped_biblios %] >- <input type="text" inputmode="decimal" pattern="[0-9\.]*" name="search_field_weight" value="[% search_field.weight | html %]" /> >- [% ELSE %] >- <input type="text" name="search_field_weight" value=""> >- [% END %] >+ </thead> >+ <tbody> >+ [% FOREACH mapping IN index.mappings %] >+ [% IF mapping.search_field_mandatory && mapping.search_field_label != loop.next.search_field_label && mapping.search_field_label != loop.prev.search_field_label %] >+ <tr> >+ <td> >+ <input type="hidden" name="mapping_index_name" value="[% index.index_name | html %]" /> >+ <input type="hidden" name="mapping_search_field_name" value="[% mapping.search_field_name | html %]"> >+ [% mapping.search_field_label | html %] > </td> >- <td> >- <select name="search_field_staff_client"> >- [% IF search_field.staff_client %] >- <option value="1" selected="selected">Yes</option> >- <option value="0">No</option> >- [% ELSE %] >- <option value="1">Yes</option> >- <option value="0" selected="selected">No</option> >- [% END %] >- </select> >- </td> >- <td> >- <select name="search_field_opac"> >- [% IF search_field.opac %] >- <option value="1" selected="selected">Yes</option> >- <option value="0">No</option> >- [% ELSE %] >- <option value="1">Yes</option> >- <option value="0" selected="selected">No</option> >- [% END %] >- </select> >- </td> >- </tr> >- [% END %] >- </tbody> >- </table> >- </div> >- [% FOREACH index IN indexes %] >- <div id="mapping_[% index.index_name | html %]" role="tabpanel" class="tab-pane"> >- <table class="mappings" data-index_name="[% index.index_name | html %]" data-ordering="false" id="mapping_[% index.index_name | html %]_table"> >- <thead> >- <tr class="nodrag nodrop"> >- <th>Search field</th> >- <th>Sortable</th> >- <th>Facetable</th> >- <th>Suggestible</th> >- <th>Searchable</th> >- <th>Mapping</th> >- <th> </th> >- </tr> >- </thead> >- <tbody> >- [% FOREACH mapping IN index.mappings %] >- [% IF mapping.search_field_mandatory && mapping.search_field_label != loop.next.search_field_label && mapping.search_field_label != loop.prev.search_field_label %] >- <tr> >- <td> >- <input type="hidden" name="mapping_index_name" value="[% index.index_name | html %]" /> >- <input type="hidden" name="mapping_search_field_name" value="[% mapping.search_field_name | html %]"> >- [% mapping.search_field_label | html %] >- </td> >- <td> >+ <td> >+ [% IF mapping.sort == 0 %] >+ <input type="hidden" name="mapping_sort" value="0" readonly />No >+ [% ELSE %] >+ <input type="hidden" name="mapping_sort" value="1" readonly />Yes >+ [% END %] >+ </td> >+ <td> >+ <input type="hidden" name="mapping_facet" value="[% mapping.facet | html %]" readonly />[% IF mapping.facet == 1 %]Yes[% ELSE %]No[% END %] >+ </td> >+ <td> >+ <input type="hidden" name="mapping_suggestible" value="[% mapping.suggestible | html %]" readonly />[% IF mapping.suggestible == 1 %]Yes[% ELSE %]No[% END %] >+ </td> >+ <td> >+ <input type="hidden" name="mapping_search" value="[% mapping.search | html %]" readonly />[% IF mapping.search == 1 %]Yes[% ELSE %]No[% END %] >+ </td> >+ <td> >+ <input name="mapping_marc_field" type="text" value="[% mapping.marc_field | html %]" /> >+ </td> >+ <td> </td> >+ </tr> >+ [% ELSE %] >+ <tr> >+ <td> >+ <input type="hidden" name="mapping_index_name" value="[% index.index_name | html %]" /> >+ <input type="hidden" name="mapping_search_field_name" value="[% mapping.search_field_name | html %]"> >+ [% mapping.search_field_label | html %] >+ </td> >+ <td> >+ <select name="mapping_sort"> > [% IF mapping.sort == 0 %] >- <input type="hidden" name="mapping_sort" value="0" readonly />No >- [% ELSE %] >- <input type="hidden" name="mapping_sort" value="1" readonly />Yes >- [% END %] >- </td> >- <td> >- <input type="hidden" name="mapping_facet" value="[% mapping.facet | html %]" readonly />[% IF mapping.facet == 1 %]Yes[% ELSE %]No[% END %] >- </td> >- <td> >- <input type="hidden" name="mapping_suggestible" value="[% mapping.suggestible | html %]" readonly />[% IF mapping.suggestible == 1 %]Yes[% ELSE %]No[% END %] >- </td> >- <td> >- <input type="hidden" name="mapping_search" value="[% mapping.search | html %]" readonly />[% IF mapping.search == 1 %]Yes[% ELSE %]No[% END %] >- </td> >- <td> >- <input name="mapping_marc_field" type="text" value="[% mapping.marc_field | html %]" /> >- </td> >- <td> </td> >- </tr> >- [% ELSE %] >- <tr> >- <td> >- <input type="hidden" name="mapping_index_name" value="[% index.index_name | html %]" /> >- <input type="hidden" name="mapping_search_field_name" value="[% mapping.search_field_name | html %]"> >- [% mapping.search_field_label | html %] >- </td> >- <td> >- <select name="mapping_sort"> >- [% IF mapping.sort == 0 %] >- <option value="0" selected="selected">No</option> >- <option value="1">Yes</option> >- [% ELSE %] >- <option value="0">No</option> >- <option value="1" selected="selected">Yes</option> >- [% END %] >- </select> >- </td> >- <td> >- [% IF mapping.is_facetable %] >- <select name="mapping_facet"> >- [% IF mapping.facet %] >- <option value="0">No</option> >- <option value="1" selected="selected">Yes</option> >- [% ELSE %] >- <option value="0" selected="selected">No</option> >- <option value="1">Yes</option> >- [% END %] >- </select> >+ <option value="0" selected="selected">No</option> >+ <option value="1">Yes</option> > [% ELSE %] >- <input type="hidden" name="mapping_facet" value="0" /> >- No >+ <option value="0">No</option> >+ <option value="1" selected="selected">Yes</option> > [% END %] >- </td> >- <td> >- <select name="mapping_suggestible"> >- [% IF mapping.suggestible %] >- <option value="0">No</option> >- <option value="1" selected="selected">Yes</option> >- [% ELSE %] >- <option value="0" selected="selected">No</option> >- <option value="1">Yes</option> >- [% END %] >- </select> >- </td> >- <td> >- <select name="mapping_search"> >- [% IF mapping.search %] >+ </select> >+ </td> >+ <td> >+ [% IF mapping.is_facetable %] >+ <select name="mapping_facet"> >+ [% IF mapping.facet %] > <option value="0">No</option> > <option value="1" selected="selected">Yes</option> >- [% ELSE %] >+ [% ELSE %] > <option value="0" selected="selected">No</option> > <option value="1">Yes</option> >- [% END %] >+ [% END %] > </select> >- </td> >- <td> >- <input name="mapping_marc_field" type="text" value="[% mapping.marc_field | html %]" /> >- </td> >- [% IF mapping.search_field_mandatory %] >- <td><a class="btn btn-default btn-xs delete mandatory" data-field_name="[% mapping.search_field_name | html %]" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td> >+ [% ELSE %] >+ <input type="hidden" name="mapping_facet" value="0" /> >+ No >+ [% END %] >+ </td> >+ <td> >+ <select name="mapping_suggestible"> >+ [% IF mapping.suggestible %] >+ <option value="0">No</option> >+ <option value="1" selected="selected">Yes</option> >+ [% ELSE %] >+ <option value="0" selected="selected">No</option> >+ <option value="1">Yes</option> >+ [% END %] >+ </select> >+ </td> >+ <td> >+ <select name="mapping_search"> >+ [% IF mapping.search %] >+ <option value="0">No</option> >+ <option value="1" selected="selected">Yes</option> > [% ELSE %] >- <td><a class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td> >+ <option value="0" selected="selected">No</option> >+ <option value="1">Yes</option> > [% END %] > </select> > </td> >@@ -376,74 +361,73 @@ 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 id="lientype" 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 id="lientype" class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td> > [% END %] >- </tr> >+ </tr> > [% END %] >- </tbody> >- <tfoot> >- <tr class="nodrag nodrop"> >- <td> >- <input data-id="mapping_index_name" type="hidden" value="[% index.index_name | html %]" /> >- <select data-id="mapping_search_field_name"> >- [% FOREACH f IN all_search_fields %] >- <option value="[% f.name | html %]">[% f.name | html %]</option> >- [% END %] >- </select> >- </td> >- <td> >- <select data-id="mapping_sort"> >- <option value="undef">Undef</option> >- <option value="0">0</option> >- <option value="1">1</option> >- </select> >- </td> >- <td> >- <select data-id="mapping_facet"> >- [% IF mapping.facet %] >- <option value="0">No</option> >- <option value="1" selected="selected">Yes</option> >- [% ELSE %] >- <option value="0" selected="selected">No</option> >- <option value="1">Yes</option> >- [% END %] >- </select> >- </td> >- <td> >- <select data-id="mapping_suggestible"> >- [% IF mapping.suggestible %] >- <option value="0">No</option> >- <option value="1" selected="selected">Yes</option> >- [% ELSE %] >- <option value="0" selected="selected">No</option> >- <option value="1">Yes</option> >- [% END %] >- </select> >- </td> >- <td> >- <select data-id="mapping_search"> >- [% IF mapping.search %] >- <option value="0">No</option> >- <option value="1" selected="selected">Yes</option> >- [% ELSE %] >- <option value="0" selected="selected">No</option> >- <option value="1">Yes</option> >- [% END %] >- </select> >- </td> >- <td><input data-id="mapping_marc_field" type="text" /></td> >- <td><a class="btn btn-default btn-xs add"><i class="fa fa-plus"></i> Add</a></td> >- </tr> >- </tfoot> >- </table> >- >+ [% END %] >+ </tbody> >+ <tfoot> >+ <tr class="nodrag nodrop"> >+ <td> >+ <input data-id="mapping_index_name" type="hidden" value="[% index.index_name | html %]" /> >+ <select data-id="mapping_search_field_name"> >+ [% FOREACH f IN all_search_fields %] >+ <option value="[% f.name | html %]">[% f.name | html %]</option> >+ [% END %] >+ </select> >+ </td> >+ <td> >+ <select data-id="mapping_sort"> >+ <option value="undef">Undef</option> >+ <option value="0">0</option> >+ <option value="1">1</option> >+ </select> >+ </td> >+ <td> >+ <select data-id="mapping_facet"> >+ [% IF mapping.facet %] >+ <option value="0">No</option> >+ <option value="1" selected="selected">Yes</option> >+ [% ELSE %] >+ <option value="0" selected="selected">No</option> >+ <option value="1">Yes</option> >+ [% END %] >+ </select> >+ </td> >+ <td> >+ <select data-id="mapping_suggestible"> >+ [% IF mapping.suggestible %] >+ <option value="0">No</option> >+ <option value="1" selected="selected">Yes</option> >+ [% ELSE %] >+ <option value="0" selected="selected">No</option> >+ <option value="1">Yes</option> >+ [% END %] >+ </select> >+ </td> >+ <td> >+ <select data-id="mapping_search"> >+ [% IF mapping.search %] >+ <option value="0">No</option> >+ <option value="1" selected="selected">Yes</option> >+ [% ELSE %] >+ <option value="0" selected="selected">No</option> >+ <option value="1">Yes</option> >+ [% END %] >+ </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> >+ </tr> >+ </tfoot> >+ </table> > > [% IF index.index_name == 'biblios' %] >- > <h3>Facet order</h3> >- <div id="facet_[% index.index_name | html %]" class="ui-tabs-panel"> >+ <div id="facet_[% index.index_name | html %]" style="border:none"> > <table> > <thead> > <tr> >@@ -455,54 +439,46 @@ a.add, a.delete { > <tbody> > [% FOREACH f IN facetable_fields %] > <tr> >- <th>Search field</th> >- <th>Label</th> >- <th>Display</th> >+ <td> >+ [% f.name | html %] >+ </td> >+ <td> >+ [% SWITCH f.name %] >+ [% CASE 'author' %]Authors >+ [% CASE 'itype' %]Item types >+ [% CASE 'location' %]Locations >+ [% CASE 'su-geo' %]Places >+ [% CASE 'title-series' %]Series >+ [% CASE 'subject' %]Topics >+ [% CASE 'ccode' %]Collections >+ [% CASE 'holdingbranch' %]Holding libraries >+ [% CASE 'homebranch' %]Home libraries >+ [% CASE 'ln' %]Language >+ [% CASE %][% f | html %] >+ [% END %] >+ </td> >+ <td> >+ [% IF f.facet_order %] >+ <input type="checkbox" name="display_facet" value="[% f.name | html %]" checked="checked" /> >+ [% ELSE %] >+ <input type="checkbox" name="display_facet" value="[% f.name | html %]" /> >+ [% END %] >+ </td> > </tr> >- </thead> >- <tbody> >- [% FOREACH f IN facetable_fields %] >- <tr> >- <td> >- [% f.name | html %] >- </td> >- <td> >- [% SWITCH f.name %] >- [% CASE 'author' %]Authors >- [% CASE 'itype' %]Item types >- [% CASE 'location' %]Locations >- [% CASE 'su-geo' %]Places >- [% CASE 'title-series' %]Series >- [% CASE 'subject' %]Topics >- [% CASE 'ccode' %]Collections >- [% CASE 'holdingbranch' %]Holding libraries >- [% CASE 'homebranch' %]Home libraries >- [% CASE 'ln' %]Language >- [% CASE %][% f | html %] >- [% END %] >- </td> >- <td> >- [% IF f.facet_order %] >- <input type="checkbox" name="display_facet" value="[% f.name | html %]" checked="checked" /> >- [% ELSE %] >- <input type="checkbox" name="display_facet" value="[% f.name | html %]" /> >- [% END %] >- </td> >- </tr> >- [% END %] >- </tbody> >- </table> >- </div> >- [% END %] >- </div> >- [% END %] >- </div> <!-- /.tab-content --> >- </div> <!-- /#tabs --> >+ [% END %] >+ </tbody> >+ </table> >+ </div> >+ [% END %] >+ </div> >+ [% END %] >+ </div> >+ </fieldset> >+ </div> > <fieldset class="action"> >- <button class="btn btn-default" type="submit" name="op" value="edit" id="lientype"><i class="fa fa-hdd-o" aria-hidden="true"></i> Save</button> >- <button class="btn btn-default" type="submit" name="op" value="reset_confirm" id="lientype"><i class="fa fa-refresh" aria-hidden="true"></i> Reset mappings</button> >+ <button class="btn btn-default principal" type="submit" name="op" value="edit"><i class="fa fa-hdd-o" aria-hidden="true"></i> Save</button> >+ <button class="btn btn-default cancel" type="submit" name="op" value="reset_confirm"><i class="fa fa-refresh" aria-hidden="true"></i> Reset mappings</button> > </fieldset> >- </div> > </form> > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >index 1fda69af78..226b5800d9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -21,21 +21,7 @@ > }); > var Sticky; > $(document).ready(function() { >- var tabs = $('#authoritytabs').tabs({ >- activate: function(e, ui) { >- $("#"+ $(ui.newPanel).attr("id") + " .input_marceditor:visible:eq(0)").focus(); >- } >- }); >- >- /* On page load, check for location.hash in the page URL */ >- var hash = location.hash; >- var hashPieces = hash.split('?'); >- if( hashPieces[0] !== "" ){ >- var activeTab = $("[href='" + hashPieces[0] + "']"); >- selectTab(activeTab); >- window.scrollTo( 0, 0 ); >- } >- >+ var tabs = $('#authoritytabs').tabs(); > $( "ul.sortable_field", tabs ).sortable(); > $( "ul.sortable_subfield", tabs ).sortable(); > Sticky = $("#toolbar"); >@@ -47,7 +33,7 @@ > if(Check()){ > $("#f").submit(); > } >- }); >+ }); > $("#z3950submit").click(function(){ > var strQuery = GetZ3950Terms(); > var index = "&index=[% index | html %]"; >@@ -56,218 +42,174 @@ > } > return false; > }); >- $(".toolbar-tabs a").on("click",function(e){ >- e.preventDefault(); >- selectTab( $(this ) ); >- }); >- >- $(".tag_anchor").on("click", function(e){ >- e.preventDefault(); >- $(".tag_anchor").removeClass("selected"); >- $(this).addClass("selected"); >- var link = this.href; >- var linkid = link.substring( link.indexOf("#") + 1 ); >- window.scrollTo( 0, getScrollto( linkid, "toolbar" ) ); >- }); >- >- $("body").on("click", ".linkfield", function(e){ >- e.preventDefault(); >- var tab = $(this).data("tab"); >- var field = $(this).data("field"); >- var tablink = $("a[data-tabid='" + tab + "']" ); >- selectTab( tablink ); >- window.scrollTo( 0, getScrollto( field, "toolbar" ) ); >- }); > }); > >- function selectTab( tablink ){ >- $(".toolbar-tabs li").removeClass("selected"); >- tablink.parent().addClass("selected"); >- var tabid = tablink.data("tabid"); >- $('#authoritytabs').selectTabByID("#tab" + tabid + "XX"); >- $(".tag_anchors").removeClass("tab_selected").hide(); >- $(".tag_anchors_" + tabid ).addClass("tab_selected").show(); >- } >- >- /** >- * Returns a roughly ideal position to scroll an element into view >- * @param {string} target - The HTML id of the element to scroll into view >- * @param {string} elemid - The HTML id of the element which might obscure >- * the view of the target element e.g. a floating toolbar >- * @return {number} - The y-coordinate to pass to window.scrollTo() >- */ >- function getScrollto( target, elemid ){ >- var dest = $("#" + target ); >- var yoffset = dest.offset(); >- >- if( elemid != "" ){ >- var element = $("#" + elemid ); >- var elem_height = element.outerHeight(); >- } else { >- elem_height = 0; >- } >- return yoffset.top - elem_height - 20; >- } >- >- >- /** >- * check if z3950 mandatories are set or not >- */ >- function GetZ3950Terms(){ >- var strQuery="&authtypecode="+document.forms['f'].authtypecode.value; >- var mandatories = new Array(); >- var mandatories_label = new Array(); >- [% FOREACH BIG_LOO IN BIG_LOOP %][% FOREACH innerloo IN BIG_LOO.innerloop %][% FOREACH subfield_loo IN innerloo.subfield_loop %][% IF ( subfield_loo.z3950_mandatory ) %]mandatories.push("[% subfield_loo.id | html %]"); >- mandatories_label.push("[% subfield_loo.z3950_mandatory | html %]");[% END %][% END %][% END %][% END %] >- >- for(var i=0,len=mandatories.length; i<len ; i++){ >- var field_value = document.getElementById(mandatories[i]).value; >- if( field_value ){ >- strQuery += "&"+mandatories_label[i]+"="+encodeURIComponent(field_value); >- } >+/** >+ * check if z3950 mandatories are set or not >+ */ >+function GetZ3950Terms(){ >+ var strQuery="&authtypecode="+document.forms['f'].authtypecode.value; >+ var mandatories = new Array(); >+ var mandatories_label = new Array(); >+ [% FOREACH BIG_LOO IN BIG_LOOP %][% FOREACH innerloo IN BIG_LOO.innerloop %][% FOREACH subfield_loo IN innerloo.subfield_loop %][% IF ( subfield_loo.z3950_mandatory ) %]mandatories.push("[% subfield_loo.id | html %]"); >+ mandatories_label.push("[% subfield_loo.z3950_mandatory | html %]");[% END %][% END %][% END %][% END %] >+ >+ for(var i=0,len=mandatories.length; i<len ; i++){ >+ var field_value = document.getElementById(mandatories[i]).value; >+ if( field_value ){ >+ strQuery += "&"+mandatories_label[i]+"="+encodeURIComponent(field_value); > } >- return strQuery; > } >- >- /** >- * check if mandatory subfields are written >- */ >- function AreMandatoriesNotOk(){ >- var mandatories = new Array(); >- var mandatoriesfields = new Array(); >- var tab = new Array(); >- var label = new Array(); >- [% FOREACH BIG_LOO IN BIG_LOOP %] >- [% FOREACH innerloo IN BIG_LOO.innerloop %] >- [% IF ( innerloo.mandatory ) %] >- mandatoriesfields.push(new Array("[% innerloo.tag | html %]","[% innerloo.index | html %][% innerloo.random | html %]","[% innerloo.index | html %]")); >- [% END %] >- [% FOREACH subfield_loo IN innerloo.subfield_loop %] >- [% IF ( subfield_loo.mandatory ) %]mandatories.push("[% subfield_loo.id | html %]"); >- tab.push("[% BIG_LOO.number | html %]"); >- label.push("[% To.json(subfield_loo.marc_lib) | html %]"); >- [% END %] >- [% END %] >+ return strQuery; >+} >+ >+/** >+ * check if mandatory subfields are written >+ */ >+function AreMandatoriesNotOk(){ >+ var mandatories = new Array(); >+ var mandatoriesfields = new Array(); >+ var tab = new Array(); >+ var label = new Array(); >+ [% FOREACH BIG_LOO IN BIG_LOOP %] >+ [% FOREACH innerloo IN BIG_LOO.innerloop %] >+ [% IF ( innerloo.mandatory ) %] >+ mandatoriesfields.push(new Array("[% innerloo.tag | html %]","[% innerloo.index | html %][% innerloo.random | html %]","[% innerloo.index | html %]")); > [% END %] >- [% END %] >- var StrAlert = ""; >- for(var i=0,len=mandatories.length; i<len ; i++){ >- var id_string = mandatories[i]; >- // alert (id_string); >- if( ! $("#" + id_string).val() ){ >- var elt = document.getElementById(id_string); >- if ( elt.nodeName == 'SELECT' ) { >- $(elt).siblings('.select2').find("span[role='combobox']").addClass('subfield_not_filled'); >- } else { >- $(elt).addClass('subfield_not_filled'); >- } >- >- $(elt).focus(); >- StrAlert += "\t* " + _("%s in tab %s").format(label[i], tab[i]) + "\n"; >- } >- } >- >- /* Check for mandatories field(not subfields) */ >- for(var i=0,len=mandatoriesfields.length; i<len; i++){ >- isempty = true; >- arr = mandatoriesfields[i]; >- divid = "tag_" + arr[0] + "_" + arr[1]; >- varegexp = new RegExp("^tag_" + arr[0] + "_code_"); >- >- if(parseInt(arr[0]) >= 10){ >- elem = document.getElementById(divid); >- eleminputs = elem.getElementsByTagName('input'); >- >- for(var j=0,len2=eleminputs.length; j<len2; j++){ >- >- if(eleminputs[j].name.match(varegexp) && eleminputs[j].value){ >- inputregexp = new RegExp("^tag_" + arr[0] + "_subfield_" + eleminputs[j].value + "_" + arr[2]); >- >- for( var k=0; k<len2; k++){ >- if(eleminputs[k].id.match(inputregexp) && eleminputs[k].value){ >- isempty = false >- } >- } >- } >- } >- }else{ >- isempty = false; >+ [% FOREACH subfield_loo IN innerloo.subfield_loop %] >+ [% IF ( subfield_loo.mandatory ) %]mandatories.push("[% subfield_loo.id | html %]"); >+ tab.push("[% BIG_LOO.number | html %]"); >+ label.push("[% To.json(subfield_loo.marc_lib) | html %]"); >+ [% END %] >+ [% END %] >+ [% END %] >+ [% END %] >+ var StrAlert = ""; >+ for(var i=0,len=mandatories.length; i<len ; i++){ >+ var id_string = mandatories[i]; >+ // alert (id_string); >+ if( ! $("#" + id_string).val() ){ >+ var elt = document.getElementById(id_string); >+ if ( elt.nodeName == 'SELECT' ) { >+ $(elt).siblings('.select2').find("span[role='combobox']").addClass('subfield_not_filled'); >+ } else { >+ $(elt).addClass('subfield_not_filled'); > } > >- if(isempty){ >- flag = 1; >- StrAlert += "\t* " + _("Field %s is mandatory, at least one of its subfields must be filled.").format(arr[0]) + "\n"; >- } >- >- } >- >- >- if(StrAlert){ >- return _("Can't save this record because the following field aren't filled :") + "\n\n" + StrAlert; >+ $(elt).focus(); >+ StrAlert += "\t* " + _("%s in tab %s").format(label[i], tab[i]) + "\n"; > } >- return false; > } >- >- function Check(){ >- var StrAlert = AreMandatoriesNotOk(); >- if( ! StrAlert ){ >- document.f.submit(); >- return true; >- } else { >- alert(StrAlert); >- return false; >- } >+ >+ /* Check for mandatories field(not subfields) */ >+ for(var i=0,len=mandatoriesfields.length; i<len; i++){ >+ isempty = true; >+ arr = mandatoriesfields[i]; >+ divid = "tag_" + arr[0] + "_" + arr[1]; >+ varegexp = new RegExp("^tag_" + arr[0] + "_code_"); >+ >+ if(parseInt(arr[0]) >= 10){ >+ elem = document.getElementById(divid); >+ eleminputs = elem.getElementsByTagName('input'); >+ >+ for(var j=0,len2=eleminputs.length; j<len2; j++){ >+ >+ if(eleminputs[j].name.match(varegexp) && eleminputs[j].value){ >+ inputregexp = new RegExp("^tag_" + arr[0] + "_subfield_" + eleminputs[j].value + "_" + arr[2]); >+ >+ for( var k=0; k<len2; k++){ >+ if(eleminputs[k].id.match(inputregexp) && eleminputs[k].value){ >+ isempty = false >+ } >+ } >+ } >+ } >+ }else{ >+ isempty = false; >+ } >+ >+ if(isempty){ >+ flag = 1; >+ StrAlert += "\t* " + _("Field %s is mandatory, at least one of its subfields must be filled.").format(arr[0]) + "\n"; >+ } >+ > } >- >- function AddField(field,cntrepeatfield) { >- document.forms['f'].op.value = "addfield"; >- document.forms['f'].addfield_field.value=field; >- document.forms['f'].repeat_field.value=cntrepeatfield; >- document.f.submit(); >+ >+ >+ if(StrAlert){ >+ return _("Can't save this record because the following field aren't filled :") + "\n\n" + StrAlert; > } >+ return false; >+} > >- function addauthority() { >- X = document.forms[0].authtype.value; >- window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X; >- } >- function searchauthority() { >- X = document.forms[0].authtype2.value; >- Y = document.forms[0].value.value; >- window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains"; >- } >- function confirmnotdup(redirect){ >- $("#confirm_not_duplicate").attr("value","1"); >- Check(); >+function Check(){ >+ var StrAlert = AreMandatoriesNotOk(); >+ if( ! StrAlert ){ >+ document.f.submit(); >+ return true; >+ } else { >+ alert(StrAlert); >+ return false; > } >+} >+ >+function AddField(field,cntrepeatfield) { >+ document.forms['f'].op.value = "addfield"; >+ document.forms['f'].addfield_field.value=field; >+ document.forms['f'].repeat_field.value=cntrepeatfield; >+ document.f.submit(); >+} >+ >+function addauthority() { >+ X = document.forms[0].authtype.value; >+ window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X; >+} >+function searchauthority() { >+ X = document.forms[0].authtype2.value; >+ Y = document.forms[0].value.value; >+ window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains"; >+} >+function confirmnotdup(redirect){ >+ $("#confirm_not_duplicate").attr("value","1"); >+ Check(); >+} > </script> > [% Asset.css("css/addbiblio.css") | $raw %] > > </head> > <body id="auth_authorities" class="auth"> > >- <div id="loading"> >- <div>Loading, please wait...</div> >- </div> >+<div id="loading"> >+ <div>Loading, please wait...</div> >+</div> >+ >+[% INCLUDE 'header.inc' %] > >- [% INCLUDE 'header.inc' %] >+<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >+ <ol> >+ <li> >+ <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ </li> >+ <li> >+ <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> >+ </li> > >- <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >- <ol> >+ [% IF ( authid ) %] > <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ <a href="#" aria-current="page"> >+ Modify authority #[% authid | html %] ([% authtypetext | html %]) >+ </a> > </li> >+ >+ [% ELSE %] > <li> >- <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> >+ <a href="#" aria-current="page"> >+ Adding authority [% authtypetext | html %] >+ </a> > </li> > > [% END %] > </ol> >- <ol> >- [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >- </ol> >- <ol> >- <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >- </ol> > </nav> > > <div class="main container-fluid"> >@@ -275,9 +217,9 @@ > <div class="col-md-10 col-md-offset-1"> > > [% IF ( authid ) %] >-<h1>Modify authority #[% authid | html %] [% authtypetext | html %]</h1> >+<h2>Modify authority #[% authid | html %] [% authtypetext | html %]</h2> > [% ELSE %] >-<h1>Adding authority [% authtypetext | html %]</h1> >+<h2>Adding authority [% authtypetext | html %]</h2> > [% END %] > > [% IF ( duplicateauthid ) %] >@@ -305,61 +247,59 @@ > <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> > > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="#" class="btn btn-default" id="principal" accesskey="w"><i class="fa fa-save"></i> Save</a></div> > <div class="btn-group"> > [% IF ( authid ) %] >- <a class="cancel" class="btn btn-default" id="cancel" href="/cgi-bin/koha/authorities/detail.pl?authid=[% authid | url %]">Cancel</a> >+ <a class="btn btn-default cancel" id="cancel" href="/cgi-bin/koha/authorities/detail.pl?authid=[% authid | url %]">Cancel</a> > [% ELSE %] >- <a class="cancel" class="btn btn-default" id="cancel" href="/cgi-bin/koha/authorities/authorities-home.pl">Cancel</a> >+ <a class="btn btn-default cancel" id="cancel" href="/cgi-bin/koha/authorities/authorities-home.pl">Cancel</a> > [% END %] > </div> >+ <div class="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"> > [% IF ( authid ) %] >- <a class="pat" class="btn btn-default" href="#"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a> >+ <a class="btn btn-default pat" id="z3950submit" href="#"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a> > [% ELSE %] >- <a class="pat" class="btn btn-default" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a> >+ <a class="btn btn-default pat" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a> > [% END %] > </div> > </div> > >- <fieldset class="select-libs"> >- <div id="authoritytabs" class="toptabs numbered"> >- <ul> >- [% FOREACH BIG_LOO IN BIG_LOOP %] >- <li><a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a></li> >- [% END %] >- </ul> >+<div id="authoritytabs" style="background-color: #fff" class="toptabs numbered"> >+ <ul> >+ [% FOREACH BIG_LOO IN BIG_LOOP %] >+ <li><a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a></li> >+ [% END %] >+ </ul> > >- [% FOREACH BIG_LOO IN BIG_LOOP %] >- <div id="tab[% BIG_LOO.number | html %]XX"> >- [% previous = "" %] >- [% FOREACH innerloo IN BIG_LOO.innerloop %] >- [% IF ( innerloo.tag ) %] >- [% IF innerloo.tag != previous %] >- [% IF previous != "" %] >- </ul> >- [% END %] >- [% previous = innerloo.tag %] >- [% IF ( innerloo.repeatable ) %] >- <ul class="sortable_field"> >- [% ELSE %] >- <ul> >- [% END %] >- [% END %] >- [% IF ( innerloo.repeatable ) %] >- <li class="tag sortable_tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> >+[% FOREACH BIG_LOO IN BIG_LOOP %] >+ <div id="tab[% BIG_LOO.number | html %]XX"> >+ >+ [% previous = "" %] >+ [% FOREACH innerloo IN BIG_LOO.innerloop %] >+ [% IF ( innerloo.tag ) %] >+ [% IF innerloo.tag != previous %] >+ [% IF previous != "" %] >+ </ul> >+ [% END %] >+ [% previous = innerloo.tag %] >+ [% IF ( innerloo.repeatable ) %] >+ <ul class="sortable_field"> >+ [% ELSE %] >+ <ul> >+ [% END %] >+ [% END %] >+ [% IF ( innerloo.repeatable ) %] >+ <li class="tag sortable_tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> >+ [% ELSE %] >+ <li class="tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> >+ [% END %] >+ <div class="tag_title" style="background-color:#f3f4f4" id="div_indicator_tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> >+ [% UNLESS hide_marc %] >+ [% IF advancedMARCEditor %] >+ <a href="#" tabindex="1" class="tagnum" title="[% innerloo.tag_lib | html %] - Click to Expand this Tag" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;">[% innerloo.tag | html %]</a> > [% ELSE %] >- <li class="tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> >+ <span class="tagnum" title="[% innerloo.tag_lib | html %]">[% innerloo.tag | html %]</span> > [% END %] >- >- <div class="tag_title" id="div_indicator_tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> >- [% UNLESS hide_marc %] >- [% IF advancedMARCEditor %] >- <a href="#" tabindex="1" class="tagnum" title="[% innerloo.tag_lib | html %] - Click to Expand this Tag" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;">[% innerloo.tag | html %]</a> >- [% ELSE %] >- <span class="tagnum" title="[% innerloo.tag_lib | html %]">[% innerloo.tag | html %]</span> >- [% END %] >- > [% IF ( innerloo.fixedfield ) %] > <input type="text" > tabindex="1" >@@ -393,179 +333,177 @@ > maxlength="1" > value="[% innerloo.indicator2 | html %]" /> > [% END %] - >- [% ELSE %] >- [% IF ( innerloo.fixedfield ) %] >- <input type="hidden" >- tabindex="1" >- name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]" >- value="[% innerloo.indicator1 | html %]" /> >- <input type="hidden" >- tabindex="1" >- name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]" >- value="[% innerloo.indicator2 | html %]" /> >- [% ELSE %] >- <input type="hidden" >- tabindex="1" >- name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]" >- value="[% innerloo.indicator1 | html %]" /> >- <input type="hidden" >- tabindex="1" >- name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]" >- value="[% innerloo.indicator2 | html %]" /> >- [% END %] >- [% END %] >+ [% ELSE %] >+ [% IF ( innerloo.fixedfield ) %] >+ <input type="hidden" >+ tabindex="1" >+ name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]" >+ value="[% innerloo.indicator1 | html %]" /> >+ <input type="hidden" >+ tabindex="1" >+ name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]" >+ value="[% innerloo.indicator2 | html %]" /> >+ [% ELSE %] >+ <input type="hidden" >+ tabindex="1" >+ name="tag_[% innerloo.tag | html %]_indicator1_[% innerloo.index | html %][% innerloo.random | html %]" >+ value="[% innerloo.indicator1 | html %]" /> >+ <input type="hidden" >+ tabindex="1" >+ name="tag_[% innerloo.tag | html %]_indicator2_[% innerloo.index | html %][% innerloo.random | html %]" >+ value="[% innerloo.indicator2 | html %]" /> >+ [% END %] >+ [% END %] > >- [% UNLESS advancedMARCEditor %] >- <a href="#" tabindex="1" class="expandfield" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Click to Expand this Tag">[% innerloo.tag_lib | html %]</a> >+ [% UNLESS advancedMARCEditor %] >+ <a href="#" tabindex="1" class="expandfield" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Click to Expand this Tag">[% innerloo.tag_lib | html %]</a> >+ [% END %] >+ <span class="field_controls"> >+ [% IF ( innerloo.repeatable ) %] >+ <a href="#" tabindex="1" class="buttonPlus" onclick="CloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]','[% hide_marc | html %]','[% advancedMARCEditor | html %]'); return false;" title="Repeat this Tag"> >+ <img src="[% interface | html %]/[% theme | html %]/img/repeat-tag.png" alt="Repeat this Tag" /> >+ </a> > [% END %] >- <span class="field_controls"> >- [% IF ( innerloo.repeatable ) %] >- <a href="#" tabindex="1" class="buttonPlus" onclick="CloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]','[% hide_marc | html %]','[% advancedMARCEditor | html %]'); return false;" title="Repeat this Tag"> >- <img src="[% interface | html %]/[% theme | html %]/img/repeat-tag.png" alt="Repeat this Tag" /> >- </a> >- [% END %] >- <a href="#" tabindex="1" class="buttonMinus" onclick="UnCloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Delete this Tag"> >- <img src="[% interface | html %]/[% theme | html %]/img/delete-tag.png" alt="Delete this Tag" /> >- </a> >- </span> <!-- /.field_controls --> >+ <a href="#" tabindex="1" class="buttonMinus" onclick="UnCloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Delete this Tag"> >+ <img src="[% interface | html %]/[% theme | html %]/img/delete-tag.png" alt="Delete this Tag" /> >+ </a> >+ </span> <!-- /.field_controls --> > > </div> <!-- /div.tag_title --> > >- <ul class="sortable_subfield"> >- [% FOREACH subfield_loo IN innerloo.subfield_loop %] >- <!-- One line on the marc editor --> >- <li class="subfield_line" style="[% subfield_loo.visibility | html %]" id="subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]"> >- >- [% UNLESS hide_marc %] >- <div class="subfieldcode"> >- <input type="text" >- title="[% subfield_loo.marc_lib | $raw %]" >- style=" [% IF ( subfield_loo.fixedfield ) %]display:none; [% END %]border:0;" >- name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" >- value="[% subfield_loo.subfield | html %]" >- size="1" >- maxlength="1" >- class="flat" >- tabindex="0" /> >- </div> >- [% ELSE %] >- <input type="hidden" >+ <ul class="sortable_subfield"> >+ [% FOREACH subfield_loo IN innerloo.subfield_loop %] >+ <!-- One line on the marc editor --> >+ <li class="subfield_line" style="[% subfield_loo.visibility | html %]" id="subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]"> >+ >+ [% UNLESS hide_marc %] >+ <div class="subfieldcode"> >+ <input type="text" >+ title="[% subfield_loo.marc_lib | $raw %]" >+ style=" [% IF ( subfield_loo.fixedfield ) %]display:none; [% END %]border:0;" > name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" >- value="[% subfield_loo.subfield | html %]" /> >- [% END %] >+ value="[% subfield_loo.subfield | html %]" >+ size="1" >+ maxlength="1" >+ class="flat" >+ tabindex="0" /> >+ </div> >+ [% ELSE %] >+ <input type="hidden" >+ name="tag_[% subfield_loo.tag | html %]_code_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" >+ value="[% subfield_loo.subfield | html %]" /> >+ [% END %] > >- [% UNLESS advancedMARCEditor %] >- [% IF ( subfield_loo.mandatory ) %] >- <div class="subfield subfield_mandatory"> >+ [% UNLESS advancedMARCEditor %] >+ [% IF ( subfield_loo.mandatory ) %] >+ <div class="subfield subfield_mandatory"> >+ [% ELSE %] >+ <div class="subfield"> >+ [% END %] >+ [% IF ( subfield_loo.fixedfield ) %] >+ <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" style="display:none;" class="labelsubfield"> > [% ELSE %] >- <div class="subfield"> >+ <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" class="labelsubfield"> > [% END %] >- [% IF ( subfield_loo.fixedfield ) %] >- <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" style="display:none;" class="labelsubfield"> >- [% ELSE %] >- <label for="tag_[% subfield_loo.tag | html %]_subfield_[% subfield_loo.subfield | html %]_[% subfield_loo.index | html %]_[% subfield_loo.index_subfield | html %]" class="labelsubfield"> >- [% END %] >- [% subfield_loo.marc_lib | $raw %] >- </label> >- </div> >+ [% subfield_loo.marc_lib | $raw %] >+ </label> >+ </div> >+ [% END %] >+ >+ [% SET mv = subfield_loo.marc_value %] >+ <div id="field_marceditor[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]" class="field_marceditor"> >+ [% IF ( mv.type == 'select' ) %] >+ [% IF mv.category AND CAN_user_parameters_manage_auth_values %] >+ <select name="[%- mv.name | html -%]" tabindex="1" class="input_marceditor" id="[%- mv.id | html -%]" data-category="[% mv.category | html %]"> >+ [% ELSE %] >+ <select name="[%- mv.name | html -%]" tabindex="1" class="input_marceditor select2" id="[%- mv.id | html -%]"> > [% END %] > >- [% SET mv = subfield_loo.marc_value %] >- <div id="field_marceditor[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]" class="field_marceditor"> >- [% IF ( mv.type == 'select' ) %] >- [% IF mv.category AND CAN_user_parameters_manage_auth_values %] >- <select name="[%- mv.name | html -%]" tabindex="1" class="input_marceditor" id="[%- mv.id | html -%]" data-category="[% mv.category | html %]"> >+ [% FOREACH aval IN mv.values %] >+ [% IF aval == mv.default %] >+ <option value="[%- aval | html -%]" selected="selected">[%- mv.labels.$aval | html -%]</option> >+ [% ELSE %] >+ <option value="[%- aval | html -%]">[%- mv.labels.$aval | html -%]</option> >+ [% END %] >+ [% END %] >+ </select> >+ [% ELSIF ( mv.type == 'text1' ) %] >+ <input type="text" id="[%- mv.id | html -%]" name="[%- mv.id | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" /> >+ [% ELSIF ( mv.type == 'text2' ) %] >+ <input type="text" id="[%- mv.id | html -%]" size="67" maxlength="[%- mv.maxlength | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" /> >+ [% ELSIF ( mv.type == 'text' ) %] >+ <input type="text" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" size="67" maxlength="[%- mv.maxlength | html -%]" /> >+ [% ELSIF ( mv.type == 'textarea' ) %] >+ <textarea cols="70" rows="4" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" class="input_marceditor" tabindex="1" size="67" maxlength="[%- mv.maxlength | html -%]">[%- mv.value | html -%]</textarea> >+ [% ELSIF ( mv.type == 'hidden' ) %] >+ <input tabindex="1" type="hidden" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" size="67" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" /> >+ [% ELSIF ( mv.type == 'hidden_simple' ) %] >+ <input type="hidden" name="[%- mv.name | html -%]" /> >+ [% END %] >+ </div> >+ [% IF ( subfield_loo.mandatory ) %] >+ <div class="subfield_loop_mandatory"> >+ <span class="required">Required</span> >+ </div> >+ [% END %] >+ <div class="subfield_controls"> >+ [% IF ( mv.type == 'text1' ) %] >+ <a href="#" class="buttonDot tag_editor" onclick="openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id,'[%- mv.authtypecode | html -%]','auth'); return false;" tabindex="1" title="Tag editor">Tag editor</a> >+ [% ELSIF ( mv.type == 'text2' ) %] >+ [% IF mv.noclick %] >+ <a href="#" class="buttonDot tag_editor disabled" tabindex="-1" title="No popup">...</a> > [% ELSE %] >- <select name="[%- mv.name | html -%]" tabindex="1" class="input_marceditor select2" id="[%- mv.id | html -%]"> >+ <a href="#" id="buttonDot_[% mv.id | html %]" class="buttonDot tag_editor" title="Tag editor">...</a> > [% END %] >- >- [% FOREACH aval IN mv.values %] >- [% IF aval == mv.default %] >- <option value="[%- aval | html -%]" selected="selected">[%- mv.labels.$aval | html -%]</option> >- [% ELSE %] >- <option value="[%- aval | html -%]">[%- mv.labels.$aval | html -%]</option> >- [% END %] >- [% END %] >- </select> >- [% ELSIF ( mv.type == 'text1' ) %] >- <input type="text" id="[%- mv.id | html -%]" name="[%- mv.id | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" /> >- [% ELSIF ( mv.type == 'text2' ) %] >- <input type="text" id="[%- mv.id | html -%]" size="67" maxlength="[%- mv.maxlength | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" /> >- [% ELSIF ( mv.type == 'text' ) %] >- <input type="text" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" value="[%- mv.value | html -%]" class="input_marceditor" tabindex="1" size="67" maxlength="[%- mv.maxlength | html -%]" /> >- [% ELSIF ( mv.type == 'textarea' ) %] >- <textarea cols="70" rows="4" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" class="input_marceditor" tabindex="1" size="67" maxlength="[%- mv.maxlength | html -%]">[%- mv.value | html -%]</textarea> >- [% ELSIF ( mv.type == 'hidden' ) %] >- <input tabindex="1" type="hidden" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" size="67" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" /> >- [% ELSIF ( mv.type == 'hidden_simple' ) %] >- <input type="hidden" name="[%- mv.name | html -%]" /> >+ [% mv.javascript | $raw %] > [% END %] >- </div> >- [% IF ( subfield_loo.mandatory ) %] >- <div class="subfield_loop_mandatory"> >- <span class="required">Required</span> >- </div> >+ [% IF ( subfield_loo.repeatable ) %] >+ <a href="#" class="buttonPlus" tabindex="1" onclick="CloneSubfield('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]','[% advancedMARCEditor | html %]'); return false;"> >+ <img src="[% interface | html %]/[% theme | html %]/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /> >+ </a> >+ <a href="#" class="buttonMinus" tabindex="1" onclick="UnCloneField('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]'); return false;"> >+ <img src="[% interface | html %]/[% theme | html %]/img/delete-subfield.png" alt="Delete" title="Delete this subfield" /> >+ </a> > [% END %] >- <div class="subfield_controls"> >- [% IF ( mv.type == 'text1' ) %] >- <a href="#" class="buttonDot tag_editor" onclick="openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id,'[%- mv.authtypecode | html -%]','auth'); return false;" tabindex="1" title="Tag editor">Tag editor</a> >- [% ELSIF ( mv.type == 'text2' ) %] >- [% IF mv.noclick %] >- <a href="#" class="buttonDot tag_editor disabled" tabindex="-1" title="No popup">...</a> >- [% ELSE %] >- <a href="#" id="buttonDot_[% mv.id | html %]" class="buttonDot tag_editor" title="Tag editor">...</a> >- [% END %] >- [% mv.javascript | $raw %] >- [% END %] >- [% IF ( subfield_loo.repeatable ) %] >- <a href="#" class="buttonPlus" tabindex="1" onclick="CloneSubfield('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]','[% advancedMARCEditor | html %]'); return false;"> >- <img src="[% interface | html %]/[% theme | html %]/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /> >- </a> >- <a href="#" class="buttonMinus" tabindex="1" onclick="UnCloneField('subfield[% subfield_loo.tag | html %][% subfield_loo.subfield | html %][% subfield_loo.random | html %]'); return false;"> >- <img src="[% interface | html %]/[% theme | html %]/img/delete-subfield.png" alt="Delete" title="Delete this subfield" /> >- </a> >- [% END %] >- </div> >- </li> >- <!-- End of the line --> >- [% END %] >- </ul> <!-- /.sortable_subfield --> >- </li> >- [% END %]<!-- if innerloo.tag --> >- [% END %]<!-- BIG_LOO.innerloop --> >- </ul> <!-- /.sortable_field --> > </div> >- [% END %]<!-- BIG_LOOP --> >- </div><!-- tabs --> >- >- <div name="hidden" id="hidden" class="tab"> >- [% FOREACH hidden_loo IN hidden_loop %] >- <input type="hidden" name="tag" value="[% hidden_loo.tag | html %]" /> >- <input type="hidden" name="subfield" value="[% hidden_loo.subfield | html %]" /> >- <input type="hidden" name="mandatory" value="[% hidden_loo.mandatory | html %]" /> >- <input type="hidden" name="kohafield" value="[% hidden_loo.kohafield | html %]" /> >- <input type="hidden" name="tag_mandatory" value="[% hidden_loo.tag_mandatory | html %]" /> >- [% END %] >- </div> >- >- [% IF ( oldauthnumtagfield ) %] >- <input type="hidden" name="tag" value="[% oldauthnumtagfield | html %]" /> >- <input type="hidden" name="subfield" value="[% oldauthnumtagsubfield | html %]" /> >- <input type="hidden" name="field_value" value="[% authid | html %]" /> >- <input type="hidden" name="mandatory" value="0" /> >- <input type="hidden" name="kohafield" value="[% kohafield | html %]" /> >- <input type="hidden" name="tag_mandatory" value="[% tag_mandatory | html %]" /> >- <input type="hidden" name="tag" value="[% oldauthtypetagfield | html %]" /> >- <input type="hidden" name="subfield" value="[% oldauthtypetagsubfield | html %]" /> >- <input type="hidden" name="field_value" value="[% authtypecode | html %]" /> >- [% END %] >+ </li> >+ <!-- End of the line --> >+ [% END %] >+ </ul> <!-- /.sortable_subfield --> >+ </li> >+ [% END %]<!-- if innerloo.tag --> >+ [% END %]<!-- BIG_LOO.innerloop --> >+ </ul> <!-- /.sortable_field --> >+ </div> >+ [% END %]<!-- BIG_LOOP --> >+ </div><!-- tabs --> >+ >+<div name="hidden" id="hidden" class="tab"> >+[% FOREACH hidden_loo IN hidden_loop %] >+ <input type="hidden" name="tag" value="[% hidden_loo.tag | html %]" /> >+ <input type="hidden" name="subfield" value="[% hidden_loo.subfield | html %]" /> >+ <input type="hidden" name="mandatory" value="[% hidden_loo.mandatory | html %]" /> >+ <input type="hidden" name="kohafield" value="[% hidden_loo.kohafield | html %]" /> >+ <input type="hidden" name="tag_mandatory" value="[% hidden_loo.tag_mandatory | html %]" /> >+[% END %] >+</div> >+[% IF ( oldauthnumtagfield ) %] >+ <input type="hidden" name="tag" value="[% oldauthnumtagfield | html %]" /> >+ <input type="hidden" name="subfield" value="[% oldauthnumtagsubfield | html %]" /> >+ <input type="hidden" name="field_value" value="[% authid | html %]" /> >+ <input type="hidden" name="mandatory" value="0" /> >+ <input type="hidden" name="kohafield" value="[% kohafield | html %]" /> >+ <input type="hidden" name="tag_mandatory" value="[% tag_mandatory | html %]" /> >+ <input type="hidden" name="tag" value="[% oldauthtypetagfield | html %]" /> >+ <input type="hidden" name="subfield" value="[% oldauthtypetagsubfield | html %]" /> >+ <input type="hidden" name="field_value" value="[% authtypecode | html %]" /> >+[% END %] > >- </form> >+</form> > > [% INCLUDE 'modals/cataloguing_create_av.inc' %] > > </div> >-</fieldset> > </div> > </div> > >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 a21bf2784c..e7e07e41cf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -354,10 +354,10 @@ > + ' <tbody></tbody>' > + '</table>'; > >- var advSearchLink = $('<a>') >+ var advSearchLink = $('<a id="lientype">') > .attr('href', '/cgi-bin/koha/catalogue/search.pl') > .html(_("Go to advanced search")); >- var editSearchLink = $('<a>') >+ var editSearchLink = $('<a id="lientype">') > .attr('href', '#') > .html(_("Edit search")) > .addClass('btn btn-default btn-xs') >@@ -390,14 +390,14 @@ > } > } > >- var csvExportLink = $('<a>') >+ var csvExportLink = $('<a id="lientype">') > .attr('href', '#') > .html("CSV") > .on('click', function(e) { > e.preventDefault(); > exportItems('csv'); > }); >- var barcodesExportLink = $('<a>') >+ var barcodesExportLink = $('<a id="lientype">') > .attr('href', '#') > .html(_("Barcodes file")) > .on('click', function(e) { >@@ -419,7 +419,7 @@ > .append($('<li>').append(csvExportLink)) > .append($('<li>').append(barcodesExportLink))); > >- var selectVisibleRows = $('<a>') >+ var selectVisibleRows = $('<a id="lientype">') > .attr('href', '#') > .append('<i class="fa fa-check"></i> ') > .append(_("Select visible rows")) >@@ -427,7 +427,7 @@ > e.preventDefault(); > $('#results input[type="checkbox"]').prop('checked', true).change(); > }); >- var clearSelection = $('<a>') >+ var clearSelection = $('<a id="lientype">') > .attr('href', '#') > .append('<i class="fa fa-remove"></i> ') > .append(_("Clear selection")) >@@ -594,7 +594,7 @@ > // Add the "New field" link. > var form_field = $('div.form-field-select-text').last() > var NEW_FIELD = _("New field"); >- var button_field_new = $('<a href="#" class="button-field-new" id="lientype" title="Add a new field"><i class="fa fa-plus"></i> ' + NEW_FIELD + '</a>'); >+ 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>'); > button_field_new.click(function(e) { > e.preventDefault(); > addNewField( $(this) ); >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 0ddc1dc330..009f6fe512 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -1,13 +1,9 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >-[% INCLUDE 'doc-head-open.inc' %][% SET footerjs = 1 %] >-[% formulaire = BLOCK %] >- [% INCLUDE 'cat-search.inc' %] >-[% END %] >+[% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( biblionumber ) %]Editing [% title | html %] (Record number [% biblionumber | html %])[% ELSE %]Add MARC record[% END %] › Cataloging › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >-[% INCLUDE 'calendar.inc' %] > [% Asset.js("lib/hc-sticky.js") | $raw %] > [% INCLUDE 'select2.inc' %] > <script> >@@ -134,7 +130,7 @@ > > if ( !confirm( breedingid ? _("This record cannot be transferred to the advanced editor. Continue?") : _("Any changes will not be saved. Continue?") ) ) return false; > >- Cookies.set( 'catalogue_editor_[% logged_in_user.borrowernumber | html %]', 'advanced', { expires: 365, path: '/', sameSite: 'Lax' } ); >+ Cookies.set( 'catalogue_editor_[% logged_in_user.borrowernumber | html %]', 'advanced', { expires: 365, path: '/' } ); > > var biblionumber = [% biblionumber || "null" | html %]; > >@@ -512,11 +508,11 @@ function PopupMARCFieldDoc(field) { > function toggleMARCdocLinks(flag){ > if( flag === true ){ > $(".marcdocs").show(); >- Cookies.set("marcdocs_[% borrowernumber | html %]",'show', { path: "/", expires: 365, sameSite: 'Lax' }); >+ Cookies.set("marcdocs_[% borrowernumber | html %]",'show', { path: "/", expires: 365 }); > $("#marcDocsSelect i").addClass('fa-check-square-o').removeClass('fa-square-o'); > } else { > $(".marcdocs").hide(); >- Cookies.set("marcdocs_[% borrowernumber | html %]",'hide', { path: "/", expires: 365, sameSite: 'Lax' }); >+ Cookies.set("marcdocs_[% borrowernumber | html %]",'hide', { path: "/", expires: 365 }); > $("#marcDocsSelect i").removeClass('fa-check-square-o').addClass('fa-square-o'); > } > } >@@ -525,12 +521,12 @@ function PopupMARCFieldDoc(field) { > if( flag === true ){ > $(".tagnum").show(); > $(".subfieldcode").show(); >- Cookies.set("marctags_[% borrowernumber | html %]",'show', { path: "/", expires: 365, sameSite: 'Lax' }); >+ Cookies.set("marctags_[% borrowernumber | html %]",'show', { path: "/", expires: 365 }); > $("#marcTagsSelect i").addClass('fa-check-square-o').removeClass('fa-square-o'); > } else { > $(".tagnum").hide(); > $(".subfieldcode").hide(); >- Cookies.set("marctags_[% borrowernumber | html %]",'hide', { path: "/", expires: 365, sameSite: 'Lax' }); >+ Cookies.set("marctags_[% borrowernumber | html %]",'hide', { path: "/", expires: 365 }); > $("#marcTagsSelect i").removeClass('fa-check-square-o').addClass('fa-square-o'); > } > } >@@ -544,7 +540,7 @@ function PopupMARCFieldDoc(field) { > var subfields = new Array(); > var tab = new Array(); > var label = new Array(); >- var flag = false; >+ var flag=0; > var tabflag= new Array(); > var StrAlert = "<div id='form-errors' class='dialog alert list'>"; > var notFilledClass = "subfield_not_filled"; >@@ -563,7 +559,7 @@ function PopupMARCFieldDoc(field) { > [% END %] > [% END %] > [% END %] >- StrAlert += "<h4>" + _("The following mandatory subfields aren't filled:") + "</h4>"; >+ StrAlert += "<h4>" + _("The following subfields aren't filled:") + "</h4>"; > } else { > [% FOREACH BIG_LOO IN BIG_LOOP %] > [% FOREACH innerloo IN BIG_LOO.innerloop %] >@@ -578,7 +574,7 @@ function PopupMARCFieldDoc(field) { > [% END %] > [% END %] > [% END %] >- StrAlert += "<h4>" + _("The following important subfields arenât filled:") + "</h4>"; >+ StrAlert += "<h4>" + _("A few important fields are not filled:") + "</h4>"; > notFilledClass = "important_subfield_not_filled"; > } > StrAlert += "<ul>"; >@@ -613,7 +609,7 @@ function PopupMARCFieldDoc(field) { > var tag=tagsubfieldid.substr(0,3); > var subfield=tagsubfieldid.substr(3,1); > StrAlert += "<li>"+_("Tag %s subfield %s %s in tab %s").format(tag, subfield, formatFieldName( tabflag[tagsubfieldid][1] ), tabflag[tagsubfieldid][2]) + ' <a class="linkfield btn btn-link" href="#" data-tab="' + tabflag[tagsubfieldid][2] + '" data-field="' + tabflag[tagsubfieldid][3] + '"><i class="fa fa-arrow-right" aria-hidden="true"></i> ' + _("Go to field") + '</a></li>'; >- flag = true; >+ flag=1; > } > } > StrAlert += "</ul>"; >@@ -667,7 +663,7 @@ function PopupMARCFieldDoc(field) { > } > > if(isempty){ >- flag = true; >+ flag = 1; > if (mandatory) { > mandatoryFields[ arr[0] ] = { > importance: "mandatory", >@@ -692,14 +688,14 @@ function PopupMARCFieldDoc(field) { > if( mandatoryFields[prop]["importance"] == "mandatory" ){ > StrAlert += "<li>" + _("Field %s is mandatory, at least one of its subfields must be filled.").format( prop ) + ' <a class="linkfield btn btn-link" href="#" data-tab="' + mandatoryFields[prop]["tab"] + '" data-field="' + mandatoryFields[prop]["elemid"] + '"><i class="fa fa-arrow-right" aria-hidden="true"></i> ' + _("Go to field") + '</a></li>'; > } else { >- StrAlert += "<li>" + _("Field %s is important, at least one of its subfields must be filled.").format(prop) + ' <a class="linkfield btn btn-link" href="#" data-tab="' + mandatoryFields[prop]["tab"] + '" data-field="' + mandatoryFields[prop]["elemid"] + '"><i class="fa fa-arrow-right" aria-hidden="true"></i> ' + _("Go to field") + '</a></li>'; >+ StrAlert += "<li>" + _("Field %s is important, at least one of its subfields must be filled.").format(arr[0]) + ' <a class="linkfield btn btn-link" href="#" data-tab="' + mandatoryFields[prop]["tab"] + '" data-field="' + mandatoryFields[prop]["elemid"] + '"><i class="fa fa-arrow-right" aria-hidden="true"></i> ' + _("Go to field") + '</a></li>'; > } > } > StrAlert += "</ul>"; > } > StrAlert += "</div>"; >- if ( flag ) { >- $("#show-errors").html('<button type="button" class="btn btn-danger show-errors"><i class="fa fa-warning"></i> ' + _("Errors") + '</span>'); >+ if (flag) { >+ $("#show-errors").html('<button type="button" style="margin-top: 5px" class="btn btn-danger show-errors"><i class="fa fa-warning"></i> ' + _("Errors") + '</span>'); > return StrAlert; > } else { > return flag; >@@ -707,36 +703,27 @@ function PopupMARCFieldDoc(field) { > } > > /** >- * Run checks for mandatory and important fields >- * Output errors if necessary, or submit the form >+ * >+ * > */ > function Check(){ > var StrAlert = AreFieldsNotOk(); >- var StrWarning = AreFieldsNotOk( false ); >- if( !StrAlert && StrWarning ){ >- // Check important fields >- $("#check_errors").html( StrWarning ); >- $('html, body').animate({ scrollTop: 0 }, 'fast'); >- >- var r=confirm( _("Important fields(s) are not filled. Are you sure you want to save?" ) ); >- if (! r){ >- return false; >- } else { >- document.f.submit(); >- return true; >- } >- } else if( StrAlert ){ >- var strAll = StrAlert; >- if( StrWarning ){ >- strAll += StrWarning; >+ if( ! StrAlert ){ >+ var StrWarning = AreFieldsNotOk(false); >+ if (StrWarning){ >+ StrWarning += "\n" + _("Are you sure you want to save?"); >+ var r=confirm(StrWarning); >+ if (! r){ >+ return false; >+ } > } >- $("#check_errors").html( strAll ); >+ document.f.submit(); >+ return true; >+ } else { >+ $("#check_errors").html( StrAlert ); > $('html, body').animate({ scrollTop: 0 }, 'fast'); > Sticky.hcSticky('refresh'); > return false; >- } else if( !StrAlert && !StrWarning ){ >- document.f.submit(); >- return true; > } > } > >@@ -789,7 +776,7 @@ function PopupMARCFieldDoc(field) { > <div>Loading, please wait...</div> > </div> > >- [% INCLUDE 'header.inc' form=formulaire %] >+ [% INCLUDE 'header.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -809,12 +796,6 @@ function PopupMARCFieldDoc(field) { > </a> > </li> > </ol> >- <ol> >- [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >- </ol> >- <ol> >- <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >- </ol> > </nav> > > <div class="main container-fluid"> >@@ -873,16 +854,15 @@ function PopupMARCFieldDoc(field) { > [% END %] > > <div id="toolbar" class="btn-toolbar"> >- <div> > [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] > [% IF (circborrowernumber) %][%# fast cataloging must lead to items %] > <!-- Action is under fast cataloging - Save button redirecting to items --> >- <div class="btn-group"><a href="#" id="saveanditems" class="principal"><i class="fa fa-save"></i> Save</a></div> >+ <div class="btn-group"><a href="#" id="saveanditems" class="btn btn-default principal"><i class="fa fa-save"></i> Save</a></div> > [% ELSE %] > <!-- Not using fast cataloging - Display split menu --> > <div class="btn-group"> >- <button class="principal" id="saverecord"><i class="fa fa-save"></i> Save</button> >- <button class="dropdown-toggle pat" data-toggle="dropdown"> >+ <button class="btn btn-default principal" id="saverecord"><i class="fa fa-save"></i> Save</button> >+ <button class="btn btn-default dropdown-toggle principal" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -894,29 +874,29 @@ function PopupMARCFieldDoc(field) { > [% END %] > [% ELSE %] > <!-- User cannot edit items - single button redirecting to view --> >- <div class="btn-group"><a href="#" id="saveandview" class="principal"><i class="fa fa-save"></i> Save</a></div> >+ <div class="btn-group"><a href="#" id="saveandview" class="btn btn-default principal"><i class="fa fa-save"></i> Save</a></div> > [% END # /IF CAN_user_editcatalogue_edit_items %] > > [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %] > [% IF biblionumber %] >- <div class="btn-group"><a class="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 pat" href="#" id="z3950search"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a></div> > [% ELSE %] >- <div class="btn-group"><a class="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 pat" href="#" id="z3950search"><i class="fa fa-search"></i> Z39.50/SRU search</a></div> > [% END %] > [% IF ( CAN_user_editauthorities ) %] >- <div class="btn-group"><a class="pat" href="#" id="linkerbutton"><i class="fa fa-refresh"></i> Link authorities automatically</a></div> >+ <div class="btn-group"><a class="btn btn-default pat" href="#" id="linkerbutton"><i class="fa fa-refresh"></i> Link authorities automatically</a></div> > [% END %] > [% END %] > > <div class="btn-group"> >- <button class="pat dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button> >+ <button class="btn btn-default dropdown-toggle pat" 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> > [% END %] > [% UNLESS advancedMARCEditor %] > <li> >- <a href="#" id="marcDocsSelect"><i class="fa fa-check-square-o"></i> Show MARC tag documentation links</a> >+ <a href="#" id="marcDocsSelect"><i class="fa fa-check-square-o"></i> Show MARC tag documentation links</a></li> > <li> > <a href="#" id="marcTagsSelect"><i class="fa fa-check-square-o"></i> Show tags</a> > </li> >@@ -934,7 +914,7 @@ function PopupMARCFieldDoc(field) { > </li> > [% FOREACH framework IN frameworks%] > <li> >- <a href="#" class="change-framework" data-frameworkcode="[% framework.frameworkcode | html %]"> >+ <a href="#" id="lientype" class="change-framework" data-frameworkcode="[% framework.frameworkcode | html %]"> > [% IF framework.frameworkcode == frameworkcode %] > <i class="fa fa-fw fa-check"></i> > [% ELSE %] >@@ -943,22 +923,37 @@ function PopupMARCFieldDoc(field) { > [% framework.frameworktext | html %] > </a> > </li> >- [% END %] >+ [% 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" id="cancel">Cancel</a> >- </div> >+ [% IF ( BiblioDefaultViewmarc ) %] >+ <div class="btn-group"> >+ <a class="btn btn-default cancel" id="cancel" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblionumber |url %]">Cancel</a> >+ </div> >+ [% ELSIF ( BiblioDefaultViewlabeled_marc ) %] >+ <div class="btn-group"> >+ <a class="btn btn-default cancel" id="cancel" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=[% biblionumber |url %]">Cancel</a> >+ </div> >+ [% ELSIF ( BiblioDefaultViewisbd ) %] >+ <div class="btn-group"> >+ <a class="btn btn-default cancel" id="cancel" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblionumber |url %]">Cancel</a> >+ </div> >+ [% ELSE %] >+ <div class="btn-group"> >+ <a class="btn btn-default cancel" id="cancel" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber |url %]">Cancel</a> >+ </div> >+ [% END %] > [% ELSE %] > <div class="btn-group"> >- <a class="cancel" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a> >+ <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 ) %] > <ul class="toolbar-tabs"> > [%- FOREACH BIG_LOO IN BIG_LOOP -%] >@@ -984,8 +979,8 @@ function PopupMARCFieldDoc(field) { > [% END %] > [% END %] > </ul> >- </div> >- </div></div> <!-- /#toolbar.btn-toolbar --> >+ </div></div> >+ </div> <!-- /#toolbar.btn-toolbar --> > > [% IF bib_doesnt_exist %] > <div class="dialog alert"> >@@ -1004,6 +999,7 @@ 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"> > <ul> > [% FOREACH BIG_LOO IN BIG_LOOP %] >@@ -1036,7 +1032,7 @@ function PopupMARCFieldDoc(field) { > [% ELSE %] > <li class="tag clearfix" id="tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> > [% END %] >- <div class="tag_title" id="div_indicator_tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> >+ <div class="tag_title" style="background-color: #f3f4f4" id="div_indicator_tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"> > [% IF advancedMARCEditor %] > <a href="#" tabindex="1" class="tagnum" title="[% innerloo.tag_lib | html %] - Click to Expand this Tag" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;">[% innerloo.tag | html %]</a> > [% ELSE %] >@@ -1204,7 +1200,7 @@ function PopupMARCFieldDoc(field) { > </ul> <!-- /.sortable_field --> > </div> <!-- /#tabXXX --> > [% END # /FOREACH BIG_LOOP %] >- </div><!-- /#addbibliotabs --> >+ </div></div><!-- /#addbibliotabs --> > > [%# Fields for fast cataloging %] > <input type="hidden" name="barcode" value="[% barcode | html %]" /> >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 2b5aa413a0..8001e5a389 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -610,7 +610,7 @@ > </div> > [% END %] > >- <div class="row"> >+ <div> > [% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%] > <div class="col-sm-6"> > <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off"> >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 bdd37b0536..4f4511a033 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -180,7 +180,7 @@ > <!-- Patron has added an issue note --> > [% IF ( issue.note) %] > <div class="dialog message"> >- <h1>Patron note</h1> >+ <h2>Patron note</h2> > <p>[% issue.notedate | $KohaDates %]</p> > <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber | uri %]"> [% title | html %]</a> [% author | html %]</p> > <p>[% issue.note | html %]</p> >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 ed4d8b3b9b..9339d76296 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -52,9 +52,9 @@ > [% END %] > [% END %] > </div><!-- /additional-contents --> >+ > <div id="area-news"> > <h3>Quote of the day</h3> >- > [% IF ( daily_quote ) %] > <div class="newsitem"> > <span id="daily-quote-text">[% daily_quote.text | html %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source | html %]</span> >@@ -62,79 +62,9 @@ > [% END %] > </div> > >- </div> <!-- /.col-sm-2 --> >- <div class="col-sm-9"> >- <div class="row"> >- <div class="menuspe"><ul class="biglinks-list"> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li><a class="accueil" href="/cgi-bin/koha/circ/circulation-home.pl"><i class="fa fa-fw fa-exchange 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> >- [% END %] >- >- </ul></div> >- <div class="menuspe"><ul class="biglinks-list"> >- >- [% IF ( CAN_user_catalogue ) %] >- <li><a class="accueil" href="/cgi-bin/koha/catalogue/search.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Advanced search</h1></a></li> >- <li><a class="accueil" href="/cgi-bin/koha/catalogue/itemsearch.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Item search</h1></a></li> >- [% END %] >- >- <li><a class="accueil" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt 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> >- [% END %] >- >- </ul></div> >- <div class="menuspe"><ul class="biglinks-list"> >- >- <li><a class="accueil" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-fw fa-link fa-2x"></i><h1>Authorities</h1></a></li> >- [% IF Koha.Preference('ILLModule') && CAN_user_ill %] >- <li><a class="accueil" href="/cgi-bin/koha/ill/ill-requests.pl"><i class="fa fa-fw fa-retweet 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> >- [% 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> >- [% 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> >- [% 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> >- [% END %] >- </ul></div> >- <div class="vert"><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> >- [% 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> >- [% 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> >- [% 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> >- </div> >- </ul></div> >- </div> <!-- /.row --> >- <div class="row"> >- <div class="col-sm-12"> >- [%# Following statement must be in one line for translatability %] >+ [%# Following statement must be in one line for translatability %] > [% IF ( CAN_user_tools_moderate_comments && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) || ( CAN_user_suggestions_suggestions_manage && ( pendingsuggestions || all_pendingsuggestions )) || ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) || pending_article_requests || ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) || ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) || already_ran_jobs %] >- <div id="area-pending"> >+ <div id="area-news"> > [% IF pending_article_requests %] > <div class="pending-info" id="article_requests_pending"> > >@@ -146,7 +76,7 @@ > [% IF CAN_user_suggestions_suggestions_manage && ( pendingsuggestions || all_pendingsuggestions ) %] > <div class="pending-info" id="suggestions_pending"> > >- Suggestions pending approval: >+ <h3>Suggestions pending approval</h3> > <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]#ASKED"> > <span id="pendingsuggestions" class="pending-number-link">[% Branches.GetLoggedInBranchname | html %]: [% pendingsuggestions | html %]</span> > </a> >@@ -211,10 +141,78 @@ > </div> > > [% END %] >+ </div> <!-- /.col-sm-2 --> >+ >+ >+ <div class="col-sm-9"> >+ <div class="row"> >+ <div class="menuspe"><ul class="biglinks-list"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >+ <li><a class="accueil" href="/cgi-bin/koha/circ/circulation-home.pl"><i class="fa fa-fw fa-exchange 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> >+ [% END %] >+ >+ </ul></div> >+ <div class="menuspe"><ul class="biglinks-list"> >+ >+ [% IF ( CAN_user_catalogue ) %] >+ <li><a class="accueil" href="/cgi-bin/koha/catalogue/search.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Advanced search</h1></a></li> >+ <li><a class="accueil" href="/cgi-bin/koha/catalogue/itemsearch.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Item search</h1></a></li> >+ [% END %] >+ >+ <li><a class="accueil" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt 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> >+ [% END %] >+ >+ </ul></div> >+ <div class="menuspe"><ul class="biglinks-list"> >+ >+ <li><a class="accueil" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-fw fa-link fa-2x"></i><h1>Authorities</h1></a></li> >+ [% IF Koha.Preference('ILLModule') && CAN_user_ill %] >+ <li><a class="accueil" href="/cgi-bin/koha/ill/ill-requests.pl"><i class="fa fa-fw fa-retweet 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> >+ [% 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> >+ [% 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> >+ [% END %] > >- </div> <!-- /.col-sm-12 --> >+ [% 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> >+ [% END %] >+ </ul></div> >+ <div class="vert"><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> >+ [% 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> >+ [% 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> >+ [% 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> >+ </div> >+ </ul></div> > </div> <!-- /.row --> > >+ > [% IF ( IntranetmainUserblock ) %] > <div class="row"> > <div class="col-sm-12"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >index cf4d1ba2b3..7d098b6562 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >@@ -68,7 +68,7 @@ > <h2>Barcode image generator</h2> > > <form action="/cgi-bin/koha/svc/barcode" method="post" id="barcodegen"> >- <fieldset class="brief"> >+ <fieldset class="searchresults"> > <div class="row"> > <div class="col-sm-6"> > <ol> >@@ -115,7 +115,7 @@ > </fieldset> > </div> > <div class="col-sm-6"> >- <div id="barcode_container"> >+ <div id="barcode_container" style="overflow:auto"> > <img id="barcode_image" /> > <textarea readonly="readonly" rows="5" cols="40" id="urltext"></textarea> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >index af86823123..2387339e20 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 >@@ -66,11 +66,11 @@ > [% INCLUDE 'labels-toolbar.inc' %] > > [% IF description %] >- <h1>Edit [% description | html %]</h1> >+ <h2>Edit [% description | html %]</h2> > [% ELSIF batch_id %] >- <h1>Edit label batch [% batch_id | html %]</h1> >+ <h2>Edit label batch [% batch_id | html %]</h2> > [% ELSE %] >- <h1>New label batch</h1> >+ <h2>New label batch</h2> > [% END %] > > [% IF ( err ) %] >@@ -131,13 +131,15 @@ > </div> > </form> > <div id="batch-manage" class="btn-toolbar"> >- <a class="btn btn-default" id="additems" href="#"><i class="fa fa-plus"></i> Add item(s)</a>[% IF ( table_loop ) %] >- <a class="btn btn-default" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a> >- <a class="btn btn-default" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected items</a> >- <a class="btn btn-default" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a> >- <a class="btn btn-default" id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a> >- <a class="btn btn-default" id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected items</a> >- <a class="btn btn-default" id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export full batch</a>[% END %] >+ <a class="btn btn-default lientype" 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> >+ [% END %] > </div> > [% IF ( table_loop ) %] > <form name="items"> >@@ -173,8 +175,8 @@ > [% FOREACH text_field IN table_loo.text_fields %] > [% IF ( text_field.select_field ) %] > <td> >- <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/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> >+ <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> > </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-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >index a9ce9df5c8..a7e420c6d2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >@@ -5,11 +5,11 @@ > [% END %] > [%- BLOCK translate_label_types -%] > [%- SWITCH type -%] >- [%- CASE 'BIB' -%]<span> Only the bibliographic data is printed</span> >- [%- CASE 'BARBIB'-%]<span> Barcode proceeds bibliographic data</span> >- [%- CASE 'BIBBAR'-%]<span> Bibliographic data proceeds barcode</span> >- [%- CASE 'ALT' -%]<span> Barcode and bibliographic data are printed on alternating labels</span> >- [%- CASE 'BAR' -%]<span> Only the barcode is printed</span> >+ [%- CASE 'BIB' -%] Only the bibliographic data is printed >+ [%- CASE 'BARBIB'-%] Barcode proceeds bibliographic data >+ [%- CASE 'BIBBAR'-%] Bibliographic data proceeds barcode >+ [%- CASE 'ALT' -%] Barcode and bibliographic data are printed on alternating labels >+ [%- CASE 'BAR' -%] Only the barcode is printed > [%- END -%] > [%- END -%] > [% INCLUDE 'doc-head-open.inc' %] >@@ -19,13 +19,13 @@ > > [% BLOCK translate_justification_types %] > [% SWITCH type %] >-[% CASE 'L' %]<span>Left</span> >-[% CASE 'C' %]<span>Center</span> >-[% CASE 'R' %]<span>Right</span> >+[% CASE 'L' %]Left >+[% CASE 'C' %]Center >+[% CASE 'R' %]Right > [% END %] > [% END %] > <body id="labels_label-edit-layout" class="tools labels"> >- [% INCLUDE 'header.inc'' form=formulaire %] >+ [% INCLUDE 'header.inc' %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >@@ -72,9 +72,9 @@ > [% INCLUDE 'labels-toolbar.inc' %] > > [% IF ( layout_id ) %] >- <h1>Edit label layout [% layout_id | html %]</h1> >+ <h2>Edit label layout [% layout_id | html %]</h2> > [% ELSE %] >- <h1>New label layout</h1> >+ <h2>New label layout</h2> > [% END %] > > <form name="input" action="/cgi-bin/koha/labels/label-edit-layout.pl" method="get"> >@@ -110,7 +110,7 @@ > </li> > <li> > <fieldset> >- <legend>Bibliographic data to print</legend> >+ <h3>Bibliographic data to print</h3> > <ol> > <li class="radio">[% IF ( layout_string ) %] > <input type="radio" name="layout_choice" id="layout_choice_order" value="layout_table" checked="checked" /><label for="layout_choice_order">Choose order of text fields to print</label> >@@ -208,9 +208,8 @@ > [% END %] > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="submit" value="Save" /> >+ >+ <input type="submit" class="principal" value="Save" /> > <a class="cancel" href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Cancel</a> > <input type="hidden" name="op" value="save" /> > <input type="hidden" name="layout_id" value="[% layout_id | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >index 132db0e7e9..cb7e09df20 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >@@ -131,8 +131,9 @@ > <label for="creep_vert">Vertical: </label><input type="text" size="4" name="creep_vert" id="creep_vert" value="[% creep_vert | html %]" /> > </li> > </ol> >- >- <input type="submit" value="Save" class="princip"/> >+ </fieldset> >+ <fieldset class="action"> >+ <input type="submit" value="Save" class="principal"/> > <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile" class="cancel">Cancel</a> > <input type="hidden" name="op" value="save" /> > <input type="hidden" name="profile_id" value="[% profile_id | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >index c96750fc07..b1694b7ed6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt >@@ -54,9 +54,8 @@ > <input type="text" inputmode="numeric" pattern="[0-9]*" name="to" id="to-input" value="0" style="text-align: right;"/> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <button type="button" class="btn btn-default" id="print">Print range</button> >+ >+ <button type="button" class="btn btn-default principal" id="print">Print range</button> > </fieldset> > </form> > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt >index ecf8107b1d..5526d9234e 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 >@@ -177,7 +177,7 @@ > </div> > </div> > <fieldset class="action"> >- <input type="submit" class="submit principal" value="Save" /><a class="cancel" href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Cancel</a> >+ <input type="submit" class="principal" value="Save" /><a class="cancel" href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Cancel</a> > <input type="hidden" name="op" value="save" /> > [% IF ( template_id ) %] > <input type="hidden" name="template_id" value="[% template_id | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index f71da3b54a..40c2b33e73 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,6 +66,7 @@ > > <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 %]"> > [% IF ( label_element == 'layout' ) %] > <h3>Currently available layouts</h3> >@@ -124,6 +125,7 @@ > [% 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/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >index 4909f32e64..dd4375e437 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >@@ -101,7 +101,7 @@ to add to Batch [% batch_id | html %] > </ol> > </fieldset> > >-<fieldset class="action"><input type="submit" value="Search" class="submit principal" /> <a class="cancel close" href="#">Cancel</a></fieldset> >+<fieldset class="action"><input type="submit" value="Search" class="principal" /> <a class="cancel close" href="#">Cancel</a></fieldset> > </form> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >index 2ce1f157bb..3874f27c4c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -15,7 +15,7 @@ > </head> > > <body id="pat_member"> >-[% INCLUDE 'header.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index a76ee7226d..250bf2bec5 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 >@@ -435,12 +435,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 type="submit" class="new"><i class="fa fa-plus"></i> New guided report</button> >+ <button id="lientype" 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 type="submit" class="new"><i class="fa fa-plus"></i> New SQL report</button> >+ <button id="lientype" 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"> >@@ -865,7 +865,7 @@ > </p> > [% END %] > </div> >- <fieldset class="action"><input type="submit" value="Edit SQL" /></fieldset> >+ <fieldset class="action"><input type="submit" class="principal" value="Edit SQL" /></fieldset> > [% ELSE # IF ( auth_val_error ) %] > <input type='hidden' name='phase' value='Run this report' /> > <h2>Enter parameters for report [% name | html %]:</h2> >@@ -907,7 +907,7 @@ > </ol> > </fieldset> <!-- /.rows --> > <fieldset class="action"> >- <input type="submit" value="Run the report" /> >+ <input type="submit" class="principal" value="Run the report" /> > </fieldset> > [% END # / IF ( auth_val_error ) %] > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >index 78b922ccb6..6af96bde81 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -73,7 +73,7 @@ > [% IF ( SHOWCONFIRMATION ) %] > <div class="dialog alert">Your notification has been sent.</div> > [% END %] >-[% UNLESS letters %]<div class="dialog alert">No claims notice defined. <a href="/cgi-bin/koha/tools/letter.pl">Please define one</a>.</div>[% END %] >+[% UNLESS letters %]<div class="dialog alert">No claims notice defined. <a id="lientype" href="/cgi-bin/koha/tools/letter.pl">Please define one</a>.</div>[% END %] > <form id="claims" name="claims" action="claims.pl" method="post"> > <fieldset> > <label for="supplierid">Vendor: </label> >@@ -107,7 +107,7 @@ > <input type="text" name="enddate" id="to" value="[% enddate | html %]" size="10" maxlength="10" class="flatpickr" /> > <span class="hint">[% INCLUDE 'date-format.inc' %]</span> > <input id="filterByDate" type="button" value="OK" /> >- <a href="#" id="clearfilter"><i class="fa fa-remove"></i> Clear filter</a> >+ <a class="lientype" href="#" id="clearfilter"><i class="fa fa-remove"></i> Clear filter</a> > </li> > </ol> > </fieldset> >@@ -202,7 +202,7 @@ > <option value="[% csv.export_format_id | html %]">[% csv.profile | html %]</option> > [% END %] > </select> >- <span class="exportSelected"><a id="ExportSelected" href="/cgi-bin/koha/serials/claims.pl">Download selected claims</a></span> >+ <span class="exportSelected"> class="lientype" id="ExportSelected" href="/cgi-bin/koha/serials/claims.pl">Download selected claims</a></span> > [% END %] > > [% IF letters %] >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 8103979932..beb459d76a 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 >@@ -71,7 +71,7 @@ fieldset.rows table { clear: none; margin: 0; } > <div class="main container-fluid"> > <div class="row"> > <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> >- <h1>[% IF ( modify ) %] Modify subscription for <em>[% bibliotitle | html %]</em>[% ELSE %]Add a new subscription[% END %] (<span id="page_number">1/2</span>)</h1> >+ <h2>[% IF ( modify ) %] Modify subscription for <em>[% bibliotitle | html %]</em>[% ELSE %]Add a new subscription[% END %] (<span id="page_number">1/2</span>)</h2> > </div> > </div> > <form method="post" id="subscription_add_form" name="f" action="/cgi-bin/koha/serials/subscription-add.pl" class="validated"> >@@ -86,14 +86,14 @@ fieldset.rows table { clear: none; margin: 0; } > <input type="hidden" name="user" value="[% logged_in_user.userid | html %]" /> > <input type="hidden" name="irreg_check" value="0" /> > <fieldset id="subscription_add_information" class="rows"> >- <legend>Subscription details</legend> >+ <h3>Subscription details</h3> > <ol> > [% IF ( subscriptionid ) %] > <li><span class="label">Subscription number: </span> [% subscriptionid | html %]</li> > [% END %] > <li> > <label for="aqbooksellerid">Vendor: </label> >- <input type="text" name="aqbooksellerid" id="aqbooksellerid" value="[% aqbooksellerid | html %]" size="8" /> (<input type="text" name="aqbooksellername" id="aqbooksellername" value="[% aqbooksellername | html %]" disabled="disabled" readonly="readonly" />) <a href="#" id="vendor_search"><i class="fa fa-search"></i> Search for a vendor</a> >+ <input type="text" name="aqbooksellerid" id="aqbooksellerid" value="[% aqbooksellerid | html %]" size="8" /> (<input type="text" name="aqbooksellername" id="aqbooksellername" value="[% aqbooksellername | html %]" disabled="disabled" readonly="readonly" />) <a id="lientype" 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 href="#" id="record_search"><i class="fa fa-search"></i> Search for record</a> >+ <div class="inputnote"> <a class="lientype" href="#" id="record_search"><i class="fa fa-search"></i> Search for record</a> > [% IF ( CAN_user_editcatalogue ) %] > [% IF ( modify ) %] >- | <a href="#" id="biblio_add_edit" data-biblionumber="[% bibnum | html %]"><i class="fa fa-pencil"></i> Edit record</a> >+ | <a class="lientype" href="#" id="biblio_add_edit" data-biblionumber="[% bibnum | html %]"><i class="fa fa-pencil"></i> Edit record</a> > [% ELSE %] >- | <a href="#" id="biblio_add_edit"><i class="fa fa-plus"></i> Create record</a> >+ | <a class="lientype" 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 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 id="lientype" href="/cgi-bin/koha/tools/letter.pl">define a notice</a>.</div> > [% END %] > </li> > <li> >@@ -263,7 +263,7 @@ fieldset.rows table { clear: none; margin: 0; } > </ol> > </fieldset> > <fieldset class="action"> >- <button type="button" id="subscription_add_next" style="float:right;">Next <i class="fa fa-long-arrow-right"></i></button> >+ <button type="button" class="principal" id="subscription_add_next" style="float:right;">Next <i class="fa fa-long-arrow-right"></i></button> > </fieldset> > </div> <!-- /.col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 --> > </div> <!-- /.row#page_1 --> >@@ -279,7 +279,7 @@ fieldset.rows table { clear: none; margin: 0; } > </div> > <div id="subscription_form_planning"> > <fieldset class="rows"> >- <legend>Serials planning</legend> >+ <h3>Serials planning</h3> > <ol> > <li> > <label for="acqui_date" class="required">First issue publication date:</label> >@@ -419,8 +419,8 @@ fieldset.rows table { clear: none; margin: 0; } > </li> > <li> > <span class="label"> </span> >- <a href="#" class="toggle_advanced_pattern show_advanced_pattern"><i class="fa fa-plus-square"></i> Show advanced pattern</a> >- <a href="#" style="display:none;" class="toggle_advanced_pattern hide_advanced_pattern"><i class="fa fa-minus-square"></i> Hide advanced pattern</a> >+ <a 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> > </li> > </ol> > >@@ -511,14 +511,14 @@ fieldset.rows table { clear: none; margin: 0; } > </li> > <li> > <span class="label"> </span> >- <a href="#" id="modifyadvancedpatternbutton"><i class="fa fa-pencil"></i> Modify pattern</a> >- <button type="button" class="btn btn-default btn-xs" id="saveadvancedpatternbutton" style="display:none"><i class="fa fa-save"></i> Save as new pattern</button> >- <a class="cancel" href="#" id="restoreadvancedpatternbutton" style="display:none">Cancel modifications</a> >+ <a id="lientype" href="#" id="modifyadvancedpatternbutton"><i class="fa fa-pencil"></i> Modify pattern</a> >+ <button type="button" class="btn btn-default btn-xs principal" id="saveadvancedpatternbutton" style="display:none"><i class="fa fa-save"></i> Save as new pattern</button> >+ <a class="cancel" href="#" id="restoreadvancedpatternbutton" style="display:none">Cancel modifications</a> > </li> > </ol> > </div> <!-- /#advancedpredictionpattern --> > <fieldset class="action"> >- <button type="button" id="testpatternbutton" class="btn btn-default btn-sm"><i class="fa fa-play"></i> Test prediction pattern</button> >+ <button type="button" id="testpatternbutton" class="btn btn-default btn-sm principal"><i class="fa fa-play"></i> Test prediction pattern</button> > </fieldset> > </fieldset> > >@@ -535,8 +535,8 @@ fieldset.rows table { clear: none; margin: 0; } > <input type="hidden" id="unitsperissue" name="unitsperissue" value=""/> > <input type="hidden" id="issuesperunit" name="issuesperunit" value=""/> > <fieldset class="action"> >- <button type="button" id="subscription_add_previous" style="float:left"><i class="fa fa-long-arrow-left"></i> Previous</button> >- <input id="save-subscription" type="submit" value="Save subscription" style="float:right;" accesskey="w"/> >+ <button type="button" id="subscription_add_previous" class="cancel" style="float:left"><i class="fa fa-long-arrow-left"></i> Previous</button> >+ <input id="save-subscription" type="submit" value="Save subscription" class="principal" style="float:right;" accesskey="w"/> > </fieldset> > </div> > </div> >@@ -558,7 +558,7 @@ fieldset.rows table { clear: none; margin: 0; } > <div class="modal-body"> > </div> > <div class="modal-footer"> >- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> >+ <button type="button" class="btn btn-default cancel" data-dismiss="modal">Close</button> > </div> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 46da66afdf..76682144fa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -987,6 +987,7 @@ > > <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"> >@@ -1029,7 +1030,7 @@ > > <div id="limits"> > <fieldset class="brief"> >- <h4 class="local_collapse"><a href="#">Bibliographic information</a></h4> >+ <h4 class="local_collapse"><a href="#">Bibliographic information<b class="caret"></b></a></h4> > <ol> > <li> > <p for="title"> Title: >@@ -1059,7 +1060,7 @@ > </fieldset> <!-- /.brief --> > > <fieldset class="brief"> >- <h4 class="local_collapse"><a href="#">Suggestion information</a></h4> >+ <h4 class="local_collapse"><a href="#">Suggestion information<b class="caret"></b></a></h4> > <ol> > <li> > <p for="archived" style="display: inline;">Include archived: >@@ -1184,7 +1185,7 @@ > > <fieldset class="brief"> > <h4 class="local_collapse"> >- <a href="#">Acquisition information</a> >+ <a href="#">Acquisition information<b class="caret"></b></a> > </h4> > <ol> > <li> >@@ -1214,7 +1215,7 @@ > </form> <!-- /suggestionsfilter --> > > [% INCLUDE 'acquisitions-menu.inc' %] >- >+ </div> > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > [% END # /UNLESS ( op == 'show' ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/js/elasticsearch-mappings.js b/koha-tmpl/intranet-tmpl/prog/js/elasticsearch-mappings.js >index cf1faa9519..4b36850c4a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/elasticsearch-mappings.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/elasticsearch-mappings.js >@@ -21,6 +21,7 @@ function clone_line(line) { > } > > function tableInit( oldtabid, newtabid ) { >+ > if ( oldtabid ){ > var oldTableId = $("#" + oldtabid + "_table"); > oldTableId.DataTable().destroy(); >@@ -41,10 +42,10 @@ $(document).ready(function () { > > tableInit( "", "search_fields"); > >- $("a[data-toggle='tab']").on("shown.bs.tab", function (e) { >- var oldtabid = $(e.relatedTarget).data("tab"); >- var newtabid = $(e.target).data("tab"); >- tableInit( oldtabid, newtabid ); >+ $("#tabs").tabs({ >+ activate: function( event, ui ){ >+ tableInit( ui.oldPanel.attr('id'), ui.newPanel.attr('id') ); >+ }, > }); > > $('.delete').click(function () { >@@ -52,9 +53,7 @@ $(document).ready(function () { > alert( __("This field is mandatory and must have at least one mapping") ); > return; > } else { >- var table = $(this).closest('table'); >- let dt = $(table).DataTable(); >- dt.row( $(this).closest('tr') ).remove().draw(); >+ $(this).parents('tr').remove(); > } > }); > >@@ -64,22 +63,15 @@ $(document).ready(function () { > > $('.add').click(function () { > var table = $(this).closest('table'); >- let table_id = table.attr('id'); > var index_name = $(table).attr('data-index_name'); > var line = $(this).closest("tr"); > var marc_field = $(line).find('input[data-id="mapping_marc_field"]').val(); > if (marc_field.length > 0) { > var new_line = clone_line(line); > new_line.appendTo($('table[data-index_name="' + index_name + '"]>tbody')); >- let dt = $('#' + table_id).DataTable(); >- dt.row.add(new_line).draw(); >- >- $(table).on( 'click', '.delete', function () { >- var table = $(this).closest('table'); >- let dt = $(table).DataTable(); >- dt.row( $(this).closest('tr') ).remove().draw(); >- } ); >- >+ $('.delete').click(function () { >+ $(this).parents('tr').remove(); >+ }); > clean_line(line); > > $(table).tableDnD({ >@@ -90,22 +82,4 @@ $(document).ready(function () { > $("#facet_biblios > table").tableDnD({ > onDragClass: "dragClass highlighted-row", > }); >- >- $("#es_mappings").on("submit", function(e){ >- let table_ids = ['search_fields_table', 'mapping_biblios_table', 'mapping_authorities_table']; >- $(table_ids).each(function(){ >- let table; >- // Remove warning "Cannot reinitialise DataTable" >- if ( $.fn.dataTable.isDataTable( '#' + this ) ) { >- table = $('#' + this).DataTable(); >- } >- else { >- table = $('#' + this).DataTable( { >- paging: false >- } ); >- } >- table.search('').draw(); >- }); >- return true; >- }); > }); >-- >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=136898">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