Attachment #136896 for bug #30952

View | Details | Raw Unified | Return to bug 30952
Collapse All | Expand All




}

body	{
	background: #f3f4f4;
}

form, label input {


#login {
	background: #fff;
	border: none;
	box-shadow: 8px 8px 12px rgb(170 170 170);
	margin: 4em auto;
	padding: 1.5em;
	position : relative;

#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 {

}

.submit input:active, .button:active {
	background: #fff;
	border: 1px solid #999;
	border-left-color: #999;
	border-top-color: #999;

	text-align: right;
}


textarea, input, select {
    background: #fff;
    border: 1px solid #b2b2b2;
    color: #000;
    font:  13px Verdana, Arial, Helvetica, sans-serif;

Lines 153-159 fieldset.brief li.radio { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss (-1 / +1 lines)
153		153
154	.flatpickr-calendar {	154	.flatpickr-calendar {
155	border-radius: 0;	155	border-radius: 0;
156	border: 1px solid #B9D8D9;	156	border: 1px solid #71B344;
157	box-shadow: none;	157	box-shadow: none;
158	}	158	}
159		159




    &.btn {
        &:link,
        &:visited {
            //color: #71B443;
            padding: 6px 25px;
        }



    }

    &.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;


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 {

        align-items: center;
        justify-content: center;
        flex-wrap: wrap;
        width: 200px;
        height: 150px;
        margin-right: auto;
        margin-left: auto;

            border-color: #418940;
        }

        h1{
            font-weight: bold;
        }
    }
}


}

fieldset {
    overflow: auto;
    background-color: #FFF;
    position: relative;
    color: #696969;

        position: relative;
        float: right;
        height: 100%;
        padding: 0.3em;

        .dropdown-menu {
            /*border-top-width: 1px;

            }
        }

        #up{
            display: table;
        }

        #down{
            display: table;
        }

        #patdrop{
            border-top-width: 1px;
            text-align: center;

        border-radius: 0;
        margin-top: 0;
        z-index: 300;
        left: auto !important;
        width: 851px;
    }

    a.addtocart {

    }
}

#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;

   // top: 0px;
    //position: absolute;
    //right: 5px;
    //overflow-x: hidden;
    //overflow-y: visible;
    display: block !important;
    height: auto !important;
}

    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;

            position: relative;
            left: 0px;
            top: 0px;
            width: 500px;
            //line-height: 40px;
           // overflow: hidden;
            display: block;
            margin: 10px 0;
        }

        #submit, #autocsubmit{
            background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%;
            position: absolute;
            min-width: 7px;
            right: 0;
            top: 0px;
            width: 25px;
            height: 30px;

                //font-size: 150%;

                i{

                    &.fa{
                    color: #fff;
                    border-radius: 50%;

                    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 {

                            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;
                    }
                }
            }

Lines 7-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc (-1 / +1 lines)
7	<label>From an existing record:	7	<label>From an existing record:
8	<input type="text" name="q" size="25" />	8	<input type="text" name="q" size="25" />
9	</label>	9	</label>
10	<input type="submit" class="submit" id="searchtoorder" data-booksellerid="[% booksellerid \| html %]" data-basketno="[% basketno \| html %]" value="Submit" />	10	<input type="submit" class="submit principal" id="searchtoorder" data-booksellerid="[% booksellerid \| html %]" data-basketno="[% basketno \| html %]" value="Submit" />
11	</form>	11	</form>
12	</li>	12	</li>
13	<li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]">From a suggestion</a></li>	13	<li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]">From a suggestion</a></li>




[% 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="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" 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 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>
    </div>
    

    <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>


</div>


 
<script type="text/javascript">
    function focusInput(){
        document.getElementsByClassName('head-searchbox').focus();

            if (elem == iconssearch[i]){
                inputssearch[i].classList.add('focus');

                taille(inputssearch[i])
                inputssearch[i].style = "width:calc(355px - "+offsetWidth+"px)";
            }
        }



    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')

    }
});



</script>
  

<!-- /header_search -->
<!-- End Main page Resident Search Box -->




<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 %]&amp;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&amp;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 %]&amp;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_contracts_manage && active %]
                    <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;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 %]&amp;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 -->

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc (-1 / +1 lines)
1	[% USE AuthorisedValues %]	1	[% USE AuthorisedValues %]
2	[% IF wrap_fieldset != 0 %]	2	[% IF wrap_fieldset != 0 %]
3	<fieldset class="rows">	3	<fieldset class="rows">
4	<legend>Additional fields</legend>	4	<h3>Additional fields</h3>
5	<ol>	5	<ol>
6	[% END %]	6	[% END %]
7	[% FOR field IN available %]	7	[% FOR field IN available %]




<!-- 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="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>
        </form>
    </div>

    <div id="renew_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
            <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Scan a barcode to renew" />
            <input value="" type="submit" id="submitsearch" />
        </form>
    </div>
    [% END %]

    [% IF CAN_user_borrowers_edit_borrowers %]
        <div id="patron_search" class="residentsearch">
            <form action="/cgi-bin/koha/members/member.pl" method="post">
                <input name="searchmember" class="head-searchbox 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 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>


<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');

            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]){


            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).addClass('active')
    }
});

</script>

<!-- /header_search -->
<!-- End Main page Resident Search Box -->


</div><!-- /#header_search -->
<!-- End advanced search page resident search box -->

Lines 1-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc (-3 / +3 lines)
1	[% PROCESS 'form-blocks.inc' %]	1	[% PROCESS 'form-blocks.inc' %]
2		2
3	<div id="toolbar" class="btn-toolbar">	3	<div id="toolbar" class="btn-toolbar">
4	<div class="btn-group"><a href="#" id="clear" class="btn btn-default btn-sm"><i class="fa fa-trash"></i> Clear field</a></div>	4	<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>
5	<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>	5	<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>
6	</div>	6	</div>
7	<form name="f" method="get" action="auth_finder.pl">	7	<form name="f" method="get" action="auth_finder.pl">
8	<input type="hidden" name="source" value="[% source \| html %]" />	8	<input type="hidden" name="source" value="[% source \| html %]" />
Lines 158-163 Link Here
158	</ol>	158	</ol>
159	</fieldset>	159	</fieldset>
160	[% END %]	160	[% END %]
161	<fieldset class="action"> <input type="submit" value="Search" class="submit" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a>	161	<fieldset class="action"> <input type="submit" value="Search" class="submit principal" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a>
162	</fieldset>	162	</fieldset>
163	</form>	163	</form>




            <option value="">None</option>
            [% END %]
        </select>
        <input type="submit" class="submit principal" value="Submit" />
    </form>
    </div>
    <div id="main_heading" class="residentsearch">

            <option value="">None</option>
            [% END %]
        </select>
        <input type="submit" class="submit principal" value="Submit" />
    </form>
    </div>
    <div id="matchheading_search" class="residentsearch">

            <option value="">None</option>
            [% END %]
         </select>
         <input type="submit" class="submit principal" value="Submit" />
    </form>
    </div>
    <div id="entire_record" class="residentsearch">

            <option value="">None</option>
            [% END %]
        </select>
        <input type="submit" class="submit principal" value="Submit" />
    </form>
    </div>
    <ul>

Lines 10-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc (-1 / +1 lines)
10	<img src="[% interface \| html %]/[% theme \| html %]/img/spinner-small.gif" alt="" />	10	<img src="[% interface \| html %]/[% theme \| html %]/img/spinner-small.gif" alt="" />
11	</div>	11	</div>
12	<div class="modal-footer">	12	<div class="modal-footer">
13	<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>	13	<button type="button" class="btn btn-default cancel" data-dismiss="modal">Close</button>
14	</div>	14	</div>
15	</div>	15	</div>
16	</div>	16	</div>

Lines 8-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc (-2 / +2 lines)
8	<span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>	8	<span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
9	[% END %]	9	[% END %]
10	[% IF CAN_user_updatecharges_remaining_permissions %]	10	[% IF CAN_user_updatecharges_remaining_permissions %]
11	<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber \| uri %]" class="btn btn-default btn-xs" >Make payment</a>	11	<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber \| uri %]" class="btn btn-default btn-xs" id="lientype" >Make payment</a>
12	<a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber \| uri %]" class="btn btn-default btn-xs" >Pay all charges</a></li>	12	<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>
13	[% END %]	13	[% END %]
14	</li>	14	</li>
15	[% END %]	15	[% END %]




                    [% END %]
            </select>
            <input type="hidden"  name="budget_period_id" value="[% budget_period_id | html %]" />
            <input type="submit" class="submit" id="submit" name="filter" value="" />
        </form>
    </div>



    [% INCLUDE 'catalogue-search-box.inc' %]

    <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 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 -->




[% 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 -->




[% 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 -->




    <div>
        <div id="addbooks_search" class="residentsearch">
            <form name="search" action="addbooks.pl">
                <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>

    [% 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" 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 focus" name="barcode" id="ren_barcode" type="text" placeholder="Scan a barcode to renew" />
            <input value="" type="submit" id="submit" />
        </form>
    </div>


    [% INCLUDE 'catalogue-search-box.inc' %]

    <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 %]

        <li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]

        <span id="button_1" class="buttonsearch">Cataloging search</span>
        <span id="button_2" class="buttonsearch active">Check out</span>
        <span id="button_3" class="buttonsearch">Check in</span>
        <span id="button_4" class="buttonsearch">Renew</span>
        <span id="button_5" class="buttonsearch">Search catalog</span>
    </ul>

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc (-2 / +3 lines)
1	<li>	1	<li>
2	<span class="circ-hlt">Patron's age is incorrect for their category.</span>	2	<span class="circ-hlt">Patron's age is incorrect for their category.</span>
3	Ages allowed are [% age_low \| html %]-[% age_high \| html %].	3	Ages allowed are [% age_low \| html %]-[% age_high \| html %].
4	<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>	4	<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>
		5	</li>

Lines 102-109 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc (-2 / +2 lines)
102	[% header_row.unshift(item) \| html %]	102	[% header_row.unshift(item) \| html %]
103	</div>	103	</div>
104	<div class="modal-footer">	104	<div class="modal-footer">
105	<button id="draw-chart" class="btn btn-default">Draw</button>	105	<button id="draw-chart" class="btn btn-default lientype">Draw</button>
106	<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>	106	<button type="button" class="btn btn-default cancel" data-dismiss="modal">Close</button>
107	</div>	107	</div>
108	</div>	108	</div>
109	</div>	109	</div>

Lines 21-27 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc (-1 / +1 lines)
21	[% 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 %]	21	[% 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 %]
22	[% 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 %]	22	[% IF ( CAN_user_catalogue ) %]<li><a id="icon_3" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
23		23
24	<span id="button_1" class="buttonsearch active">Check-out</span>	24	<span id="button_1" class="buttonsearch active">Check out</span>
25	<span id="button_2" class="buttonsearch">Renew</span>	25	<span id="button_2" class="buttonsearch">Renew</span>
26	<span id="button_3" class="buttonsearch">Search catalog</span>	26	<span id="button_3" class="buttonsearch">Search catalog</span>
27	</ul>	27	</ul>

Lines 121-127 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (-1 / +1 lines)
121	<input type="hidden" id="claims-returned-itemnumber" />	121	<input type="hidden" id="claims-returned-itemnumber" />
122	</div>	122	</div>
123	<div class="modal-footer">	123	<div class="modal-footer">
124	<button id="claims-returned-modal-btn-submit" type="button" class="btn btn-primary"><i class="fa fa-exclamation-circle"></i> Make claim</button>	124	<button id="claims-returned-modal-btn-submit" type="button" class="btn btn-primary principal"><i class="fa fa-exclamation-circle"></i> Make claim</button>
125	<button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button>	125	<button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button>
126	</div>	126	</div>
127	</div>	127	</div>




<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">


    <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" accesskey="r" type="text" placeholder="Scan a barcode to renew" />
            <input value="" type="submit" id="submit" />
        </form>
    </div>

        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_4" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]

        <span id="button_1" class="buttonsearch active">Check out</span>
        <span id="button_2" class="buttonsearch">Check in</span>
        <span id="button_3" class="buttonsearch">Renew</span>
        <span id="button_4" class="buttonsearch">Search catalog</span>
    </ul>
</div>


<script type="text/javascript">
    function focusInput(){
        document.getElementsByClassName('head-searchbox').focus();

    }

    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);
    }

    }
});



</script>


<!-- /header_search -->
<!-- End Main page Resident Search Box -->




	</div>

    [% INCLUDE 'patron-search-box.inc' %]
    
    [% INCLUDE 'catalogue-search-box.inc' %]

    <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 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 -->




                [% UNLESS destination == 'holds' %]
                    <td class="actions">
                        <div class="btn-group dropup">
                            <a class="btn btn-default btn-xs dropdown-toggle lientype" id="clubactions[% c.id | html %]" role="button" data-toggle="dropdown" href="#">
                                Actions <b class="caret"></b>
                            </a>
                            <ul class="dropdown-menu pull-right" id="lientype" role="menu" aria-labelledby="clubactions[% c.id | html %]">
                                [% IF ( c.club_enrollments.count ) %]
                                    <li>
                                        <a href="club-enrollments.pl?id=[% c.id | uri %]">

                                    </li>
                                [% ELSE %]
                                    <li class="disabled">
                                        <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 id="lientype" href="clubs-add-modify.pl?id=[% c.id | uri %]">
                                            <i class="fa fa-pencil"></i> Edit
                                        </a>
                                    </li>
                                    <li>
                                        <a href="#" id="lientype" class="delete_club" data-id="[% c.id | html %]" data-name="[% c.name | html %]">
                                            <i class="fa fa-trash"></i> Delete
                                        </a>
                                    </li>
                                [% END %]
                                [% IF ( c.club_enrollments.count ) %]
                                    <li>
                                        <a href="#" class="club_hold_search" id="lientype" data-id="[% c.id | html %]">
                                            <i class="fa fa-search"></i> Search to hold
                                        </a>
                                    </li>




<div id="header_search" class="fold">
	<div id="contract_description_search" class="residentsearch">
	<form action="[% script_name | html %]" method="post">
        <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 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  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>





<div id="header_search" class="fold">
	<div id="currency_search" class="residentsearch">
        <form action="[% script_name | html %]" method="post">
                <input class="head-searchbox focus" type="text" name="description" id="description" value="[% searchfield | html %]" placeholder="Currencies search:" />
                <input type="submit" id="submit" name="search" value="" />
        </form>	
	</div>

    [% INCLUDE 'patron-search-box.inc' %]

    [% INCLUDE 'catalogue-search-box.inc' %]

    <ul id="taille">
        <li><a id="icon_1" title="Check out" onclick="clique(this)" class="iconsearch" href="#currency_search"><i class="fa fa-dollar"></i></a></li>
        [% 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 %]





[% USE Koha %]
<div id="header_search" class="fold">

<div id="header_search">
        <div id="desk_search" class="residentsearch">
            <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>
        </form>
        </div>

    [% INCLUDE 'patron-search-box.inc' %]

    [% INCLUDE 'catalogue-search-box.inc' %]

    <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 -->

Lines 56-65 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc (-2 / +2 lines)
56	[% END %]	56	[% END %]
57	[% IF facets_loo.facets.size > 5 %]	57	[% IF facets_loo.facets.size > 5 %]
58	<li class="moretoggle">	58	<li class="moretoggle">
59	<a href="#"><strong>Show more</strong></a>	59	<a href="#" id="lientype"><strong>Show more</strong></a>
60	</li>	60	</li>
61	<li class="moretoggle" style="display:none">	61	<li class="moretoggle" style="display:none">
62	<a href="#"><strong>Show less</strong></a>	62	<a href="#" id="lientype"><strong>Show less</strong></a>
63	</li>	63	</li>
64	[% END %]	64	[% END %]
65	</ul></li>	65	</ul></li>

Lines 199-205 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (-1 / +1 lines)
199	[%- END -%]	199	[%- END -%]
200	<td>	200	<td>
201	<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 %]">	201	<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 %]">
202	<i class="fa fa-trash" aria-hidden="true"></i> Cancel	202	<i class="fa fa-trash cancel" aria-hidden="true"></i> Cancel
203	</a>	203	</a>
204	</td>	204	</td>
205	<td>	205	<td>




        [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a id="icon_4" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>[% END %]
        [% IF ( CAN_user_catalogue ) %]<li><a id="icon_5" title="Search catalog" onclick="clique(this)" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]

        <span id="button_1" class="buttonsearch active">Check out</span>
        <span id="button_2" class="buttonsearch">Check in</span>
        <span id="button_3" class="buttonsearch">Renew</span>
        <span id="button_4" class="buttonsearch">Search patrons</span>
        <span id="button_5" class="buttonsearch">Search catalog</span>
    </ul>
</div>



<script type="text/javascript">
    function focusInput(){
        document.getElementsByClassName('head-searchbox').focus();

    }
});



</script>

<!-- /header_search -->




        [% IF backends_available %]
          [% IF backends.size > 1 %]
            <div class="dropdown btn-group">
                <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 pat" aria-labelledby="ill-backend-dropdown">
                    [% FOREACH backend IN backends %]
                        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backend | uri %]">[% backend | html %]</a></li>
                    [% END %]
                </ul>
            </div>
          [% ELSE %]
            <a id="ill-new" class="btn btn-default pat" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backends.0 | html %]">
                <i class="fa fa-plus"></i> New ILL request
            </a>
          [% END %]
        [% ELSE %]
            <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 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 pat btn-group" href="/cgi-bin/koha/ill/ill-requests.pl">
                <i class="fa fa-list"></i> List requests
            </a>
        [% END %]

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc (-1 / +1 lines)
1		1
2	[% IF ( ( ! one_language_enabled ) && ( languages_loop ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' \|\| Koha.Preference('StaffLangSelectorMode') == 'top') ) %]	2	[% IF ( ( ! one_language_enabled ) && ( languages_loop ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' \|\| Koha.Preference('StaffLangSelectorMode') == 'top') ) %]
3	<li class="dropdown">	3	<li class="dropdown">
4	<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>	4	<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>
5	<ul aria-labelledby="langmenu" role="menu" class="dropdown-menu dropdown-menu-left">	5	<ul aria-labelledby="langmenu" role="menu" class="dropdown-menu dropdown-menu-left">
6	[% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]	6	[% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
7	[% IF ( languages_loo.group_enabled ) %]	7	[% IF ( languages_loo.group_enabled ) %]

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc (-3 / +3 lines)
4	<div id="notices_search" class="residentsearch">	4	<div id="notices_search" class="residentsearch">
5	<form action="/cgi-bin/koha/tools/letter.pl" method="post">	5	<form action="/cgi-bin/koha/tools/letter.pl" method="post">
6	<input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="" placeholder="Search existing notices:"/>	6	<input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="" placeholder="Search existing notices:"/>
7	<input type="submit" class="submit" name="search" value="" />	7	<input type="submit" class="submit" id="submit" name="search" value="" />
8	</form>	8	</form>
9	</div>	9	</div>
10		10
Lines 12-19 Link Here
12		12
13	[% INCLUDE 'catalogue-search-box.inc' %]	13	[% INCLUDE 'catalogue-search-box.inc' %]
14		14
15	<ul>	15	<ul id="taille">
16	<li><a id="icon_1" title="Search notices" onclick="clique(this)" class="iconsearch" href="#notices_search"><i class="fa fa-upload"></i></a></li>	16	<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>
17	[% 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 %]	17	[% 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 %]
18	[% 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 %]	18	[% 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 %]
19		19




<!-- Begin Main page Resident Search Box -->

<div id="containersearch" class="fold">

    [% INCLUDE 'patron-search-box.inc' %]
        <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post">
            <input id="inputsearch"  class="inpu" type="text" autocomplete="off" placeholder="Enter patron card number or partial name"  />
            <input type="hidden" name="quicksearch" value="1" />
            <input value="" type="submit" id="submitsearch" />
        </form>
    </div>
    [% END %]

    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
    <div id="checkin_search" class="residentsearch">
        <form action="/cgi-bin/koha/members/member.pl" id="patronsearch" method="post">
            [% IF ( PatronAutoComplete ) %]
                <div class="autocomplete">
                    <input 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 %]" />

                </div>

            [% ELSE %]
                <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="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="ren_barcode" class="head-searchbox" accesskey="r" type="text" placeholder="Scan a barcode to renew" />
            <input value="" type="submit" id="submit" />
        </form>
    </div>
    [% END %]

    [% IF ( CAN_user_catalogue ) %]
    <div id="search_search" class="residentsearch">
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
            <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Enter search keyords" />
            <input value="" type="submit" id="submit" />
                [% END %]
            <input name="barcode" class="inpu" id="inputsearch focus" type="text" placeholder="Enter search keyords" />
            <input value="" type="submit" id="submitsearch" />
        </form>
    </div>
    [% END %]

    [% INCLUDE 'catalogue-search-box.inc' %]

    <ul id="taille">
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_1" title="Check out" onclick="clique(this)" 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.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');

            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]){


            if (elem == iconssearch[i]){
                inputssearch[i].classList.add('focus');

                taille(inputssearch[i])
            }
        }

        fold();
        focusInput();
        fold();
    }

    function fold(){
        document.getElementById('header_search').classList.add('fold');
       // document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
        // document.getElementById('inputsearch').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>





<div id="header_search" class="fold">
[% 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="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">
            <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 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 -->




<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>




                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)";



</script>
>>>>>>> Bug 30952: Search bar

        // modify parent window owner element
        function add_user(borrowernumber, borrowername) {

Lines 8-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-2 / +2 lines)
8	<li class="has_modifications">	8	<li class="has_modifications">
9	<span class="circ-hlt">Pending modifications:</span>	9	<span class="circ-hlt">Pending modifications:</span>
10	[% IF CAN_user_borrowers_edit_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') \|\| borrower.branch == branch ) %]	10	[% IF CAN_user_borrowers_edit_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') \|\| borrower.branch == branch ) %]
11	<a href="/cgi-bin/koha/members/members-update.pl?active=[% patron.borrowernumber \| uri %]">Review pending modifications</a>	11	<a href="/cgi-bin/koha/members/members-update.pl?active=[% patron.borrowernumber \| uri %]" id="lientype">Review pending modifications</a>
12	[% ELSE %]	12	[% ELSE %]
13	<span>Patron has pending modifications</span>	13	<span>Patron has pending modifications</span>
14	[% END %]	14	[% END %]
Lines 20-26 Link Here
20	<span class="circ-hlt">Expiration:</span>	20	<span class="circ-hlt">Expiration:</span>
21	<span>Patron's card will expire soon.</span>	21	<span>Patron's card will expire soon.</span>
22	<span>Patron's card expires on [% expiry \| $KohaDates %]</span>	22	<span>Patron's card expires on [% expiry \| $KohaDates %]</span>
23	<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>	23	<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>
24	</li>	24	</li>
25	[% END %]	25	[% END %]
26		26




	<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" id="submit" name="search" value="" />
        </form>
	</div>

    [% INCLUDE 'patron-search-box.inc' %]

	[% INCLUDE 'catalogue-search-box.inc' %]
    <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 %]

	<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 %]





<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>

        </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 %]





    [% INCLUDE 'catalogue-search-box.inc' %]

    <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_3" class="buttonsearch">Search the catalog</span>
    </ul>
</div>




                            &nbsp;
                        [% ELSE %]
                            <div class="btn-group">
                                <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" 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" 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" 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" id="lientype"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.item.homebranch) | html %]</a></li>
                                    [% END %]
                                </ul>
                            </div>




[% INCLUDE 'blocking_errors.inc' %]
<div id="toolbar" class="btn-toolbar">
    <div class="btn-group">
        <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 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 pat" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% colId | html %]"><i class="fa fa-pencil"></i> Edit</a>
        </div>
        <div class="btn-group">
            <a class="btn btn-default  pat confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% colId | html %]"><i class="fa fa-trash"></i> Delete</a>
        </div>
    [% END %]
</div>




[% USE Koha %]
<!-- Begin Main page Resident Search Box -->

<div id="header_search" class="fold">

    <div id="subscription_search" class="residentsearch">
        <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>
        <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/serials/serials-search.pl">Advanced search</a>
      </form>
    </div>

    [% INCLUDE 'patron-search-box.inc' %]

    [% INCLUDE 'catalogue-search-box.inc' %]

    <ul 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 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')
    }
});

</script>
<!-- End Serials Resident Search Box -->




[% USE Koha %]
<div id="toolbar" class="btn-toolbar">
<div>
    [% IF no_op_set %]
        <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 pat" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&amp;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&amp;rota_id=[% rota_id | uri %]"><i class="fa fa-pencil"></i> Edit rota</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>




[% USE Koha %]
<div id="header_search" class="fold">

<div id="header_search">
	<div id="suggestions_search" class="residentsearch">
        <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="" />
    <input type="submit" class="submit" value="Search" />
        </form>
	</div>

    [% INCLUDE 'patron-search-box.inc' %]
    
    [% INCLUDE 'catalogue-search-box.inc' %]

    <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 -->

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc (-2 / +3 lines)
1	[% IF ( booksellerid ) %]	1	[% IF ( booksellerid ) %]
2	<div id="menu">	2	<div id="navmenu">
		3	<div id="navmenulist">
3	<ul>	4	<ul>
4	[% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid \| uri %]">Baskets</a></li>[% END %]	5	[% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid \| uri %]">Baskets</a></li>[% END %]
5	[% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid \| uri %]">Basket groups</a></li>[% END %]	6	[% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid \| uri %]">Basket groups</a></li>[% END %]
Lines 11-15 Link Here
11	<li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid \| uri %]&owner=1">Uncertain prices</a></li>	12	<li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid \| uri %]&owner=1">Uncertain prices</a></li>
12	[% END %] [% END %]	13	[% END %] [% END %]
13	</ul>	14	</ul>
14	</div>	15	</div></div>
15	[% END %]	16	[% END %]

Lines 58-66 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc (-2 / +2 lines)
58	<input type="hidden" name="tbr" value="[% reserveloo.item.homebranch \| html %]" />	58	<input type="hidden" name="tbr" value="[% reserveloo.item.homebranch \| html %]" />
59	<input type="hidden" name="tab" value="[% tab \| html %]">	59	<input type="hidden" name="tab" value="[% tab \| html %]">
60	[% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %]	60	[% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %]
61	<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>	61	<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>
62	[% ELSE %]	62	[% ELSE %]
63	<button type="submit" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Cancel hold</button>	63	<button type="submit" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-remove"></i> Cancel hold</button>
64	[% END %]	64	[% END %]
65	</form>	65	</form>
66	</td>	66	</td>

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc (-3 / +3 lines)
4	<div id="z3950_search" class="residentsearch">	4	<div id="z3950_search" class="residentsearch">
5	<form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">	5	<form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
6	<input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="[% searchfield \| html %]" placeholder="Z39.50/SRU server search:" />	6	<input class="head-searchbox focus" type="text" name="searchfield" id="searchfield" value="[% searchfield \| html %]" placeholder="Z39.50/SRU server search:" />
7	<input type="submit" class="submit" name="search" value="Search" />	7	<input type="submit" class="submit" id="submit" name="search" value="Search" />
8	</form>	8	</form>
9	</div>	9	</div>
10		10
Lines 12-19 Link Here
12		12
13	[% INCLUDE 'catalogue-search-box.inc' %]	13	[% INCLUDE 'catalogue-search-box.inc' %]
14		14
15	<ul>	15	<ul id="taille">
16	<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>	16	<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>
17	[% 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 %]	17	[% 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 %]
18	[% 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 %]	18	[% 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 %]
19		19

Lines 40-48 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-1 / +1 lines)
40	<div class="col-sm-10 col-sm-push-2">	40	<div class="col-sm-10 col-sm-push-2">
41	<main>	41	<main>
42		42
43	[% INCLUDE 'acquisitions-toolbar.inc' %]
44		43
45	<h2>Acquisitions</h2>	44	<h2>Acquisitions</h2>
		45	[% INCLUDE 'acquisitions-toolbar.inc' %]
46	[% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]	46	[% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]
47	[% UNLESS ( loop_budget ) %]	47	[% UNLESS ( loop_budget ) %]
48	[% IF ( CAN_user_acquisition_period_manage ) %]	48	[% IF ( CAN_user_acquisition_period_manage ) %]




[% USE Asset %]
[% USE Branches %]
[% USE Price %]
[% formulaire = BLOCK %]
    [% INCLUDE 'acquisitions-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Basket grouping for [% booksellername | html %] &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]

                [% IF ( grouping ) %]
                    [% IF (closedbg) %]
                        <div id="toolbar" class="btn-toolbar">
                            <div class="btn-group"><a href="[% script_name | url %]?op=reopen&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;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&amp;basketgroupid=[% basketgroupid | uri %]&amp;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&amp;basketgroupid=[% basketgroupid | uri %]&amp;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&amp;basketgroupid=[% basketgroupid | uri %]&amp;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) %]
                        <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) %]
                        <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 %]
                        <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>

                                                </table>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        [% END %]
                        [% IF ( closedbg ) %]

                            <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">
                                    <ol>
                                        [% UNLESS (closedbg) %]
                                            <li>

                                            <input type="hidden" name="basketgroupid" value="[% basketgroupid | html %]" />
                                        [% END %]
                                        <input type="hidden" name="op" value="attachbasket" />
                                        <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>

                    </div>
                [% ELSE %]
                    <div id="toolbar" class="btn-toolbar">
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default pat" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
                    </div>
                    <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>

                                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td>
                                                    <td>[% basketgroup.basketsqty | html %]</td>
                                                    <td>
                                                        <input type="button" onclick="closeandprint('[% basketgroup.id | html %]');" id="lientype" value="Close and export as PDF" />
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Edit" /></form>
                                                        [% UNLESS basketgroup.basketsqty %]
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Delete" /></form>
                                                        [% END %]
                                                    </td>
                                                </tr>

                                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %]</td>
                                                    <td>[% basketgroup.basketsqty | html %]</td>
                                                    <td>
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="View" /></form>
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Reopen" /></form>
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Export as PDF" /></form>
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Export as CSV" /></form>
                                                [% IF (ediaccount) %]
                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" id="lientype" value="Generate EDIFACT order" /></form>
                                                [% ELSE %]
                                                        <div>No EDIFACT configuration for [% booksellername | html %]</div>
                                                [% END %]

                                </table>
                            </div>
                        </div>
                    </div></div>
                [% END %]
            </main>
        </div> <!-- /.col-sm-10.col-sm-push-2 -->

Lines 61-68 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt (-3 / +3 lines)
61		61
62	[% IF ( add_form ) %]	62	[% IF ( add_form ) %]
63	[% IF ( basketno ) %]	63	[% IF ( basketno ) %]
64	<h1>Edit basket [% basketname \| html %]</h1>	64	<h2>Edit basket [% basketname \| html %]</h2>
65	[% ELSE %]<h1>Add a basket to [% booksellername \| html %]</h1>	65	[% ELSE %]<h2>Add a basket to [% booksellername \| html %]</h2>
66	[% END %]	66	[% END %]
67	<form name="Aform" action="[% script_name \| html %]" method="post" class="validated">	67	<form name="Aform" action="[% script_name \| html %]" method="post" class="validated">
68	<input type="hidden" name="booksellerid" value="[% booksellerid \| html %]" />	68	<input type="hidden" name="booksellerid" value="[% booksellerid \| html %]" />
Lines 162-168 Link Here
162		162
163	<fieldset class="action">	163	<fieldset class="action">
164	<input type="hidden" name="op" value="add_validate" />	164	<input type="hidden" name="op" value="add_validate" />
165	<input type="submit" value="Save" />	165	<input type="submit" class="principal" value="Save" />
166	[% IF ( basketno ) %]	166	[% IF ( basketno ) %]
167	<a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno \| html %]">Cancel</a>	167	<a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno \| html %]">Cancel</a>
168	[% ELSE %]	168	[% ELSE %]




        </select>
        </p>
        [% IF ( allbaskets ) %]
            <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&amp;booksellerid=[% booksellerid | uri %]" id="lientype">Show active baskets only</a>
        [% ELSE %]
            <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;allbaskets=1" id="lientype">Show all baskets</a>
        [% END %]
    [% END %]
    [% UNLESS booksellerid %]

                    [% IF ( supplier.basketcount > 0 ) %]
                        <div>
                            [% IF ( allbaskets ) %]
                                <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&amp;booksellerid=[% booksellerid | uri %]" id="lientype">Show active baskets only</a>
                            [% ELSE %]
                                <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;allbaskets=1" id="lientype">Show all baskets</a>
                            [% END %]
                        </div>
                    [% END %]

                                            <div class="dropup">
                                                <div class="btn-group">
                                                [%# There should be no space between these two buttons, it would render badly %]
                                                    <a class="btn btn-default btn-xs lientype" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a><a class="btn btn-default lientype btn-xs dropdown-toggle" id="basketactions[% basket.basknetno | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a>
                                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="basketactions[% basketn.basketno | html %]">
                                                        [% IF basket.uncertainprices %]
                                                        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% basket.booksellerid | uri %]&owner=1" id="lientype"><i class="fa fa-usd"></i> Uncertain prices</a></li>
                                                        [% ELSIF basket.total_items && !basket.is_standing %]
                                                        <li><a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basket.basketno | uri %]&booksellerid=[% basket.booksellerid | uri %]" id="lientype"><i class="fa fa-times-circle"></i> Close this basket</a></li>
                                                        [% END %]
                                                    </ul>
                                                </div>
                                            </div>
                                            [% ELSE %]
                                                <a class="btn btn-default btn-xs lientype" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a>
                                            [% 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 %]">




        <div class="col-sm-10 col-sm-push-2">
            <main>

                <h2>Order search</h2>

                [% IF !order_loop && search_done %]
                    <div class="dialog message">

                [% END %]


    [% IF ( order_loop ) %]<h2>Search results</h2>
	<div id="acqui_histsearch">
        <table id="histsearcht">
            <thead>

                <h4>Search orders</h4>
        [% ELSE %]
            <fieldset class="rows">
                <h3>Search orders</h3>
        [% END %]
            [% INCLUDE 'filter-orders.inc' %]
            <input type="hidden" name="do_search" value="1" />
            <fieldset class="action"><input type="submit" class="principal" value="Search" /></fieldset>
        </fieldset>
    </form>
[% END %]





<body id="acq_invoice" class="acq">
[% INCLUDE 'header.inc' form=formulaire %]
[% INCLUDE 'acquisitions-search.inc' %]

[% SET readonly = NOT CAN_user_acquisition_edit_invoices %]


            <fieldset class="action">
                <input type="submit" value="Save" />
                [% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %]
                <a class="cancel" href="invoice.pl?op=delete&invoiceid=[% invoiceid | uri %]" id="delete">Delete</a>
                [% END %]
            </fieldset>
        [% END %]

                                  [% END %]
                                  [% UNLESS readonly %]
                                      <td>
                                         <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>

                          </fieldset>
                          <fieldset class="action">
                              <input type="hidden" name="op" value="mod_adj" />
                              <input type="submit" class="principal" value="Update adjustments" />
                          </fieldset>
                    [% END %]
                  </fieldset>
              </form>
      <p>
          <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]" id="lientype">Go to receipt page</a>
          [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]" id="lientype">Manage invoice files</a>[% END %]
      </p>
      <h2>Invoice details</h2>
      <fieldset>




</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>

                </tr>
            </thead>
        </table>
    </div></div>
[% ELSE %]
    <p>
        <span>Invoice is closed, so you can't receive orders anymore.</span>

    <form action="/cgi-bin/koha/acqui/invoice.pl" method="get">
        <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
        <fieldset class="action">
            <input type="submit" class="principal" value="Finish receiving" />
        </fieldset>
    </form>
[% END %]




            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
        [% END %]
            <main>
<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">

            <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 principal" value="Create new invoice anyway" />
        </form>
    </div>
    [% END %]

    <div id="parcels_new_parcel">
        <form method="get" action="parcels.pl" class="validated">
    <fieldset class="rows">
    <h3>Receive a new shipment</h3>
       <ol> <li>
            <label for="invoice" class="required">Vendor invoice:</label>
            <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />


        </li>
		</ol>
<input type="submit" class="button principal" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></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>
        </form>
    </div>
</main>

                <option value="100">100</option>
                </select></li>
        </ol>
    <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>




            [% END %]
            <input type="hidden" class="contact_claimissues_hidden" name="contact_claimissues" value="[% contact.claimissues | html %]"></input>
        </li>
        [% IF contact.id %]<li><button class="btn btn-default delete-contact" id="lientype"><i class="fa fa-trash"></i> Delete contact</li>[% END %]
    </ol>
[% END %]



    [% IF ( enter ) %]
        [% IF ( booksellerid ) %]
        <h2>Update: [% name | html %]</h2>
    [% ELSE %]
        <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">
            <div>
            <button class="btn btn-default principal" type="submit"><i class="fa fa-save"></i> Save</button>
            [% 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 %] <i class="fa fa-remove"></i> Cancel</a>
        </div></div>

        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
        <fieldset class="rows">
            <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>

                <input type="text" size="40" id="accountnumber" name="accountnumber" value="[% accountnumber | html %]" /></li></ol>
        </fieldset>
        <fieldset class="rows">
            <h3>Contacts</h3>
            <fieldset id="contact-template" class="supplier-contact">
                <h3nd>Contact details</h3nd>
                [% INCLUDE edit_contact %]
            </fieldset>
            [% FOREACH contact IN contacts %]
                <fieldset class="supplier-contact">
                    <h3nd>Contact details</h3nd>
                    [% INCLUDE edit_contact %]
                </fieldset>
            [% END %]

        </fieldset>

        <fieldset class="rows">
            <h3>Ordering information</h3>
            <ol><li><label for="activestatus">Vendor is:</label>
                    [% IF ( active ) %]
                        <label class="radio" for="activestatus">

                <textarea cols="40" rows="4" id="notes" name="notes" >[% notes | html %]</textarea></li>
            </ol>
        </fieldset>
        <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>


    <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>

                [% 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 %]

                        [% END %]
                    </p>
                </div>

            </div>
</div>
        </div>

        [% IF ( contracts ) %]

                        <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&amp;contractnumber=[% contract.contractnumber | html %]&amp;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&amp;contractnumber=[% contract.contractnumber | html %]&amp;booksellerid=[% contract.booksellerid | html %]" id="lientype"><i class="fa fa-trash"></i> Delete</a>
                            </td>
                        [% END %]
                        </tr>




            [% END %]
        [% END %]

    <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>

            <option value="1">me</option>
            [% END %]
        </select>
        <input type="submit" id="lientype" value="Filter" />
        </form>
        <form action="[% scriptname | html %]" method="post" id="uncertainprices">
        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />

	    [% END %]
    </tbody>
	</table>
    <fieldset class="action"><input type="submit" value="Save" class="principal" /></fieldset>
	</form>
    </div>
	[% END %]

</main>




                        <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 ) %]
                            <h3>Modify contract [% contractname | html %] for [% booksellername | html %]</h3>
                        [% ELSE %]
                            <h3>New contract for [% booksellername | html %]</h3>
                        [% END %]
                        <fieldset class="rows">
                            <ol>
                                [% IF ( contractnumber ) %]
                                        <li><span class="label">Contract id </span>[% contractnumber | html %]

                                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                                </li>
                            </ol>
                            <input type="submit" class="principal" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]&amp;contractnumber=[% contractnumber | html %]">Cancel</a>
                        <fieldset class="action">
                            <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]&amp;contractnumber=[% contractnumber | html %]">Cancel</a>
                        </fieldset>
                    </form>
            [% END %]
            [% IF ( add_validate ) %]
                <h2>Data recorded</h2>
                <form action="[% script_name | html %]" method="post">
                    <input type="submit" class="principal" value="OK" />
                </form>
            [% END %]
            [% IF ( delete_confirm ) %]
                    <div class="dialog alert">
                        <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>

                    </div>
            [% END %]
            [% IF ( delete_confirmed ) %]
                <h2>Contract deleted</h2>
                <form action="[% script_name | html %]" method="post">
                    <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
                    <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>

                        <td>[% loo.contractstartdate | html %]</td>
                        <td>[% loo.contractenddate | html %]</td>
                        <td class="actions">
                            <a id="lientype" href="[% loo.script_name | url %]?op=add_form&amp;contractnumber=[% loo.contractnumber | uri %]&amp;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&amp;contractnumber=[% loo.contractnumber | uri %]&amp;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&amp;booksellerid=[% booksellerid | uri %]" id="lientype">Add a contract</a>.
                        [% END %]
                    </div>
                [% END %]





        <td class="actions">
             [% UNLESS ( budget_line.budget_lock ) %]
                    <input type="button" class="auto_fill_row btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" id="lientype" value="Auto-fill row"/>
                    <input type="button" class="clear_fields btn btn-default btn-xs" data-budget-id="[% budget_line.budget_id | html %]" id="lientype" value="Clear">
            [% ELSE %]
             <div style="color:red;">not owned</div>
            [% END %]


    <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"/> -->
    [% ELSE %]
        <input type="hidden" name="op" class="principal" value="save" />
        <fieldset class="action"><input type="submit" class="principal" value="Save"/></fieldset>
    [% END %]







                <!-- 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 %]">

                            </div> <!-- /#advsearch-[% advsearchloo.advanced_search_type | html %] -->
                        [% END # /FOREACH advsearchloo %]
                    </div> <!-- /.tab-content -->
                </fieldset>
                </div> <!-- /#advsearches -->
                <!-- /MC-TYPE LIMIT -->


                    [% PROCESS 'subtype_limits.inc' %]
                    <!-- SUBTYPE LIMITS -->
                    <fieldset id="subtype">
                        <h3>Subtype limits</h3><p>
                        [% PROCESS subtype_dropdowns %]
                        <fieldset id="current_subtype_limits">
                            <h3>Current subtype limits</h3>
                            [% FOREACH subtype IN ['aud','fic','bio','ctype','l-format'] %]
                                [% FOREACH limit IN limits.$subtype %]
                                    <span>


                <!-- AVAILABILITY LIMITS -->
                <fieldset id="availability">
                    <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>


                <!-- OTHER LIMITS (facets, etc.) -->
                [% IF limits.size %]
                    <fieldset id="sortby">
                        <h3>Other limits</h3>
                        <p>
                            [% FOREACH key IN limits.keys %]
                                [% FOREACH limit IN limits.$key %]


                <!-- RANK LIMITS -->
                <fieldset id="sortby">
                    <h3>Sorting</h3>
                    <p>
                        <label for="sort_by">Sort by: </label>
                        <select id="sort_by" name="sort_by">




        <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>

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-2 / +5 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
4	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %][% SET footerjs = 1 %]
		5	[% formulaire = BLOCK %]
		6	[% INCLUDE 'cat-search.inc' %]
		7	[% END %]
5	<title>[% IF ( biblionumber ) %]Editing [% title \| html %] (Record number [% biblionumber \| html %])[% ELSE %]Add MARC record[% END %] &rsaquo; Cataloging &rsaquo; Koha</title>	8	<title>[% IF ( biblionumber ) %]Editing [% title \| html %] (Record number [% biblionumber \| html %])[% ELSE %]Add MARC record[% END %] &rsaquo; Cataloging &rsaquo; Koha</title>
6	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
7	[% INCLUDE 'calendar.inc' %]	10	[% INCLUDE 'calendar.inc' %]
Lines 786-792 function PopupMARCFieldDoc(field) { Link Here
786	<div>Loading, please wait...</div>	789	<div>Loading, please wait...</div>
787	</div>	790	</div>
788		791
789	[% INCLUDE 'header.inc' %]	792	[% INCLUDE 'header.inc' form=formulaire %]
790		793
791	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	794	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
792	<ol>	795	<ol>




[% USE Koha %]
[% USE KohaDates %]
[% USE TablesSettings %]
[% SET footerjs = 1 %][% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'cat-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Cataloging [% IF ( total || breeding_loop ) %] &rsaquo; Search results [% ELSIF ( query ) %] &rsaquo; No results found [% END %] &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>

<body id="cat_addbooks" class="cat">
    [% INCLUDE 'header.inc' form=formulaire %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
    <ol>

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt (-1 / +1 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% USE KohaDates %]	5	[% USE KohaDates %]
6	[% formulaire = BLOCK %]	6	[% formulaire = BLOCK %]
7	[% INCLUDE 'cataloging-search.inc' %]	7	[% INCLUDE 'cat-search.inc' %]
8	[% END %]	8	[% END %]
9	[% USE TablesSettings %]	9	[% USE TablesSettings %]
10	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]

Lines 7-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt (-1 / +4 lines)
7	[% Asset.css("lib/codemirror/codemirror.min.css") \| $raw %]	7	[% Asset.css("lib/codemirror/codemirror.min.css") \| $raw %]
8	[% Asset.css("css/humanmsg.css") \| $raw %]	8	[% Asset.css("css/humanmsg.css") \| $raw %]
9	[% Asset.js("js/cataloging.js") \| $raw %]	9	[% Asset.js("js/cataloging.js") \| $raw %]
10	[% Asset.js("lib/jquery/plugins/humanmsg.js") \| $raw %]	10	[% Asset.js("lib/jquery/plugins/humanmsg.js") \| $raw %][% SET footerjs = 1 %]
		11	[% formulaire = BLOCK %]
		12	[% INCLUDE 'cat-search.inc' %]
		13	[% END %]
11	</head>	14	</head>
12	<body id="cat_addbiblio" class="cat">	15	<body id="cat_addbiblio" class="cat">
13		16

Lines 2-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt (-1 / +1 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
4	[% formulaire = BLOCK %]	4	[% formulaire = BLOCK %]
5	[% INCLUDE 'cataloging-search.inc' %]	5	[% INCLUDE 'cat-search.inc' %]
6	[% END %]	6	[% END %]
7	[% PROCESS 'merge-record.inc' %]	7	[% PROCESS 'merge-record.inc' %]
8		8

Lines 34-41 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (-3 / +1 lines)
34		34
35	<div class="main container-fluid">	35	<div class="main container-fluid">
36		36
37	<h1>Circulation</h1>
38
39	<div class="row">	37	<div class="row">
40	<div class="col-sm-5 col-md-4">	38	<div class="col-sm-5 col-md-4">
41	<h1>Circulation</h1>	39	<h1>Circulation</h1>
Lines 126-132 Link Here
126	<a class="menucirc"	124	<a class="menucirc"
127	href="/cgi-bin/koha/circ/branchoverdues.pl"	125	href="/cgi-bin/koha/circ/branchoverdues.pl"
128	title="Limited to your library. See report help for other details."	126	title="Limited to your library. See report help for other details."
129	><i class="fa fa-clock-o fa-2x"></i><h1> Overdues with fines</h1></a>	127	><i class="fa fa-clock-o fa-2x"></i><i class="fond fa fa-dollar"></i><h1> Overdues with fines</h1></a>
130	</li>	128	</li>
131	</ul>	129	</ul>
132	</div>	130	</div>




                            <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">
                            

Lines 3-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt (-1 / +1 lines)
3	[% USE Asset %]	3	[% USE Asset %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
5	[% formulaire = BLOCK %]	5	[% formulaire = BLOCK %]
6	[% INCLUDE 'patron-search.inc' %]	6	[% INCLUDE 'patron-search-header.inc' %]
7	[% END %]	7	[% END %]
8	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
9	<title>API Keys &rsaquo; Patrons &rsaquo; Koha</title>	9	<title>API Keys &rsaquo; Patrons &rsaquo; Koha</title>

Lines 10-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-1 / +1 lines)
10	[% USE Registers %]	10	[% USE Registers %]
11	[% SET footerjs = 1 %]	11	[% SET footerjs = 1 %]
12	[% formulaire = BLOCK %]	12	[% formulaire = BLOCK %]
13	[% INCLUDE 'patron-search.inc' %]	13	[% INCLUDE 'patron-search-header.inc' %]
14	[% END %]	14	[% END %]
15	[% SET registers = Registers.all( filters => { current_branch => 1 } ) %]	15	[% SET registers = Registers.all( filters => { current_branch => 1 } ) %]
16		16

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt (-1 / +1 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
6	[% formulaire = BLOCK %]	6	[% formulaire = BLOCK %]
7	[% INCLUDE 'patron-search.inc' %]	7	[% INCLUDE 'patron-search-header.inc' %]
8	[% END %]	8	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
10	<title>Delete patron [% patron.firstname \| html %] [% patron.surname \| html %] &rsaquo; Koha</title>	10	<title>Delete patron [% patron.firstname \| html %] [% patron.surname \| html %] &rsaquo; Koha</title>

Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt (-1 / +1 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
7	[% formulaire = BLOCK %]	7	[% formulaire = BLOCK %]
8	[% INCLUDE 'patron-search.inc' %]	8	[% INCLUDE 'patron-search-header.inc' %]
9	[% END %]	9	[% END %]
10	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
11	<title>[% UNLESS blocking_error %]Discharge for [% patron.firstname \| html %] [% patron.surname \| html %] ([% patron.cardnumber \| html %])[% END %] &rsaquo; Patrons &rsaquo; Koha</title>	11	<title>[% UNLESS blocking_error %]Discharge for [% patron.firstname \| html %] [% patron.surname \| html %] ([% patron.cardnumber \| html %])[% END %] &rsaquo; Patrons &rsaquo; Koha</title>




[% USE KohaDates %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'patron-search-header.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Pending discharge requests &rsaquo; Patrons &rsaquo; 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

  [% 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">

Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt (-1 / +1 lines)
5	[% USE AuthorisedValues %]	5	[% USE AuthorisedValues %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
7	[% formulaire = BLOCK %]	7	[% formulaire = BLOCK %]
8	[% INCLUDE 'patron-search.inc' %]	8	[% INCLUDE 'patron-search-header.inc' %]
9	[% END %]	9	[% END %]
10	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
11	<title>Files for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>	11	<title>Files for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>

Lines 8-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt (-1 / +1 lines)
8	[% USE ItemTypes %]	8	[% USE ItemTypes %]
9	[% SET footerjs = 1 %]	9	[% SET footerjs = 1 %]
10	[% formulaire = BLOCK %]	10	[% formulaire = BLOCK %]
11	[% INCLUDE 'patron-search.inc' %]	11	[% INCLUDE 'patron-search-header.inc' %]
12	[% END %]	12	[% END %]
13	[% INCLUDE 'doc-head-open.inc' %]	13	[% INCLUDE 'doc-head-open.inc' %]
14	<title>Holds history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>	14	<title>Holds history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt (-1 / +1 lines)
6	[% USE Branches %]	6	[% USE Branches %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
8	[% formulaire = BLOCK %]	8	[% formulaire = BLOCK %]
9	[% INCLUDE 'patron-search.inc' %]	9	[% INCLUDE 'patron-search-header.inc' %]
10	[% END %]	10	[% END %]
11	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
12	<title>Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Housebound &rsaquo; Koha</title>	12	<title>Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Housebound &rsaquo; Koha</title>

Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt (-1 / +1 lines)
5	[% USE KohaDates %]	5	[% USE KohaDates %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
7	[% formulaire = BLOCK %]	7	[% formulaire = BLOCK %]
8	[% INCLUDE 'patron-search.inc' %]	8	[% INCLUDE 'patron-search-header.inc' %]
9	[% END %]	9	[% END %]
10	[% USE AuthorisedValues %]	10	[% USE AuthorisedValues %]
11	[% USE TablesSettings %]	11	[% USE TablesSettings %]

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-1 / +1 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
6	[% formulaire = BLOCK %]	6	[% formulaire = BLOCK %]
7	[% INCLUDE 'patron-search.inc' %]	7	[% INCLUDE 'patron-search-header.inc' %]
8	[% END %]	8	[% END %]
9		9
10	[% PROCESS 'accounts.inc' %]	10	[% PROCESS 'accounts.inc' %]

Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-1 / +1 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
7	[% formulaire = BLOCK %]	7	[% formulaire = BLOCK %]
8	[% INCLUDE 'patron-search.inc' %]	8	[% INCLUDE 'patron-search-header.inc' %]
9	[% END %]	9	[% END %]
10		10
11	[% PROCESS 'accounts.inc' %]	11	[% PROCESS 'accounts.inc' %]

Lines 3-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt (-2 / +6 lines)
3	[% USE Branches %]	3	[% USE Branches %]
4	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
5	[% formulaire = BLOCK %]	5	[% formulaire = BLOCK %]
6	[% INCLUDE 'patron-search.inc' %]	6	[% INCLUDE 'patron-search-header.inc' %]
7	[% END %]	7	[% END %]
8	[% PROCESS 'permissions.inc' %]	8	[% PROCESS 'permissions.inc' %]
9	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
Lines 52-60 Link Here
52	<h2>Set permissions for [% INCLUDE 'patron-title.inc' no_html = 1 %]</h2>	52	<h2>Set permissions for [% INCLUDE 'patron-title.inc' no_html = 1 %]</h2>
53		53
54	<div id="permissionstree">	54	<div id="permissionstree">
55	<div id="permissions_toolbar" class="btn-toolbar">	55	<div id="permissions_toolbar" class="btn-toolbar" style="width: 851px !important;">
		56	<div id="up">
56	<button type="submit" class="principal"><i class="fa fa-save"></i> Save</button>	57	<button type="submit" class="principal"><i class="fa fa-save"></i> Save</button>
57	<a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber \| html %]"><i class="fa fa-remove"></i> Cancel</a>	58	<a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber \| html %]"><i class="fa fa-remove"></i> Cancel</a>
		59	</div>
		60	<div id="down">
58	<a class="toggleall toggleall_on btn btn-link" href="#"><i class="fa fa-plus-square-o"></i> Show all</a>	61	<a class="toggleall toggleall_on btn btn-link" href="#"><i class="fa fa-plus-square-o"></i> Show all</a>
59	<a class="toggleall toggleall_off btn btn-link" href="#"><i class="fa fa-minus-square-o"></i> Hide all</a>	62	<a class="toggleall toggleall_off btn btn-link" href="#"><i class="fa fa-minus-square-o"></i> Hide all</a>
60	<a id="CheckAllFlags" class="btn btn-link" href="#">	63	<a id="CheckAllFlags" class="btn btn-link" href="#">
Lines 68-73 Link Here
68	<a href="#" id="clear_filter" style="display:none"><i class="fa fa-remove"></i></a>	71	<a href="#" id="clear_filter" style="display:none"><i class="fa fa-remove"></i></a>
69	</div>	72	</div>
70	</div>	73	</div>
		74	</div>
71	<div class="permissions">	75	<div class="permissions">
72	[% FOREACH loo IN loop %]	76	[% FOREACH loo IN loop %]
73	[% IF ( loo.expand ) %]	77	[% IF ( loo.expand ) %]

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt (-1 / +1 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
6	[% formulaire = BLOCK %]	6	[% formulaire = BLOCK %]
7	[% INCLUDE 'patron-search.inc' %]	7	[% INCLUDE 'patron-search-header.inc' %]
8	[% END %]	8	[% END %]
9	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
10	<title>	10	<title>

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-1 / +1 lines)
6	[% USE Categories %]	6	[% USE Categories %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
8	[% formulaire = BLOCK %]	8	[% formulaire = BLOCK %]
9	[% INCLUDE 'patron-search-header.inc.inc' %]	9	[% INCLUDE 'patron-search-header.inc' %]
10	[% END %]	10	[% END %]
11	[% PROCESS 'patronfields.inc' %]	11	[% PROCESS 'patronfields.inc' %]
12	[% SET libraries = Branches.all %]	12	[% SET libraries = Branches.all %]

Lines 10-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-1 / +1 lines)
10	[% PROCESS 'member-alt-contact-style.inc' %]	10	[% PROCESS 'member-alt-contact-style.inc' %]
11	[% SET footerjs = 1 %]	11	[% SET footerjs = 1 %]
12	[% formulaire = BLOCK %]	12	[% formulaire = BLOCK %]
13	[% INCLUDE 'patron-search.inc' %]	13	[% INCLUDE 'patron-search-header.inc' %]
14	[% END %]	14	[% END %]
15	[% INCLUDE 'doc-head-open.inc' %]	15	[% INCLUDE 'doc-head-open.inc' %]
16	<title>	16	<title>

Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt (-1 / +1 lines)
5	[% USE KohaDates %]	5	[% USE KohaDates %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
7	[% formulaire = BLOCK %]	7	[% formulaire = BLOCK %]
8	[% INCLUDE 'patron-search.inc' %]	8	[% INCLUDE 'patron-search-header.inc' %]
9	[% END %]	9	[% END %]
10	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
11	<title>Merge patron records &rsaquo; Patrons &rsaquo; Koha</title>	11	<title>Merge patron records &rsaquo; Patrons &rsaquo; Koha</title>

Lines 12-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
12	[% PROCESS 'member-display-alt-address-style.inc' %]	12	[% PROCESS 'member-display-alt-address-style.inc' %]
13	[% SET footerjs = 1 %]	13	[% SET footerjs = 1 %]
14	[% formulaire = BLOCK %]	14	[% formulaire = BLOCK %]
15	[% INCLUDE 'patron-search.inc' %]	15	[% INCLUDE 'patron-search-header.inc' %]
16	[% END %]	16	[% END %]
17	[% INCLUDE 'doc-head-open.inc' %]	17	[% INCLUDE 'doc-head-open.inc' %]
18	[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") \| $raw %]	18	[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") \| $raw %]

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt (-1 / +1 lines)
6	[% USE KohaDates %]	6	[% USE KohaDates %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
8	[% formulaire = BLOCK %]	8	[% formulaire = BLOCK %]
9	[% INCLUDE 'patron-search.inc' %]	9	[% INCLUDE 'patron-search-header.inc' %]
10	[% END %]	10	[% END %]
11	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
12	<title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>	12	<title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>

Lines 8-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-1 / +1 lines)
8	[% USE KohaDates %]	8	[% USE KohaDates %]
9	[% SET footerjs = 1 %]	9	[% SET footerjs = 1 %]
10	[% formulaire = BLOCK %]	10	[% formulaire = BLOCK %]
11	[% INCLUDE 'patron-search.inc' %]	11	[% INCLUDE 'patron-search-header.inc' %]
12	[% END %]	12	[% END %]
13	[% PROCESS 'accounts.inc' %]	13	[% PROCESS 'accounts.inc' %]
14	[% INCLUDE 'doc-head-open.inc' %]	14	[% INCLUDE 'doc-head-open.inc' %]

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-1 / +1 lines)
6	[% USE Price %]	6	[% USE Price %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
8	[% formulaire = BLOCK %]	8	[% formulaire = BLOCK %]
9	[% INCLUDE 'patron-search.inc' %]	9	[% INCLUDE 'patron-search-header.inc' %]
10	[% END %]	10	[% END %]
11	[% PROCESS 'accounts.inc' %]	11	[% PROCESS 'accounts.inc' %]
12	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt (-1 / +1 lines)
6	[% USE Branches %]	6	[% USE Branches %]
7	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
8	[% formulaire = BLOCK %]	8	[% formulaire = BLOCK %]
9	[% INCLUDE 'patron-search.inc' %]	9	[% INCLUDE 'patron-search-header.inc' %]
10	[% END %]	10	[% END %]
11	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
12	<title>Purchase suggestions for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>	12	<title>Purchase suggestions for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>

Lines 7-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt (-1 / +1 lines)
7	[% USE TablesSettings %]	7	[% USE TablesSettings %]
8	[% SET footerjs = 1 %]	8	[% SET footerjs = 1 %]
9	[% formulaire = BLOCK %]	9	[% formulaire = BLOCK %]
10	[% INCLUDE 'patron-search.inc' %]	10	[% INCLUDE 'patron-search-header.inc' %]
11	[% END %]	11	[% END %]
12	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
13	<title>Circulation history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>	13	<title>Circulation history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>




[% 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' form=formulaire %]
    [% INCLUDE 'patron-search.inc' %]

    <div id="breadcrumbs">
        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;

Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt (-1 / +1 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
7	[% formulaire = BLOCK %]	7	[% formulaire = BLOCK %]
8	[% INCLUDE 'patron-search.inc' %]	8	[% INCLUDE 'patron-search-header.inc' %]
9	[% END %]	9	[% END %]
10	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
11	<title>Subscription routing lists for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>	11	<title>Subscription routing lists for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>

Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt (-1 / +1 lines)
5	[% USE Branches %]	5	[% USE Branches %]
6	[% SET footerjs = 1 %]	6	[% SET footerjs = 1 %]
7	[% formulaire = BLOCK %]	7	[% formulaire = BLOCK %]
8	[% INCLUDE 'patron-search.inc' %]	8	[% INCLUDE 'patron-search-header.inc' %]
9	[% END %]	9	[% END %]
10	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
11	<title>	11	<title>




[% USE Koha %]
[% USE Asset %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'patron-search-header.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Two-factor authentication &rsaquo; Patrons &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="pat_two_factor_auth" class="pat">
[% INCLUDE 'header.inc' form=formulaire %]
[% INCLUDE 'patron-search.inc' %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
    <ol>

Lines 9-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt (-1 / +1 lines)
9	<div class="row">	9	<div class="row">
10	<div id="onboarding-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">	10	<div id="onboarding-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
11	<div id="logo"><a href="#">Koha</a></div>	11	<div id="logo"><a href="#">Koha</a></div>
12	<h1>Web installer &rsaquo; Create a library</h1>	12	<h2>Web installer &rsaquo; Create a library</h2>
13		13
14	[% INCLUDE 'onboarding_messages.inc' %]	14	[% INCLUDE 'onboarding_messages.inc' %]
15		15

Lines 19-25 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt (-1 / +1 lines)
19	<div id="onboarding-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">	19	<div id="onboarding-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
20	<div id="logo"><a href="#">Koha</a></div>	20	<div id="logo"><a href="#">Koha</a></div>
21		21
22	<h1>Web installer &rsaquo; Create a patron category</h1>	22	<h2>Web installer &rsaquo; Create a patron category</h2>
23		23
24	[% INCLUDE 'onboarding_messages.inc' %]	24	[% INCLUDE 'onboarding_messages.inc' %]
25		25

Lines 11-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt (-1 / +1 lines)
11	<div class="row">	11	<div class="row">
12	<div id="onboarding-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">	12	<div id="onboarding-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
13	<div id="logo"><a href="#">Koha</a></div>	13	<div id="logo"><a href="#">Koha</a></div>
14	<h1>Web installer &rsaquo; Create Koha administrator patron</h1>	14	<h2>Web installer &rsaquo; Create Koha administrator patron</h2>
15		15
16	[% INCLUDE 'onboarding_messages.inc' %]	16	[% INCLUDE 'onboarding_messages.inc' %]
17		17

Lines 8-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt (-1 / +1 lines)
8	<div class="row">	8	<div class="row">
9	<div id="onboarding-step4" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">	9	<div id="onboarding-step4" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
10	<div id="logo"><a href="#">Koha</a></div>	10	<div id="logo"><a href="#">Koha</a></div>
11	<h1>Web installer &rsaquo; Create a new item type</h1>	11	<h2>Web installer &rsaquo; Create a new item type</h2>
12		12
13	[% INCLUDE 'onboarding_messages.inc' %]	13	[% INCLUDE 'onboarding_messages.inc' %]
14		14

Lines 17-23 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt (-1 / +1 lines)
17		17
18	[% IF all_done %]	18	[% IF all_done %]
19		19
20	<h1>Web installer &rsaquo; Complete</h1>	20	<h2>Web installer &rsaquo; Complete</h2>
21	[% INCLUDE 'onboarding_messages.inc' %]	21	[% INCLUDE 'onboarding_messages.inc' %]
22		22
23	<div id="steps">	23	<div id="steps">

Lines 315-325 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt (-3 / +3 lines)
315	[% IF category == 'news' %]	315	[% IF category == 'news' %]
316	See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations" id="lientype">HTML customizations</a>	316	See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations" id="lientype">HTML customizations</a>
317	[% ELSE %]	317	[% ELSE %]
318	See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a>	318	See <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news" id="lientype">News</a>
319	[% END %]	319	[% END %]
320	[% IF ( CAN_user_parameters_manage_sysprefs ) %]	320	[% IF ( CAN_user_parameters_manage_sysprefs ) %]
321	<a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserJS'>OPACUserJS</a>	321	<a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserJS' id="lientype">OPACUserJS</a>
322	<a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserCSS'>OPACUserCSS</a>	322	<a class="syspref-link" href='/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserCSS' id="lientype">OPACUserCSS</a>
323	[% END %]	323	[% END %]
324		324
325	[% IF additional_contents.count %]	325	[% IF additional_contents.count %]




            </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="col-sm-10 col-sm-push-2">
            <main>

                <h2>[% Branches.GetName( branch ) | html %] calendar</h2>

                <div class="row">
                    <div class="col-sm-6">

                        <div class="panel" id="showHoliday">
                            <form action="/cgi-bin/koha/tools/exceptionHolidays.pl" method="post">
                                <input type="hidden" id="showHolidayType" name="showHolidayType" value="" />
                                <fieldset>
                                    <h3>Edit this holiday</h3>
                                    <span id="holtype"></span>
                                    <ol>

                                        <!-- showTitle is necessary for exception radio button to work properly -->
                                        <li>
                                            <label for="showDescription">Description:</label>
                                            <textarea rows="2" cols="40" id="showDescription" name="showDescription"></textarea>
                                        </li>
                                        <li class="radio">
                                            <div class="exceptionPossibility" style="position:static">
                                                <input type="radio" name="showOperation" id="showOperationExc" value="exception" /> <label for="showOperationExc">Generate an exception for this repeated holiday.</label>
                                                <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>

                                            <div class="hint">If checked, changes for this holiday will be copied to all libraries. If the holiday doesn't exists for a library, no change is made.</div>
                                        </li>
                                    </ol>
                                    <fieldset class="action">
                                        <input type="submit" class="principal" name="submit" value="Save" />
                                        <a href="#" class="cancel hidePanel showHoliday">Cancel</a>
                                    </fieldset>
                                </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>
                                    <h3>Add new holiday</h3>
                                    <ol>
                                        <li>

                                        </li>
                                    </ol>
                                    <fieldset class="action">
                                        <input type="submit" class="principal" name="submit" value="Save" />
                                        <a href="#" class="cancel hidePanel newHoliday">Cancel</a>
                                    </fieldset>
                                </fieldset>œ
                            </form>
                        </div> <!-- /#newHoliday -->


                                        <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
                                    [% END %]
                                </select>
                                <input type="submit" class="principal" value="Copy" />
                            </form>
                        </div>
                    </div> <!-- /.col-sm-6 -->




[% USE KohaDates %]
[% SET footerjs = 1 %]
[% formulaire = BLOCK %]
    [% INCLUDE 'circ-search.inc' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>

[% END %]

[% IF op == 'list' %]
<<<<<<< HEAD
    <h2>Lists</h2>
=======
>>>>>>> Bug 30952: Virtualshelves Module
    <div id="tabs" class="toptabs">
    <fieldset class="briefgr">
        <ul>
- 

Return to bug 30952

Lines 909-921 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-8 lines)
909	document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";	909	document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
910	}	910	}
911		911
912	<<<<<<< HEAD
913	patrons_table.DataTable().draw();
914	[% IF display_search_description %]
915	update_search_description();
916	[% END %]
917	}
918	=======
919	function taille(el){	912	function taille(el){
920	var offsetWidth = document.getElementById('taille').offsetWidth +5;	913	var offsetWidth = document.getElementById('taille').offsetWidth +5;
921	el.style = "width:calc(500px - "+offsetWidth+"px)";	914	el.style = "width:calc(500px - "+offsetWidth+"px)";
Lines 932-938 Link Here
932		925
933		926
934	</script>	927	</script>
935	>>>>>>> Bug 30952: Search bar
936		928
937	// modify parent window owner element	929	// modify parent window owner element
938	function add_user(borrowernumber, borrowername) {	930	function add_user(borrowernumber, borrowername) {

Lines 20-26 a:hover { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/login.css (-4 / +14 lines)
20	}	20	}
21		21
22	body {	22	body {
23	background: #f5f5f5;	23	background: #f3f4f4;
24	}	24	}
25		25
26	form, label input {	26	form, label input {
Lines 42-48 label { Link Here
42		42
43	#login {	43	#login {
44	background: #fff;	44	background: #fff;
45	border: 1px solid #a2a2a2;	45	border: none;
		46	box-shadow: 8px 8px 12px rgb(170 170 170);
46	margin: 4em auto;	47	margin: 4em auto;
47	padding: 1.5em;	48	padding: 1.5em;
48	position : relative;	49	position : relative;
Lines 107-112 label { Link Here
107	#login #submit-button, #login .button {	108	#login #submit-button, #login .button {
108	font-size: 1.4em;	109	font-size: 1.4em;
109	padding : .3em .6em;	110	padding : .3em .6em;
		111	background: rgba(254, 195, 44, 1);
		112	border: none;
		113	color: #000;
		114	}
		115
		116	#login #submit-button:hover, #login #submit-button:focus, #login #submit-button:active{
		117	background: rgba(254, 195, 44, 0.7) !important;
		118	border: none;
110	}	119	}
111		120
112	#login #onerror_actions {	121	#login #onerror_actions {
Lines 145-151 label { Link Here
145	}	154	}
146		155
147	.submit input:active, .button:active {	156	.submit input:active, .button:active {
148	background: #f4f4f4;	157	background: #fff;
149	border: 1px solid #999;	158	border: 1px solid #999;
150	border-left-color: #999;	159	border-left-color: #999;
151	border-top-color: #999;	160	border-top-color: #999;
Lines 155-162 label { Link Here
155	text-align: right;	164	text-align: right;
156	}	165	}
157		166
		167
158	textarea, input, select {	168	textarea, input, select {
159	background: #f4f4f4;	169	background: #fff;
160	border: 1px solid #b2b2b2;	170	border: 1px solid #b2b2b2;
161	color: #000;	171	color: #000;
162	font: 13px Verdana, Arial, Helvetica, sans-serif;	172	font: 13px Verdana, Arial, Helvetica, sans-serif;

Lines 37-43 a { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-11 / +130 lines)
37	&.btn {	37	&.btn {
38	&:link,	38	&:link,
39	&:visited {	39	&:visited {
40	color: #71B443;	40	//color: #71B443;
41	padding: 6px 25px;	41	padding: 6px 25px;
42	}	42	}
43		43
Lines 55-60 a { Link Here
55		55
56	}	56	}
57		57
		58	&.lientype{
		59	color: #71B443;
		60	padding: .3em;
		61	border: none;
		62	background-color: transparent;
		63	border: none;
		64	box-shadow: none;
		65	font-size: 100%;
		66
		67	&:hover, &:focus, &:active{
		68	text-decoration: underline;
		69	color: #71B443;
		70	padding: .3em;
		71	border: none;
		72	background-color: transparent;
		73	border: none;
		74	box-shadow: none;
		75	font-size: 100%;
		76	}
		77	}
		78
58	&.cancel {	79	&.cancel {
59		80
60	background-color: transparent;	81	background-color: transparent;
Lines 640-645 hr { Link Here
640		661
641	p {	662	p {
642	margin: .7em 0;	663	margin: .7em 0;
		664
		665	&.plus{
		666	background-color: #352C2E;
		667	height: 100% !important;
		668	top: 30px;
		669	border-bottom-left-radius: 17px;
		670	border-bottom-right-radius: 17px;
		671
		672	input{
		673	outline-offset: 0px;
		674	outline: 1px black;
		675	float: right;
		676	height: 30px;
		677	border-radius: 17px;
		678	padding-left: 2em;
		679	padding-right: 1.5em;
		680	border: none;
		681	margin-left: 0px;
		682	position: absolute;
		683	top: -5px;
		684	right: 30px;
		685	z-index: 100;
		686	display: inline-block !important;
		687	letter-spacing: normal;
		688	word-spacing: normal;
		689	text-transform: none;
		690	text-indent: 0px;
		691	text-shadow: none;
		692	text-align: start;
		693	cursor: text;
		694	font: 400 13.3333px Arial;
		695	}
		696	}
643	}	697	}
644		698
645	strong {	699	strong {
Lines 832-838 label, Link Here
832	align-items: center;	886	align-items: center;
833	justify-content: center;	887	justify-content: center;
834	flex-wrap: wrap;	888	flex-wrap: wrap;
835	width: 150px;	889	width: 200px;
836	height: 150px;	890	height: 150px;
837	margin-right: auto;	891	margin-right: auto;
838	margin-left: auto;	892	margin-left: auto;
Lines 885-893 label, Link Here
885	border-color: #418940;	939	border-color: #418940;
886	}	940	}
887		941
888	h1{
889	font-weight: bold;
890	}
891	}	942	}
892	}	943	}
893		944
Lines 1204-1209 ol { Link Here
1204	}	1255	}
1205		1256
1206	fieldset {	1257	fieldset {
		1258	overflow: auto;
1207	background-color: #FFF;	1259	background-color: #FFF;
1208	position: relative;	1260	position: relative;
1209	color: #696969;	1261	color: #696969;
Lines 2088-2093 dd { Link Here
2088	position: relative;	2140	position: relative;
2089	float: right;	2141	float: right;
2090	height: 100%;	2142	height: 100%;
		2143	padding: 0.3em;
2091		2144
2092	.dropdown-menu {	2145	.dropdown-menu {
2093	/*border-top-width: 1px;	2146	/*border-top-width: 1px;
Lines 2154-2159 dd { Link Here
2154	}	2207	}
2155	}	2208	}
2156		2209
		2210	#up{
		2211	display: table;
		2212	}
		2213
		2214	#down{
		2215	display: table;
		2216	}
		2217
2157	#patdrop{	2218	#patdrop{
2158	border-top-width: 1px;	2219	border-top-width: 1px;
2159	text-align: center;	2220	text-align: center;
Lines 2197-2202 dd { Link Here
2197	border-radius: 0;	2258	border-radius: 0;
2198	margin-top: 0;	2259	margin-top: 0;
2199	z-index: 300;	2260	z-index: 300;
		2261	left: auto !important;
		2262	width: 851px;
2200	}	2263	}
2201		2264
2202	a.addtocart {	2265	a.addtocart {
Lines 3258-3264 td { Link Here
3258	}	3321	}
3259	}	3322	}
3260		3323
3261	#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{	3324	#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{
3262	color: #71B443;	3325	color: #71B443;
3263	padding: .3em;	3326	padding: .3em;
3264	border: none;	3327	border: none;
Lines 4311-4317 nav { Link Here
4311	// top: 0px;	4374	// top: 0px;
4312	//position: absolute;	4375	//position: absolute;
4313	//right: 5px;	4376	//right: 5px;
4314	overflow-x: hidden;	4377	//overflow-x: hidden;
		4378	//overflow-y: visible;
4315	display: block !important;	4379	display: block !important;
4316	height: auto !important;	4380	height: auto !important;
4317	}	4381	}
Lines 4353-4358 nav { Link Here
4353	li {	4417	li {
4354	list-style: none;	4418	list-style: none;
4355		4419
		4420	.filteraction{
		4421	position: absolute;
		4422	right: 30px;
		4423	top: -5px;
		4424	width: 25px;
		4425	height: 30px;
		4426	border: none;
		4427	padding-left: 5px;
		4428	padding-right: 5px;
		4429	margin: 0;
		4430	display: inline;
		4431
		4432	a{
		4433	color: #71B443;
		4434	vertical-align: middle;
		4435
		4436	&:hover, &:active{
		4437	background-color: transparent;
		4438	//font-weight: bold;
		4439	text-decoration: none;
		4440
		4441	}
		4442	}
		4443
		4444	}
		4445
4356	.residentsearch {	4446	.residentsearch {
4357	border: 0;	4447	border: 0;
4358	//border-bottom: 1px solid #85CA11;	4448	//border-bottom: 1px solid #85CA11;
Lines 4387-4394 nav { Link Here
4387	position: relative;	4477	position: relative;
4388	left: 0px;	4478	left: 0px;
4389	top: 0px;	4479	top: 0px;
		4480	width: 500px;
4390	//line-height: 40px;	4481	//line-height: 40px;
4391	overflow: hidden;	4482	// overflow: hidden;
4392	display: block;	4483	display: block;
4393	margin: 10px 0;	4484	margin: 10px 0;
4394	}	4485	}
Lines 4396-4403 nav { Link Here
4396	#submit, #autocsubmit{	4487	#submit, #autocsubmit{
4397	background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%;	4488	background: transparent url("../img/UIKit/arrow.svg") no-repeat scroll 0%;
4398	position: absolute;	4489	position: absolute;
4399	// right : 0px;	4490	min-width: 7px;
4400	right : -65px;	4491	right: 0;
4401	top: 0px;	4492	top: 0px;
4402	width: 25px;	4493	width: 25px;
4403	height: 30px;	4494	height: 30px;
Lines 6130-6135 input.renew { Link Here
6130	//font-size: 150%;	6221	//font-size: 150%;
6131		6222
6132	i{	6223	i{
		6224
6133	&.fa{	6225	&.fa{
6134	color: #fff;	6226	color: #fff;
6135	border-radius: 50%;	6227	border-radius: 50%;
Lines 6146-6151 input.renew { Link Here
6146	border: solid 3px #71B443;	6238	border: solid 3px #71B443;
6147	}	6239	}
6148		6240
		6241	&.fond{
		6242	opacity: 70%;
		6243	position: relative;
		6244	top: 5px;
		6245	border: none;
		6246	right: 20px;
		6247	border-radius: 0;
		6248	background-color: transparent;
		6249	width: auto;
		6250	height: auto;
		6251	margin: 0;
		6252	padding: 0;
		6253	}
		6254
6149	}	6255	}
6150		6256
6151	h1 {	6257	h1 {
Lines 6163-6172 input.renew { Link Here
6163	background-color: #418940;	6269	background-color: #418940;
6164	border: solid 3px #418940;	6270	border: solid 3px #418940;
6165	}	6271	}
		6272	&.fond{
		6273	opacity: 70%;
		6274	position: relative;
		6275	top: 5px;
		6276	border: none;
		6277	right: 20px;
		6278	border-radius: 0;
		6279	background-color: transparent;
		6280	width: auto;
		6281	height: auto;
		6282	margin: 0;
		6283	padding: 0;
		6284	}
6166	}	6285	}
6167		6286
6168	h1{	6287	h1{
6169	font-weight: bold;	6288	//font-weight: bold;
6170	}	6289	}
6171	}	6290	}
6172	}	6291	}

Lines 1-33 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc (-24 / +25 lines)
1	[% USE Koha %]
2	[% PROCESS 'html_helpers.inc' %]
3	[% PROCESS 'patronfields.inc' %]
4	<!-- Begin Acquisitions Resident Search Box -->	1	<!-- Begin Acquisitions Resident Search Box -->
5		2
6	<div id="header_search" class="fold">	3	<div id="header_search" class="fold">
7	<div id="supplier_search" class="residentsearch">	4	<div id="supplier_search" class="residentsearch">
8	<form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">	5	<form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
9	<input type="text" name="supplier" id="supplier" class="focus" placeholder="Search vendors" />	6	<input type="text" name="supplier" id="supplier" class="head-searchbox focus" placeholder="Search vendors" />
10	<input type="submit" id="submit" value="" />	7	<input type="submit" id="submit" value="" />
11	</form>	8	</form>
12	</div>	9	</div>
13		10
14	<div id="orders_search" class="residentsearch">	11	<div id="orders_search" class="residentsearch">
15	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">	12	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
16	<input type="text" id="title" name="title" class="focus" value="[% title \| html %]" placeholder="Title" />	13	<input type="text" id="title" style="display:inline;left: 125px;" class="focus" placeholder="Title" name="title" size="13" value="[% title \| html %]" />
17	<input type="text" id="title" name="name" class="focus" value="[% name \| html %]" placeholder="Vendor" />	14	<input type="text" id="searchsupplier" style="display:inline" class="focus" placeholder="Vendor" name="name" size="13" value="[% name \| html %]" />
18	<input type="hidden" id="do_search" name="do_search" value="do" />	15	<input type="hidden" id="do_search" name="do_search" value="do" />
19	<span class="filteraction" id="filteraction_off" style="display:none"> <a id="plus" href="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span>	16	<span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span>
20	<span class="filteraction" id="filteraction_on"> <a id="plus" href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span>	17	<span class="filteraction" id="filteraction_on"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span>
21	<input value="" id="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a>	18	<input value="" class="submit" id="submit" type="submit" />
22		19
23	<p id="filters" class="plus" style="display:none">	20	<p class="plus" id="filters" style="display:none">
24	<input type="text" name="basket" id="basket" placeholder="Basket" />	21	<input type="text" style="right: 260px" placeholder="Basket" name="basket" id="basket" />
25	<input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" placeholder="Invoice number" />	22	<input type="text" placeholder="Invoice number" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
26	</p>	23	</p>
27	</form>	24	</form>
28	</div>	25	</div>
		26
29		27
30	<ul>	28	<ul id="taille">
31	<li><a id="button_1" title="Vendor search" onclick="clique(this)" class="iconsearch" href="#supplier_search"><i class="fa fa-upload"></i></a></li>	29	<li><a id="button_1" title="Vendor search" onclick="clique(this)" class="iconsearch" href="#supplier_search"><i class="fa fa-upload"></i></a></li>
32	<li><a id="button_2" title="Orders search" onclick="clique(this)" class="iconsearch" href="#orders_search"><i class="fa fa-download"></i></a></li>	30	<li><a id="button_2" title="Orders search" onclick="clique(this)" class="iconsearch" href="#orders_search"><i class="fa fa-download"></i></a></li>
33		31
Lines 37-43 Link Here
37	</div>	35	</div>
38		36
39		37
40		38
41	<script type="text/javascript">	39	<script type="text/javascript">
42	function focusInput(){	40	function focusInput(){
43	document.getElementsByClassName('head-searchbox').focus();	41	document.getElementsByClassName('head-searchbox').focus();
Lines 78-85 Link Here
78	if (elem == iconssearch[i]){	76	if (elem == iconssearch[i]){
79	inputssearch[i].classList.add('focus');	77	inputssearch[i].classList.add('focus');
80		78
81	var offsetWidth = buttonssearch[i].offsetWidth +5;	79	taille(inputssearch[i])
82	inputssearch[i].style = "width:calc(355px - "+offsetWidth+"px)";
83	}	80	}
84	}	81	}
85		82
Lines 89-103 Link Here
89		86
90	function fold(){	87	function fold(){
91	document.getElementById('header_search').classList.add('fold');	88	document.getElementById('header_search').classList.add('fold');
92	// document.getElementsByClassName('head-searchbox').style = "width:calc(355px - 100px)";	89	// document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
93	setTimeout(	90	setTimeout(
94	function(){	91	function(){
95	var offsetWidth = document.getElementsByClassName('buttonsearch').offsetWidth +5;	92	var offsetWidth = document.getElementById('taille').offsetWidth +5;
96	document.getElementsByClassName('head-searchbox').style = "width:calc(355px - "+offsetWidth+"px)";	93	document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
97	}	94	}
98	, 250);	95	, 250);
99	}	96	}
100		97
		98	function taille(el){
		99	var offsetWidth = document.getElementById('taille').offsetWidth +5;
		100	el.style = "width:calc(500px - "+offsetWidth+"px)";
		101	}
		102
101	$('.btn').click(function(){	103	$('.btn').click(function(){
102	if($(this).hasClass('active')){	104	if($(this).hasClass('active')){
103	$(this).removeClass('active')	105	$(this).removeClass('active')
Lines 106-114 Link Here
106	}	108	}
107	});	109	});
108		110
109
110
111	</script>	111	</script>
		112
112		113
113	<!-- /header_search -->	114	<!-- /header_search -->
114	<!-- End Main page Resident Search Box -->	115	<!-- End Main page Resident Search Box -->

Lines 1-58 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc (-55 / +55 lines)
		1	<!-- Begin main page resident search box -->
		2	<div id="header_search" class="fold">
1		3
2	<div id="header_search">
3	[% INCLUDE 'patron-search-box.inc' %]	4	[% INCLUDE 'patron-search-box.inc' %]
4		5
5	[% IF (CAN_user_circulate_circulate_remaining_permissions) %]	6	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
6	<div id="checkout_search" class="residentsearch">	7	<div id="checkin_search" class="residentsearch">
7	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">	8	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
8	<input id="inputsearch" class="inpu focus" type="text" autocomplete="off" placeholder="Enter patron card number or partial name" />	9	<input type="text" name="barcode" placeholder="Scan a barcode to check in" class="head-searchbox focus" id="ret_barcode" size="40" accesskey="r" />
9	<input type="hidden" name="quicksearch" value="1" />	10	<input value="" class="submit" id="submit" type="submit" />
10	<input value="" type="submit" id="submitsearch" />	11	</form>
11	</form>	12	</div>
12	</div>	13	<div id="renew_search" class="residentsearch">
13		14	<form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
14	<div id="checkin_search" class="residentsearch">	15	<input type="text" class="head-searchbox focus" placeholder="Scan a barcode to renew" name="barcode" id="ren_barcode" size="40" />
15	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">	16	<input value="" class="submit" id="submit" type="submit" />
16	<input name="barcode" id="inputsearch" class="inpu" accesskey="r" type="text" placeholder="Scan a barcode to check in" />	17	</form>
17	<input value="" type="submit" id="submitsearch" />	18	</div>
18	</form>
19	</div>
20
21	<div id="renew_search" class="residentsearch">
22	<form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
23	<input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Scan a barcode to renew" />
24	<input value="" type="submit" id="submitsearch" />
25	</form>
26	</div>
27	[% END %]	19	[% END %]
28		20
29	[% IF CAN_user_borrowers_edit_borrowers %]	21	[% IF CAN_user_borrowers_edit_borrowers %]
30	<div id="patron_search" class="residentsearch">	22	<div id="patron_search" class="residentsearch">
31	<form action="/cgi-bin/koha/members/member.pl" method="post">	23	<form action="/cgi-bin/koha/members/member.pl" method="post">
32	<input name="searchmember" class="head-searchbox" id="inputsearch" class="inpu" type="text" placeholder="Enter patron card number or partial name" />	24	<input name="searchmember" class="head-searchbox focus" placeholder="Enter patron card number or partial name" id="searchmember" size="40" type="text" />
33	<input type="hidden" name="quicksearch" value="1" />	25	<input type="hidden" name="quicksearch" value="1" />
34	<input value="" id="submitsearch" type="submit" />	26	<input value="" class="submit" id="submit" type="submit" />
35	</form>	27	</form>
36	</div>	28	</div>
37	[% END %]	29	[% END %]
38		30
39	<ul>	31	<ul id="taille">
40	<span id="buttonssearch">	32	[% 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 %]
41	<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>	33	[% 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 %]
42	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_1" onclick="toggle(this)" class="buttonsearch active" href="#circ_search">Check-out</span>[% END %]	34	[% 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 %]
43	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_2" onclick="toggle(this)" class="buttonsearch" href="#checkin_search">Check-in</span>[% END %]	35	[% 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 %]
44	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<span id="button_3" onclick="toggle(this)" class="buttonsearch" href="#renew_search">Renew</span>[% END %]	36
45	[% IF ( CAN_user_borrowers_edit_borrowers ) %]<span id="button_4" onclick="toggle(this)" class="buttonsearch" href="#patron_search">Search patrons</span>[% END %]	37	<span id="button_1" class="buttonsearch active">Check out</span>
46	</span>	38	<span id="button_2" class="buttonsearch">Check in</span>
		39	<span id="button_3" class="buttonsearch">Renew</span>
		40	<span id="button_4" class="buttonsearch">Search patrons</span>
47	</ul>	41	</ul>
48	</div>	42
49		43
50	<script type="text/javascript">	44	<script type="text/javascript">
51	function focusInput(){	45	function focusInput(){
52	document.getElementById('inputsearch').focus();	46	document.getElementsByClassName('head-searchbox').focus();
53	}	47	}
54		48
55	function toggle(elem){	49	function toggle(elem){style="width: calc(301px);"
56	var buttonssearch = document.getElementsByClassName('active');	50	var buttonssearch = document.getElementsByClassName('active');
57	for (var i = buttonssearch.length - 1; i >= 0; i--) {	51	for (var i = buttonssearch.length - 1; i >= 0; i--) {
58	buttonssearch[i].classList.remove('active');	52	buttonssearch[i].classList.remove('active');
Lines 63-79 Link Here
63	fold();	57	fold();
64	}else{//Back	58	}else{//Back
65	document.getElementById('button_1').classList.add('active');	59	document.getElementById('button_1').classList.add('active');
66	document.getElementById('containersearch').classList.remove('fold');	60	document.getElementById('header_search').classList.remove('fold');
67	document.getElementById('inputsearch').style = '';	61	document.getElementsByClassName('head-searchbox').style = '';
68	}	62	}
69		63
70	focusInput();	64	focusInput();
71	}	65	}
72		66
73	function clique(elem){	67	function clique(elem){
74	var buttonssearch = document.getElementsByClassName('buttonsearch');	68	var buttonssearch = document.getElementsByClassName('buttonsearch');
75	var iconssearch = document.getElementsByClassName('iconsearch');	69	var iconssearch = document.getElementsByClassName('iconsearch');
76	var inputssearch = document.getElementsByClassName('inpu');	70	var inputssearch = document.getElementsByClassName('head-searchbox');
77	for (var i = buttonssearch.length - 1; i >= 0; i--) {	71	for (var i = buttonssearch.length - 1; i >= 0; i--) {
78	buttonssearch[i].classList.remove('active');	72	buttonssearch[i].classList.remove('active');
79	if (elem == iconssearch[i]){	73	if (elem == iconssearch[i]){
Lines 86-111 Link Here
86		80
87	if (elem == iconssearch[i]){	81	if (elem == iconssearch[i]){
88	inputssearch[i].classList.add('focus');	82	inputssearch[i].classList.add('focus');
		83
		84	taille(inputssearch[i])
89	}	85	}
90	}	86	}
91		87
92	focusInput();	88	focusInput();
93	fold(elem);	89	fold();
94	}	90	}
95		91
96	function fold(elem){	92	function fold(){
97	document.getElementById('containersearch').classList.add('fold');	93	document.getElementById('header_search').classList.add('fold');
98	// document.getElementById('inputsearch').style = "width:calc(500px - 100px)";	94	// document.getElementsByClassName('head-searchbox').style = "width:calc(500px - 100px)";
99	setTimeout(	95	setTimeout(
100	function(){	96	function(){
101	var offsetWidth = document.getElementById('buttonssearch').offsetWidth +5;	97	var offsetWidth = document.getElementById('taille').offsetWidth +5;
102	document.getElementById('inputsearch').style = "width:calc(500px - "+offsetWidth+"px)";	98	document.getElementsByClassName('head-searchbox').style = "width:calc(500px - "+offsetWidth+"px)";
103	}	99	}
104	, 250);	100	, 250);
105	}	101	}
106		102
107		103	function taille(el){
108		104	var offsetWidth = document.getElementById('taille').offsetWidth +5;
		105	el.style = "width:calc(500px - "+offsetWidth+"px)";
		106	}
109		107
110	$('.btn').click(function(){	108	$('.btn').click(function(){
111	if($(this).hasClass('active')){	109	if($(this).hasClass('active')){
Lines 114-123 Link Here
114	$(this).addClass('active')	112	$(this).addClass('active')
115	}	113	}
116	});	114	});
		115
117	</script>	116	</script>
118		117
119	<!-- /header_search -->	118	<!-- /header_search -->
120	<!-- End Main page Resident Search Box -->	119	<!-- End Main page Resident Search Box -->
121		120
		121
122	</div><!-- /#header_search -->	122	</div><!-- /#header_search -->
123	<!-- End advanced search page resident search box -->	123	<!-- End advanced search page resident search box -->

Lines 54-60 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc (-4 / +4 lines)
54	<option value="">None</option>	54	<option value="">None</option>
55	[% END %]	55	[% END %]
56	</select>	56	</select>
57	<input type="submit" class="submit" value="Submit" />	57	<input type="submit" class="submit principal" value="Submit" />
58	</form>	58	</form>
59	</div>	59	</div>
60	<div id="main_heading" class="residentsearch">	60	<div id="main_heading" class="residentsearch">
Lines 110-116 Link Here
110	<option value="">None</option>	110	<option value="">None</option>
111	[% END %]	111	[% END %]
112	</select>	112	</select>
113	<input type="submit" class="submit" value="Submit" />	113	<input type="submit" class="submit principal" value="Submit" />
114	</form>	114	</form>
115	</div>	115	</div>
116	<div id="matchheading_search" class="residentsearch">	116	<div id="matchheading_search" class="residentsearch">
Lines 164-170 Link Here
164	<option value="">None</option>	164	<option value="">None</option>
165	[% END %]	165	[% END %]
166	</select>	166	</select>
167	<input type="submit" class="submit" value="Submit" />	167	<input type="submit" class="submit principal" value="Submit" />
168	</form>	168	</form>
169	</div>	169	</div>
170	<div id="entire_record" class="residentsearch">	170	<div id="entire_record" class="residentsearch">
Lines 220-226 Link Here
220	<option value="">None</option>	220	<option value="">None</option>
221	[% END %]	221	[% END %]
222	</select>	222	</select>
223	<input type="submit" class="submit" value="Submit" />	223	<input type="submit" class="submit principal" value="Submit" />
224	</form>	224	</form>
225	</div>	225	</div>
226	<ul>	226	<ul>

Lines 1-37 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search-pareilquecirc-search.inc (-37 lines)
1	[% USE Koha %]
2	<div class="gradient">
3	<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName \| html %]</a></div><!-- Begin Catalogue Resident Search Box -->
4	<div id="header_search">
5
6	[% INCLUDE 'patron-search-box.inc' %]
7
8	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
9	<div id="checkin_search" class="residentsearch">
10	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
11	<label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
12	<input class="head-searchbox" name="barcode" id="ret_barcode" size="40" type="text" />
13
14	<input value="Submit" class="submit" type="submit" />
15	</form>
16	</div>
17	<div id="renew_search" class="residentsearch">
18	<form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
19	<label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
20	<input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
21	<input value="Submit" class="submit" type="submit" />
22	</form>
23	</div>
24	[% END %]
25
26	[% INCLUDE 'catalogue-search-box.inc' %]
27
28	<ul>
29	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
30	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
31	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
32	[% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-active"><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
33	</ul>
34
35	</div><!-- /header_search -->
36	</div><!-- /gradient -->
37	<!-- End Catalogue Resident Search Box -->

Lines 8-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc (-6 / +6 lines)
8	<div>	8	<div>
9	<div id="addbooks_search" class="residentsearch">	9	<div id="addbooks_search" class="residentsearch">
10	<form name="search" action="addbooks.pl">	10	<form name="search" action="addbooks.pl">
11	<input class="head-searchbox" type="text" name="q" id="cat_search" placeholder="Search the catalog and the reservoir" />	11	<input class="head-searchbox focus" type="text" name="q" id="cat_search" placeholder="Search the catalog and the reservoir" />
12	<input type="submit" id="submit" value="" />	12	<input type="submit" id="submit" value="" />
13	</form>	13	</form>
14	</div>	14	</div>
Lines 18-31 Link Here
18	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]	18	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
19	<div id="checkin_search" class="residentsearch">	19	<div id="checkin_search" class="residentsearch">
20	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">	20	<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
21	<input class="head-searchbox" name="barcode" id="ret_barcode" accesskey="r" type="text" placeholder="Scan a barcode to check in" />	21	<input class="head-searchbox focus" name="barcode" id="ret_barcode" accesskey="r" type="text" placeholder="Scan a barcode to check in" />
22	<input value="" type="submit" id="submit" />	22	<input value="" type="submit" id="submit" />
23	</form>	23	</form>
24	</div>	24	</div>
25		25
26	<div id="renew_search" class="residentsearch">	26	<div id="renew_search" class="residentsearch">
27	<form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">	27	<form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
28	<input class="head-searchbox" name="barcode" id="ren_barcode" type="text" placeholder="Scan a barcode to renew" />	28	<input class="head-searchbox focus" name="barcode" id="ren_barcode" type="text" placeholder="Scan a barcode to renew" />
29	<input value="" type="submit" id="submit" />	29	<input value="" type="submit" id="submit" />
30	</form>	30	</form>
31	</div>	31	</div>
Lines 33-39 Link Here
33		33
34	[% INCLUDE 'catalogue-search-box.inc' %]	34	[% INCLUDE 'catalogue-search-box.inc' %]
35		35
36	<ul>	36	<ul id="taille">
37	<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 %]	37	<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 %]
38	[% 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 %]	38	[% 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 %]
39	[% 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 %]	39	[% 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 %]
Lines 41-48 Link Here
41	<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 %]	41	<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 %]
42		42
43	<span id="button_1" class="buttonsearch">Cataloging search</span>	43	<span id="button_1" class="buttonsearch">Cataloging search</span>
44	<span id="button_2" class="buttonsearch active">Check-out</span>	44	<span id="button_2" class="buttonsearch active">Check out</span>
45	<span id="button_3" class="buttonsearch">Check-in</span>	45	<span id="button_3" class="buttonsearch">Check in</span>
46	<span id="button_4" class="buttonsearch">Renew</span>	46	<span id="button_4" class="buttonsearch">Renew</span>
47	<span id="button_5" class="buttonsearch">Search catalog</span>	47	<span id="button_5" class="buttonsearch">Search catalog</span>
48	</ul>	48	</ul>

Lines 72-81 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc (-6 / +6 lines)
72	[% UNLESS destination == 'holds' %]	72	[% UNLESS destination == 'holds' %]
73	<td class="actions">	73	<td class="actions">
74	<div class="btn-group dropup">	74	<div class="btn-group dropup">
75	<a class="btn btn-default btn-xs dropdown-toggle" id="clubactions[% c.id \| html %]" role="button" data-toggle="dropdown" href="#">	75	<a class="btn btn-default btn-xs dropdown-toggle lientype" id="clubactions[% c.id \| html %]" role="button" data-toggle="dropdown" href="#">
76	Actions <b class="caret"></b>	76	Actions <b class="caret"></b>
77	</a>	77	</a>
78	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="clubactions[% c.id \| html %]">	78	<ul class="dropdown-menu pull-right" id="lientype" role="menu" aria-labelledby="clubactions[% c.id \| html %]">
79	[% IF ( c.club_enrollments.count ) %]	79	[% IF ( c.club_enrollments.count ) %]
80	<li>	80	<li>
81	<a href="club-enrollments.pl?id=[% c.id \| uri %]">	81	<a href="club-enrollments.pl?id=[% c.id \| uri %]">
Lines 84-109 Link Here
84	</li>	84	</li>
85	[% ELSE %]	85	[% ELSE %]
86	<li class="disabled">	86	<li class="disabled">
87	<a href="#" data-toggle="tooltip" data-placement="left" title="There are no enrollments for this club yet">	87	<a href="#" data-toggle="tooltip" data-placement="left" id="lientype" title="There are no enrollments for this club yet">
88	<i class="fa fa-list-ul"></i> Enrollments	88	<i class="fa fa-list-ul"></i> Enrollments
89	</a>	89	</a>
90	</li>	90	</li>
91	[% END %]	91	[% END %]
92	[% IF CAN_user_clubs_edit_clubs %]	92	[% IF CAN_user_clubs_edit_clubs %]
93	<li>	93	<li>
94	<a href="clubs-add-modify.pl?id=[% c.id \| uri %]">	94	<a id="lientype" href="clubs-add-modify.pl?id=[% c.id \| uri %]">
95	<i class="fa fa-pencil"></i> Edit	95	<i class="fa fa-pencil"></i> Edit
96	</a>	96	</a>
97	</li>	97	</li>
98	<li>	98	<li>
99	<a href="#" class="delete_club" data-id="[% c.id \| html %]" data-name="[% c.name \| html %]">	99	<a href="#" id="lientype" class="delete_club" data-id="[% c.id \| html %]" data-name="[% c.name \| html %]">
100	<i class="fa fa-trash"></i> Delete	100	<i class="fa fa-trash"></i> Delete
101	</a>	101	</a>
102	</li>	102	</li>
103	[% END %]	103	[% END %]
104	[% IF ( c.club_enrollments.count ) %]	104	[% IF ( c.club_enrollments.count ) %]
105	<li>	105	<li>
106	<a href="#" class="club_hold_search" data-id="[% c.id \| html %]">	106	<a href="#" class="club_hold_search" id="lientype" data-id="[% c.id \| html %]">
107	<i class="fa fa-search"></i> Search to hold	107	<i class="fa fa-search"></i> Search to hold
108	</a>	108	</a>
109	</li>	109	</li>

Lines 4-34 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc (-6 / +6 lines)
4	[% IF backends_available %]	4	[% IF backends_available %]
5	[% IF backends.size > 1 %]	5	[% IF backends.size > 1 %]
6	<div class="dropdown btn-group">	6	<div class="dropdown btn-group">
7	<button class="btn btn-default dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">	7	<button class="btn btn-default pat dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
8	<i class="fa fa-plus"></i> New ILL request <span class="caret"></span>	8	<i class="fa fa-plus"></i> New ILL request <span class="caret"></span>
9	</button>	9	</button>
10	<ul class="dropdown-menu" aria-labelledby="ill-backend-dropdown">	10	<ul class="dropdown-menu pat" aria-labelledby="ill-backend-dropdown">
11	[% FOREACH backend IN backends %]	11	[% FOREACH backend IN backends %]
12	<li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backend \| uri %]">[% backend \| html %]</a></li>	12	<li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backend \| uri %]">[% backend \| html %]</a></li>
13	[% END %]	13	[% END %]
14	</ul>	14	</ul>
15	</div>	15	</div>
16	[% ELSE %]	16	[% ELSE %]
17	<a id="ill-new" class="btn btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backends.0 \| html %]">	17	<a id="ill-new" class="btn btn-default pat" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backends.0 \| html %]">
18	<i class="fa fa-plus"></i> New ILL request	18	<i class="fa fa-plus"></i> New ILL request
19	</a>	19	</a>
20	[% END %]	20	[% END %]
21	[% ELSE %]	21	[% ELSE %]
22	<a id="ill-new" class="btn btn-default disabled" href="">	22	<a id="ill-new" class="btn btn-default pat disabled" href="">
23	<i class="fa fa-plus"></i> New ILL request	23	<i class="fa fa-plus"></i> New ILL request
24	</a>	24	</a>
25	[% END %]	25	[% END %]
26	[% IF query_type == 'illlist' %]	26	[% IF query_type == 'illlist' %]
27	<a id="ill-list" class="btn btn-sm btn-default btn-group" href="/cgi-bin/koha/ill/ill-requests.pl">	27	<a id="ill-list" class="btn btn-sm btn-default pat btn-group" href="/cgi-bin/koha/ill/ill-requests.pl">
28	<i class="fa fa-list"></i> Refresh	28	<i class="fa fa-list"></i> Refresh
29	</a>	29	</a>
30	[% ELSE %]	30	[% ELSE %]
31	<a id="ill-list" class="btn btn-sm btn-default btn-group" href="/cgi-bin/koha/ill/ill-requests.pl">	31	<a id="ill-list" class="btn btn-sm btn-default pat btn-group" href="/cgi-bin/koha/ill/ill-requests.pl">
32	<i class="fa fa-list"></i> List requests	32	<i class="fa fa-list"></i> List requests
33	</a>	33	</a>
34	[% END %]	34	[% END %]

Lines 4-31 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc (-16 / +4 lines)
4	<div id="patron_category_search" class="residentsearch">	4	<div id="patron_category_search" class="residentsearch">
5	<form action="[% script_name \| html %]" method="post">	5	<form action="[% script_name \| html %]" method="post">
6	<input class="head-searchbox focus" type="text" name="description" value="[% searchfield \| html %]" placeholder="Search by patron category name:" />	6	<input class="head-searchbox focus" type="text" name="description" value="[% searchfield \| html %]" placeholder="Search by patron category name:" />
7	<input type="submit" class="submit" name="search" value="" />	7	<input type="submit" class="submit" id="submit" name="search" value="" />
8	</form>	8	</form>
9	</div>	9	</div>
10		10
11	[% INCLUDE 'patron-search-box.inc' %]	11	[% INCLUDE 'patron-search-box.inc' %]
12		12
13	[% IF ( CAN_user_catalogue ) %]	13	[% INCLUDE 'catalogue-search-box.inc' %]
14	<div id="catalog_search" class="residentsearch">
15	<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
16	[% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
17	<label class="tip" for="search-form">Enter search keywords:</label>
18	[% INCLUDE 'search_indexes.inc' %]
19	[% ELSE %]
20	<label class="tip" for="search-form">Enter search keywords:</label>
21	[% END %]
22	<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" />
23	<input type="submit" value="" class="submit" />
24	</form>
25	</div>[% END %]
26		14
27	<ul>	15	<ul id="taille">
28	<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>	16	<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>
29	[% 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 %]	17	[% 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 %]
30	[% 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 %]	18	[% 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 %]
31		19

Lines 1-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc (-4 / +4 lines)
1	[% INCLUDE 'blocking_errors.inc' %]	1	[% INCLUDE 'blocking_errors.inc' %]
2	<div id="toolbar" class="btn-toolbar">	2	<div id="toolbar" class="btn-toolbar">
3	<div class="btn-group">	3	<div class="btn-group">
4	<a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="fa fa-plus"></i> New collection</a>	4	<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>
5	</div>	5	</div>
6		6
7	[% IF ( colId ) %]	7	[% IF ( colId ) %]
8	<div class="btn-group">	8	<div class="btn-group">
9	<a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId \| html %]"><i class="fa fa-exchange"></i> Transfer</a>	9	<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>
10	</div>	10	</div>
11	<div class="btn-group">	11	<div class="btn-group">
12	<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>	12	<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>
13	</div>	13	</div>
14	<div class="btn-group">	14	<div class="btn-group">
15	<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>	15	<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>
16	</div>	16	</div>
17	[% END %]	17	[% END %]
18	</div>	18	</div>

Lines 16-22 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-6 / +5 lines)
16		16
17	<body id="acq_invoice" class="acq">	17	<body id="acq_invoice" class="acq">
18	[% INCLUDE 'header.inc' form=formulaire %]	18	[% INCLUDE 'header.inc' form=formulaire %]
19	[% INCLUDE 'acquisitions-search.inc' %]
20		19
21	[% SET readonly = NOT CAN_user_acquisition_edit_invoices %]	20	[% SET readonly = NOT CAN_user_acquisition_edit_invoices %]
22		21
Lines 152-158 Link Here
152	<fieldset class="action">	151	<fieldset class="action">
153	<input type="submit" value="Save" />	152	<input type="submit" value="Save" />
154	[% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %]	153	[% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %]
155	<a href="invoice.pl?op=delete&invoiceid=[% invoiceid \| uri %]" id="delete">Delete</a>	154	<a class="cancel" href="invoice.pl?op=delete&invoiceid=[% invoiceid \| uri %]" id="delete">Delete</a>
156	[% END %]	155	[% END %]
157	</fieldset>	156	</fieldset>
158	[% END %]	157	[% END %]
Lines 261-267 Link Here
261	[% END %]	260	[% END %]
262	[% UNLESS readonly %]	261	[% UNLESS readonly %]
263	<td>	262	<td>
264	<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>	263	<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>
265	</td>	264	</td>
266	[% END %]	265	[% END %]
267	</tr>	266	</tr>
Lines 336-349 Link Here
336	</fieldset>	335	</fieldset>
337	<fieldset class="action">	336	<fieldset class="action">
338	<input type="hidden" name="op" value="mod_adj" />	337	<input type="hidden" name="op" value="mod_adj" />
339	<input type="submit" value="Update adjustments" />	338	<input type="submit" class="principal" value="Update adjustments" />
340	</fieldset>	339	</fieldset>
341	[% END %]	340	[% END %]
342	</fieldset>	341	</fieldset>
343	</form>	342	</form>
344	<p>	343	<p>
345	<a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid \| uri %]">Go to receipt page</a>	344	<a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid \| uri %]" id="lientype">Go to receipt page</a>
346	[% IF Koha.Preference('AcqEnableFiles') %]\| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid \| uri %]">Manage invoice files</a>[% END %]	345	[% IF Koha.Preference('AcqEnableFiles') %]\| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid \| uri %]" id="lientype">Manage invoice files</a>[% END %]
347	</p>	346	</p>
348	<h2>Invoice details</h2>	347	<h2>Invoice details</h2>
349	<fieldset>	348	<fieldset>

Lines 46-52 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-6 / +5 lines)
46	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">	46	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
47	[% END %]	47	[% END %]
48	<main>	48	<main>
49	<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| uri %]">[% name \| html %]</a></h1>	49	<h2>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| uri %]">[% name \| html %]</a></h2>
50		50
51	[% IF ( error_failed_to_create_invoice ) %]	51	[% IF ( error_failed_to_create_invoice ) %]
52	<div id="error" class="dialog alert">	52	<div id="error" class="dialog alert">
Lines 76-82 Link Here
76	<input type="hidden" name="shipmentdate" value="[% shipmentdate \| $KohaDates %]" />	76	<input type="hidden" name="shipmentdate" value="[% shipmentdate \| $KohaDates %]" />
77	<input type="hidden" name="shipmentcost" value="[% shipmentcost \| html %]" />	77	<input type="hidden" name="shipmentcost" value="[% shipmentcost \| html %]" />
78	<input type="hidden" name="shipmentcost_budgetid" value="[% shipmentcost_budgetid \| html %]" />	78	<input type="hidden" name="shipmentcost_budgetid" value="[% shipmentcost_budgetid \| html %]" />
79	<input type="submit" class="button" value="Create new invoice anyway" />	79	<input type="submit" class="button principal" value="Create new invoice anyway" />
80	</form>	80	</form>
81	</div>	81	</div>
82	[% END %]	82	[% END %]
Lines 151-157 Link Here
151	<div id="parcels_new_parcel">	151	<div id="parcels_new_parcel">
152	<form method="get" action="parcels.pl" class="validated">	152	<form method="get" action="parcels.pl" class="validated">
153	<fieldset class="rows">	153	<fieldset class="rows">
154	<legend>Receive a new shipment</legend>	154	<h3>Receive a new shipment</h3>
155	<ol> <li>	155	<ol> <li>
156	<label for="invoice" class="required">Vendor invoice:</label>	156	<label for="invoice" class="required">Vendor invoice:</label>
157	<input type="hidden" name="booksellerid" value="[% booksellerid \| html %]" />	157	<input type="hidden" name="booksellerid" value="[% booksellerid \| html %]" />
Lines 195-202 Link Here
195		195
196	</li>	196	</li>
197	</ol>	197	</ol>
198	</fieldset>	198	<input type="submit" class="button principal" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| html %]">Cancel</a></fieldset>
199	<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>
200	</form>	199	</form>
201	</div>	200	</div>
202	</main>	201	</main>
Lines 234-240 Link Here
234	<option value="100">100</option>	233	<option value="100">100</option>
235	</select></li>	234	</select></li>
236	</ol>	235	</ol>
237	<fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid \| uri %]">Clear</a></fieldset>	236	<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>
238	</fieldset>	237	</fieldset>
239	</form>	238	</form>
240	</aside>	239	</aside>

Lines 187-192 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt (-6 / +8 lines)
187		187
188	<!-- MC-TYPE LIMITS -->	188	<!-- MC-TYPE LIMITS -->
189	<div id="advsearches" class="toptabs">	189	<div id="advsearches" class="toptabs">
		190	<fieldset>
190	<ul class="nav nav-tabs" role="tablist">	191	<ul class="nav nav-tabs" role="tablist">
191	[% FOREACH advsearchloo IN advancedsearchesloop %]	192	[% FOREACH advsearchloo IN advancedsearchesloop %]
192	<li role="presentation" id="advsearch-tab-[% advsearchloo.advanced_search_type \| html %]">	193	<li role="presentation" id="advsearch-tab-[% advsearchloo.advanced_search_type \| html %]">
Lines 239-244 Link Here
239	</div> <!-- /#advsearch-[% advsearchloo.advanced_search_type \| html %] -->	240	</div> <!-- /#advsearch-[% advsearchloo.advanced_search_type \| html %] -->
240	[% END # /FOREACH advsearchloo %]	241	[% END # /FOREACH advsearchloo %]
241	</div> <!-- /.tab-content -->	242	</div> <!-- /.tab-content -->
		243	</fieldset>
242	</div> <!-- /#advsearches -->	244	</div> <!-- /#advsearches -->
243	<!-- /MC-TYPE LIMIT -->	245	<!-- /MC-TYPE LIMIT -->
244		246
Lines 281-290 Link Here
281	[% PROCESS 'subtype_limits.inc' %]	283	[% PROCESS 'subtype_limits.inc' %]
282	<!-- SUBTYPE LIMITS -->	284	<!-- SUBTYPE LIMITS -->
283	<fieldset id="subtype">	285	<fieldset id="subtype">
284	<legend>Subtype limits</legend><p>	286	<h3>Subtype limits</h3><p>
285	[% PROCESS subtype_dropdowns %]	287	[% PROCESS subtype_dropdowns %]
286	<fieldset id="current_subtype_limits">	288	<fieldset id="current_subtype_limits">
287	<legend>Current subtype limits</legend>	289	<h3>Current subtype limits</h3>
288	[% FOREACH subtype IN ['aud','fic','bio','ctype','l-format'] %]	290	[% FOREACH subtype IN ['aud','fic','bio','ctype','l-format'] %]
289	[% FOREACH limit IN limits.$subtype %]	291	[% FOREACH limit IN limits.$subtype %]
290	<span>	292	<span>
Lines 301-307 Link Here
301		303
302	<!-- AVAILABILITY LIMITS -->	304	<!-- AVAILABILITY LIMITS -->
303	<fieldset id="availability">	305	<fieldset id="availability">
304	<legend>Location and availability</legend>	306	<h3>Location and availability</h3>
305	<fieldset id="currently-avail">	307	<fieldset id="currently-avail">
306	[% IF limit_available %]	308	[% IF limit_available %]
307	<p><label for="available-items">Only items currently available:</label> <input type="checkbox" id="available-items" name="limit" value="available" checked="checked" /></p>	309	<p><label for="available-items">Only items currently available:</label> <input type="checkbox" id="available-items" name="limit" value="available" checked="checked" /></p>
Lines 345-352 Link Here
345		347
346	<!-- OTHER LIMITS (facets, etc.) -->	348	<!-- OTHER LIMITS (facets, etc.) -->
347	[% IF limits.size %]	349	[% IF limits.size %]
348	<fieldset id="">	350	<fieldset id="sortby">
349	<legend>Other limits</legend>	351	<h3>Other limits</h3>
350	<p>	352	<p>
351	[% FOREACH key IN limits.keys %]	353	[% FOREACH key IN limits.keys %]
352	[% FOREACH limit IN limits.$key %]	354	[% FOREACH limit IN limits.$key %]
Lines 364-370 Link Here
364		366
365	<!-- RANK LIMITS -->	367	<!-- RANK LIMITS -->
366	<fieldset id="sortby">	368	<fieldset id="sortby">
367	<legend>Sorting</legend>	369	<h3>Sorting</h3>
368	<p>	370	<p>
369	<label for="sort_by">Sort by: </label>	371	<label for="sort_by">Sort by: </label>
370	<select id="sort_by" name="sort_by">	372	<select id="sort_by" name="sort_by">

Lines 82-97 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-4 lines)
82	<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>	82	<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>
83	[% END %]	83	[% END %]
84		84
85	<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>
86
87	<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>	85	<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>
88		86
89	[% IF ( UseCourseReserves ) %]	87	[% IF ( UseCourseReserves ) %]
90	<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>	88	<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>
91	[% END %]	89	[% END %]
92		90
93	<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>
94
95	</ul></div>	91	</ul></div>
96	<div class="menuspe"><ul class="biglinks-list">	92	<div class="menuspe"><ul class="biglinks-list">
97		93