Bugzilla – Attachment 136896 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 include
Bug-30952-update-include.patch (text/plain), 220.42 KB, created by
Solene D
on 2022-07-01 12:46:08 UTC
(
hide
)
Description:
Bug 30952: update include
Filename:
MIME Type:
Creator:
Solene D
Created:
2022-07-01 12:46:08 UTC
Size:
220.42 KB
patch
obsolete
>From d7d9c384be2a0f5d6eed9e68d8985b1127adfd77 Mon Sep 17 00:00:00 2001 >From: Solene Desvaux <sdesvaux@biblibre.com> >Date: Tue, 21 Jun 2022 09:52:48 +0200 >Subject: [PATCH] Bug 30952: update include > >--- > koha-tmpl/intranet-tmpl/prog/css/login.css | 18 +- > .../intranet-tmpl/prog/css/src/calendar.scss | 2 +- > .../prog/css/src/staff-global.scss | 141 ++++++++++++- > .../prog/en/includes/.patron-search.inc.swp | Bin 0 -> 16384 bytes > .../includes/acquisitions-add-to-basket.inc | 2 +- > .../prog/en/includes/acquisitions-search.inc | 49 ++--- > .../prog/en/includes/acquisitions-toolbar.inc | 65 +++--- > .../en/includes/additional-fields-entry.inc | 2 +- > .../prog/en/includes/adv-search.inc | 110 +++++----- > .../prog/en/includes/auth-finder-search.inc | 6 +- > .../prog/en/includes/authorities-search.inc | 8 +- > .../en/includes/authority-detail-modal.inc | 2 +- > .../prog/en/includes/blocked-fines.inc | 4 +- > .../prog/en/includes/budgets-admin-search.inc | 89 +++++++- > .../cat-search-pareilquecirc-search.inc | 37 ---- > .../prog/en/includes/cat-search.inc | 73 +++++++ > .../prog/en/includes/cataloging-search.inc | 12 +- > .../en/includes/category-out-of-age-limit.inc | 5 +- > .../intranet-tmpl/prog/en/includes/chart.inc | 4 +- > .../prog/en/includes/checkin-search.inc | 2 +- > .../prog/en/includes/checkouts-table.inc | 2 +- > .../prog/en/includes/circ-search.inc | 22 +- > .../prog/en/includes/cities-admin-search.inc | 11 +- > .../prog/en/includes/clubs-table.inc | 12 +- > .../en/includes/contracts-admin-search.inc | 14 +- > .../en/includes/currencies-admin-search.inc | 7 +- > .../prog/en/includes/desks-admin-search.inc | 30 +-- > .../intranet-tmpl/prog/en/includes/facets.inc | 4 +- > .../prog/en/includes/holds_table.inc | 2 +- > .../prog/en/includes/home-search.inc | 8 +- > .../prog/en/includes/ill-toolbar.inc | 12 +- > .../prog/en/includes/langmenu-staff-top.inc | 2 +- > .../prog/en/includes/letters-search.inc | 6 +- > .../prog/en/includes/lis-search.inc | 98 ++++----- > .../prog/en/includes/patron-search-header.inc | 198 +++++++++--------- > .../prog/en/includes/patron-search.inc | 8 - > .../prog/en/includes/patron_messages.inc | 4 +- > .../prog/en/includes/patrons-admin-search.inc | 20 +- > .../prog/en/includes/pos-menu.inc | 4 +- > .../prog/en/includes/prefs-admin-search.inc | 6 +- > .../prog/en/includes/recalls.inc | 12 +- > .../includes/rotating-collections-toolbar.inc | 8 +- > .../prog/en/includes/serials-search.inc | 121 ++++++++--- > .../en/includes/stockrotation-toolbar.inc | 11 +- > .../en/includes/suggestions-add-search.inc | 34 +-- > .../prog/en/includes/vendor-menu.inc | 5 +- > .../prog/en/includes/waiting_holds.inc | 4 +- > .../prog/en/includes/z3950-admin-search.inc | 6 +- > .../prog/en/modules/acqui/acqui-home.tt | 2 +- > .../prog/en/modules/acqui/basketgroup.tt | 49 +++-- > .../prog/en/modules/acqui/basketheader.tt | 6 +- > .../prog/en/modules/acqui/booksellers.tt | 16 +- > .../prog/en/modules/acqui/histsearch.tt | 8 +- > .../prog/en/modules/acqui/invoice.tt | 11 +- > .../prog/en/modules/acqui/parcel.tt | 5 +- > .../prog/en/modules/acqui/parcels.tt | 11 +- > .../prog/en/modules/acqui/supplier.tt | 37 ++-- > .../prog/en/modules/acqui/uncertainprice.tt | 8 +- > .../prog/en/modules/admin/aqcontract.tt | 28 +-- > .../prog/en/modules/admin/aqplan.tt | 8 +- > .../prog/en/modules/catalogue/advsearch.tt | 14 +- > .../prog/en/modules/catalogue/itemsearch.tt | 6 - > .../prog/en/modules/cataloguing/addbiblio.tt | 7 +- > .../prog/en/modules/cataloguing/addbooks.tt | 7 +- > .../prog/en/modules/cataloguing/additem.tt | 2 +- > .../prog/en/modules/cataloguing/editor.tt | 5 +- > .../prog/en/modules/cataloguing/merge.tt | 2 +- > .../prog/en/modules/circ/circulation-home.tt | 4 +- > .../prog/en/modules/intranet-main.tt | 4 - > .../prog/en/modules/members/apikeys.tt | 2 +- > .../prog/en/modules/members/boraccount.tt | 2 +- > .../prog/en/modules/members/deletemem.tt | 2 +- > .../prog/en/modules/members/discharge.tt | 2 +- > .../prog/en/modules/members/discharges.tt | 55 +++-- > .../prog/en/modules/members/files.tt | 2 +- > .../prog/en/modules/members/holdshistory.tt | 2 +- > .../prog/en/modules/members/housebound.tt | 2 +- > .../prog/en/modules/members/ill-requests.tt | 2 +- > .../prog/en/modules/members/mancredit.tt | 2 +- > .../prog/en/modules/members/maninvoice.tt | 2 +- > .../prog/en/modules/members/member-flags.tt | 8 +- > .../en/modules/members/member-password.tt | 2 +- > .../prog/en/modules/members/member.tt | 2 +- > .../prog/en/modules/members/memberentrygen.tt | 2 +- > .../prog/en/modules/members/merge-patrons.tt | 2 +- > .../prog/en/modules/members/moremember.tt | 2 +- > .../prog/en/modules/members/notices.tt | 2 +- > .../prog/en/modules/members/pay.tt | 2 +- > .../prog/en/modules/members/paycollect.tt | 2 +- > .../modules/members/purchase-suggestions.tt | 2 +- > .../prog/en/modules/members/readingrec.tt | 2 +- > .../prog/en/modules/members/recallshistory.tt | 6 +- > .../prog/en/modules/members/routing-lists.tt | 2 +- > .../prog/en/modules/members/statistics.tt | 2 +- > .../en/modules/members/two_factor_auth.tt | 6 +- > .../en/modules/onboarding/onboardingstep1.tt | 2 +- > .../en/modules/onboarding/onboardingstep2.tt | 2 +- > .../en/modules/onboarding/onboardingstep3.tt | 2 +- > .../en/modules/onboarding/onboardingstep4.tt | 2 +- > .../en/modules/onboarding/onboardingstep5.tt | 2 +- > .../en/modules/tools/additional-contents.tt | 6 +- > .../prog/en/modules/tools/holidays.tt | 30 ++- > .../prog/en/modules/virtualshelves/shelves.tt | 6 +- > 103 files changed, 1002 insertions(+), 711 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/.patron-search.inc.swp > delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cat-search-pareilquecirc-search.inc > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/login.css b/koha-tmpl/intranet-tmpl/prog/css/login.css >index 1a8c06a3a3..8a5201a430 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/login.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/login.css >@@ -20,7 +20,7 @@ a:hover { > } > > body { >- background: #f5f5f5; >+ background: #f3f4f4; > } > > form, label input { >@@ -42,7 +42,8 @@ label { > > #login { > background: #fff; >- border: 1px solid #a2a2a2; >+ border: none; >+ box-shadow: 8px 8px 12px rgb(170 170 170); > margin: 4em auto; > padding: 1.5em; > position : relative; >@@ -107,6 +108,14 @@ label { > #login #submit-button, #login .button { > font-size: 1.4em; > padding : .3em .6em; >+ background: rgba(254, 195, 44, 1); >+ border: none; >+ color: #000; >+} >+ >+#login #submit-button:hover, #login #submit-button:focus, #login #submit-button:active{ >+ background: rgba(254, 195, 44, 0.7) !important; >+ border: none; > } > > #login #onerror_actions { >@@ -145,7 +154,7 @@ label { > } > > .submit input:active, .button:active { >- background: #f4f4f4; >+ background: #fff; > border: 1px solid #999; > border-left-color: #999; > border-top-color: #999; >@@ -155,8 +164,9 @@ label { > text-align: right; > } > >+ > textarea, input, select { >- background: #f4f4f4; >+ background: #fff; > border: 1px solid #b2b2b2; > color: #000; > font: 13px Verdana, Arial, Helvetica, sans-serif; >diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss b/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss >index e53a1b9bd8..2f160e06ec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss >@@ -153,7 +153,7 @@ fieldset.brief li.radio { > > .flatpickr-calendar { > border-radius: 0; >- border: 1px solid #B9D8D9; >+ border: 1px solid #71B344; > box-shadow: none; > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >index ef2bcd2e5c..4882ea4ed8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -37,7 +37,7 @@ a { > &.btn { > &:link, > &:visited { >- color: #71B443; >+ //color: #71B443; > padding: 6px 25px; > } > >@@ -55,6 +55,27 @@ a { > > } > >+ &.lientype{ >+ color: #71B443; >+ padding: .3em; >+ border: none; >+ background-color: transparent; >+ border: none; >+ box-shadow: none; >+ font-size: 100%; >+ >+ &:hover, &:focus, &:active{ >+ text-decoration: underline; >+ color: #71B443; >+ padding: .3em; >+ border: none; >+ background-color: transparent; >+ border: none; >+ box-shadow: none; >+ font-size: 100%; >+ } >+ } >+ > &.cancel { > > background-color: transparent; >@@ -640,6 +661,39 @@ hr { > > p { > margin: .7em 0; >+ >+ &.plus{ >+ background-color: #352C2E; >+ height: 100% !important; >+ top: 30px; >+ border-bottom-left-radius: 17px; >+ border-bottom-right-radius: 17px; >+ >+ input{ >+ outline-offset: 0px; >+ outline: 1px black; >+ float: right; >+ height: 30px; >+ border-radius: 17px; >+ padding-left: 2em; >+ padding-right: 1.5em; >+ border: none; >+ margin-left: 0px; >+ position: absolute; >+ top: -5px; >+ right: 30px; >+ z-index: 100; >+ display: inline-block !important; >+ letter-spacing: normal; >+ word-spacing: normal; >+ text-transform: none; >+ text-indent: 0px; >+ text-shadow: none; >+ text-align: start; >+ cursor: text; >+ font: 400 13.3333px Arial; >+ } >+ } > } > > strong { >@@ -832,7 +886,7 @@ label, > align-items: center; > justify-content: center; > flex-wrap: wrap; >- width: 150px; >+ width: 200px; > height: 150px; > margin-right: auto; > margin-left: auto; >@@ -885,9 +939,6 @@ label, > border-color: #418940; > } > >- h1{ >- font-weight: bold; >- } > } > } > >@@ -1204,6 +1255,7 @@ ol { > } > > fieldset { >+ overflow: auto; > background-color: #FFF; > position: relative; > color: #696969; >@@ -2088,6 +2140,7 @@ dd { > position: relative; > float: right; > height: 100%; >+ padding: 0.3em; > > .dropdown-menu { > /*border-top-width: 1px; >@@ -2154,6 +2207,14 @@ dd { > } > } > >+ #up{ >+ display: table; >+ } >+ >+ #down{ >+ display: table; >+ } >+ > #patdrop{ > border-top-width: 1px; > text-align: center; >@@ -2197,6 +2258,8 @@ dd { > border-radius: 0; > margin-top: 0; > z-index: 300; >+ left: auto !important; >+ width: 851px; > } > > a.addtocart { >@@ -3258,7 +3321,7 @@ td { > } > } > >-#lientype, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #addauth, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #z3950submit, #add_manual_restriction{ >+#lientype, #show_invoice_adjustment, #cancel_invoice_adjustment, #show_active_vendors, #add-contact, #multi_hold_submit, #show-picture-upload, #edit_suggester, #expand_all, #collapse_all, #hide_inactive, #show_inactive, #addnewmessageLabel, #results_batch_ops, #highlight_toggle_off, #selectall, #clearall, #highlight_toggle_on, #addColumn, #remove_from_cart, #place_hold, #add_to_list, #batch_modify, #batch_delete, #delColumn, #edit_manager, #addauth, #unset, #UncheckAll, #check-all, #results_batch_ops #uncheck-all, #frameworkactions, #authtypeactions, #modify_sru_fields, #cartsubmit, #z3950submit, #add_manual_restriction{ > color: #71B443; > padding: .3em; > border: none; >@@ -4311,7 +4374,8 @@ nav { > // top: 0px; > //position: absolute; > //right: 5px; >- overflow-x: hidden; >+ //overflow-x: hidden; >+ //overflow-y: visible; > display: block !important; > height: auto !important; > } >@@ -4353,6 +4417,32 @@ nav { > li { > list-style: none; > >+ .filteraction{ >+ position: absolute; >+ right: 30px; >+ top: -5px; >+ width: 25px; >+ height: 30px; >+ border: none; >+ padding-left: 5px; >+ padding-right: 5px; >+ margin: 0; >+ display: inline; >+ >+ a{ >+ color: #71B443; >+ vertical-align: middle; >+ >+ &:hover, &:active{ >+ background-color: transparent; >+ //font-weight: bold; >+ text-decoration: none; >+ >+ } >+ } >+ >+ } >+ > .residentsearch { > border: 0; > //border-bottom: 1px solid #85CA11; >@@ -4387,8 +4477,9 @@ nav { > position: relative; > left: 0px; > top: 0px; >+ width: 500px; > //line-height: 40px; >- overflow: hidden; >+ // overflow: hidden; > display: block; > margin: 10px 0; > } >@@ -4396,8 +4487,8 @@ nav { > #submit, #autocsubmit{ > background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%; > position: absolute; >- // right : 0px; >- right : -65px; >+ min-width: 7px; >+ right: 0; > top: 0px; > width: 25px; > height: 30px; >@@ -6130,6 +6221,7 @@ input.renew { > //font-size: 150%; > > i{ >+ > &.fa{ > color: #fff; > border-radius: 50%; >@@ -6146,6 +6238,20 @@ input.renew { > border: solid 3px #71B443; > } > >+ &.fond{ >+ opacity: 70%; >+ position: relative; >+ top: 5px; >+ border: none; >+ right: 20px; >+ border-radius: 0; >+ background-color: transparent; >+ width: auto; >+ height: auto; >+ margin: 0; >+ padding: 0; >+ } >+ > } > > h1 { >@@ -6163,10 +6269,23 @@ input.renew { > background-color: #418940; > border: solid 3px #418940; > } >+ &.fond{ >+ opacity: 70%; >+ position: relative; >+ top: 5px; >+ border: none; >+ right: 20px; >+ border-radius: 0; >+ background-color: transparent; >+ width: auto; >+ height: auto; >+ margin: 0; >+ padding: 0; >+ } > } > > h1{ >- font-weight: bold; >+ //font-weight: bold; > } > } > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/.patron-search.inc.swp b/koha-tmpl/intranet-tmpl/prog/en/includes/.patron-search.inc.swp >new file mode 100644 >index 0000000000000000000000000000000000000000..4c9496a048b2bae1f74c3bc559a4e30a71e1609c >GIT binary patch >literal 16384 >zcmeHNO^*~s7%ox1R6c@`a8Zj!vb)ilS%d(=o*}!-f*W8LS<oorq^GB5r=_QR?CxP% >z6-+d6^<b2vCgRN)^`Kr%#DgajLjotlL4Sb8L_zWMsjjM?o@Qnl0x@c8k|#Y~Z`E5> >zPd)usS9Mi}pPbl7x8;Wkek%z%cH;fY+SNPA&@-FKQNM2S<Qx6^&3BS#EQEnw;D2&a >zqv;kLFA6M=MdGd*_%j9OA=P$URTdVSRuuSNE@W0<*YileQCqZKGoTsh#lSMM>Cuhx >zqrTo)NAFv8s8>dvt{Kn_Xa+O`ngPv#W<WEb8PE*;4;hG>%gHO~*8<tMee!xo=K7cX >zjmz}OjQvk(SLttL?0-o6luZ9NWB*;+)rw?THbAxGH)$V{<xXYn*QDK)_OCMbU!{G! >zv@ehyR{npH_EBj!Gxn>Q@+UL)E7JaiEdN=?{<E}?N&C_}#UEAwPtsnI_PrUqyd`U- >z{ez5MChLo4Kr^5j&<tn>Gy|Fe&46Y=GoTsJ3}^<rGGJ8+IR(o_z7WOtf3^PqaRnjY >z0p9@UfRBK)z-vGS*a~a`Rst)4OUns)6YzkG%Wwq<@cF%j90wRs1$G1X1J~{$<U?Q| >z@Bpw1SOP2tF5OMYm%tgI3G4ut0T-4M@-gr_-~qdVEx<b9(h@>yz<yu~7z7pqmlqTA >z1rPz-fXj;rc?Wn7*bH1<NXTj6SzrsW7Wn=yLe2xP0y}|4z&Wh9cK~aEAF#GR54;PU >z1_}V@?}A#)cV+q?Or-Pt%#gXvj;LofSkVv%D{2mNt6?<PWCnGr*Qb_ijvKMSD3N&_ >zQ`5C7%%wFyn8(9(e3FC4HEuTxagp9`P1oseJiLL9jZBZz0nq_85Iq>68;<mBA?oVk >zOZCYt2x_|5sB-ZuY9F86IbUt*+@{}*9N(kIEVl*9QP{R3Hsc3#dG*KktBk%(>rumn >zSEH29gJUpu;0PB<7PBCn_SM#1QwPRJ#vV_qr4y6tzr(_Qx{>LEQ5x~)`fGxc8<$nO >zw>K}TuBFE$lea@ks)GNFjNE($XQ%9X7xgF;f6Cj!>Tk%T!j)=VE*IB9RY9L>xuwVB >zCbT6RI<c$WynN`q$mqHv-Pn(;(a`DfgYD9^NJnEvS(vw6caZv?J6Em+exp1S_^l=_ >zmf(2kMy}JEZ;#N;E51wFz418A-43}6?>)uNxp`{hAi_qiTYq7OKwyJ7#Ox3U5|R#l >z{D1GTYdT)D6;VFx6pe@-kJ58bSseURoTXxC67czq)RwkEZPyCJqEYkhR%p;d_sDqt >z9F?i5Bqpfd1Yb8LnZDaums#H=z3{n^ik_GSq$cc`V#Z~WYIOzAR!z>YCQ3Epd03L5 >zx{PFG0rR7Kr^fb3$7N-Wr|5VP4sTdbb5y2tez#L4NyGNN$Z|Y`qGd)HSwTc+ov3b< >z_#k%_6jO9kQnW=(+<0QbC{;p5&UQUAw=!f42<^4Ai|{hnneA!6g=xy8QJs0{Y#352 >z&OrTIT5_V%a@eR)RnoSdPS|v<Ih3@095-dhC2Nu$K0poLbIxjNN;eDKkQ%SFR>M}M >z;Xti&J{L82D6WgNd0Z+Qn}_EUd8dM{R^*FDM=0snYMoV7onuNobsVBKO5+}XAQIw( >zD)m~83X)<C29aaA@k<}1jk2O|w<NW4=x|D@Qcjy|X-LRT2ZdDa9m#2i>rS=Gpi%LT >z`a;XGj|w#>q;KpXLphSX%Yl(p$D^f+i)f=puuG6I!zLuBMk0QuEStZ+32!3QiIg%D >zOVqT)qw4agQx90JXspKz+`~uAf>pvRCEVc>_pYs{q`@~+8x+v9x?H+CqTH*i<VDa~ >z!BJ|wZl;CUU|c9k2(2@#Dvw-O{Ns2=;)t3K)Oe<BR`=a1!@GXJ!pkfl%#?!DT2EyY >z@)T?rje<Sn<SLFApB^uWHiz<>Z@LC;u&D0iJ+tYDcphRF;!60tXGbVadK$3Mfzl!= >zj}jqC0Zsx7WOPjm)X-<RCg!?aj*hY!$D{k>BkCbNAbn905a=kV%jM#Dz5l?}*!c7` >z9T2S$!JnUIk7r+mo+JZb0hH^^ZL%OtXE=nl&Ou*1X_ViLgdt{+IA+K9fi;`D8<lS{ >zsicXG+a^=DdvF4u-}3eUdsvUJ;p=s*|JC>9Gg#9f1tx*3Skr$Ed;**W-U4QU2CxlS >z16)D*Pl30A=YeTpE06;o1i1gzfc|L)Gy|Fe&46Y=GoTsJ3}^;41Db(<6$9DLAn^gF >zy?j5>vBI8pysAH&w_QJEgF}yX*x)I>ucQ{_{MyWm&rRi4$b!L&9|Zm^3&ftyBeZHo >zRySXJvG&8VE$v7+LrpgJtSgp%w7o0ZuUl-PCxtWKk6GAM!p6AlrQc*83)-EmwY+$H >z1RHAnv*J9Rp)Vz^&hTeBQ5kzhW#KzZVP|IE+3Qn!r*g|fgT{KttNF%IKCJt**$Q|T >z^-E>tOYy<-pdr@xbYMd`KrQS`RrBz}x3;XPO)oyP3}uE(xjaFc8?sdIl|fy3oeZNN >f^w~a@w_5`pY?8VGwl3x<wkEK18t<6S)8fAY6+KMD > >literal 0 >HcmV?d00001 > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc >index f330237f37..0fecc7788c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc >@@ -7,7 +7,7 @@ > <label>From an existing record: > <input type="text" name="q" size="25" /> > </label> >- <input type="submit" class="submit" id="searchtoorder" data-booksellerid="[% booksellerid | html %]" data-basketno="[% basketno | html %]" value="Submit" /> >+ <input type="submit" class="submit principal" id="searchtoorder" data-booksellerid="[% booksellerid | html %]" data-basketno="[% basketno | html %]" value="Submit" /> > </form> > </li> > <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From a suggestion</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >index 8da5376457..a9b17bcf69 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >@@ -1,33 +1,31 @@ >-[% USE Koha %] >-[% PROCESS 'html_helpers.inc' %] >-[% PROCESS 'patronfields.inc' %] > <!-- Begin Acquisitions Resident Search Box --> > > <div id="header_search" class="fold"> > <div id="supplier_search" class="residentsearch"> > <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post"> >- <input type="text" name="supplier" id="supplier" class="focus" placeholder="Search vendors" /> >+ <input type="text" name="supplier" id="supplier" class="head-searchbox focus" placeholder="Search vendors" /> > <input type="submit" id="submit" value="" /> > </form> > </div> > > <div id="orders_search" class="residentsearch"> >- <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"> >- <input type="text" id="title" name="title" class="focus" value="[% title | html %]" placeholder="Title" /> >- <input type="text" id="title" name="name" class="focus" value="[% name | html %]" placeholder="Vendor" /> >+ <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"> >+ <input type="text" id="title" style="display:inline;left: 125px;" class="focus" placeholder="Title" name="title" size="13" value="[% title | html %]" /> >+ <input type="text" id="searchsupplier" style="display:inline" class="focus" placeholder="Vendor" name="name" size="13" value="[% name | html %]" /> > <input type="hidden" id="do_search" name="do_search" value="do" /> >- <span class="filteraction" id="filteraction_off" style="display:none"> <a id="plus" href="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span> >- <span class="filteraction" id="filteraction_on"> <a id="plus" href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span> >- <input value="" id="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a> >- >- <p id="filters" class="plus" style="display:none"> >- <input type="text" name="basket" id="basket" placeholder="Basket" /> >- <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" placeholder="Invoice number" /> >+ <span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span> >+ <span class="filteraction" id="filteraction_on"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span> >+ <input value="" class="submit" id="submit" type="submit" /> >+ >+ <p class="plus" id="filters" style="display:none"> >+ <input type="text" style="right: 260px" placeholder="Basket" name="basket" id="basket" /> >+ <input type="text" placeholder="Invoice number" name="booksellerinvoicenumber" id="booksellerinvoicenumber" /> > </p> >- </form> >+ </form> > </div> >+ > >- <ul> >+ <ul id="taille"> > <li><a id="button_1" title="Vendor search" onclick="clique(this)" class="iconsearch" href="#supplier_search"><i class="fa fa-upload"></i></a></li> > <li><a id="button_2" title="Orders search" onclick="clique(this)" class="iconsearch" href="#orders_search"><i class="fa fa-download"></i></a></li> > >@@ -37,7 +35,7 @@ > </div> > > >- >+ > <script type="text/javascript"> > function focusInput(){ > document.getElementsByClassName('head-searchbox').focus(); >@@ -78,8 +76,7 @@ > if (elem == iconssearch[i]){ > inputssearch[i].classList.add('focus'); > >- var offsetWidth = buttonssearch[i].offsetWidth +5; >- inputssearch[i].style = "width:calc(355px - "+offsetWidth+"px)"; >+ taille(inputssearch[i]) > } > } > >@@ -89,15 +86,20 @@ > > function fold(){ > document.getElementById('header_search').classList.add('fold'); >- // document.getElementsByClassName('head-searchbox').style = "width:calc(355px - 100px)"; >+ // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)"; > setTimeout( > function(){ >- var offsetWidth = document.getElementsByClassName('buttonsearch').offsetWidth +5; >- document.getElementsByClassName('head-searchbox').style = "width:calc(355px - "+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') >@@ -106,9 +108,8 @@ > } > }); > >- >- > </script> >+ > > <!-- /header_search --> > <!-- End Main page Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >index c00fd218ee..ef7e4128c7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >@@ -3,37 +3,44 @@ > <div id="toolbar" class="btn-toolbar"> > [% IF ( booksellerid ) %] > <div class="btn-group"> >- <a class="pat" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New >- <span class="caret"></span> >- </a> >- <ul class="dropdown-menu"> >- [% IF CAN_user_acquisition_order_manage && active %] >- <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid | uri %]&op=add_form">Basket</a></li> >- [% END %] >- [% IF CAN_user_acquisition_contracts_manage && active %] >- <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid | uri %]">Contract</a></li> >- [% END %] >- [% IF ( CAN_user_acquisition_vendors_manage ) %] >- <li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Vendor</a></li> >- [% END %] >- </ul> >- </div> >- [% IF ( CAN_user_acquisition_vendors_manage ) %] >- <div class="btn-group"><a class="pat" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]&op=enter"><i class="fa fa-pencil"></i> Edit vendor</a></div> >- [% UNLESS ( basketcount OR subscriptioncount ) %] >- <div class="btn-group"> >- <form action="/cgi-bin/koha/acqui/supplier.pl" method="post"> >- <input type="hidden" name="op" value="delete" /> >- <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >- <button class="pat" id="deletesupplier" type="submit"><i class="fa fa-trash"></i> Delete vendor</button> >- </form></div> >+ <a class="pat" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New >+ <span class="caret"></span> >+ </a> >+ <ul class="dropdown-menu"> >+ [% IF CAN_user_acquisition_order_manage && active %] >+ <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid | uri %]&op=add_form">Basket</a></li> > [% END %] >+ [% IF CAN_user_acquisition_contracts_manage && active %] >+ <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid | uri %]">Contract</a></li> >+ [% END %] >+ [% IF ( CAN_user_acquisition_vendors_manage ) %] >+ <li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Vendor</a></li> >+ [% END %] >+ </ul> >+ </div> >+ [% IF ( CAN_user_acquisition_vendors_manage ) %] >+ <div class="btn-group"> >+ <a class="pat" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]&op=enter"><i class="fa fa-pencil"></i> Edit vendor</a> >+ </div> >+ [% UNLESS ( basketcount OR subscriptioncount ) %] >+ <div class="btn-group"> >+ <form action="/cgi-bin/koha/acqui/supplier.pl" method="post"> >+ <input type="hidden" name="op" value="delete" /> >+ <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >+ <button class="pat" id="deletesupplier" type="submit"><i class="fa fa-trash"></i> Delete vendor</button> >+ </form> >+ </div> > [% END %] >- [% IF CAN_user_acquisition_order_receive && basketcount %] >- <div class="btn-group"><a class="pat" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | html %]"><i class="fa fa-inbox"></i> Receive shipments</a></div> >- [% END %] >- [% ELSE %] >- <div class="btn-group"><a class="pat" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="fa fa-plus"></i> New vendor</a></div> > [% END %] >+ [% IF CAN_user_acquisition_order_receive && basketcount %] >+ <div class="btn-group"> >+ <a class="pat" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | html %]"><i class="fa fa-inbox"></i> Receive shipments</a> >+ </div> >+ [% END %] >+ [% ELSE %] >+ <div class="btn-group"> >+ <a class="pat" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="fa fa-plus"></i> New vendor</a> >+ </div> >+ [% END %] > </div> > <!-- / acquisitions-toolbar.inc --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc >index 775c04d167..8f9c83acaa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc >@@ -1,7 +1,7 @@ > [% USE AuthorisedValues %] > [% IF wrap_fieldset != 0 %] > <fieldset class="rows"> >- <legend>Additional fields</legend> >+ <h3>Additional fields</h3> > <ol> > [% END %] > [% FOR field IN available %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc >index 4b4227ba20..7cff97878f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc >@@ -1,58 +1,52 @@ >+<!-- Begin main page resident search box --> >+<div id="header_search" class="fold"> > >-<div id="header_search"> > [% INCLUDE 'patron-search-box.inc' %] >- >- [% IF (CAN_user_circulate_circulate_remaining_permissions) %] >- <div id="checkout_search" class="residentsearch"> >- <form action="/cgi-bin/koha/circ/circulation.pl" method="post"> >- <input id="inputsearch" class="inpu focus" type="text" autocomplete="off" placeholder="Enter patron card number or partial name" /> >- <input type="hidden" name="quicksearch" value="1" /> >- <input value="" type="submit" id="submitsearch" /> >- </form> >- </div> >- >- <div id="checkin_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <input name="barcode" id="inputsearch" class="inpu" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> >- <input value="" type="submit" id="submitsearch" /> >- </form> >- </div> >- >- <div id="renew_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Scan a barcode to renew" /> >- <input value="" type="submit" id="submitsearch" /> >- </form> >- </div> >+ >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >+ <div id="checkin_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >+ <input type="text" name="barcode" placeholder="Scan a barcode to check in" class="head-searchbox focus" id="ret_barcode" size="40" accesskey="r" /> >+ <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 type="text" class="head-searchbox focus" placeholder="Scan a barcode to renew" name="barcode" id="ren_barcode" size="40" /> >+ <input value="" class="submit" id="submit" type="submit" /> >+ </form> >+ </div> > [% END %] > > [% IF CAN_user_borrowers_edit_borrowers %] >- <div id="patron_search" class="residentsearch"> >- <form action="/cgi-bin/koha/members/member.pl" method="post"> >- <input name="searchmember" class="head-searchbox" id="inputsearch" class="inpu" type="text" placeholder="Enter patron card number or partial name" /> >- <input type="hidden" name="quicksearch" value="1" /> >- <input value="" id="submitsearch" type="submit" /> >- </form> >- </div> >+ <div id="patron_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/members/member.pl" method="post"> >+ <input name="searchmember" class="head-searchbox focus" placeholder="Enter patron card number or partial name" id="searchmember" size="40" type="text" /> >+ <input type="hidden" name="quicksearch" value="1" /> >+ <input value="" class="submit" id="submit" type="submit" /> >+ </form> >+ </div> > [% END %] > >- <ul> >- <span id="buttonssearch"> >- <span id="button_1" title="Check out" onclick="clique(this)" class="iconsearch"><i class="fa fa-upload"></i></span> <span id="button_2" title="Check in" onclick="clique(this)" class="iconsearch"><i class="fa fa-download"></i></span> <span id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch"><i class="fa fa-retweet"></i></span> <span id="icon_4" title="Search patrons" onclick="clique(this)" class="iconsearch"><i class="fa fa-fw fa-id-card-o"></i></span> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch active" href="#circ_search">Check-out</span>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#checkin_search">Check-in</span>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %] >- [% IF ( CAN_user_borrowers_edit_borrowers ) %]<span id="button_4" onclick="toggle(this)" class="buttonsearch" href="#patron_search">Search patrons</span>[% END %] >- </span> >+ <ul id="taille"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a id="icon_4" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch active">Check out</span> >+ <span id="button_2" class="buttonsearch">Check in</span> >+ <span id="button_3" class="buttonsearch">Renew</span> >+ <span id="button_4" class="buttonsearch">Search patrons</span> > </ul> >-</div> >+ > > <script type="text/javascript"> > function focusInput(){ >- document.getElementById('inputsearch').focus(); >+ document.getElementsByClassName('head-searchbox').focus(); > } > >- function toggle(elem){ >+ function toggle(elem){style="width: calc(301px);" > var buttonssearch = document.getElementsByClassName('active'); > for (var i = buttonssearch.length - 1; i >= 0; i--) { > buttonssearch[i].classList.remove('active'); >@@ -63,17 +57,17 @@ > fold(); > }else{//Back > document.getElementById('button_1').classList.add('active'); >- document.getElementById('containersearch').classList.remove('fold'); >- document.getElementById('inputsearch').style = ''; >+ document.getElementById('header_search').classList.remove('fold'); >+ document.getElementsByClassName('head-searchbox').style = ''; > } >- >+ > focusInput(); > } > > function clique(elem){ > var buttonssearch = document.getElementsByClassName('buttonsearch'); > var iconssearch = document.getElementsByClassName('iconsearch'); >- var inputssearch = document.getElementsByClassName('inpu'); >+ var inputssearch = document.getElementsByClassName('head-searchbox'); > for (var i = buttonssearch.length - 1; i >= 0; i--) { > buttonssearch[i].classList.remove('active'); > if (elem == iconssearch[i]){ >@@ -86,26 +80,30 @@ > > if (elem == iconssearch[i]){ > inputssearch[i].classList.add('focus'); >+ >+ taille(inputssearch[i]) > } > } > > focusInput(); >- fold(elem); >+ fold(); > } > >- function fold(elem){ >- document.getElementById('containersearch').classList.add('fold'); >- // document.getElementById('inputsearch').style = "width:calc(500px - 100px)"; >+ function fold(){ >+ document.getElementById('header_search').classList.add('fold'); >+ // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)"; > setTimeout( > function(){ >- var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5; >- document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)"; >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)"; > } > , 250); > } > >- >- >+ function taille(el){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ el.style = "width:calc(500px - "+offsetWidth+"px)"; >+ } > > $('.btn').click(function(){ > if($(this).hasClass('active')){ >@@ -114,10 +112,12 @@ > $(this).addClass('active') > } > }); >+ > </script> > > <!-- /header_search --> > <!-- End Main page Resident Search Box --> > >+ > </div><!-- /#header_search --> >-<!-- End advanced search page resident search box --> >+<!-- End advanced search page resident search box --> >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >index 9453e3f40b..3ef66e1f9c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >@@ -1,8 +1,8 @@ > [% PROCESS 'form-blocks.inc' %] > > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="#" id="clear" class="btn btn-default btn-sm"><i class="fa fa-trash"></i> Clear field</a></div> >- <div class="btn-group"><a href="#" id="createnew" class="btn btn-default btn-sm"><i class="fa fa-plus"></i> Create new authority</a></div> >+ <div class="btn-group"><a href="#" id="clear" class="btn btn-default pat btn-sm"><i class="fa fa-trash"></i> Clear field</a></div> >+ <div class="btn-group"><a href="#" id="createnew" class="btn btn-default pat btn-sm"><i class="fa fa-plus"></i> Create new authority</a></div> > </div> > <form name="f" method="get" action="auth_finder.pl"> > <input type="hidden" name="source" value="[% source | html %]" /> >@@ -158,6 +158,6 @@ > </ol> > </fieldset> > [% END %] >- <fieldset class="action"> <input type="submit" value="Search" class="submit" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a> >+ <fieldset class="action"> <input type="submit" value="Search" class="submit principal" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >index 4bb44b205a..05e740501a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >@@ -54,7 +54,7 @@ > <option value="">None</option> > [% END %] > </select> >- <input type="submit" class="submit" value="Submit" /> >+ <input type="submit" class="submit principal" value="Submit" /> > </form> > </div> > <div id="main_heading" class="residentsearch"> >@@ -110,7 +110,7 @@ > <option value="">None</option> > [% END %] > </select> >- <input type="submit" class="submit" value="Submit" /> >+ <input type="submit" class="submit principal" value="Submit" /> > </form> > </div> > <div id="matchheading_search" class="residentsearch"> >@@ -164,7 +164,7 @@ > <option value="">None</option> > [% END %] > </select> >- <input type="submit" class="submit" value="Submit" /> >+ <input type="submit" class="submit principal" value="Submit" /> > </form> > </div> > <div id="entire_record" class="residentsearch"> >@@ -220,7 +220,7 @@ > <option value="">None</option> > [% END %] > </select> >- <input type="submit" class="submit" value="Submit" /> >+ <input type="submit" class="submit principal" value="Submit" /> > </form> > </div> > <ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc >index 7cb0f9864f..9de0c3ebe1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc >@@ -10,7 +10,7 @@ > <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> > </div> > <div class="modal-footer"> >- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> >+ <button type="button" class="btn btn-default cancel" data-dismiss="modal">Close</button> > </div> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >index 7625708ecf..fe01f2c998 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >@@ -8,8 +8,8 @@ > <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span> > [% END %] > [% IF CAN_user_updatecharges_remaining_permissions %] >- <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Make payment</a> >- <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Pay all charges</a></li> >+ <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" id="lientype" >Make payment</a> >+ <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" id="lientype" >Pay all charges</a></li> > [% END %] > </li> > [% END %] >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 632ed7099b..a0e850e3e9 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 >@@ -17,7 +17,7 @@ > [% END %] > </select> > <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> >- <input type="submit" class="submit" name="filter" value="" /> >+ <input type="submit" class="submit" id="submit" name="filter" value="" /> > </form> > </div> > >@@ -25,14 +25,89 @@ > > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a id="icon_1" title="Search funds" onclick="clique(this)" class="iconsearch" href="#budgets_search"><i class="fa fa-upload"></i></a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ <ul id="taille"> >+ <li><a id="icon_1" title="Search funds" onclick="clique(this)" class="iconsearch" href="#budgets_search"><i class="fa fa-credit-card"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] > [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >- <span class="buttonsearch active">Search funds</span> >- <span class="buttonsearch">Check out</span> >- <span class="buttonsearch" href="#catalog_search">Search the catalog</span> >+ <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> > </ul> > </div> >+ >+<script type="text/javascript"> >+ function focusInput(){ >+ document.getElementsByClassName('head-searchbox').focus(); >+ } >+ >+ function toggle(elem){style="width: calc(301px);" >+ var buttonssearch = document.getElementsByClassName('active'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ } >+ >+ if(elem){ >+ elem.classList.add('active'); >+ fold(); >+ }else{//Back >+ document.getElementById('button_1').classList.add('active'); >+ document.getElementById('header_search').classList.remove('fold'); >+ document.getElementsByClassName('head-searchbox').style = ''; >+ } >+ >+ focusInput(); >+ } >+ >+ function clique(elem){ >+ var buttonssearch = document.getElementsByClassName('buttonsearch'); >+ var iconssearch = document.getElementsByClassName('iconsearch'); >+ var inputssearch = document.getElementsByClassName('head-searchbox'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ if (elem == iconssearch[i]){ >+ buttonssearch[i].classList.add('active'); >+ } >+ } >+ >+ for (var i = inputssearch.length - 1; i >= 0; i--) { >+ inputssearch[i].classList.remove('focus'); >+ >+ if (elem == iconssearch[i]){ >+ inputssearch[i].classList.add('focus'); >+ >+ taille(inputssearch[i]) >+ } >+ } >+ >+ focusInput(); >+ fold(); >+ } >+ >+ function fold(){ >+ document.getElementById('header_search').classList.add('fold'); >+ // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)"; >+ setTimeout( >+ function(){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ , 250); >+ } >+ >+ function taille(el){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ el.style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ >+ $('.btn').click(function(){ >+ if($(this).hasClass('active')){ >+ $(this).removeClass('active') >+ } else { >+ $(this).addClass('active') >+ } >+}); >+ >+</script> >+ > <!-- End Suggestions Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search-pareilquecirc-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search-pareilquecirc-search.inc >deleted file mode 100644 >index 56450d6616..0000000000 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search-pareilquecirc-search.inc >+++ /dev/null >@@ -1,37 +0,0 @@ >-[% USE Koha %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Catalogue Resident Search Box --> >-<div id="header_search"> >- >-[% INCLUDE 'patron-search-box.inc' %] >- >-[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >-<div id="checkin_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <label class="tip" for="ret_barcode">Scan a barcode to check in:</label> >- <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" type="text" /> >- >- <input value="Submit" class="submit" type="submit" /> >- </form> >-</div> >-<div id="renew_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <label class="tip" for="ren_barcode">Scan a barcode to renew:</label> >- <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >-</div> >-[% END %] >- >-[% INCLUDE 'catalogue-search-box.inc' %] >- >-<ul> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-active"><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >-</ul> >- >-</div><!-- /header_search --> >-</div><!-- /gradient --> >-<!-- End Catalogue 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 >new file mode 100644 >index 0000000000..a595bb4117 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >@@ -0,0 +1,73 @@ >+[% USE Koha %] >+<div id="header_search"> >+ >+ [% INCLUDE 'patron-search-box.inc' %] >+ >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >+ <div id="checkin_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >+ <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 value="" class="submit" id="submit" type="submit" /> >+ </form> >+ </div> >+ [% END %] >+ >+ [% INCLUDE 'catalogue-search-box.inc' %] >+ >+ <ul id="taille"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-active"><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch">Check out</span> >+ <span id="button_2" class="buttonsearch">Check in</span> >+ <span id="button_3" class="buttonsearch">Renew</span> >+ <span id="button_4" class="buttonsearch active">Search catalog</span> >+ </ul> >+</div><!-- /header_search --> >+ >+<script type="text/javascript"> >+ function focusInput(){ >+ document.getElementById('inputsearch').focus(); >+ } >+ >+ function toggle(elem){ >+ var buttonssearch = document.getElementsByClassName('active'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ } >+ >+ if(elem){ >+ elem.classList.add('active'); >+ fold(); >+ }else{//Back >+ document.getElementById('button_1').classList.add('active'); >+ document.getElementById('containersearch').classList.remove('fold'); >+ document.getElementById('inputsearch').style = ''; >+ } >+ >+ focusInput(); >+ } >+ >+ function fold(){ >+ >+ document.getElementById('containersearch').classList.add('fold'); >+ // document.getElementById('inputsearch').style = "width:calc(500px - 100px)"; >+ setTimeout( >+ function(){ >+ var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5; >+ document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ , 250); >+ } >+ >+</script> >+<!-- End Catalogue Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >index 16a20ff4c0..73391f1663 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >@@ -8,7 +8,7 @@ > <div> > <div id="addbooks_search" class="residentsearch"> > <form name="search" action="addbooks.pl"> >- <input class="head-searchbox" type="text" name="q" id="cat_search" placeholder="Search the catalog and the reservoir" /> >+ <input class="head-searchbox focus" type="text" name="q" id="cat_search" placeholder="Search the catalog and the reservoir" /> > <input type="submit" id="submit" value="" /> > </form> > </div> >@@ -18,14 +18,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" name="barcode" id="ret_barcode" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> >+ <input class="head-searchbox focus" name="barcode" id="ret_barcode" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> > <input value="" type="submit" id="submit" /> > </form> > </div> > > <div id="renew_search" class="residentsearch"> > <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <input class="head-searchbox" name="barcode" id="ren_barcode" type="text" placeholder="Scan a barcode to renew" /> >+ <input class="head-searchbox focus" name="barcode" id="ren_barcode" type="text" placeholder="Scan a barcode to renew" /> > <input value="" type="submit" id="submit" /> > </form> > </div> >@@ -33,7 +33,7 @@ > > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >+ <ul id="taille"> > <li><a id="icon_1" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#addbooks_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="button_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="button_3" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >@@ -41,8 +41,8 @@ > <li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > > <span id="button_1" class="buttonsearch">Cataloging search</span> >- <span id="button_2" class="buttonsearch active">Check-out</span> >- <span id="button_3" class="buttonsearch">Check-in</span> >+ <span id="button_2" class="buttonsearch active">Check out</span> >+ <span id="button_3" class="buttonsearch">Check in</span> > <span id="button_4" class="buttonsearch">Renew</span> > <span id="button_5" class="buttonsearch">Search catalog</span> > </ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc >index 0eca171626..09a39bb293 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc >@@ -1,4 +1,5 @@ >- <li> >+<li> > <span class="circ-hlt">Patron's age is incorrect for their category.</span> > Ages allowed are [% age_low | html %]-[% age_high | html %]. >- <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | uri %]&step=3" class="btn btn-default btn-xs">Change category</a></li> >+ <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber | uri %]&step=3" class="btn btn-default btn-xs">Change category</a> >+</li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc >index 553d3c0286..0c654dfea5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc >@@ -102,8 +102,8 @@ > [% header_row.unshift(item) | html %] > </div> > <div class="modal-footer"> >- <button id="draw-chart" class="btn btn-default">Draw</button> >- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> >+ <button id="draw-chart" class="btn btn-default lientype">Draw</button> >+ <button type="button" class="btn btn-default cancel" data-dismiss="modal">Close</button> > </div> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc >index 0f5565bc21..a2071ad38e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc >@@ -21,7 +21,7 @@ > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] > [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >- <span id="button_1" class="buttonsearch active">Check-out</span> >+ <span id="button_1" class="buttonsearch active">Check out</span> > <span id="button_2" class="buttonsearch">Renew</span> > <span id="button_3" class="buttonsearch">Search catalog</span> > </ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc >index 59646ddd7e..6ea6120e20 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc >@@ -121,7 +121,7 @@ > <input type="hidden" id="claims-returned-itemnumber" /> > </div> > <div class="modal-footer"> >- <button id="claims-returned-modal-btn-submit" type="button" class="btn btn-primary"><i class="fa fa-exclamation-circle"></i> Make claim</button> >+ <button id="claims-returned-modal-btn-submit" type="button" class="btn btn-primary principal"><i class="fa fa-exclamation-circle"></i> Make claim</button> > <button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >index b449bc66bf..a71a12b208 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >@@ -4,7 +4,6 @@ > <div id="header_search" class="fold"> > > [% INCLUDE 'patron-search-box.inc' %] >- [% INCLUDE 'catalogue-search-box.inc' %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > <div id="checkin_search" class="residentsearch"> >@@ -16,7 +15,7 @@ > > <div id="renew_search" class="residentsearch"> > <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <input class="head-searchbox" name="barcode" id="ren_barcode" accesskey="r" type="text" placeholder="Scan a barcode to renew" /> >+ <input class="head-searchbox focus" name="barcode" id="ren_barcode" accesskey="r" type="text" placeholder="Scan a barcode to renew" /> > <input value="" type="submit" id="submit" /> > </form> > </div> >@@ -30,14 +29,13 @@ > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] > [% IF ( CAN_user_catalogue ) %]<li><a id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >- <span id="button_1" class="buttonsearch active">Check-out</span> >- <span id="button_2" class="buttonsearch">Check-in</span> >+ <span id="button_1" class="buttonsearch active">Check out</span> >+ <span id="button_2" class="buttonsearch">Check in</span> > <span id="button_3" class="buttonsearch">Renew</span> > <span id="button_4" class="buttonsearch">Search catalog</span> > </ul> > </div> > >- > <script type="text/javascript"> > function focusInput(){ > document.getElementsByClassName('head-searchbox').focus(); >@@ -87,22 +85,12 @@ > } > > function fold(){ >-<<<<<<< HEAD >- >- document.getElementById('containersearch').classList.add('fold'); >- // document.getElementById('inputsearch').style = "width:calc(500px - 100px)"; >- setTimeout( >- function(){ >- var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5; >- document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)"; >-======= > document.getElementById('header_search').classList.add('fold'); > // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)"; > setTimeout( > function(){ > var offsetWidth = document.getElementById('taille').offsetWidth +5; > document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)"; >->>>>>>> Bug 30952: Search bar > } > , 250); > } >@@ -120,10 +108,6 @@ > } > }); > >- >- > </script> > >- >-<!-- /header_search --> > <!-- End Main page Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc >index 1d30abea14..7034066c61 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 >@@ -8,16 +8,17 @@ > </div> > > [% INCLUDE 'patron-search-box.inc' %] >+ > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a id="icon_1" title="Search cities" onclick="clique(this)" class="iconsearch" href="#city_search"><i class="fa fa-upload"></i></a></li> >+ <ul id="taille"> >+ <li><a id="icon_1" title="Search cities" onclick="clique(this)" class="iconsearch" href="#city_search"><i class="fa fa-building-o"></i></a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] > [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >- <span class="keep_text">Search cities</span> >- <span class="keep_text">Check out</span> >- <span class="keep_text">Search the catalog</span> >+ <span id="button_1" class="buttonsearch active">Search cities</span> >+ <span id="button_2" class="buttonsearch">Check out</span> >+ <span id="button_3" class="buttonsearch">Search the catalog</span> > </ul> > </div> > <!-- End Cities Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc >index f6df1bbc18..e59aa8c751 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc >@@ -72,10 +72,10 @@ > [% UNLESS destination == 'holds' %] > <td class="actions"> > <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="clubactions[% c.id | html %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle lientype" id="clubactions[% c.id | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> >- <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="clubactions[% c.id | html %]"> >+ <ul class="dropdown-menu pull-right" id="lientype" role="menu" aria-labelledby="clubactions[% c.id | html %]"> > [% IF ( c.club_enrollments.count ) %] > <li> > <a href="club-enrollments.pl?id=[% c.id | uri %]"> >@@ -84,26 +84,26 @@ > </li> > [% ELSE %] > <li class="disabled"> >- <a href="#" data-toggle="tooltip" data-placement="left" title="There are no enrollments for this club yet"> >+ <a href="#" data-toggle="tooltip" data-placement="left" id="lientype" title="There are no enrollments for this club yet"> > <i class="fa fa-list-ul"></i> Enrollments > </a> > </li> > [% END %] > [% IF CAN_user_clubs_edit_clubs %] > <li> >- <a href="clubs-add-modify.pl?id=[% c.id | uri %]"> >+ <a id="lientype" href="clubs-add-modify.pl?id=[% c.id | uri %]"> > <i class="fa fa-pencil"></i> Edit > </a> > </li> > <li> >- <a href="#" class="delete_club" data-id="[% c.id | html %]" data-name="[% c.name | html %]"> >+ <a href="#" id="lientype" class="delete_club" data-id="[% c.id | html %]" data-name="[% c.name | html %]"> > <i class="fa fa-trash"></i> Delete > </a> > </li> > [% END %] > [% IF ( c.club_enrollments.count ) %] > <li> >- <a href="#" class="club_hold_search" data-id="[% c.id | html %]"> >+ <a href="#" class="club_hold_search" id="lientype" data-id="[% c.id | html %]"> > <i class="fa fa-search"></i> Search to hold > </a> > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc >index 0b222f0cb8..7070648336 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc >@@ -3,22 +3,22 @@ > <div id="header_search" class="fold"> > <div id="contract_description_search" class="residentsearch"> > <form action="[% script_name | html %]" method="post"> >- <input class="head-searchbox" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Search by contract name or/and description:"/> >- <input type="submit" class="submit" name="search" value="" /> >+ <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Search by contract name or/and description:"/> >+ <input type="submit" class="submit" id="submit" name="search" value="" /> > </form> > </div> > > [% INCLUDE 'patron-search-box.inc' %] > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a id="icon_1" title="Search contracts" onclick="clique(this)" class="iconsearch" href="#contract_description_search"><i class="fa fa-upload"></i></a></li> >+ <ul id="taille"> >+ <li><a id="icon_1" title="Search contracts" onclick="clique(this)" class="iconsearch" href="#contract_description_search"><i class="fa fa-pencil-square-o"></i></a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] > [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >- <span class="keep_text">Search contracts</span> >- <span class="keep_text">Check out</span> >- <span class="keep_text" href="#catalog_search">Search the catalog</span> >+ <span id="button_1" class="buttonsearch active">Search contracts</span> >+ <span id="button_2" class="buttonsearch">Check out</span> >+ <span id="button_3" class="buttonsearch">Search the catalog</span> > </ul> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc >index c1c7c60f27..3da8458484 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,16 +3,17 @@ > <div id="header_search" class="fold"> > <div id="currency_search" class="residentsearch"> > <form action="[% script_name | html %]" method="post"> >- <input class="head-searchbox" 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> > > [% INCLUDE 'patron-search-box.inc' %] >+ > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#currency_search"><i class="fa fa-upload"></i></a></li> >+ <ul id="taille"> >+ <li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#currency_search"><i class="fa fa-dollar"></i></a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] > [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Check out" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-upload"></i></a></li>[% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc >index 1ccecacdc9..11ee830a03 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc >@@ -1,23 +1,25 @@ > [% USE Koha %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName|html %]</a></div><!-- Begin Desks Resident Search Box --> >-<div id="header_search"> >+<div id="header_search" class="fold"> >+ > <div id="desk_search" class="residentsearch"> >- <form action="[% script_name|html %]" method="post"> >- <label class="tip" for="desk_name">Desk search:</label> >- <input class="head-searchbox" type="text" name="desk_name" id="desk_name" value="[% searchfield|html %]" size="40" /> >- <input type="submit" name="submit" value="OK" class="submit" /> >- </form> >+ <form action="[% script_name|html %]" method="post"> >+ <input class="head-searchbox focus" type="text" name="desk_name" placeholder="Desk search:" id="desk_name" value="[% searchfield|html %]" size="40" /> >+ <input type="submit" name="submit" value="" class="submit" id="submit" /> >+ </form> > </div> > > [% INCLUDE 'patron-search-box.inc' %] >+ > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a class="keep_text" href="#desk_search">Search desks</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >- </ul> >-</div> >+ <ul id="taille"> >+ <li><a id="icon_1" title="Search desks" onclick="clique(this)" class="iconsearch" href="#desk_search"><i class="fa fa-desktop"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch active">Search desks</span> >+ <span id="button_2" class="buttonsearch">Check out</span> >+ <span id="button_3" class="buttonsearch">Search catalog</span> >+ </ul> > </div> > <!-- End Desks Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc >index 641f6c3a2c..b4271c52a2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc >@@ -56,10 +56,10 @@ > [% END %] > [% IF facets_loo.facets.size > 5 %] > <li class="moretoggle"> >- <a href="#"><strong>Show more</strong></a> >+ <a href="#" id="lientype"><strong>Show more</strong></a> > </li> > <li class="moretoggle" style="display:none"> >- <a href="#"><strong>Show less</strong></a> >+ <a href="#" id="lientype"><strong>Show less</strong></a> > </li> > [% END %] > </ul></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc >index 2c1fd418dd..42cf9cd180 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc >@@ -199,7 +199,7 @@ > [%- END -%] > <td> > <a class="btn btn-default btn-xs cancel-hold" data-borrowernumber="[% hold.borrowernumber | html %]" data-biblionumber="[% hold.biblionumber | html %]" data-id="[% hold.reserve_id | html %]" href="request.pl?action=cancel&borrowernumber=[% hold.borrowernumber | html %]&biblionumber=[% hold.biblionumber | html %]&reserve_id=[% hold.reserve_id | html %]&date=[% hold.date | html %]"> >- <i class="fa fa-trash" aria-hidden="true"></i> Cancel >+ <i class="fa fa-trash cancel" aria-hidden="true"></i> Cancel > </a> > </td> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc >index f2a00434fa..153f3d4a91 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc >@@ -40,16 +40,14 @@ > [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a id="icon_4" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %] > [% IF ( CAN_user_catalogue ) %]<li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >- <span id="button_1" class="buttonsearch active">Check-out</span> >- <span id="button_2" class="buttonsearch">Check-in</span> >+ <span id="button_1" class="buttonsearch active">Check out</span> >+ <span id="button_2" class="buttonsearch">Check in</span> > <span id="button_3" class="buttonsearch">Renew</span> > <span id="button_4" class="buttonsearch">Search patrons</span> > <span id="button_5" class="buttonsearch">Search catalog</span> > </ul> > </div> > >- >- > <script type="text/javascript"> > function focusInput(){ > document.getElementsByClassName('head-searchbox').focus(); >@@ -122,8 +120,6 @@ > } > }); > >- >- > </script> > > <!-- /header_search --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc >index 03fec59ce1..10a77abb4b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc >@@ -4,31 +4,31 @@ > [% IF backends_available %] > [% IF backends.size > 1 %] > <div class="dropdown btn-group"> >- <button class="btn btn-default dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> >+ <button class="btn btn-default pat dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> > <i class="fa fa-plus"></i> New ILL request <span class="caret"></span> > </button> >- <ul class="dropdown-menu" aria-labelledby="ill-backend-dropdown"> >+ <ul class="dropdown-menu pat" aria-labelledby="ill-backend-dropdown"> > [% FOREACH backend IN backends %] > <li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backend | uri %]">[% backend | html %]</a></li> > [% END %] > </ul> > </div> > [% ELSE %] >- <a id="ill-new" class="btn btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backends.0 | html %]"> >+ <a id="ill-new" class="btn btn-default pat" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backends.0 | html %]"> > <i class="fa fa-plus"></i> New ILL request > </a> > [% END %] > [% ELSE %] >- <a id="ill-new" class="btn btn-default disabled" href=""> >+ <a id="ill-new" class="btn btn-default pat disabled" href=""> > <i class="fa fa-plus"></i> New ILL request > </a> > [% END %] > [% IF query_type == 'illlist' %] >- <a id="ill-list" class="btn btn-sm btn-default btn-group" href="/cgi-bin/koha/ill/ill-requests.pl"> >+ <a id="ill-list" class="btn btn-sm btn-default pat btn-group" href="/cgi-bin/koha/ill/ill-requests.pl"> > <i class="fa fa-list"></i> Refresh > </a> > [% ELSE %] >- <a id="ill-list" class="btn btn-sm btn-default btn-group" href="/cgi-bin/koha/ill/ill-requests.pl"> >+ <a id="ill-list" class="btn btn-sm btn-default pat btn-group" href="/cgi-bin/koha/ill/ill-requests.pl"> > <i class="fa fa-list"></i> List requests > </a> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc >index 69c4fea07d..34f0e5ebf3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc >@@ -1,7 +1,7 @@ > > [% IF ( ( ! one_language_enabled ) && ( languages_loop ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'top') ) %] > <li class="dropdown"> >- <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"><i class="fa fa-flag"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a> >+ <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button" id="lientype"><i class="fa fa-flag"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a> > <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu dropdown-menu-left"> > [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %] > [% IF ( languages_loo.group_enabled ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >index 094800e248..d12402a8e1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >@@ -4,7 +4,7 @@ > <div id="notices_search" class="residentsearch"> > <form action="/cgi-bin/koha/tools/letter.pl" method="post"> > <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="" placeholder="Search existing notices:"/> >- <input type="submit" class="submit" name="search" value="" /> >+ <input type="submit" class="submit" id="submit" name="search" value="" /> > </form> > </div> > >@@ -12,8 +12,8 @@ > > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a id="icon_1" title="Search notices" onclick="clique(this)" class="iconsearch" href="#notices_search"><i class="fa fa-upload"></i></a></li> >+ <ul id="taille"> >+ <li><a id="icon_1" title="Search notices" onclick="clique(this)" class="iconsearch" href="#notices_search"><i class="fa fa-commenting-o"></i></a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] > [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc >index d1f6acbcf9..ab96350259 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc >@@ -2,23 +2,16 @@ > <!-- Begin Main page Resident Search Box --> > > <div id="containersearch" class="fold"> >- [% IF (CAN_user_borrowers) %] >- <div id="checkout_search" class="residentsearch"> >- <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post"> >- <input id="inputsearch" class="inpu" type="text" autocomplete="off" placeholder="Enter patron card number or partial name" /> >- <input type="hidden" name="quicksearch" value="1" /> >- <input value="" type="submit" id="submitsearch" /> >- </form> >- </div> >- [% END %] >+ >+ [% INCLUDE 'patron-search-box.inc' %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > <div id="checkin_search" class="residentsearch"> > <form action="/cgi-bin/koha/members/member.pl" id="patronsearch" method="post"> > [% IF ( PatronAutoComplete ) %] > <div class="autocomplete"> >- <input autocomplete="off" class="inpu" id="inputsearch" name="findborrower" class="head-searchbox" type="text" placeholder="Scan a barcode to check in" /> >- <input value="" id="submitsearch" type="submit"/> >+ <input name="barcode" id="ret_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> >+ <input value="" id="submit" type="submit"/> > > [% IF ( stickyduedate ) %] > <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" /> >@@ -27,59 +20,52 @@ > </div> > > [% ELSE %] >- <input id="inputsearch" name="findborrower" class="inpu head-searchbox" type="text" autocomplete="off" placeholder=Scan a barcode to check in" /> >+ <input name="barcode" id="ret_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> > [% IF ( stickyduedate ) %] > <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" /> > <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" /> > [% END %] >- <input value="" id="submitsearch" type="submit" /> >+ <input value="" id="submit" type="submit" /> > [% END %] > </form> > </div> > > <div id="renew_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <input name="barcode" id="inputsearch" class="inpu" accesskey="r" type="text" placeholder="Scan a barcode to renew" /> >- <input value="" type="submit" id="submitsearch" /> >- </form> >- </div> >- <div id="search_search" class="residentsearch"> > <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Enter search keyords" /> >- <input value="" type="submit" id="submitsearch" /> >+ <input name="barcode" id="ren_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to renew" /> >+ <input value="" type="submit" id="submit" /> > </form> > </div> >- [% END %] > >- [% IF ( CAN_user_catalogue ) %] > <div id="search_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/catalogue/search.pl" autocomplete="off" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- [% INCLUDE 'search_indexes.inc' %] >- [% END %] >- <input name="barcode" class="inpu" id="inputsearch focus" type="text" placeholder="Enter search keyords" /> >- <input value="" type="submit" id="submitsearch" /> >+ <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >+ <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Enter search keyords" /> >+ <input value="" type="submit" id="submit" /> > </form> > </div> > [% END %] > >- <ul> >- <span id="buttonssearch"> >- <span id="button_1" title="Check out" onclick="clique(this)" class="iconsearch"><i class="fa fa-upload"></i></span> <span id="button_2" title="Check in" onclick="clique(this)" class="iconsearch"><i class="fa fa-download"></i></span> <span id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch"><i class="fa fa-retweet"></i></span> <span id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch"><i class="fa fa-fw fa-search"></i></span> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch" href="#circ_search">Check-out</span>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#checkin_search">Check-in</span>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %] >- [% IF ( CAN_user_catalogue ) %]<span id="button_5" onclick="toggle(this)" class="buttonsearch active" href="#catalog_search">Search catalog</span>[% END %] >- </span> >+ [% INCLUDE 'catalogue-search-box.inc' %] >+ >+ <ul id="taille"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" href="#circ_search" class="iconsearch"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check in" onclick="clique(this)" href="#checkin_search" class="iconsearch"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" href="#renew_search" class="iconsearch"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_4" title="Search catalog" onclick="clique(this)" href="#catalog_search" class="iconsearch"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch active">Check-out</span> >+ <span id="button_2" class="buttonsearch">Check-in</span> >+ <span id="button_3" class="buttonsearch">Renew</span> >+ <span id="button_5" class="buttonsearch active">Search catalog</span> > </ul> > </div> > > <script type="text/javascript"> > function focusInput(){ >- document.getElementById('inputsearch').focus(); >+ document.getElementsByClassName('head-searchbox').focus(); > } > >- function toggle(elem){ >+ function toggle(elem){style="width: calc(301px);" > var buttonssearch = document.getElementsByClassName('active'); > for (var i = buttonssearch.length - 1; i >= 0; i--) { > buttonssearch[i].classList.remove('active'); >@@ -90,18 +76,17 @@ > fold(); > }else{//Back > document.getElementById('button_1').classList.add('active'); >- document.getElementById('containersearch').classList.remove('fold'); >- document.getElementById('inputsearch').style = ''; >+ document.getElementById('header_search').classList.remove('fold'); >+ document.getElementsByClassName('head-searchbox').style = ''; > } > > focusInput(); > } > >- > function clique(elem){ > var buttonssearch = document.getElementsByClassName('buttonsearch'); > var iconssearch = document.getElementsByClassName('iconsearch'); >- var inputssearch = document.getElementsByClassName('inpu'); >+ var inputssearch = document.getElementsByClassName('head-searchbox'); > for (var i = buttonssearch.length - 1; i >= 0; i--) { > buttonssearch[i].classList.remove('active'); > if (elem == iconssearch[i]){ >@@ -114,25 +99,40 @@ > > if (elem == iconssearch[i]){ > inputssearch[i].classList.add('focus'); >+ >+ taille(inputssearch[i]) > } > } > >- fold(); > focusInput(); >+ fold(); > } > > function fold(){ >- >- document.getElementById('containersearch').classList.add('fold'); >- // document.getElementById('inputsearch').style = "width:calc(500px - 100px)"; >+ 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> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc >index ff17ca9280..25df9b3cc3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc >@@ -1,111 +1,111 @@ >-[% USE Koha %] >-[% USE Branches %] >-[% USE Categories %] >-[% USE raw %] >-[% PROCESS 'html_helpers.inc' %] >-[% PROCESS 'patronfields.inc' %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Patrons Resident Search Box --> >-<div id="header_search"> >- <div id="patron_search" class="residentsearch"> >- <form action="/cgi-bin/koha/members/member.pl" method="post"> >- <label class="tip" for="searchmember">Enter patron card number or partial name:</label> >- <div class="autocomplete"> >- <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox" name="searchmember" type="text" value="[% searchmember | html %]" autocomplete="off" /> >- <input type="hidden" name="quicksearch" value="1" /> >- <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span> >- <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span> >- <input value="Search" class="submit" type="submit" /> >- </div> >- >- >+<div id="header_search" class="fold"> > >- <div id="filters"> >- <p><label for="searchfieldstype">Search fields:</label> >- <select name="searchfieldstype" id="searchfieldstype"> >- [% SET standard = Koha.Preference('DefaultPatronSearchFields') || 'firstname,surname,othernames,cardnumber,userid' %] >- [% default_fields = [ standard, 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %] >- [% search_options = default_fields.merge(standard.split(',')).unique %] >- [% FOREACH s_o IN search_options %] >- [% display_name = PROCESS patron_fields name=s_o %] >- [% NEXT IF !display_name.length %] >- [% IF searchfieldstype == s_o %] >- <option selected="selected" value="[% s_o | html %]">[% display_name | $raw %]</option> >- [% ELSE %] >- <option value="[% s_o | html %]">[% display_name | $raw %]</option> >- [% END %] >- [% END %] >- </select> >- </p> >- <p> >- <label for="searchtype">Search type:</label> >- <select name="searchtype" id="searchtype"> >- [% IF searchtype == 'start_with' %] >- <option selected="selected" value='start_with'>Starts with</option> >- <option value='contain'>Contains</option> >- [% ELSE %] >- <option value='start_with'>Starts with</option> >- <option selected="selected" value='contain'>Contains</option> >- [% END %] >- </select> >- </p> >- >- <p> >- <label for="branchcode">Library: </label> >- [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %] >- <select name="branchcode_filter" id="branchcode"> >- [% IF branches.size != 1 %] >- <option value="">Any</option> >- [% END %] >- [% PROCESS options_for_libraries libraries => branches %] >- </select> >- </p> >- >- <p> >- <label for="categorycode">Category: </label> >- [% SET categories = Categories.all() %] >- <select name="categorycode_filter" id="categorycode"> >- <option value="">Any</option> >- [% FOREACH category IN categories %] >- [% IF category.categorycode == categorycode_filter %] >- <option value="[% category.categorycode | html %]" selected="selected">[% category.description | html %]</option> >- [% ELSE %] >- <option value="[% category.categorycode | html %]">[% category.description | html %]</option> >- [% END %] >- [% END %] >- </select> >- </p> >- </div> >- </form> >-</div> > [% INCLUDE 'patron-search-box.inc' %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > <div id="checkin_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >- <label class="tip" for="ret_barcode">Scan a barcode to check in:</label> >- <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" type="text" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >+ <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> >+ <input name="barcode" id="ret_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to check in" /> >+ <input value="" type="submit" id="submit" /> >+ </form> >+ </div> >+ >+ <div id="renew_search" class="residentsearch"> >+ <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >+ <input name="barcode" id="ren_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to renew" /> >+ <input value="" type="submit" id="submit" /> >+ </form> > </div> >- <div id="renew_search" class="residentsearch"> >- <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> >- <label class="tip" for="ren_barcode">Scan a barcode to renew:</label> >- <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" /> >- <input value="Submit" class="submit" type="submit" /> >- </form> >- </div> > [% END %] > > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a class="keep_text" href="#patron_search">Search patrons</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %] >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >+ <ul id="taille"> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %] >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch active">Check out</span> >+ <span id="button_2" class="buttonsearch">Check in</span> >+ <span id="button_3" class="buttonsearch">Renew</span> >+ <span id="button_4" class="buttonsearch">Search catalog</span> > </ul> > </div><!-- /header_search --> >-</div><!-- /gradient --> >-<!-- End Patrons Resident Search Box --> >+ >+ >+ >+ >+<script type="text/javascript"> >+ function focusInput(){ >+ document.getElementsByClassName('head-searchbox').focus(); >+ } >+ >+ function toggle(elem){style="width: calc(301px);" >+ var buttonssearch = document.getElementsByClassName('active'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ } >+ >+ if(elem){ >+ elem.classList.add('active'); >+ fold(); >+ }else{//Back >+ document.getElementById('button_1').classList.add('active'); >+ document.getElementById('header_search').classList.remove('fold'); >+ document.getElementsByClassName('head-searchbox').style = ''; >+ } >+ >+ focusInput(); >+ } >+ >+ function clique(elem){ >+ var buttonssearch = document.getElementsByClassName('buttonsearch'); >+ var iconssearch = document.getElementsByClassName('iconsearch'); >+ var inputssearch = document.getElementsByClassName('head-searchbox'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ if (elem == iconssearch[i]){ >+ buttonssearch[i].classList.add('active'); >+ } >+ } >+ >+ for (var i = inputssearch.length - 1; i >= 0; i--) { >+ inputssearch[i].classList.remove('focus'); >+ >+ if (elem == iconssearch[i]){ >+ inputssearch[i].classList.add('focus'); >+ >+ taille(inputssearch[i]) >+ } >+ } >+ >+ focusInput(); >+ fold(); >+ } >+ >+ function fold(){ >+ document.getElementById('header_search').classList.add('fold'); >+ // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)"; >+ setTimeout( >+ function(){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ , 250); >+ } >+ >+ function taille(el){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ el.style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ >+ $('.btn').click(function(){ >+ if($(this).hasClass('active')){ >+ $(this).removeClass('active') >+ } else { >+ $(this).addClass('active') >+ } >+}); >+ >+</script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >index 55417bdf7b..0b0f9c39a4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >@@ -909,13 +909,6 @@ > document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)"; > } > >-<<<<<<< HEAD >- patrons_table.DataTable().draw(); >- [% IF display_search_description %] >- update_search_description(); >- [% END %] >- } >-======= > function taille(el){ > var offsetWidth = document.getElementById('taille').offsetWidth +5; > el.style = "width:calc(500px - "+offsetWidth+"px)"; >@@ -932,7 +925,6 @@ > > > </script> >->>>>>>> Bug 30952: Search bar > > // modify parent window owner element > function add_user(borrowernumber, borrowername) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >index aabbd996d3..d2242d7cb1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >@@ -8,7 +8,7 @@ > <li class="has_modifications"> > <span class="circ-hlt">Pending modifications:</span> > [% IF CAN_user_borrowers_edit_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') || borrower.branch == branch ) %] >- <a href="/cgi-bin/koha/members/members-update.pl?active=[% patron.borrowernumber | uri %]">Review pending modifications</a> >+ <a href="/cgi-bin/koha/members/members-update.pl?active=[% patron.borrowernumber | uri %]" id="lientype">Review pending modifications</a> > [% ELSE %] > <span>Patron has pending modifications</span> > [% END %] >@@ -20,7 +20,7 @@ > <span class="circ-hlt">Expiration:</span> > <span>Patron's card will expire soon.</span> > <span>Patron's card expires on [% expiry | $KohaDates %]</span> >- <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber | html %]">Edit details</a> >+ <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a> > </li> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc >index b034003474..6a05dac007 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc >@@ -4,28 +4,16 @@ > <div id="patron_category_search" class="residentsearch"> > <form action="[% script_name | html %]" method="post"> > <input class="head-searchbox focus" type="text" name="description" value="[% searchfield | html %]" placeholder="Search by patron category name:" /> >- <input type="submit" class="submit" name="search" value="" /> >+ <input type="submit" class="submit" id="submit" name="search" value="" /> > </form> > </div> > > [% INCLUDE 'patron-search-box.inc' %] > >- [% IF ( CAN_user_catalogue ) %] >- <div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% INCLUDE 'search_indexes.inc' %] >- [% ELSE %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% END %] >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> >- <input type="submit" value="" class="submit" /> >- </form> >- </div>[% END %] >+ [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a id="icon_1" title="Search patron categories" onclick="clique(this)" class="iconsearch" href="#patron_category_search"><i class="fa fa-upload"></i></a></li> >+ <ul id="taille"> >+ <li><a id="icon_1" title="Search patron categories" onclick="clique(this)" class="iconsearch" href="#patron_category_search"><i class="fa fa-fw fa-id-card-o"></i></a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] > [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >index 3878bfa742..5a2a1f3885 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >@@ -3,8 +3,8 @@ > <div id="navmenu"> > <div id="navmenulist"> > [% IF ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) %] >- <h5>Cash management</h5> > <ul> >+ <h5>Cash management</h5> > <li><a href="/cgi-bin/koha/pos/pay.pl">Point of sale</a></li> > [% IF !(Registers.session_register_name == '') %] > <li><a href="/cgi-bin/koha/pos/register.pl">Transaction history for [% Registers.session_register_name | html %]</a></li> >@@ -13,8 +13,8 @@ > </ul> > [% END %] > [% IF ( CAN_user_parameters_manage_cash_registers || CAN_user_parameters_manage_accounts) %] >- <h5>Administration</h5> > <ul> >+ <h5>Administration</h5> > [% IF ( CAN_user_parameters_manage_cash_registers ) %] > <li><a href="/cgi-bin/koha/admin/cash_registers.pl">Configure cash registers</a></li> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc >index 39de69167a..33585b0444 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc >@@ -15,13 +15,13 @@ > > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a id="icon_1" title="Search system preferences" onclick="clique(this)" class="iconsearch" href="#syspref_search"><i class="fa fa-upload"></i></a></li> >+ <ul id="taille"> >+ <li><a id="icon_1" title="Search system preferences" onclick="clique(this)" class="iconsearch" href="#syspref_search"><i class="fa fa-fw fa-cogs"></i></a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] > [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > > <span id="button_1" class="buttonsearch active">Search system preferences</span> >- <span id="button_2" class="buttonsearch">Check-out</span> >+ <span id="button_2" class="buttonsearch">Check out</span> > <span id="button_3" class="buttonsearch">Search the catalog</span> > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc >index 0c007f0285..3bc039af7e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc >@@ -101,18 +101,18 @@ > > [% ELSE %] > <div class="btn-group"> >- <a class="btn btn-sm dropdown-toggle" data-toggle="dropdown" href="#"> Actions <span class="caret"></span></a> >+ <a class="btn btn-sm dropdown-toggle" data-toggle="dropdown" href="#" id="lientype"> Actions <span class="caret"></span></a> > <ul class="dropdown-menu pull-right"> > [% IF ( recall.requested or recall.overdue ) %] >- <li><a class="cancel_recall" data-id="[% recall.id | html %]" data-action="cancel"><i class="fa fa-times"></i> Cancel</a></li> >+ <li><a class="cancel_recall" data-id="[% recall.id | html %]" data-action="cancel" id="lientype"><i class="fa fa-times"></i> Cancel</a></li> > [% IF ( recall.should_be_overdue ) %] >- <li><a class="overdue_recall" data-id="[% recall.id | html %]" data-action="overdue"><i class="fa fa-hourglass-end"></i> Mark as overdue</a></li> >+ <li><a class="overdue_recall" data-id="[% recall.id | html %]" data-action="overdue" id="lientype"><i class="fa fa-hourglass-end"></i> Mark as overdue</a></li> > [% END %] > [% ELSIF ( recall.waiting ) %] >- <li><a class="revert_recall" data-id="[% recall.id | html %]" data-action="revert"><i class="fa fa-undo"></i> Revert waiting</a></li> >- <li><a class="expire_recall" data-id="[% recall.id | html %]" data-action="expire"><i class="fa fa-times"></i> Expire</a></li> >+ <li><a class="revert_recall" data-id="[% recall.id | html %]" data-action="revert" id="lientype"><i class="fa fa-undo"></i> Revert waiting</a></li> >+ <li><a class="expire_recall" data-id="[% recall.id | html %]" data-action="expire" id="lientype"><i class="fa fa-times"></i> Expire</a></li> > [% ELSIF ( recall.in_transit ) %] >- <li><a class="transit_recall" data-id="[% recall.id | html %]" data-action="transit"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.item.homebranch) | html %]</a></li> >+ <li><a class="transit_recall" data-id="[% recall.id | html %]" data-action="transit" id="lientype"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.item.homebranch) | html %]</a></li> > [% END %] > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc >index 179f40e2c7..107dd76401 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc >@@ -1,18 +1,18 @@ > [% INCLUDE 'blocking_errors.inc' %] > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="fa fa-plus"></i> New collection</a> >+ <a class="btn btn-default pat" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="fa fa-plus"></i> New collection</a> > </div> > > [% IF ( colId ) %] > <div class="btn-group"> >- <a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId | html %]"><i class="fa fa-exchange"></i> Transfer</a> >+ <a class="btn btn-default pat" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId | html %]"><i class="fa fa-exchange"></i> Transfer</a> > </div> > <div class="btn-group"> >- <a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&colId=[% colId | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default pat" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&colId=[% colId | html %]"><i class="fa fa-pencil"></i> Edit</a> > </div> > <div class="btn-group"> >- <a class="btn btn-default confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&colId=[% colId | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default pat confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&colId=[% colId | html %]"><i class="fa fa-trash"></i> Delete</a> > </div> > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >index 91bfb19522..7efbeeab0f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >@@ -1,38 +1,109 @@ > [% USE Koha %] >+<!-- Begin Main page Resident Search Box --> > >- <div id="header_search" class="fold"> >- >+<div id="header_search" class="fold"> > <div id="subscription_search" class="residentsearch"> >- <p class="tip">Search subscriptions:</p> >- >- <form action="/cgi-bin/koha/serials/serials-search.pl" method="get"> >- [% IF ( routing ) %] >- <input type="hidden" name="routing" value="[% routing | html %]" /> >- [% END %] >- <input type="hidden" name="searched" value="1" /> >- <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> >- >- [% IF (UNIMARC) %] >- <label for="EAN_filter">EAN:</label> <input type="text" size="20" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter | html %]" /> >- [% END %] >- <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /> >- <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/serials/serials-search.pl">Advanced search</a> >- </form> >+ <form action="/cgi-bin/koha/serials/serials-search.pl" method="get"> >+ [% IF ( routing ) %] >+ <input type="hidden" name="routing" value="[% routing | html %]" /> >+ [% END %] >+ <input type="hidden" name="searched" value="1" /> >+ <input type="text" placeholder="ISSN" size="3" class="focus" style="display:inline;right: 225px" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> >+ >+ [% IF (UNIMARC) %] >+ <input type="text" placeholder="EAN" size="3" class="focus" style="display:inline;right: 130px" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter | html %]" /> >+ [% END %] >+ <input type="text" size="3" placeholder="Title" class="focus" style="display:inline" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /> >+ <input value="" class="submit" id="submit" type="submit" /> >+ </form> > </div> > > [% INCLUDE 'patron-search-box.inc' %] > > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a id="icon_1" title="Search subscriptions" onclick="clique(this)" class="iconsearch" href="#subscription_search"><i class="fa fa-upload"></i></a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ <ul id="taille"> >+ <li><a id="icon_1" title="Search subscriptions" onclick="clique(this)" class="iconsearch" href="#subscription_search"><i class="fa fa-book"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >- <span id="button_1" class="buttonsearch active">Search subscriptions</span> >- <span id="button_2" class="buttonsearch">Check out</span> >- <span id="button_3" class="buttonsearch">Search the catalog</span> >+ <span id="button_1" class="buttonsearch active">Search subscriptions</span> >+ <span id="button_2" class="buttonsearch">Check out</span> >+ <span id="button_3" class="buttonsearch">Search catalog</span> > </ul> >+</div><!-- /header_search --> >+ >+ >+<script type="text/javascript"> >+ function focusInput(){ >+ document.getElementsByClassName('head-searchbox').focus(); >+ } >+ >+ function toggle(elem){style="width: calc(301px);" >+ var buttonssearch = document.getElementsByClassName('active'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ } >+ >+ if(elem){ >+ elem.classList.add('active'); >+ fold(); >+ }else{//Back >+ document.getElementById('button_1').classList.add('active'); >+ document.getElementById('header_search').classList.remove('fold'); >+ document.getElementsByClassName('head-searchbox').style = ''; >+ } >+ >+ focusInput(); >+ } >+ >+ function clique(elem){ >+ var buttonssearch = document.getElementsByClassName('buttonsearch'); >+ var iconssearch = document.getElementsByClassName('iconsearch'); >+ var inputssearch = document.getElementsByClassName('head-searchbox'); >+ for (var i = buttonssearch.length - 1; i >= 0; i--) { >+ buttonssearch[i].classList.remove('active'); >+ if (elem == iconssearch[i]){ >+ buttonssearch[i].classList.add('active'); >+ } >+ } >+ >+ for (var i = inputssearch.length - 1; i >= 0; i--) { >+ >+ if (elem == iconssearch[i]){ >+ inputssearch[i].classList.add('focus'); >+ >+ taille(inputssearch[i]) >+ } >+ } >+ >+ focusInput(); >+ fold(); >+ } >+ >+ function fold(){ >+ document.getElementById('header_search').classList.add('fold'); >+ // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)"; >+ setTimeout( >+ function(){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ , 250); >+ } >+ >+ function taille(el){ >+ var offsetWidth = document.getElementById('taille').offsetWidth +5; >+ el.style = "width:calc(500px - "+offsetWidth+"px)"; >+ } >+ >+ $('.btn').click(function(){ >+ if($(this).hasClass('active')){ >+ $(this).removeClass('active') >+ } else { >+ $(this).addClass('active') >+ } >+}); > >- </div><!-- /header_search --> >+</script> > <!-- End Serials Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc >index a75408f0cf..77919f4318 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc >@@ -1,14 +1,15 @@ > [% USE Koha %] > <div id="toolbar" class="btn-toolbar"> >+<div> > [% IF no_op_set %] >- <a id="addrota" class="btn btn-default" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota"><i class="fa fa-plus"></i> New rota</a> >+ <a id="addrota" class="btn btn-default pat" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota"><i class="fa fa-plus"></i> New rota</a> > [% END %] > [% IF op == 'manage_stages' %] >- <a id="editrota" class="btn btn-default" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&rota_id=[% rota_id | uri %]"><i class="fa fa-pencil"></i> Edit rota</a> >- <a class="btn btn-default" href="#" id="addstage" data-toggle="modal" data-target="#addStageModal"><i class="fa fa-plus"></i> Add stage</a> >+ <a id="editrota" class="btn btn-default pat" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&rota_id=[% rota_id | uri %]"><i class="fa fa-pencil"></i> Edit rota</a> >+ <a class="btn btn-default pat" href="#" id="addstage" data-toggle="modal" data-target="#addStageModal"><i class="fa fa-plus"></i> Add stage</a> > [% END %] > [% IF op == 'manage_items' %] > <a id="editrota" class="btn btn-default" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&rota_id=[% rota_id | uri %]"><i class="fa fa-pencil"></i> Edit rota</a> >- <a class="btn btn-default" href="#" id="additems" data-toggle="modal" data-target="#addItemsModal"><i class="fa fa-plus"></i> Add items</a> >+ <a class="btn btn-default pat" href="#" id="additems" data-toggle="modal" data-target="#addItemsModal"><i class="fa fa-plus"></i> Add items</a> > [% END %] >-</div> >+</div></div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >index 0247293045..7ffffb4a25 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >@@ -1,26 +1,28 @@ > [% USE Koha %] >-<div class="gradient"> >-<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Suggestions Resident Search Box --> >-<div id="header_search"> >+<div id="header_search" class="fold"> >+ > <div id="suggestions_search" class="residentsearch"> >- <p class="tip">Suggestions search:</p> >- <form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get"> >- <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >- <label for="searchtitle">Title:</label> <input type="text" id="searchtitle" name="title" size="10" value="[% title | html %]" /> >- <label for="searchauthor">Author:</label> <input type="text" id="searchauthor" name="author" size="10" value="[% author | html %]" /> >- <label for="searchpublishercode">Publisher:</label> <input type="text" id="searchpublishercode" name="publishercode" size="10" value="[% publishercode | html %]" /> >- <input type="submit" class="submit" value="Search" /> >+ <form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get"> >+ <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >+ <input type="text" id="searchtitle" class="head-searchbox focus" placeholder="Title:" name="title" size="10" value="[% title | html %]" /> >+ <input type="text" id="searchauthor" class="head-searchbox focus" placeholder="Author:" name="author" size="10" value="[% author | html %]" /> >+ <input type="text" class="head-searchbox focus" placeholder="Publisher:" id="searchpublishercode" name="publishercode" size="10" value="[% publishercode | html %]" /> >+ <input type="submit" class="submit" id="submit" value="" /> > </form> > </div> > > [% INCLUDE 'patron-search-box.inc' %] >+ > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><a href="#suggestions_search">Search suggestions</a></li> >- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >- [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %] >- </ul> >+ <ul id="taille"> >+ <li><a id="icon_1" title="Search suggestions" onclick="clique(this)" class="iconsearch" href="#suggestions_search"><i class="fa fa-comment-o"></i></a></li> >+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] >+ [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] >+ >+ <span id="button_1" class="buttonsearch active">Search suggestions</span> >+ <span id="button_2" class="buttonsearch">Check out</span> >+ <span id="button_3" class="buttonsearch">Search catalog</span> >+ </ul> > </div> >-</div><!-- /gradient --> > <!-- End Suggestions Resident Search Box --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc >index 3fc669e840..4fbe6bb691 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc >@@ -1,5 +1,6 @@ > [% IF ( booksellerid ) %] >-<div id="menu"> >+<div id="navmenu"> >+<div id="navmenulist"> > <ul> > [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]">Baskets</a></li>[% END %] > [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket groups</a></li>[% END %] >@@ -11,5 +12,5 @@ > <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&owner=1">Uncertain prices</a></li> > [% END %] [% END %] > </ul> >-</div> >+</div></div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc >index 4738e44b5e..bb1af93d9a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc >@@ -58,9 +58,9 @@ > <input type="hidden" name="tbr" value="[% reserveloo.item.homebranch | html %]" /> > <input type="hidden" name="tab" value="[% tab | html %]"> > [% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %] >- <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Cancel hold and return to: [% Branches.GetName( reserveloo.item.homebranch ) | html %]</button> >+ <button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-remove"></i> Cancel hold and return to: [% Branches.GetName( reserveloo.item.homebranch ) | html %]</button> > [% ELSE %] >- <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Cancel hold</button> >+ <button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-remove"></i> Cancel hold</button> > [% END %] > </form> > </td> >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 f2c337afb2..b6763e8ebf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >@@ -4,7 +4,7 @@ > <div id="z3950_search" class="residentsearch"> > <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post"> > <input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Z39.50/SRU server search:" /> >- <input type="submit" class="submit" name="search" value="Search" /> >+ <input type="submit" class="submit" id="submit" name="search" value="Search" /> > </form> > </div> > >@@ -12,8 +12,8 @@ > > [% INCLUDE 'catalogue-search-box.inc' %] > >- <ul> >- <li><li><a id="icon_1" title="Search Z39.50/SRU servers" onclick="clique(this)" class="iconsearch" href="#z3950_search"><i class="fa fa-upload"></i></a></li> >+ <ul id="taille"> >+ <li><li><a id="icon_1" title="Search Z39.50/SRU servers" onclick="clique(this)" class="iconsearch" href="#z3950_search"><i class="fa fa-square-z"></i></a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><li><a id="icon_2" title="Check out" onclick="clique(this)" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %] > [% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index 0a884e3583..88d409fedd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -40,9 +40,9 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >-[% INCLUDE 'acquisitions-toolbar.inc' %] > > <h2>Acquisitions</h2> >+[% INCLUDE 'acquisitions-toolbar.inc' %] > [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] > [% UNLESS ( loop_budget ) %] > [% IF ( CAN_user_acquisition_period_manage ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index 16b39c69cb..2678ed2423 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -2,6 +2,9 @@ > [% USE Asset %] > [% USE Branches %] > [% USE Price %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'acquisitions-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Basket grouping for [% booksellername | html %] › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -146,25 +149,26 @@ > [% IF ( grouping ) %] > [% IF (closedbg) %] > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="[% script_name | url %]?op=reopen&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]&mode=singlebg" class="btn btn-default" id="reopenbutton"><i class="fa fa-download"></i> Reopen basket group</a></div> >- <div class="btn-group"><a href="[% script_name | url %]?op=export&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="exportbutton"><i class="fa fa-download"></i> Export basket group as CSV</a></div> >- <div class="btn-group"><a href="[% script_name | url %]?op=print&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="printbutton"><i class="fa fa-download"></i> Print basket group in PDF</a></div> >+ <div class="btn-group"><a href="[% script_name | url %]?op=reopen&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]&mode=singlebg" class="btn btn-default pat" id="reopenbutton"><i class="fa fa-download"></i> Reopen basket group</a></div> >+ <div class="btn-group"><a href="[% script_name | url %]?op=export&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default pat" id="exportbutton"><i class="fa fa-download"></i> Export basket group as CSV</a></div> >+ <div class="btn-group"><a href="[% script_name | url %]?op=print&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default pat" id="printbutton"><i class="fa fa-download"></i> Print basket group in PDF</a></div> > [% IF (ediaccount) %] >- <div class="btn-group"><a href="[% script_name | url %]?op=ediprint&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div> >+ <div class="btn-group"><a href="[% script_name | url %]?op=ediprint&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default pat" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div> > [% END %] > </div> > [% END %] > [% IF (name && closedbg) %] >- <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h2>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h2> > [% ELSIF (name) %] >- <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h2>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h2> > [% ELSE %] >- <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h2>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h2> > [% END %] > <div id="basketgroupcolumns" class="row"> > [% UNLESS (closedbg) %] > <div class="col-xs-6 col-xs-push-6"> >- >+ >+ <div id="searchresults"> > <div id="groups"> > <div class="workarea_alt" > > <h3>Ungrouped baskets</h3> >@@ -205,7 +209,7 @@ > </table> > </div> > </div> >- >+ </div> > </div> > [% END %] > [% IF ( closedbg ) %] >@@ -214,7 +218,7 @@ > <div class="col-xs-6 col-xs-pull-6"> > [% END %] > <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post" id="groupingform" onsubmit="return submitForm(this)"> >- <fieldset id="various" class="brief"> >+ <fieldset id="various"> > <ol> > [% UNLESS (closedbg) %] > <li> >@@ -323,7 +327,7 @@ > <input type="hidden" name="basketgroupid" value="[% basketgroupid | html %]" /> > [% END %] > <input type="hidden" name="op" value="attachbasket" /> >- <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]" class="cancel">Cancel</a> >+ <input type="submit" class="principal" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]" class="cancel">Cancel</a> > </fieldset> > [% END %] > </form> >@@ -331,10 +335,11 @@ > </div> > [% ELSE %] > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]" class="btn btn-default pat" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div> > </div> >- <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h2>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h2> > [% IF (NoEDIMessage) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %] >+ <div id="searchresults"> > <div id="basket_groups" class="toptabs"> > <ul class="nav nav-tabs" role="tablist"> > <li role="presentation"><a href="#opened" aria-controls="opened" role="tab" data-toggle="tab">Open</a></li> >@@ -368,10 +373,10 @@ > <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td> > <td>[% basketgroup.basketsqty | html %]</td> > <td> >- <input type="button" onclick="closeandprint('[% basketgroup.id | html %]');" value="Close and export as PDF" /> >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Edit" /></form> >+ <input type="button" onclick="closeandprint('[% basketgroup.id | html %]');" id="lientype" value="Close and export as PDF" /> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Edit" /></form> > [% UNLESS basketgroup.basketsqty %] >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Delete" /></form> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Delete" /></form> > [% END %] > </td> > </tr> >@@ -408,12 +413,12 @@ > <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td> > <td>[% basketgroup.basketsqty | html %]</td> > <td> >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="View" /></form> >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Reopen" /></form> >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as PDF" /></form> >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as CSV" /></form> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="View" /></form> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Reopen" /></form> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Export as PDF" /></form> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Export as CSV" /></form> > [% IF (ediaccount) %] >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Generate EDIFACT order" /></form> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Generate EDIFACT order" /></form> > [% ELSE %] > <div>No EDIFACT configuration for [% booksellername | html %]</div> > [% END %] >@@ -425,7 +430,7 @@ > </table> > </div> > </div> >- </div> >+ </div></div> > [% END %] > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >index b5ad801e4f..568723b595 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >@@ -61,8 +61,8 @@ > > [% IF ( add_form ) %] > [% IF ( basketno ) %] >- <h1>Edit basket [% basketname | html %]</h1> >- [% ELSE %]<h1>Add a basket to [% booksellername | html %]</h1> >+ <h2>Edit basket [% basketname | html %]</h2> >+ [% ELSE %]<h2>Add a basket to [% booksellername | html %]</h2> > [% END %] > <form name="Aform" action="[% script_name | html %]" method="post" class="validated"> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >@@ -162,7 +162,7 @@ > > <fieldset class="action"> > <input type="hidden" name="op" value="add_validate" /> >- <input type="submit" value="Save" /> >+ <input type="submit" class="principal" value="Save" /> > [% IF ( basketno ) %] > <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index be19e9debd..54d2359a86 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -66,9 +66,9 @@ > </select> > </p> > [% IF ( allbaskets ) %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&booksellerid=[% booksellerid | uri %]">Show active baskets only</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&booksellerid=[% booksellerid | uri %]" id="lientype">Show active baskets only</a> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&booksellerid=[% booksellerid | uri %]&allbaskets=1">Show all baskets</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&booksellerid=[% booksellerid | uri %]&allbaskets=1" id="lientype">Show all baskets</a> > [% END %] > [% END %] > [% UNLESS booksellerid %] >@@ -114,9 +114,9 @@ > [% IF ( supplier.basketcount > 0 ) %] > <div> > [% IF ( allbaskets ) %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&booksellerid=[% booksellerid | uri %]">Show active baskets only</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&booksellerid=[% booksellerid | uri %]" id="lientype">Show active baskets only</a> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&booksellerid=[% booksellerid | uri %]&allbaskets=1">Show all baskets</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&booksellerid=[% booksellerid | uri %]&allbaskets=1" id="lientype">Show all baskets</a> > [% END %] > </div> > [% END %] >@@ -189,18 +189,18 @@ > <div class="dropup"> > <div class="btn-group"> > [%# There should be no space between these two buttons, it would render badly %] >- <a class="btn btn-default btn-xs" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a><a class="btn btn-default btn-xs dropdown-toggle" id="basketactions[% basket.basknetno | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> >+ <a class="btn btn-default btn-xs lientype" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a><a class="btn btn-default lientype btn-xs dropdown-toggle" id="basketactions[% basket.basknetno | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="basketactions[% basketn.basketno | html %]"> > [% IF basket.uncertainprices %] >- <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% basket.booksellerid | uri %]&owner=1"><i class="fa fa-usd"></i> Uncertain prices</a></li> >+ <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% basket.booksellerid | uri %]&owner=1" id="lientype"><i class="fa fa-usd"></i> Uncertain prices</a></li> > [% ELSIF basket.total_items && !basket.is_standing %] >- <li><a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basket.basketno | uri %]&booksellerid=[% basket.booksellerid | uri %]"><i class="fa fa-times-circle"></i> Close this basket</a></li> >+ <li><a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basket.basketno | uri %]&booksellerid=[% basket.booksellerid | uri %]" id="lientype"><i class="fa fa-times-circle"></i> Close this basket</a></li> > [% END %] > </ul> > </div> > </div> > [% ELSE %] >- <a class="btn btn-default btn-xs" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a> >+ <a class="btn btn-default btn-xs lientype" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a> > [% END %] > <!-- Modal --> > <div id="addtoBasket[% basket.basketno | html %]" class="modal" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno | html %]" aria-hidden="true" data-basketno="[% basket.basketname | html %]"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index f702182b0e..3df4e3354a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -54,7 +54,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>Order search</h1> >+ <h2>Order search</h2> > > [% IF !order_loop && search_done %] > <div class="dialog message"> >@@ -67,7 +67,7 @@ > [% END %] > > >- [% IF ( order_loop ) %]<h1>Search results</h1> >+ [% IF ( order_loop ) %]<h2>Search results</h2> > <div id="acqui_histsearch"> > <table id="histsearcht"> > <thead> >@@ -190,11 +190,11 @@ > <h4>Search orders</h4> > [% ELSE %] > <fieldset class="rows"> >- <legend>Search orders</legend> >+ <h3>Search orders</h3> > [% END %] > [% INCLUDE 'filter-orders.inc' %] > <input type="hidden" name="do_search" value="1" /> >- <fieldset class="action"><input type="submit" value="Search" /></fieldset> >+ <fieldset class="action"><input type="submit" class="principal" value="Search" /></fieldset> > </fieldset> > </form> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index 4aca420959..6dd4b2d61b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -16,7 +16,6 @@ > > <body id="acq_invoice" class="acq"> > [% INCLUDE 'header.inc' form=formulaire %] >-[% INCLUDE 'acquisitions-search.inc' %] > > [% SET readonly = NOT CAN_user_acquisition_edit_invoices %] > >@@ -152,7 +151,7 @@ > <fieldset class="action"> > <input type="submit" value="Save" /> > [% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %] >- <a href="invoice.pl?op=delete&invoiceid=[% invoiceid | uri %]" id="delete">Delete</a> >+ <a class="cancel" href="invoice.pl?op=delete&invoiceid=[% invoiceid | uri %]" id="delete">Delete</a> > [% END %] > </fieldset> > [% END %] >@@ -261,7 +260,7 @@ > [% END %] > [% UNLESS readonly %] > <td> >- <a class="btn btn-default btn-xs delete_adjustment" href="/cgi-bin/koha/acqui/invoice.pl?op=del_adj&adjustment_id=[% adjustment.adjustment_id | html %]&invoiceid=[% invoiceid | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default cancel btn-xs delete_adjustment" href="/cgi-bin/koha/acqui/invoice.pl?op=del_adj&adjustment_id=[% adjustment.adjustment_id | html %]&invoiceid=[% invoiceid | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > [% END %] > </tr> >@@ -336,14 +335,14 @@ > </fieldset> > <fieldset class="action"> > <input type="hidden" name="op" value="mod_adj" /> >- <input type="submit" value="Update adjustments" /> >+ <input type="submit" class="principal" value="Update adjustments" /> > </fieldset> > [% END %] > </fieldset> > </form> > <p> >- <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]">Go to receipt page</a> >- [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]">Manage invoice files</a>[% END %] >+ <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]" id="lientype">Go to receipt page</a> >+ [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]" id="lientype">Manage invoice files</a>[% END %] > </p> > <h2>Invoice details</h2> > <fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 3359822cdd..ca8c8b8f96 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -121,6 +121,7 @@ > </div> > [% UNLESS (invoiceclosedate) %] > <div id="acqui_receive_search"> >+ <div id="searchresults"> > <h3>Pending orders</h3> > <table id="pending_orders" class="table table-bordered table-striped"> > <thead> >@@ -140,7 +141,7 @@ > </tr> > </thead> > </table> >- </div> >+ </div></div> > [% ELSE %] > <p> > <span>Invoice is closed, so you can't receive orders anymore.</span> >@@ -329,7 +330,7 @@ > <form action="/cgi-bin/koha/acqui/invoice.pl" method="get"> > <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" /> > <fieldset class="action"> >- <input type="submit" value="Finish receiving" /> >+ <input type="submit" class="principal" value="Finish receiving" /> > </fieldset> > </form> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >index 08273dbe21..79da1ac88c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -46,7 +46,7 @@ > <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> > [% END %] > <main> >-<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1> >+<h2>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h2> > > [% IF ( error_failed_to_create_invoice ) %] > <div id="error" class="dialog alert"> >@@ -76,7 +76,7 @@ > <input type="hidden" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" /> > <input type="hidden" name="shipmentcost" value="[% shipmentcost | html %]" /> > <input type="hidden" name="shipmentcost_budgetid" value="[% shipmentcost_budgetid | html %]" /> >- <input type="submit" class="button" value="Create new invoice anyway" /> >+ <input type="submit" class="button principal" value="Create new invoice anyway" /> > </form> > </div> > [% END %] >@@ -151,7 +151,7 @@ > <div id="parcels_new_parcel"> > <form method="get" action="parcels.pl" class="validated"> > <fieldset class="rows"> >- <legend>Receive a new shipment</legend> >+ <h3>Receive a new shipment</h3> > <ol> <li> > <label for="invoice" class="required">Vendor invoice:</label> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >@@ -195,8 +195,7 @@ > > </li> > </ol> >- </fieldset> >- <fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></fieldset> >+<input type="submit" class="button principal" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></fieldset> > </form> > </div> > </main> >@@ -234,7 +233,7 @@ > <option value="100">100</option> > </select></li> > </ol> >- <fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a></fieldset> >+ <fieldset class="action"><input type="submit" class="button principal" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a></fieldset> > </fieldset> > </form> > </aside> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index 9f00ccc907..f18316489d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -54,7 +54,7 @@ > [% END %] > <input type="hidden" class="contact_claimissues_hidden" name="contact_claimissues" value="[% contact.claimissues | html %]"></input> > </li> >- [% IF contact.id %]<li><button class="btn btn-default delete-contact"><i class="fa fa-trash"></i> Delete contact</li>[% END %] >+ [% IF contact.id %]<li><button class="btn btn-default delete-contact" id="lientype"><i class="fa fa-trash"></i> Delete contact</li>[% END %] > </ol> > [% END %] > >@@ -147,26 +147,27 @@ > > [% IF ( enter ) %] > [% IF ( booksellerid ) %] >- <h1>Update: [% name | html %]</h1> >+ <h2>Update: [% name | html %]</h2> > [% ELSE %] >- <h1>Add vendor</h1> >+ <h2>Add vendor</h2> > [% END %] > [% END %] > [% UNLESS ( enter ) %][% INCLUDE 'acquisitions-toolbar.inc' %][% END %] > [% IF ( enter ) %] > <form action="updatesupplier.pl" name="updatesupplier" style="display:block" class="validated" method="post"> > <div id="toolbar" class="btn-toolbar"> >- <button class="btn btn-default" type="submit"><i class="fa fa-save"></i> Save</button> >+ <div> >+ <button class="btn btn-default principal" type="submit"><i class="fa fa-save"></i> Save</button> > [% IF ( booksellerid ) %] >- <a class="btn btn-default cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]"> >+ <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]"> > [% ELSE %] >- <a class="btn btn-default cancel" href="/cgi-bin/koha/acqui/acqui-home.pl"> >+ <a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl"> > [% END %] <i class="fa fa-remove"></i> Cancel</a> >- </div> >+ </div></div> > > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> > <fieldset class="rows"> >- <legend>Company details</legend> >+ <h3>Company details</h3> > <ol><li><label for="company" class="required">Name:</label> > <input type="text" size="40" id="company" name="company" value="[% name | html %]" required="required" class="required focus" /><span class="required">Required</span></li> > <li><label for="company_postal">Postal address: </label> >@@ -183,14 +184,14 @@ > <input type="text" size="40" id="accountnumber" name="accountnumber" value="[% accountnumber | html %]" /></li></ol> > </fieldset> > <fieldset class="rows"> >- <legend>Contacts</legend> >+ <h3>Contacts</h3> > <fieldset id="contact-template" class="supplier-contact"> >- <legend>Contact details</legend> >+ <h3nd>Contact details</h3nd> > [% INCLUDE edit_contact %] > </fieldset> > [% FOREACH contact IN contacts %] > <fieldset class="supplier-contact"> >- <legend>Contact details</legend> >+ <h3nd>Contact details</h3nd> > [% INCLUDE edit_contact %] > </fieldset> > [% END %] >@@ -198,7 +199,7 @@ > </fieldset> > > <fieldset class="rows"> >- <legend>Ordering information</legend> >+ <h3>Ordering information</h3> > <ol><li><label for="activestatus">Vendor is:</label> > [% IF ( active ) %] > <label class="radio" for="activestatus"> >@@ -314,7 +315,7 @@ > <textarea cols="40" rows="4" id="notes" name="notes" >[% notes | html %]</textarea></li> > </ol> > </fieldset> >- <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %] >+ <fieldset class="action"><input type="submit" class="principal" value="Save" /> [% IF ( booksellerid ) %] > <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl"> > [% END %]Cancel</a></fieldset> > >@@ -323,6 +324,7 @@ > <h1>[% name | html %]</h1> > <div class="row"> > <div id="supplier-company-details" class="col-sm-6"> >+ <div id="searchresults"> > <h2>Vendor details</h2> > <p><span class="label">Company name: </span>[% name | html %]</p> > <p><span class="label">Postal address: </span>[% postal | html %]</p> >@@ -363,9 +365,11 @@ > [% IF ( notes ) %]<p><strong>Notes: </strong> > [% notes | html %]</p>[% END %] > </div> <!-- .supplier-ordering-information --> >+ </div> > </div> <!-- /.col-sm-6 --> > > <div class="col-sm-6"> >+ <div id="searchresults"> > <div class="supplier-contact-details"> > <h2>Contact</h2> > [% FOREACH contact IN contacts %] >@@ -383,9 +387,8 @@ > [% END %] > </p> > </div> >- > </div> >- >+</div> > </div> > > [% IF ( contracts ) %] >@@ -414,8 +417,8 @@ > <td data-order="[% contract.contractenddate | html %]">[% contract.contractenddate | $KohaDates %]</td> > [% IF CAN_user_acquisition_contracts_manage %] > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber | html %]&booksellerid=[% contract.booksellerid | html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&contractnumber=[% contract.contractnumber | html %]&booksellerid=[% contract.booksellerid | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber | html %]&booksellerid=[% contract.booksellerid | html %]" id="lientype"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&contractnumber=[% contract.contractnumber | html %]&booksellerid=[% contract.booksellerid | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a> > </td> > [% END %] > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >index 1e90d95185..7f6b8f0fcb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -87,7 +87,8 @@ > [% END %] > [% END %] > >- <h1>Orders with uncertain prices</h1> >+ <div id="searchresults"> >+ <h3>Orders with uncertain prices</h3> > <form action="[% scriptname | html %]" method="post"> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> > <label for="owner">Orders from:</label> >@@ -100,7 +101,7 @@ > <option value="1">me</option> > [% END %] > </select> >- <input type="submit" value="Filter" /> >+ <input type="submit" id="lientype" value="Filter" /> > </form> > <form action="[% scriptname | html %]" method="post" id="uncertainprices"> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >@@ -158,8 +159,9 @@ > [% END %] > </tbody> > </table> >- <fieldset class="action"><input type="submit" value="Save" /></fieldset> >+ <fieldset class="action"><input type="submit" value="Save" class="principal" /></fieldset> > </form> >+ </div> > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >index 0070a73e54..a82d47c18c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >@@ -119,12 +119,12 @@ > <input type="hidden" name="op" value="add_validate" /> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> > <input type="hidden" name="checked" value="0" /> >+ <fieldset class="rows"> > [% IF ( contractnumber ) %] >- <h1>Modify contract [% contractname | html %] for [% booksellername | html %]</h1> >+ <h3>Modify contract [% contractname | html %] for [% booksellername | html %]</h3> > [% ELSE %] >- <h1>New contract for [% booksellername | html %]</h1> >+ <h3>New contract for [% booksellername | html %]</h3> > [% END %] >- <fieldset class="rows"> > <ol> > [% IF ( contractnumber ) %] > <li><span class="label">Contract id </span>[% contractnumber | html %] >@@ -150,21 +150,19 @@ > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]&contractnumber=[% contractnumber | html %]">Cancel</a> >+ <input type="submit" class="principal" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]&contractnumber=[% contractnumber | html %]">Cancel</a> > </fieldset> > </form> > [% END %] > [% IF ( add_validate ) %] >- <h1>Data recorded</h1> >+ <h2>Data recorded</h2> > <form action="[% script_name | html %]" method="post"> >- <input type="submit" value="OK" /> >+ <input type="submit" class="principal" value="OK" /> > </form> > [% END %] > [% IF ( delete_confirm ) %] > <div class="dialog alert"> >- <h1>Confirm deletion of contract <em>[% contractname | html %]</em></h1> >+ <h2>Confirm deletion of contract <em>[% contractname | html %]</em></h2> > <table> > <tr><th scope="row">Contract number:</th><td>[% contractnumber | html %]</td></tr> > <tr><th scope="row">Contract name:</th><td>[% contractname | html %]</td></tr> >@@ -187,15 +185,16 @@ > </div> > [% END %] > [% IF ( delete_confirmed ) %] >- <h1>Contract deleted</h1> >+ <h2>Contract deleted</h2> > <form action="[% script_name | html %]" method="post"> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >- <input type="submit" value="OK" /> >+ <input type="submit" class="principal" value="OK" /> > </form> > [% END %] > [% IF ( else ) %] > <h1>Contract(s) of [% booksellername | html %]</h1> > [% IF ( loop ) %] >+ <div id="searchresults"> > <table> > <tr> > <th scope="col">Name</th> >@@ -213,17 +212,18 @@ > <td>[% loo.contractstartdate | html %]</td> > <td>[% loo.contractenddate | html %]</td> > <td class="actions"> >- <a href="[% loo.script_name | url %]?op=add_form&contractnumber=[% loo.contractnumber | uri %]&booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a href="[% loo.script_name | url %]?op=delete_confirm&contractnumber=[% loo.contractnumber | uri %]&booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >+ <a id="lientype" href="[% loo.script_name | url %]?op=add_form&contractnumber=[% loo.contractnumber | uri %]&booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a id="lientype" href="[% loo.script_name | url %]?op=delete_confirm&contractnumber=[% loo.contractnumber | uri %]&booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >+ </div> > </table> > [% ELSE %] > <div class="dialog message"> > There are no contracts with this vendor. > [% IF active %] >- <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid | uri %]">Add a contract</a>. >+ <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid | uri %]" id="lientype">Add a contract</a>. > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >index 6fae38b743..9ca36bd8f8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >@@ -159,8 +159,8 @@ > > <td class="actions"> > [% UNLESS ( budget_line.budget_lock ) %] >- <input type="button" class="auto_fill_row btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" value="Auto-fill row"/> >- <input type="button" class="clear_fields btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" value="Clear"> >+ <input type="button" class="auto_fill_row btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" id="lientype" value="Auto-fill row"/> >+ <input type="button" class="clear_fields btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" id="lientype" value="Clear"> > [% ELSE %] > <div style="color:red;">not owned</div> > [% END %] >@@ -172,10 +172,10 @@ > > <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> > [% IF ( budget_period_locked ) %] >- <!-- <input STYLE="background: gray;" class="principal" type="submit" value="Save" disabled="disabled"/> --> >+ <!-- <input STYLE="background: gray;" class="principal" type="submit" value="Save" disabled="disabled"/> --> > [% ELSE %] > <input type="hidden" name="op" class="principal" value="save" /> >- <fieldset class="action"><input type="submit" value="Save"/></fieldset> >+ <fieldset class="action"><input type="submit" class="principal" value="Save"/></fieldset> > [% END %] > > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >index ef149c04df..5a376ed62c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -187,6 +187,7 @@ > > <!-- MC-TYPE LIMITS --> > <div id="advsearches" class="toptabs"> >+ <fieldset> > <ul class="nav nav-tabs" role="tablist"> > [% FOREACH advsearchloo IN advancedsearchesloop %] > <li role="presentation" id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]"> >@@ -239,6 +240,7 @@ > </div> <!-- /#advsearch-[% advsearchloo.advanced_search_type | html %] --> > [% END # /FOREACH advsearchloo %] > </div> <!-- /.tab-content --> >+ </fieldset> > </div> <!-- /#advsearches --> > <!-- /MC-TYPE LIMIT --> > >@@ -281,10 +283,10 @@ > [% PROCESS 'subtype_limits.inc' %] > <!-- SUBTYPE LIMITS --> > <fieldset id="subtype"> >- <legend>Subtype limits</legend><p> >+ <h3>Subtype limits</h3><p> > [% PROCESS subtype_dropdowns %] > <fieldset id="current_subtype_limits"> >- <legend>Current subtype limits</legend> >+ <h3>Current subtype limits</h3> > [% FOREACH subtype IN ['aud','fic','bio','ctype','l-format'] %] > [% FOREACH limit IN limits.$subtype %] > <span> >@@ -301,7 +303,7 @@ > > <!-- AVAILABILITY LIMITS --> > <fieldset id="availability"> >- <legend>Location and availability</legend> >+ <h3>Location and availability</h3> > <fieldset id="currently-avail"> > [% IF limit_available %] > <p><label for="available-items">Only items currently available:</label> <input type="checkbox" id="available-items" name="limit" value="available" checked="checked" /></p> >@@ -345,8 +347,8 @@ > > <!-- OTHER LIMITS (facets, etc.) --> > [% IF limits.size %] >- <fieldset id=""> >- <legend>Other limits</legend> >+ <fieldset id="sortby"> >+ <h3>Other limits</h3> > <p> > [% FOREACH key IN limits.keys %] > [% FOREACH limit IN limits.$key %] >@@ -364,7 +366,7 @@ > > <!-- RANK LIMITS --> > <fieldset id="sortby"> >- <legend>Sorting</legend> >+ <h3>Sorting</h3> > <p> > <label for="sort_by">Sort by: </label> > <select id="sort_by" name="sort_by"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >index 57ed833211..3644018eaa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -182,13 +182,7 @@ > <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> > > <div id="item-search-block"> >-<<<<<<< HEAD >- <h1>Item search</h1> >- >- <p><a href="/cgi-bin/koha/catalogue/search.pl">Go to advanced search</a></p> >-======= > <h2>Item search</h2> >->>>>>>> Bug 30952: Catalogue module restyling > <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform"> > <div id="toolbar" class="btn-toolbar"> > <div> >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 709b98aebb..0ddc1dc330 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -1,7 +1,10 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >-[% INCLUDE 'doc-head-open.inc' %] >+[% INCLUDE 'doc-head-open.inc' %][% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > <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' %] >@@ -786,7 +789,7 @@ function PopupMARCFieldDoc(field) { > <div>Loading, please wait...</div> > </div> > >- [% 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/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >index b4e65023e9..c61c6a71b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -2,14 +2,17 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE TablesSettings %] >-[% SET footerjs = 1 %] >+[% SET footerjs = 1 %][% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Cataloging [% IF ( total || breeding_loop ) %] › Search results [% ELSIF ( query ) %] › No results found [% END %] › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="cat_addbooks" class="cat"> >- [% INCLUDE 'header.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >index 115fb4a488..bf61800ef3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -4,7 +4,7 @@ > [% USE Branches %] > [% USE KohaDates %] > [% formulaire = BLOCK %] >- [% INCLUDE 'cataloging-search.inc' %] >+ [% INCLUDE 'cat-search.inc' %] > [% END %] > [% USE TablesSettings %] > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >index 1bd2aee1f6..e5db589384 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -7,7 +7,10 @@ > [% Asset.css("lib/codemirror/codemirror.min.css") | $raw %] > [% Asset.css("css/humanmsg.css") | $raw %] > [% Asset.js("js/cataloging.js") | $raw %] >-[% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %] >+[% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %][% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'cat-search.inc' %] >+[% END %] > </head> > <body id="cat_addbiblio" class="cat"> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >index 2fbc65fbb1..ff1932dc6f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -2,7 +2,7 @@ > [% USE Asset %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'cataloging-search.inc' %] >+ [% INCLUDE 'cat-search.inc' %] > [% END %] > [% PROCESS 'merge-record.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >index ead534a622..a56a5549d5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >@@ -34,8 +34,6 @@ > > <div class="main container-fluid"> > >- <h1>Circulation</h1> >- > <div class="row"> > <div class="col-sm-5 col-md-4"> > <h1>Circulation</h1> >@@ -126,7 +124,7 @@ > <a class="menucirc" > href="/cgi-bin/koha/circ/branchoverdues.pl" > title="Limited to your library. See report help for other details." >- ><i class="fa fa-clock-o fa-2x"></i><h1> Overdues with fines</h1></a> >+ ><i class="fa fa-clock-o fa-2x"></i><i class="fond fa fa-dollar"></i><h1> Overdues with fines</h1></a> > </li> > </ul> > </div> >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 39b23e77a6..ed4d8b3b9b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -82,16 +82,12 @@ > <li><a class="accueil" href="/cgi-bin/koha/catalogue/itemsearch.pl"><i class="fa fa-fw fa-search fa-2x"></i><h1>Item search</h1></a></li> > [% END %] > >- <li><a class="accueil" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt"></i></a><h7>Lists</h7></li> >- > <li><a class="accueil" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt fa-2x"></i><h1>Lists</h1></a></li> > > [% IF ( UseCourseReserves ) %] > <li><a class="accueil" href="/cgi-bin/koha/course_reserves/course-reserves.pl"><i class="fa fa-fw fa-book fa-2x"></i><h1>Course reserves</h1></a></li> > [% END %] > >- <li><a class="accueil" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-fw fa-link"></i></a><h7>Authorities</h7></li> >- > </ul></div> > <div class="menuspe"><ul class="biglinks-list"> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >index f7c69e4cf9..5f9d984f78 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >@@ -3,7 +3,7 @@ > [% USE Asset %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>API Keys › Patrons › Koha</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index eae9bbdd6c..e9844babcd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -10,7 +10,7 @@ > [% USE Registers %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% SET registers = Registers.all( filters => { current_branch => 1 } ) %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >index a22f731871..8daa400115 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >@@ -4,7 +4,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Delete patron [% patron.firstname | html %] [% patron.surname | html %] › Koha</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >index db00e2b406..30c13c5a30 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >@@ -5,7 +5,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% UNLESS blocking_error %]Discharge for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])[% END %] › Patrons › Koha</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >index 006db4ab28..db73faf2b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >@@ -4,44 +4,37 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Pending discharge requests › Patrons › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="pat_discharges" class="pat"> >-<<<<<<< HEAD >-[% INCLUDE 'header.inc' %] >-<<<<<<< HEAD >-[% INCLUDE 'patron-search-header.inc' %] >-======= >->>>>>>> Bug 30952: Patrons Module >-======= >-[% INCLUDE 'header.inc' form=formulaire %] >->>>>>>> Bug 30952: Search bar > >-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >- <ol> >- <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Pending discharge requests >- </a> >- </li> >- </ol> >- <ol> >- [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >- </ol> >- <ol> >- <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >- </ol> >-</nav> >+ [% INCLUDE 'header.inc' form=formulaire %] >+ >+ <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >+ <ol> >+ <li> >+ <a href="/cgi-bin/koha/mainpage.pl">Home</a> >+ </li> >+ <li> >+ <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> >+ </li> >+ <li> >+ <a href="#" aria-current="page"> >+ Pending discharge requests >+ </a> >+ </li> >+ </ol> >+ <ol> >+ [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >+ </ol> >+ <ol> >+ <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >+ </ol> >+ </nav> > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >index 27c521a0e8..14ca84597a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >@@ -5,7 +5,7 @@ > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Files for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >index cf41682f8c..14180e2cc9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >@@ -8,7 +8,7 @@ > [% USE ItemTypes %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Holds history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >index 7b1e0e6450..1f90d07b00 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >@@ -6,7 +6,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] › Housebound › Koha</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >index e90a46d564..d67598bb6b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >@@ -5,7 +5,7 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% USE AuthorisedValues %] > [% USE TablesSettings %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >index 091c88ff71..ce24aca309 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >@@ -4,7 +4,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > > [% PROCESS 'accounts.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >index 5ae766ea71..1d1230e9b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >@@ -5,7 +5,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > > [% PROCESS 'accounts.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >index 70c90859d0..374f5d2026 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >@@ -3,7 +3,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% PROCESS 'permissions.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -52,9 +52,12 @@ > <h2>Set permissions for [% INCLUDE 'patron-title.inc' no_html = 1 %]</h2> > > <div id="permissionstree"> >- <div id="permissions_toolbar" class="btn-toolbar"> >+ <div id="permissions_toolbar" class="btn-toolbar" style="width: 851px !important;"> >+ <div id="up"> > <button type="submit" class="principal"><i class="fa fa-save"></i> Save</button> > <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-remove"></i> Cancel</a> >+ </div> >+ <div id="down"> > <a class="toggleall toggleall_on btn btn-link" href="#"><i class="fa fa-plus-square-o"></i> Show all</a> > <a class="toggleall toggleall_off btn btn-link" href="#"><i class="fa fa-minus-square-o"></i> Hide all</a> > <a id="CheckAllFlags" class="btn btn-link" href="#"> >@@ -68,6 +71,7 @@ > <a href="#" id="clear_filter" style="display:none"><i class="fa fa-remove"></i></a> > </div> > </div> >+ </div> > <div class="permissions"> > [% FOREACH loo IN loop %] > [% IF ( loo.expand ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt >index 259211b5a8..a3dc21983e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt >@@ -4,7 +4,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >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 2fc47bf8d4..e45ae0314a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -6,7 +6,7 @@ > [% USE Categories %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search-header.inc.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% PROCESS 'patronfields.inc' %] > [% SET libraries = Branches.all %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >index d798927ac3..0c57fb1b67 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -10,7 +10,7 @@ > [% PROCESS 'member-alt-contact-style.inc' %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >index f6d13935d7..3901200973 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >@@ -5,7 +5,7 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Merge patron records › Patrons › Koha</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index ebea99a797..81e89ea9a3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -12,7 +12,7 @@ > [% PROCESS 'member-display-alt-address-style.inc' %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > [% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >index d0a4793431..9f0e86f602 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -6,7 +6,7 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >index 6741264d10..5cc793b666 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -8,7 +8,7 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >index d142f8849e..2b583a929b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >@@ -6,7 +6,7 @@ > [% USE Price %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >index 10d7cef640..6f0dcba685 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >@@ -6,7 +6,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Purchase suggestions for [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >index 49c5b9b1ef..17e5ca73f4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -7,7 +7,7 @@ > [% USE TablesSettings %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Circulation history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt >index b1f3c62233..e77b063f84 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt >@@ -3,14 +3,16 @@ > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Recalls history for [% INCLUDE 'patron-title.inc' %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > > <body id="recalls_history" class="pat"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'header.inc' form=formulaire %] > > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >index 3c6250b11c..726002d7d2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >@@ -5,7 +5,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Subscription routing lists for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >index 1f3cb0dd44..031d8822d4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >@@ -5,7 +5,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'patron-search.inc' %] >+ [% INCLUDE 'patron-search-header.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt >index a0ae7afafc..dbfa82092e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt >@@ -2,13 +2,15 @@ > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] >+[% formulaire = BLOCK %] >+ [% INCLUDE 'patron-search-header.inc' %] >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Two-factor authentication › Patrons › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="pat_two_factor_auth" class="pat"> >-[% INCLUDE 'header.inc' %] >-[% INCLUDE 'patron-search.inc' %] >+[% INCLUDE 'header.inc' form=formulaire %] > > <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> > <ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >index 33c57a2c82..3ffc8d1bba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >@@ -9,7 +9,7 @@ > <div class="row"> > <div id="onboarding-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > <div id="logo"><a href="#">Koha</a></div> >- <h1>Web installer › Create a library</h1> >+ <h2>Web installer › Create a library</h2> > > [% INCLUDE 'onboarding_messages.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >index edc3088c0f..8525a963fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >@@ -19,7 +19,7 @@ > <div id="onboarding-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > <div id="logo"><a href="#">Koha</a></div> > >- <h1>Web installer › Create a patron category</h1> >+ <h2>Web installer › Create a patron category</h2> > > [% INCLUDE 'onboarding_messages.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >index 7fb6602397..eacff7a4f0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >@@ -11,7 +11,7 @@ > <div class="row"> > <div id="onboarding-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > <div id="logo"><a href="#">Koha</a></div> >- <h1>Web installer › Create Koha administrator patron</h1> >+ <h2>Web installer › Create Koha administrator patron</h2> > > [% INCLUDE 'onboarding_messages.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >index 4ed736a8f0..17d149f439 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >@@ -8,7 +8,7 @@ > <div class="row"> > <div id="onboarding-step4" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > <div id="logo"><a href="#">Koha</a></div> >- <h1>Web installer › Create a new item type</h1> >+ <h2>Web installer › Create a new item type</h2> > > [% INCLUDE 'onboarding_messages.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >index ed96a4fa73..25dcdd78b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >@@ -17,7 +17,7 @@ > > [% IF all_done %] > >- <h1>Web installer › Complete</h1> >+ <h2>Web installer › Complete</h2> > [% INCLUDE 'onboarding_messages.inc' %] > > <div id="steps"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >index 845b6da7d2..bd1a138250 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >@@ -315,11 +315,11 @@ > [% IF category == 'news' %] > See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations" id="lientype">HTML customizations</a> > [% ELSE %] >- See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a> >+ See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news" id="lientype">News</a> > [% END %] > [% IF ( CAN_user_parameters_manage_sysprefs ) %] >- <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserJS'>OPACUserJS</a> >- <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserCSS'>OPACUserCSS</a> >+ <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserJS' id="lientype">OPACUserJS</a> >+ <a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserCSS' id="lientype">OPACUserCSS</a> > [% END %] > > [% IF additional_contents.count %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >index a8aebfda8a..3d58d93f7e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -27,12 +27,6 @@ > </a> > </li> > </ol> >- <ol> >- [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] >- </ol> >- <ol> >- <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a> >- </ol> > </nav> > > <div class="main container-fluid"> >@@ -40,7 +34,7 @@ > <div class="col-sm-10 col-sm-push-2"> > <main> > >- <h1>[% Branches.GetName( branch ) | html %] calendar</h1> >+ <h2>[% Branches.GetName( branch ) | html %] calendar</h2> > > <div class="row"> > <div class="col-sm-6"> >@@ -52,7 +46,7 @@ > <div class="panel" id="showHoliday"> > <form action="/cgi-bin/koha/tools/exceptionHolidays.pl" method="post"> > <input type="hidden" id="showHolidayType" name="showHolidayType" value="" /> >- <fieldset class="brief"> >+ <fieldset> > <h3>Edit this holiday</h3> > <span id="holtype"></span> > <ol> >@@ -87,7 +81,11 @@ > <!-- showTitle is necessary for exception radio button to work properly --> > <li> > <label for="showDescription">Description:</label> >- <textarea rows="2" cols="40" id="showDescription" name="showDescription"></textarea>holiday Holiday repeating weekly Holiday repeatintion for this repeated holiday.</label> >+ <textarea rows="2" cols="40" id="showDescription" name="showDescription"></textarea> >+ </li> >+ <li class="radio"> >+ <div class="exceptionPossibility" style="position:static"> >+ <input type="radio" name="showOperation" id="showOperationExc" value="exception" /> <label for="showOperationExc">Generate an exception for this repeated holiday.</label> > <a href="#" class="helptext">[?]</a> > <div class="hint">You can make an exception for this holiday rule. This means that you will be able to say that for a repeatable holiday there is one day which is going to be an exception.</div> > </div> >@@ -132,18 +130,18 @@ > <div class="hint">If checked, changes for this holiday will be copied to all libraries. If the holiday doesn't exists for a library, no change is made.</div> > </li> > </ol> >- <fieldset class="action">ay Unique holiday Holiday repeating weekly Holiday >- <input class="principal" type="submit" name="submit" value="Save" /> >+ <fieldset class="action"> >+ <input type="submit" class="principal" name="submit" value="Save" /> > <a href="#" class="cancel hidePanel showHoliday">Cancel</a> > </fieldset> >- </fieldset> <!-- /.brief --> >+ </fieldset> > </form> > </div> <!-- /#showHoliday --> > > <!-- Panel to deal with new holidays --> > <div class="panel" id="newHoliday"> > <form action="/cgi-bin/koha/tools/newHolidays.pl" method="post"> >- <fieldset class="brief"> >+ <fieldset> > <h3>Add new holiday</h3> > <ol> > <li> >@@ -220,10 +218,10 @@ > </li> > </ol> > <fieldset class="action"> >- <input type="submit" name="submit" value="Save" /> >+ <input type="submit" class="principal" name="submit" value="Save" /> > <a href="#" class="cancel hidePanel newHoliday">Cancel</a> > </fieldset> >- </fieldset> <!-- /.brief --> >+ </fieldset>Å > </form> > </div> <!-- /#newHoliday --> > >@@ -241,7 +239,7 @@ > <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option> > [% END %] > </select> >- <input class="principal" type="submit" value="Copy" /> >+ <input type="submit" class="principal" value="Copy" /> > </form> > </div> > </div> <!-- /.col-sm-6 --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index 97571f7dd6..293d1e9ed8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -4,7 +4,7 @@ > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% formulaire = BLOCK %] >- [% INCLUDE 'lis-search.inc' %] >+ [% INCLUDE 'circ-search.inc' %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title> >@@ -398,10 +398,6 @@ > [% END %] > > [% IF op == 'list' %] >-<<<<<<< HEAD >- <h2>Lists</h2> >-======= >->>>>>>> Bug 30952: Virtualshelves Module > <div id="tabs" class="toptabs"> > <fieldset class="briefgr"> > <ul> >-- >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=136896">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