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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-2 / +10 lines)
Lines 483-488 div { Link Here
483
    height: 500px;
483
    height: 500px;
484
}
484
}
485
485
486
#filtres{
487
    width: 100%;
488
    display: block;
489
    position: absolute;
490
    left: 0px;
491
    height: 500px;
492
}
493
486
button {
494
button {
487
    //@include default-button;
495
    //@include default-button;
488
496
Lines 1161-1167 ul { Link Here
1161
    //height: 50px;
1169
    //height: 50px;
1162
1170
1163
    li {
1171
    li {
1164
        list-style-type: disc;
1172
        list-style-type: none;
1165
1173
1166
        input {
1174
        input {
1167
            &.submit {
1175
            &.submit {
Lines 4497-4503 nav { Link Here
4497
                    background-color: transparent;
4505
                    background-color: transparent;
4498
                    //font-weight: bold;
4506
                    //font-weight: bold;
4499
                    text-decoration: none;
4507
                    text-decoration: none;
4500
4508
                    color: #71B443;
4501
                }
4509
                }
4502
            }
4510
            }
4503
4511
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc (-10 / +10 lines)
Lines 7-27 Link Here
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 principal" id="searchtoorder" data-booksellerid="[% booksellerid | html %]" data-basketno="[% basketno | html %]" value="Submit" />
10
                <input type="submit" class="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 %]&amp;basketno=[% basketno | uri %]">From a suggestion</a></li>
13
        <li><a id="lientype" href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a suggestion</a></li>
14
        <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a subscription</a></li>
14
        <li><a id="lientype" href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a subscription</a></li>
15
        <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a new (empty) record</a></li>
15
        <li><a id="lientype" href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From a new (empty) record</a></li>
16
        <li><a href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basketno | uri %]">From existing orders (copy)</a></li>
16
        <li><a id="lientype" href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basketno | uri %]">From existing orders (copy)</a></li>
17
        <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From an external source</a></li>
17
        <li><a id="lientype" href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From an external source</a></li>
18
        <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"> From a new file</a></li>
18
        <li><a id="lientype" href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"> From a new file</a></li>
19
        <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]"> From a staged file</a></li>
19
        <li><a id="lientype" href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]"> From a staged file</a></li>
20
        [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From titles with highest hold ratios</a></li>[% END %]
20
        [% IF ( CAN_user_circulate ) %]<li><a id="lientype" href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From titles with highest hold ratios</a></li>[% END %]
21
      </ul>
21
      </ul>
22
    [% ELSE %]
22
    [% ELSE %]
23
        <div class="dialog alert">
23
        <div class="dialog alert">
24
          <p>You can't create any orders unless you first <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget and a fund</a>.</p>
24
          <p>You can't create any orders unless you first <a id="lientype" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget and a fund</a>.</p>
25
        </div>
25
        </div>
26
    [% END %]
26
    [% END %]
27
</fieldset>
27
</fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc (-3 / +3 lines)
Lines 13-23 Link Here
13
            <input type="text" id="title" style="display:inline;left: 125px;" class="focus" placeholder="Title" name="title" size="13" value="[% title | html %]" />
13
            <input type="text" id="title" style="display:inline;left: 125px;" class="focus" placeholder="Title" name="title" size="13" value="[% title | html %]" />
14
            <input type="text" id="searchsupplier" style="display:inline" class="focus" placeholder="Vendor" name="name" size="13" value="[% name | html %]" />
14
            <input type="text" id="searchsupplier" style="display:inline" class="focus" placeholder="Vendor" name="name" size="13" value="[% name | html %]" />
15
            <input type="hidden" id="do_search" name="do_search" value="do" />
15
            <input type="hidden" id="do_search" name="do_search" value="do" />
16
            <span class="filteraction" id="filteraction_off" style="display:none"> <a 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="#filtres,.filteraction">[-]</a></span>
17
            <span class="filteraction" id="filteraction_on"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</a></span>
17
            <span class="filteraction" id="filteraction_on"> <a href="#" class="toggle_element" data-element="#filtres,.filteraction">[+]</a></span>
18
            <input value="" class="submit" id="submit" type="submit" />
18
            <input value="" class="submit" id="submit" type="submit" />
19
19
20
            <p class="plus" id="filters" style="display:none">
20
            <p class="plus" id="filtres" style="display:none">
21
                <input type="text" style="right: 260px" placeholder="Basket" name="basket" id="basket" />
21
                <input type="text" style="right: 260px" placeholder="Basket" name="basket" id="basket" />
22
                <input type="text" placeholder="Invoice number" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
22
                <input type="text" placeholder="Invoice number" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
23
            </p>
23
            </p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc (-1 / +1 lines)
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 principal" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a>
161
        <fieldset class="action"> <input type="submit" value="Search" class="principal" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a>
162
        </fieldset>
162
        </fieldset>
163
</form>
163
</form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc (-1 / +1 lines)
Lines 52-58 Link Here
52
        </table>
52
        </table>
53
    [% END %]
53
    [% END %]
54
    [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
54
    [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
55
        <p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
55
        <p><a href="#" class="lientype" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
56
        <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
56
        <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
57
            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
57
            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
58
            <input type="hidden" name="action" value="add" />
58
            <input type="hidden" name="action" value="add" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc (-1 / +1 lines)
Lines 6-12 Link Here
6
    <div class="dialog alert">
6
    <div class="dialog alert">
7
        <h3>No active currency is defined</h3>
7
        <h3>No active currency is defined</h3>
8
        [% IF CAN_user_acquisition_currencies_manage %]
8
        [% IF CAN_user_acquisition_currencies_manage %]
9
            <p><a href="/cgi-bin/koha/admin/currency.pl">Please specify an active currency.</a></p>
9
            <p><a id="lientype" href="/cgi-bin/koha/admin/currency.pl">Please specify an active currency.</a></p>
10
        [% ELSE %]
10
        [% ELSE %]
11
            <p>Your administrator must specify an active currency.</p>
11
            <p>Your administrator must specify an active currency.</p>
12
        [% END %]
12
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc (-1 / +1 lines)
Lines 1-5 Link Here
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&amp;borrowernumber=[% patron.borrowernumber | uri %]&amp;step=3" class="btn btn-default btn-xs">Change category</a>
4
    <a id="lientype" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | uri %]&amp;step=3" class="btn btn-default btn-xs">Change category</a>
5
</li>
5
</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (-1 / +1 lines)
Lines 3-9 Link Here
3
    [% IF ( issuecount ) %]
3
    [% IF ( issuecount ) %]
4
        <div id="issues-table-loading-message">
4
        <div id="issues-table-loading-message">
5
            <p>
5
            <p>
6
                <a id="issues-table-load-now-button" href="#" class="btn btn-default"><i class="fa fa-book"></i> Show checkouts</a>
6
                <a id="issues-table-load-now-button" href="#" class="btn btn-default lientype"><i class="fa fa-book"></i> Show checkouts</a>
7
            </p>
7
            </p>
8
        </div>
8
        </div>
9
        <form name="issues" action="/cgi-bin/koha/tools/export.pl" method="post">
9
        <form name="issues" action="/cgi-bin/koha/tools/export.pl" method="post">
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc (+1 lines)
Lines 9-14 Link Here
9
	</div>
9
	</div>
10
10
11
    [% INCLUDE 'patron-search-box.inc' %]
11
    [% INCLUDE 'patron-search-box.inc' %]
12
12
    [% INCLUDE 'catalogue-search-box.inc' %]
13
    [% INCLUDE 'catalogue-search-box.inc' %]
13
14
14
	<ul id="taille">
15
	<ul id="taille">
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc (-1 / +1 lines)
Lines 211-217 Link Here
211
    [% IF display_columns_selection %][%# Needs js/pages/batchMod.js %]
211
    [% IF display_columns_selection %][%# Needs js/pages/batchMod.js %]
212
        [% IF checkboxes_edit OR checkboxes_delete %]
212
        [% IF checkboxes_edit OR checkboxes_delete %]
213
            <div id="toolbar">
213
            <div id="toolbar">
214
                <a id="selectallbutton" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="clearallbutton" href="#"><i class="fa fa-remove"></i> Clear all</a> | <a id="clearonloanbutton" href="#">Clear on loan</a>
214
                <a id="selectallbutton" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="clearallbutton" class="lienype" href="#"><i class="fa fa-remove"></i> Clear all</a> | <a id="clearonloanbutton" class="lientype" href="#">Clear on loan</a>
215
            </div>
215
            </div>
216
        [% END %]
216
        [% END %]
217
217
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc (-3 / +3 lines)
Lines 11-17 Link Here
11
11
12
            [% IF ( languages_loo.group_enabled ) %]
12
            [% IF ( languages_loo.group_enabled ) %]
13
            [% IF ( languages_loo.plural ) %]
13
            [% IF ( languages_loo.plural ) %]
14
                <li class="dropdown"><a class="dropdown-toggle dropup" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag | html %]" href="#">
14
                <li class="dropdown"><a class="dropdown-toggle dropup lientype" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag | html %]" href="#">
15
                    [% IF ( languages_loo.native_description ) %]
15
                    [% IF ( languages_loo.native_description ) %]
16
                        [% languages_loo.native_description | html %]
16
                        [% languages_loo.native_description | html %]
17
                    [% ELSE %]
17
                    [% ELSE %]
Lines 31-37 Link Here
31
                [% IF ( sublanguages_loo.sublanguage_current ) %]
31
                [% IF ( sublanguages_loo.sublanguage_current ) %]
32
                    <li class="navbar-text"> <span class="currentlanguage disabled">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</span></li>
32
                    <li class="navbar-text"> <span class="currentlanguage disabled">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</span></li>
33
                [% ELSE %]
33
                [% ELSE %]
34
                <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a></li>
34
                <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]" id="lientype"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a></li>
35
        [% END %]
35
        [% END %]
36
                [% END %]
36
                [% END %]
37
37
Lines 49-55 Link Here
49
                        [% END %]
49
                        [% END %]
50
                    </li>
50
                    </li>
51
                [% ELSE %]
51
                [% ELSE %]
52
                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]">
52
                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]" id=" lientype">
53
                        [% IF ( languages_loo.native_description ) %]
53
                        [% IF ( languages_loo.native_description ) %]
54
                            [% languages_loo.native_description | html %]
54
                            [% languages_loo.native_description | html %]
55
                        [% ELSE %]
55
                        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc (-4 / +4 lines)
Lines 9-26 Link Here
9
                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
9
                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
10
                    [% IF ( sublanguages_loo.enabled ) %]
10
                    [% IF ( sublanguages_loo.enabled ) %]
11
                        [% IF ( sublanguages_loo.sublanguage_current ) %]
11
                        [% IF ( sublanguages_loo.sublanguage_current ) %]
12
                            <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]&nbsp;<i class="fa fa-check"></i></a></li>
12
                            <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" id="lientype" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]&nbsp;<i class="fa fa-check"></i></a></li>
13
                        [% ELSE %]
13
                        [% ELSE %]
14
                            <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a></li>
14
                            <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"  tabindex="-1" id="lientype" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a></li>
15
                        [% END %]
15
                        [% END %]
16
                    [% END # / IF sublanguages_loo.enabled %]
16
                    [% END # / IF sublanguages_loo.enabled %]
17
                [% END # / FOREACH sublanguages_loo %]
17
                [% END # / FOREACH sublanguages_loo %]
18
            [% ELSE %]
18
            [% ELSE %]
19
                [% IF ( languages_loo.group_enabled ) %]
19
                [% IF ( languages_loo.group_enabled ) %]
20
                    [% IF ( languages_loo.current ) %]
20
                    [% IF ( languages_loo.current ) %]
21
                        <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]&nbsp;<i class="fa fa-check"></i></a></li>
21
                        <li role="presentation"><a href="#" tabindex="-1" id="lientype" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]&nbsp;<i class="fa fa-check"></i></a></li>
22
                    [% ELSE %]
22
                    [% ELSE %]
23
                        <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li>
23
                        <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]" id="lientype"  tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li>
24
                    [% END %]
24
                    [% END %]
25
                [% END # / IF languages_loo.current %]
25
                [% END # / IF languages_loo.current %]
26
            [% END # / IF ( languages_loo.plural ) %]
26
            [% END # / IF ( languages_loo.plural ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc (-4 / +4 lines)
Lines 2-11 Link Here
2
2
3
<div id="header_search" class="fold">
3
<div id="header_search" class="fold">
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" id="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' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/lis-search.inc (-9 / +1 lines)
Lines 37-50 Link Here
37
        </form>
37
        </form>
38
    </div>
38
    </div>
39
39
40
    <div id="search_search" class="residentsearch">
41
        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
42
            <input name="barcode" id="inputsearch" class="inpu" type="text" placeholder="Enter search keyords" />
43
            <input value="" type="submit" id="submit" />
44
        </form>
45
    </div>
46
    [% END %]
47
48
    [% INCLUDE 'catalogue-search-box.inc' %]
40
    [% INCLUDE 'catalogue-search-box.inc' %]
49
41
50
    <ul id="taille">
42
    <ul id="taille">
Lines 56-62 Link Here
56
        <span id="button_1" class="buttonsearch active">Check-out</span>
48
        <span id="button_1" class="buttonsearch active">Check-out</span>
57
        <span id="button_2" class="buttonsearch">Check-in</span>
49
        <span id="button_2" class="buttonsearch">Check-in</span>
58
        <span id="button_3" class="buttonsearch">Renew</span>
50
        <span id="button_3" class="buttonsearch">Renew</span>
59
        <span id="button_5" class="buttonsearch active">Search catalog</span>
51
        <span id="button_4" class="buttonsearch active">Search catalog</span>
60
    </ul>
52
    </ul>
61
</div>
53
</div>
62
54
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc (-2 / +2 lines)
Lines 2-11 Link Here
2
    <div class="dialog alert">
2
    <div class="dialog alert">
3
        <h3>Cannot add patron</h3>
3
        <h3>Cannot add patron</h3>
4
        [% IF ( no_branches ) %]
4
        [% IF ( no_branches ) %]
5
            <p><strong>There are no libraries defined. </strong>[% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/branches.pl">Please add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>
5
            <p><strong>There are no libraries defined. </strong>[% IF ( CAN_user_parameters ) %]<a id="lientype" href="/cgi-bin/koha/admin/branches.pl">Please add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>
6
        [% END %]
6
        [% END %]
7
        [% IF ( no_categories ) %]
7
        [% IF ( no_categories ) %]
8
            <p><strong>There are no patron categories defined. </strong>[% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/categories.pl">Please add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.[% END %]</p>
8
            <p><strong>There are no patron categories defined. </strong>[% IF ( CAN_user_parameters ) %]<a id="lientype" href="/cgi-bin/koha/admin/categories.pl">Please add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.[% END %]</p>
9
        [% END %]
9
        [% END %]
10
    </div>
10
    </div>
11
[% END %]
11
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-return-claims.inc (-4 / +4 lines)
Lines 1-11 Link Here
1
<div id="return-claims">
1
<div id="return-claims">
2
    <p id="return-claims-controls">
2
    <p id="return-claims-controls">
3
        [% IF ( patron.return_claims.resolved.count > 0 || patron.return_claims.unresolved.count > 0 ) %]
3
        [% IF ( patron.return_claims.resolved.count > 0 || patron.return_claims.unresolved.count > 0 ) %]
4
            <a id="show_all_claims" class="ctrl_link" href="#">Show all [% patron.return_claims.count | html %] claim(s)</a>
4
            <a id="show_all_claims" class="ctrl_link lientype" href="#">Show all [% patron.return_claims.count | html %] claim(s)</a>
5
            <a id="show_unresolved_claims" class="ctrl_link disabled" href="#">Show [% patron.return_claims.unresolved.count | html %] unresolved claims</a>
5
            <a id="show_unresolved_claims" class="ctrl_link disabled lientype" href="#">Show [% patron.return_claims.unresolved.count | html %] unresolved claims</a>
6
        [% ELSE %]
6
        [% ELSE %]
7
            <a id="show_all_claims" class="ctrl_link" href="#"></a>
7
            <a id="show_all_claims" class="ctrl_link lientype" href="#"></a>
8
            <a id="show_unresolved_claims" class="ctrl_link disabled" href="#"></a>
8
            <a id="show_unresolved_claims" class="ctrl_link disabled lientype" href="#"></a>
9
        [% END %]
9
        [% END %]
10
    </p>
10
    </p>
11
  <table id="return-claims-table" class="table table-bordered table-striped">
11
  <table id="return-claims-table" class="table table-bordered table-striped">
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc (-9 / +80 lines)
Lines 1-5 Link Here
1
[% USE Koha %]
2
[% USE Branches %]
3
[% USE Categories %]
4
[% USE raw %]
5
[% PROCESS 'html_helpers.inc' %]
6
[% PROCESS 'patronfields.inc' %]
7
1
<div id="header_search" class="fold">
8
<div id="header_search" class="fold">
2
9
10
    <div id="patron_search" class="residentsearch">
11
        <form action="/cgi-bin/koha/members/member.pl" method="post">
12
            <div class="autocomplete">
13
                <input id="searchmember" data-toggle="tooltip" size="25" placeholder="Enter patron card number or partial name" class="head-searchbox focus" name="searchmember" type="text" value="[% searchmember | html %]" autocomplete="off" />
14
                <input type="hidden" name="quicksearch" value="1" />
15
                <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span>
16
                <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span>
17
                <input value="" class="submit" id="submit" type="submit" />
18
            </div>
19
20
            <p class="plus" id="filters" style="display:none">
21
                <select name="searchfieldstype" id="searchfieldstype" style="position: relative;bottom: 5px;">
22
                    <option disabled selected hidden>Search fields:</option>
23
                [% pref_fields = Koha.Preference('DefaultPatronSearchFields').split(',') %]
24
                [% default_fields = [ 'standard', 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
25
                [% search_options = default_fields.merge(pref_fields).unique %]
26
                [% FOREACH s_o IN search_options %]
27
                    [% display_name = PROCESS patron_fields name=s_o %]
28
                    [% NEXT IF !display_name.length %]
29
                    [% IF searchfieldstype == s_o %]
30
                        <option selected="selected" value="[% s_o | html %]">[% display_name | $raw %]</option>
31
                    [% ELSE %]
32
                        <option value="[% s_o | html %]">[% display_name | $raw %]</option>
33
                    [% END %]
34
                [% END %]
35
                </select>
36
37
                <select name="searchtype" id="searchtype" style="position: relative;bottom: 5px;">
38
                [% IF searchtype == 'start_with' %]
39
                    <option selected="selected" value='start_with'>Starts with</option>
40
                    <option value='contain'>Contains</option>
41
                [% ELSE %]
42
                    <option value='start_with'>Starts with</option>
43
                    <option selected="selected" value='contain'>Contains</option>
44
                [% END %]
45
                </select>
46
47
                [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %]
48
                <select name="branchcode_filter" id="branchcode" style="position: relative;bottom: 5px;">
49
                    <option disabled selected hidden>Library:</option>
50
                    [% IF branches.size != 1 %]
51
                    <option value="">Any</option>
52
                    [% END %]
53
                    [% PROCESS options_for_libraries libraries => branches %]
54
                </select>
55
56
                [% SET categories = Categories.all() %]
57
                <select name="categorycode_filter" id="categorycode" style="position: relative;bottom: 5px;">
58
                    <option disabled selected hidden>Category:</option>
59
                    <option value="">Any</option>
60
                    [% FOREACH category IN categories %]
61
                        [% IF category.categorycode == categorycode_filter %]
62
                            <option value="[% category.categorycode | html %]" selected="selected">[% category.description | html %]</option>
63
                        [% ELSE %]
64
                            <option value="[% category.categorycode | html %]">[% category.description | html %]</option>
65
                        [% END %]
66
                    [% END %]
67
                </select>
68
            </p>
69
        </form>
70
    </div>
71
3
    [% INCLUDE 'patron-search-box.inc' %]
72
    [% INCLUDE 'patron-search-box.inc' %]
4
73
5
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
74
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
Lines 21-35 Link Here
21
    [% INCLUDE 'catalogue-search-box.inc' %]
90
    [% INCLUDE 'catalogue-search-box.inc' %]
22
91
23
    <ul id="taille">
92
    <ul id="taille">
24
        [% 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 %]
93
        <li><a id="icon_1" title="Search patrons" onclick="clique(this)" class="iconsearch" href="#patron_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>
25
        [% 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 %]
94
        [% 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 %]
26
        [% 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 %]
95
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_3" title="Check in" onclick="clique(this)" class="iconsearch" href="#checkin_search"><i class="fa fa-download"></i></a></li>[% END %]
27
        [% 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 %]
96
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a id="icon_4" title="Renew" onclick="clique(this)" class="iconsearch" href="#renew_search"><i class="fa fa-retweet"></i></a></li>[% END %]
28
97
        [% 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 %]
29
        <span id="button_1" class="buttonsearch active">Check out</span>
98
30
        <span id="button_2" class="buttonsearch">Check in</span>
99
        <span id="button_1" class="buttonsearch active">Search patrons</span>
31
        <span id="button_3" class="buttonsearch">Renew</span>
100
        <span id="button_2" class="buttonsearch active">Check out</span>
32
        <span id="button_4" class="buttonsearch">Search catalog</span>
101
        <span id="button_3" class="buttonsearch">Check in</span>
102
        <span id="button_4" class="buttonsearch">Renew</span>
103
        <span id="button_5" class="buttonsearch">Search catalog</span>
33
    </ul>
104
    </ul>
34
</div><!-- /header_search -->
105
</div><!-- /header_search -->
35
106
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-1 / +1 lines)
Lines 21-27 Link Here
21
                <span class="circ-hlt">Expiration:</span>
21
                <span class="circ-hlt">Expiration:</span>
22
                <span>Patron's card will expire soon.</span>
22
                <span>Patron's card will expire soon.</span>
23
                <span>Patron's card expires on [% expiry | $KohaDates %]</span>
23
                <span>Patron's card expires on [% expiry | $KohaDates %]</span>
24
                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a>
24
                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y" id="lientype">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]" id="lientype">Edit details</a>
25
            </li>
25
            </li>
26
        [% END %]
26
        [% END %]
27
27
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc (-1 / +1 lines)
Lines 1-6 Link Here
1
[%- BLOCK patron_fields -%]
1
[%- BLOCK patron_fields -%]
2
     [%- SWITCH name -%]
2
     [%- SWITCH name -%]
3
     [%- CASE standard -%]<span>Standard</span>
3
     [%- CASE 'standard' -%]<span>Standard</span>
4
     [%- CASE 'borrowernumber' -%]<span>Borrowernumber</span>
4
     [%- CASE 'borrowernumber' -%]<span>Borrowernumber</span>
5
     [%- CASE 'cardnumber' -%]<span>Card number</span>
5
     [%- CASE 'cardnumber' -%]<span>Card number</span>
6
     [%- CASE 'surname' -%]<span>Surname</span>
6
     [%- CASE 'surname' -%]<span>Surname</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc (-1 / +1 lines)
Lines 3-9 Link Here
3
3
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" id="submit" name="search" value="" />
7
            <input type="submit" class="submit" id="submit" name="search" value="" />
8
        </form>
8
        </form>
9
	</div>
9
	</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc (-14 / +14 lines)
Lines 2-39 Link Here
2
<div id="advsearch">
2
<div id="advsearch">
3
    <form action="" method="get">
3
    <form action="" method="get">
4
        <fieldset class="brief">
4
        <fieldset class="brief">
5
        <a href="#" class="toggle_element" data-element="#advsearch_form">Advanced search</a>
5
        <a href="#" class="toggle_element" id="lientype" data-element="#advsearch_form">Advanced search</a>
6
            <div id="advsearch_form" style="display:none">
6
            <div id="advsearch_form" style="display:none">
7
            <ol>
7
            <ol>
8
              <li>
8
              <li>
9
                <label for="issn">ISSN:</label>
9
                <p for="issn">ISSN:
10
                <input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter | html %]" />
10
                <input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter | html %]" /></p>
11
              </li>
11
              </li>
12
              <li>
12
              <li>
13
                <label for="title">Title:</label>
13
                <p for="title">Title:
14
                <input type="text" id="title" name="title_filter" value="[% title_filter | html %]" />
14
                <input type="text" id="title" name="title_filter" value="[% title_filter | html %]" /></p>
15
              </li>
15
              </li>
16
              [% IF Koha.Preference( 'marcflavour' ) == "UNIMARC" %]
16
              [% IF Koha.Preference( 'marcflavour' ) == "UNIMARC" %]
17
              <li>
17
              <li>
18
                <label for="ean">EAN:</label>
18
                <p for="ean">EAN:
19
                <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter | html %]" />
19
                <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter | html %]" /></p>
20
              </li>
20
              </li>
21
              [% END %]
21
              [% END %]
22
              <li>
22
              <li>
23
                <label for="publisher">Publisher:</label>
23
                <p for="publisher">Publisher:
24
                <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" />
24
                <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" /></p>
25
              </li>
25
              </li>
26
              <li>
26
              <li>
27
                <label for="supplier">Vendor:</label>
27
                <p for="supplier">Vendor:
28
                <input type="text" id="supplier" name="supplier_filter" value="[% supplier_filter | html %]" />
28
                <input type="text" id="supplier" name="supplier_filter" value="[% supplier_filter | html %]" /></p>
29
              </li>
29
              </li>
30
              <li>
30
              <li>
31
                <label for="branch">Library:</label>
31
                <p for="branch">Library:
32
                <select id="branch" name="branch_filter">
32
                <select id="branch" name="branch_filter">
33
                  <option value="">All</option>
33
                  <option value="">All</option>
34
                  [%# FIXME Should not we filter the libraries? %]
34
                  [%# FIXME Should not we filter the libraries? %]
35
                  [% PROCESS options_for_libraries libraries => Branches.all( selected => branch_filter, unfiltered => 1 ) %]
35
                  [% PROCESS options_for_libraries libraries => Branches.all( selected => branch_filter, unfiltered => 1 ) %]
36
                </select>
36
                </select></p>
37
              </li>
37
              </li>
38
            </ol>
38
            </ol>
39
            <input type="hidden" name="searched" value="1" />
39
            <input type="hidden" name="searched" value="1" />
Lines 44-50 Link Here
44
                <input type="hidden" name="basketno" value="[% basketno | html %]" />
44
                <input type="hidden" name="basketno" value="[% basketno | html %]" />
45
            [% END %]
45
            [% END %]
46
            <fieldset class="action">
46
            <fieldset class="action">
47
              <input type="submit" value="Search" />
47
              <input type="submit" class="principal" value="Search" />
48
            </fieldset>
48
            </fieldset>
49
            </div>
49
            </div>
50
        </fieldset>
50
        </fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-13 / +15 lines)
Lines 64-75 Link Here
64
                [% END %]
64
                [% END %]
65
65
66
                [% IF ( batch_details ) %]
66
                [% IF ( batch_details ) %]
67
                    <h1>
67
                    <h2>
68
                        Add orders from [% comments | html %]
68
                        Add orders from [% comments | html %]
69
                        ([% file_name | html %] staged on [% upload_timestamp | $KohaDates  with_hours => 1 %])
69
                        ([% file_name | html %] staged on [% upload_timestamp | $KohaDates  with_hours => 1 %])
70
                    </h1>
70
                    </h2>
71
                    <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
71
                    <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
72
                        <div id="tabs" class="toptabs">
72
                        <div id="tabs" class="toptabs">
73
                        <div id="searchresults">
73
                            <ul>
74
                            <ul>
74
                                <li><a href="#records_to_import">Select to import</a></li>
75
                                <li><a href="#records_to_import">Select to import</a></li>
75
                                <li><a href="#items_info" class="items_info">Item information</a></li>
76
                                <li><a href="#items_info" class="items_info">Item information</a></li>
Lines 117-131 Link Here
117
118
118
                                [% FOREACH biblio IN biblio_list %]
119
                                [% FOREACH biblio IN biblio_list %]
119
                                    <fieldset class="biblio unselected rows" style="float:none;">
120
                                    <fieldset class="biblio unselected rows" style="float:none;">
120
                                        <legend>
121
                                        <h3>
121
                                            <label for="record_[% biblio.import_record_id | html %]" style="width:auto;">
122
                                            <label for="record_[% biblio.import_record_id | html %]" style="width:auto;">
122
                                                <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id | html %]" value="[% biblio.import_record_id | html %]" />
123
                                                <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id | html %]" value="[% biblio.import_record_id | html %]" />
123
                                                <span class="citation">[% biblio.citation | html %]</span>
124
                                                <span class="citation">[% biblio.citation | html %]</span>
124
                                            </label>
125
                                            </label>
125
                                            <span class="links" style="font-weight: normal;">
126
                                            <span class="links" style="font-weight: normal;">
126
                                                ( <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | uri %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% biblio.import_record_id | html %]" class="previewData">Card</a> | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;breedingid=[% biblio.import_record_id | html %]&amp;import_batch_id=[% biblio.import_batch_id | html %]&amp;biblionumber=[% biblio.match_biblionumber | html %]">Add order</a> )
127
                                                ( <a id="lientype" href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | uri %]" class="previewData">MARC</a> | <a id="lientype" href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% biblio.import_record_id | html %]" class="previewData">Card</a> | <a id="lientype" href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]&amp;breedingid=[% biblio.import_record_id | html %]&amp;import_batch_id=[% biblio.import_batch_id | html %]&amp;biblionumber=[% biblio.match_biblionumber | html %]">Add order</a> )
127
                                            </span>
128
                                            </span>
128
                                        </legend>
129
                                        </h3>
129
                                        <div style="float:left">
130
                                        <div style="float:left">
130
                                            <ol>
131
                                            <ol>
131
                                                <li class="status">
132
                                                <li class="status">
Lines 201-207 Link Here
201
                                            [% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %]
202
                                            [% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %]
202
                                            [% FOREACH item IN biblio.iteminfos %]
203
                                            [% FOREACH item IN biblio.iteminfos %]
203
                                                <fieldset>
204
                                                <fieldset>
204
                                                    <legend>Item record [% item.item_id | html %]</legend>
205
                                                    <h3>Item record [% item.item_id | html %]</h3>
205
                                                    <ol>
206
                                                    <ol>
206
                                                        <li>
207
                                                        <li>
207
                                                            <label for="homebranch_item_[% item.item_id | html %]">homebranch</label>
208
                                                            <label for="homebranch_item_[% item.item_id | html %]">homebranch</label>
Lines 354-360 Link Here
354
355
355
                                [% IF ( items ) %]
356
                                [% IF ( items ) %]
356
                                    <fieldset class="rows" style="float:none;">
357
                                    <fieldset class="rows" style="float:none;">
357
                                        <legend>Item</legend>
358
                                        <h3>Item</h3>
358
                                        [% IF ( NoACQframework ) %]
359
                                        [% IF ( NoACQframework ) %]
359
                                            <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
360
                                            <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
360
                                        [% END %]
361
                                        [% END %]
Lines 406-412 Link Here
406
                            <div id="accounting_details">
407
                            <div id="accounting_details">
407
                                <p>Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):</p>
408
                                <p>Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):</p>
408
                                <fieldset class="rows" style="float:none;">
409
                                <fieldset class="rows" style="float:none;">
409
                                    <legend>Accounting details</legend>
410
                                    <h3>Accounting details</h3>
410
                                    <ol>
411
                                    <ol>
411
                                        <li>
412
                                        <li>
412
                                            <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
413
                                            <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
Lines 466-480 Link Here
466
                                    </ol>
467
                                    </ol>
467
                                </fieldset> <!-- /.rows -->
468
                                </fieldset> <!-- /.rows -->
468
                            </div> <!-- /#accounting_details -->
469
                            </div> <!-- /#accounting_details -->
469
                        </div> <!-- /#tabs -->
470
                        </div></div> <!-- /#tabs -->
470
471
471
                        <fieldset class="action">
472
                        <fieldset class="action">
472
                            <input id="add_order" type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
473
                            <input id="add_order" type="submit" class="principal" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
473
                        </fieldset>
474
                        </fieldset>
474
                    </form> <!-- /#Aform -->
475
                    </form> <!-- /#Aform -->
475
                [% ELSE # IF ( batch_details ) %]
476
                [% ELSE # IF ( batch_details ) %]
476
                    <div>
477
                    <div>
477
                        <h1>Choose the file to add to the basket</h1>
478
                        <h2>Choose the file to add to the basket</h2>
479
                        <div id="searchresults">
478
                        <table id="files">
480
                        <table id="files">
479
                            <thead>
481
                            <thead>
480
                                <tr>
482
                                <tr>
Lines 513-525 Link Here
513
                                        </td>
515
                                        </td>
514
                                        <td>[% batch_lis.num_records | html %]</td>
516
                                        <td>[% batch_lis.num_records | html %]</td>
515
                                        <td class="actions">
517
                                        <td class="actions">
516
                                            <a href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add orders</a>
518
                                            <a id="lientype" href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add orders</a>
517
                                        </td>
519
                                        </td>
518
                                    </tr>
520
                                    </tr>
519
                                [% END # /FOREACH batch_lis %]
521
                                [% END # /FOREACH batch_lis %]
520
                            </tbody>
522
                            </tbody>
521
                        </table> <!-- /#files -->
523
                        </table> <!-- /#files -->
522
                    </div>
524
                    </div></div>
523
                [% END # /IF ( batch_details ) %]
525
                [% END # /IF ( batch_details ) %]
524
            </div> [% # /div.col-sm-6 %]
526
            </div> [% # /div.col-sm-6 %]
525
        </div> [% # /div.row %]
527
        </div> [% # /div.row %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt (-8 / +8 lines)
Lines 58-70 Acquisitions &rsaquo; Koha Link Here
58
        <div class="col-sm-10 col-sm-push-2">
58
        <div class="col-sm-10 col-sm-push-2">
59
            <main>
59
            <main>
60
60
61
<h1>Duplicate existing orders</h1>
61
<h2>Duplicate existing orders</h2>
62
[% INCLUDE 'blocking_errors.inc' %]
62
[% INCLUDE 'blocking_errors.inc' %]
63
63
64
[% IF op == 'search' || op == 'select' %]
64
[% IF op == 'search' || op == 'select' %]
65
<form action="/cgi-bin/koha/acqui/duplicate_orders.pl" method="post">
65
<form action="/cgi-bin/koha/acqui/duplicate_orders.pl" method="post">
66
    <fieldset class="rows">
66
    <fieldset class="rows">
67
        <legend>
67
        <h3>
68
            [% IF op == 'search' %]
68
            [% IF op == 'search' %]
69
                <span>Search orders</span>
69
                <span>Search orders</span>
70
            [% ELSE %]
70
            [% ELSE %]
Lines 72-85 Acquisitions &rsaquo; Koha Link Here
72
            [% END %]
72
            [% END %]
73
            <span class="toggle_orders_filters" id="show_orders_filters"><a href="#">[+]</a></span>
73
            <span class="toggle_orders_filters" id="show_orders_filters"><a href="#">[+]</a></span>
74
            <span class="toggle_orders_filters" id="hide_orders_filters"><a href="#">[-]</a></span>
74
            <span class="toggle_orders_filters" id="hide_orders_filters"><a href="#">[-]</a></span>
75
        </legend>
75
        </h3>
76
        <div id="orders_filters">
76
        <div id="orders_filters">
77
            [% INCLUDE 'filter-orders.inc' %]
77
            [% INCLUDE 'filter-orders.inc' %]
78
            <input type="hidden" name="op" value="select" />
78
            <input type="hidden" name="op" value="select" />
79
            <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
79
            <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
80
80
81
            <input type="hidden" name="ordernumbers" value="[% ordernumbers.join(',') | html %]" />
81
            <input type="hidden" name="ordernumbers" value="[% ordernumbers.join(',') | html %]" />
82
            <fieldset class="action"><input type="submit" value="Search" /></fieldset>
82
            <fieldset class="action"><input type="submit" class="principal" value="Search" /></fieldset>
83
        </div>
83
        </div>
84
    </fieldset>
84
    </fieldset>
85
</form>
85
</form>
Lines 184-190 Acquisitions &rsaquo; Koha Link Here
184
        <fieldset class="action">
184
        <fieldset class="action">
185
            <input type="hidden" name="op" value="batch_edit" />
185
            <input type="hidden" name="op" value="batch_edit" />
186
            <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
186
            <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
187
            <button type="submit" class="btn btn-default go_to_batch_edit">Next <i class="fa fa-fw fa-arrow-right"></i></button>
187
            <button type="submit" class="btn btn-default go_to_batch_edit principal">Next <i class="fa fa-fw fa-arrow-right"></i></button>
188
        </fieldset>
188
        </fieldset>
189
        </form>
189
        </form>
190
    </div>
190
    </div>
Lines 195-201 Acquisitions &rsaquo; Koha Link Here
195
    <div id="accounting_details">
195
    <div id="accounting_details">
196
      <p>Duplicate all the orders with the following accounting details:</p>
196
      <p>Duplicate all the orders with the following accounting details:</p>
197
      <fieldset class="rows" style="float:none;">
197
      <fieldset class="rows" style="float:none;">
198
          <legend>Accounting details</legend>
198
          <h3>Accounting details</h3>
199
          <div class="hint" style="margin: 1em 1em 0">Check boxes to duplicate the original values</div>
199
          <div class="hint" style="margin: 1em 1em 0">Check boxes to duplicate the original values</div>
200
          <ol>
200
          <ol>
201
              <li>
201
              <li>
Lines 265-271 Acquisitions &rsaquo; Koha Link Here
265
        <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
265
        <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
266
        <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
266
        <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
267
        <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
267
        <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
268
        <button type="submit" class="btn btn-default">Duplicate orders</button>
268
        <button type="submit" class="btn btn-default principal">Duplicate orders</button>
269
        <a class="cancel" href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno | html %]">Cancel</a>
269
        <a class="cancel" href="/cgi-bin/koha/acqui/duplicate_orders.pl?basketno=[% basket.basketno | html %]">Cancel</a>
270
    </fieldset>
270
    </fieldset>
271
</form>
271
</form>
Lines 297-303 Acquisitions &rsaquo; Koha Link Here
297
            [% END %]
297
            [% END %]
298
            </tbody>
298
            </tbody>
299
        </table>
299
        </table>
300
        <a class="btn btn-default" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"><i class="fa fa-fw fa-arrow-left"></i> Return to the basket</a
300
        <a class="btn btn-default" id="lientype" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"><i class="fa fa-fw fa-arrow-left"></i> Return to the basket</a
301
    [% ELSE %]
301
    [% ELSE %]
302
        <span>No order has been duplicated. Maybe something wrong happened?</span>
302
        <span>No order has been duplicated. Maybe something wrong happened?</span>
303
    [% END %]
303
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-312 / +159 lines)
Lines 28-41 Link Here
28
            <a href="#" aria-current="page">Invoices</a>
28
            <a href="#" aria-current="page">Invoices</a>
29
        </li>
29
        </li>
30
    </ol>
30
    </ol>
31
31
        <ol>
32
    <ol>
32
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
33
        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
33
        </ol>
34
    </ol>
34
        <ol>
35
35
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
36
    <ol>
36
        </ol>
37
        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
38
    </ol>
39
</nav>
37
</nav>
40
38
41
<div class="main container-fluid">
39
<div class="main container-fluid">
Lines 102-108 Link Here
102
                  <td>
100
                  <td>
103
101
104
                      <div class="btn-group dropup">
102
                      <div class="btn-group dropup">
105
                          <a class="btn btn-default btn-xs dropdown-toggle" id="invoiceactions[% invoice.invoiceid | html %]" role="button" data-toggle="dropdown" href="#">
103
                          <a class="btn btn-default btn-xs dropdown-toggle lientype" id="invoiceactions[% invoice.invoiceid | html %]" role="button" data-toggle="dropdown" href="#">
106
                             Actions <b class="caret"></b>
104
                             Actions <b class="caret"></b>
107
                          </a>
105
                          </a>
108
                          <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid | html %]">
106
                          <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid | html %]">
Lines 112-286 Link Here
112
                                    <li><a href="invoice.pl?op=reopen&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen</a></li>
110
                                    <li><a href="invoice.pl?op=reopen&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen</a></li>
113
                                [% END %]
111
                                [% END %]
114
                            [% ELSE %]
112
                            [% ELSE %]
115
                                [% SET tab = 'opened' %]
113
                                [% IF CAN_user_acquisition_edit_invoices %]
114
                                    <li><a href="invoice.pl?op=close&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close</a></li>
115
                                [% END %]
116
                            [% END %]
116
                            [% END %]
117
                            <input type="checkbox" style="vertical-align: middle;" id="show_only_subscription_[% tab | html %]" class="show_only_subscription" data-tableid="[% tab | html %]resultst"/>
117
                            [% UNLESS invoice.receivedbiblios || invoice.receiveditems %]
118
                            <label for="show_only_subscription_[% tab | html %]">
118
                                [% IF CAN_user_acquisition_delete_invoices %]
119
                                Show only subscriptions
119
                                    <li><a href="invoice.pl?op=delete&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]" class="delete_invoice"><i class="fa fa-trash"></i> Delete</a></li>
120
                            </label>
120
                                [% END %]
121
                            <p><a id="CheckAll[% tab | html %]table" data-cb="[% tab | html %]" class="checkall" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="UncheckAll[% tab | html %]table" data-cb="[% tab | html %]" class="uncheckall" href="#"><i class="fa fa-remove"></i> Clear all</a></p>
121
                            [% END %]
122
                            <table id="[% tab | html %]resultst" class="result">
122
                          </ul>
123
                                <thead>
123
                      </div>
124
                                    <tr>
124
                  </td>
125
                                        [% IF CAN_user_acquisition_merge_invoices %]
125
                </tr>
126
                                            <th>&nbsp;</th>
126
              [% END %]
127
                                        [% END %]
127
            </tbody>
128
                                        <th>&nbsp;</th>
128
          </table>
129
                                        <th>Invoice number</th>
129
          [% IF CAN_user_acquisition_merge_invoices %]
130
                                        <th>Vendor</th>
130
              [% IF tab == 'closed' %]
131
                                        <th>Shipment date</th>
131
                <a class="btn btn-default merge lientype" id="merge_closed" href="#merge_invoices" data-table="closedresultst"><i class="fa fa-compress"></i> Merge selected invoices</a>
132
                                        <th>Billing date</th>
132
                <a class="btn btn-default lientype" id="open_sel" href="#reopen_selected" data-table="closedresultst" data-op="reopen" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen selected invoices</a>
133
                                        <th>Received bibliographic records</th>
133
              [% ELSE  %]
134
                                        <th>Received items</th>
134
                <a class="btn btn-default merge lientype" id="merge_open" href="#merge_invoices" data-table="openedresultst"><i class="fa fa-compress"></i> Merge selected invoices</a>
135
                                        <th>Status</th>
135
                <a class="btn btn-default lientype" id="close_sel" href="#close_selected" data-table="openedresultst" data-op="close" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close selected invoices</a>
136
                                        <th>&nbsp;</th>
136
              [% END %]
137
                                    </tr>
137
          [% END %] <!-- invoices_table -->
138
                                </thead>
138
        [% END %]
139
                                <tbody>
139
              <div id="invoicestabs" class="toptabs" style="clear:both;">
140
                                    [% FOREACH invoice IN invoices %]
140
                  <ul class="ui-tabs-nav">
141
                                        <tr data-invoiceid="[% invoice.invoiceid | html %]" data-booksellerid="[% invoice.booksellerid | html %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost | html %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid | html %]" data-closedate="[% invoice.closedate | $KohaDates %]">
141
                      <li><a href="#opened">Open invoices ([% openedinvoices.size || 0 | html %])</a></li>
142
                                            [% IF CAN_user_acquisition_merge_invoices %]
142
                      <li><a href="#closed">Closed invoices ([% closedinvoices.size || 0 | html %]) </a></li>
143
                                                <td>[% invoice.is_linked_to_subscriptions | html %]</td>
143
                  </ul>
144
                                            [% END %]
144
                  <div id="opened">
145
                                            <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td>
145
                      [% IF openedinvoices %]
146
                                            <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td>
146
                        [% INCLUDE invoices_table invoices = openedinvoices %]
147
                                            <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td>
147
                    [% ELSE %]
148
                                            <td data-order="[% invoice.shipmentdate | html %]">
148
                        <div class="dialog message">
149
                                                [% invoice.shipmentdate | $KohaDates %]
149
                            <p>Your search returned no open invoices.</p>
150
                                            </td>
150
                        </div>
151
                                            <td data-order="[% invoice.billingdate | html %]">
151
                    [% END %]
152
                                                [% invoice.billingdate | $KohaDates %]
152
                  </div> <!-- opened -->
153
                                            </td>
153
                  <div id="closed">
154
                                            <td>[% invoice.receivedbiblios | html %]</td>
154
                      [% IF closedinvoices %]
155
                                            <td>[% invoice.receiveditems | html %]</td>
155
                        [% INCLUDE invoices_table invoices = closedinvoices closed = 1 %]
156
                                            <td>
156
                    [% ELSE %]
157
                                                [% IF invoice.closedate %]
157
                        <div class="dialog message">
158
                                                    <span>Closed on [% invoice.closedate | $KohaDates %]</span>
158
                            <p>Your search returned no closed invoices.</p>
159
                                                [% ELSE %]
159
                        </div>
160
                                                    <span>Open</span>
160
                    [% END %]
161
                                                [% END %]
161
                </div> <!-- closed -->
162
                                            </td>
162
              </div> <!-- invoicestabs -->
163
                                            <td>
164
165
                                                <div class="btn-group dropup">
166
                                                    <a class="btn btn-default btn-xs dropdown-toggle" id="invoiceactions[% invoice.invoiceid | html %]" role="button" data-toggle="dropdown" href="#">
167
                                                        Actions <b class="caret"></b>
168
                                                    </a>
169
                                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid | html %]">
170
                                                        <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]"><i class="fa fa-search"></i> Details</a></li>
171
                                                        [% IF invoice.closedate %]
172
                                                            [% IF CAN_user_acquisition_reopen_closed_invoices %]
173
                                                                <li><a href="invoice.pl?op=reopen&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen</a></li>
174
                                                            [% END %]
175
                                                        [% ELSE %]
176
                                                            [% IF CAN_user_acquisition_edit_invoices %]
177
                                                                <li><a href="invoice.pl?op=close&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close</a></li>
178
                                                            [% END %]
179
                                                        [% END # /IF invoice.closedate %]
180
                                                        [% UNLESS invoice.receivedbiblios || invoice.receiveditems %]
181
                                                            [% IF CAN_user_acquisition_delete_invoices %]
182
                                                                <li><a href="invoice.pl?op=delete&amp;invoiceid=[% invoice.invoiceid | uri %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]" class="delete_invoice"><i class="fa fa-trash"></i> Delete</a></li>
183
                                                            [% END %]
184
                                                        [% END %]
185
                                                    </ul>
186
                                                </div> <!-- /.btn-group dropup -->
187
                                            </td>
188
                                        </tr>
189
                                    [% END # /FOREACH invoice %]
190
                                </tbody>
191
                            </table> <!-- /#[% tab | html %]resultst -->
192
193
                            [% IF CAN_user_acquisition_merge_invoices %]
194
                                [% IF tab == 'closed' %]
195
                                    <a class="btn btn-default merge" id="merge_closed" href="#merge_invoices" data-table="closedresultst"><i class="fa fa-compress"></i> Merge selected invoices</a>
196
                                    <a class="btn btn-default" id="open_sel" href="#reopen_selected" data-table="closedresultst" data-op="reopen" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen selected invoices</a>
197
                                [% ELSE  %]
198
                                    <a class="btn btn-default merge" id="merge_open" href="#merge_invoices" data-table="openedresultst"><i class="fa fa-compress"></i> Merge selected invoices</a>
199
                                    <a class="btn btn-default" id="close_sel" href="#close_selected" data-table="openedresultst" data-op="close" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close selected invoices</a>
200
                                [% END # /IF tab == 'closed' %]
201
                            [% END # /IF CAN_user_acquisition_merge_invoices %]
202
                        [% END # /BLOCK invoices_table %]
203
204
                        <div id="invoicestabs" class="toptabs">
205
                            <ul class="nav nav-tabs" role="tablist">
206
                                <li role="presentation" class="active"><a href="#opened" aria-controls="opened" role="tab" data-toggle="tab">Open invoices ([% openedinvoices.size || 0 | html %])</a></li>
207
                                <li role="presentation"><a href="#closed" aria-controls="closed" role="tab" data-toggle="tab">Closed invoices ([% closedinvoices.size || 0 | html %]) </a></li>
208
                            </ul>
209
                            <div class="tab-content">
210
                                <div id="opened" role="tabpanel" class="tab-pane active">
211
                                    [% IF openedinvoices %]
212
                                        [% INCLUDE invoices_table invoices = openedinvoices %]
213
                                    [% ELSE %]
214
                                        <div class="dialog message">
215
                                            <p>Your search returned no open invoices.</p>
216
                                        </div>
217
                                    [% END %]
218
                                </div> <!-- /#opened -->
219
                                <div id="closed" role="tabpanel" class="tab-pane">
220
                                    [% IF closedinvoices %]
221
                                        [% INCLUDE invoices_table invoices = closedinvoices closed = 1 %]
222
                                    [% ELSE %]
223
                                        <div class="dialog message">
224
                                            <p>Your search returned no closed invoices.</p>
225
                                        </div>
226
                                    [% END %]
227
                                </div> <!-- /#closed -->
228
                            </div> <!-- /.tab-content -->
229
                        </div> <!-- /#invoicestabs -->
230
231
232
                        <div id="merge_invoices">
233
                            <form id="merge_invoice_form" action="/cgi-bin/koha/acqui/invoice.pl" method="post">
234
                                <fieldset class="rows">
235
                                    <ol>
236
                                        <li><h2>Merge invoices</h2></li>
237
                                        <li>
238
                                            <table id="merge_table">
239
                                                <thead>
240
                                                    <tr>
241
                                                        <th>Invoice number</th>
242
                                                        <th>Shipment date</th>
243
                                                        <th>Billing date</th>
244
                                                        <th>Shipment cost</th>
245
                                                    </tr>
246
                                                </thead>
247
                                                <tbody>
248
                                                </tbody>
249
                                            </table>
250
                                        </li>
251
252
                                        <li>
253
                                            <label for="merge_invoicenumber" class="required">Invoice number:</label>
254
                                            <input type="text" size="10" id="merge_invoicenumber" name="invoicenumber" value="" class="required" required="required" />
255
                                            <span class="required">Required</span>
256
                                        </li>
257
163
258
                                        <li>
259
                                            <label for="merge_shipmentdate">Shipment date:</label>
260
                                            <input type="text" size="10" id="merge_shipmentdate" name="shipmentdate" value="" class="flatpickr" />
261
                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
262
                                        </li>
263
164
264
                                        <li>
165
                <div id="merge_invoices">
265
                                            <label for="merge_billingdate">Billing date:</label>
166
                    <form id="merge_invoice_form" action="/cgi-bin/koha/acqui/invoice.pl" method="post">
266
                                            <input type="text" size="10" id="merge_billingdate" name="billingdate" value="" class="flatpickr" />
167
                    <fieldset class="rows">
267
                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
168
                        <ol>
268
                                        </li>
169
                        <li><h2>Merge invoices</h2></li>
170
                        <li><table id="merge_table">
171
                            <thead><tr><th>Invoice number</th><th>Shipment date</th><th>Billing date</th><th>Shipment cost</th></tr></thead>
172
                            <tbody>
173
                            </tbody>
174
                        </table></li>
175
                        <li><label for="merge_invoicenumber" class="required">Invoice number:</label>
176
                                <input type="text" size="10" id="merge_invoicenumber" name="invoicenumber" value="" class="required" required="required" />
177
                                <span class="required">Required</span>
178
                                </li>
179
                        <li>
180
                            <label for="merge_shipmentdate">Shipment date:</label>
181
                            <input type="text" size="10" id="merge_shipmentdate" name="shipmentdate" value="" class="flatpickr" />
182
                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
183
                        </li>
269
184
270
<<<<<<< HEAD
185
                        <li>
271
                                        <li>
186
                            <label for="merge_billingdate">Billing date:</label>
272
                                            <label for="merge_shipmentcost">Shipment cost:</label>
187
                            <input type="text" size="10" id="merge_billingdate" name="billingdate" value="" class="flatpickr" />
273
                                            <input type="text" size="10" id="merge_shipmentcost" name="shipmentcost" value="" />
188
                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
274
                                        </li>
189
                        </li>
275
                                        <li>
276
                                            <label for="merge_shipment_budgetid">Fund:</label>
277
                                            <select id="merge_shipment_budgetid" name="shipment_budget_id">
278
                                                <option value="">No fund</option>
279
                                                [% FOREACH budget IN budgets_loop %]
280
                                                    <option value="[% budget.budget_id | html %]">[% budget.budget_name | html %]</option>
281
                                                [% END %]
282
                                            </select>
283
                                        </li>
284
190
285
                                        <li>
191
                                        <li>
286
                                            <span class="label">Status:</span> <span id="merge_status"></span>
192
                                            <span class="label">Status:</span> <span id="merge_status"></span>
Lines 340-476 Link Here
340
                                        </li>
246
                                        </li>
341
                                    [% END %]
247
                                    [% END %]
342
                                [% END %]
248
                                [% END %]
343
                                [% IF ( isbneanissn ) %]
249
                              </select></li>
344
                                    <li>ISBN/EAN/ISSN: [% isbneanissn | html %]</li>
250
345
                                [% END %]
251
                      <li><span class="label">Status:</span> <span id="merge_status"></span></li>
346
                                [% IF ( title ) %]
252
                      <li><input type="submit" value="Merge" /></li>
347
                                    <li>Title: [% title | html %]</li>
253
                      </ol>
348
                                [% END %]
254
                      <input type="hidden" name="op" value="mod" />
349
                                [% IF ( author ) %]
255
                      <input type="hidden" id="merge_invoiceid" name="invoiceid" value="" />
350
                                    <li>Author: [% author | html %]</li>
256
                  </fieldset>
351
                                [% END %]
257
                  </form>
352
                                [% IF ( publisher ) %]
258
              </div>
353
                                    <li>Publisher: [% publisher | html %]</li>
259
        [% ELSE %]
354
                                [% END %]
260
          <p>Sorry, but there are no results for your search.</p>
355
                                [% IF ( publicationyear ) %]
261
          <p>Search was:
356
                                    <li>Publication year: [% publicationyear | html %]</li>
262
            <ul>
357
                                [% END %]
263
              [% IF ( invoicenumber ) %]
358
                                [% IF ( branch ) %]
264
                <li>Invoice number: [% invoicenumber | html %]</li>
359
                                    <li>Library: [% Branches.GetName( branch ) | html %]</li>
265
              [% END %]
360
                                [% END %]
266
              [% IF booksellerid %]
361
                            </ul>
267
                <li>Vendor: [% suppliername | html %]</li>
362
                        </p>
268
              [% END %]
363
                    [% END # /IF invoices %]
269
              [% IF shipmentdatefrom %]
270
                <li>Shipment date:
271
                [% IF shipmentdateto %]
272
                  From [% shipmentdatefrom | $KohaDates %]
273
                  To [% shipmentdateto | $KohaDates %]
364
                [% ELSE %]
274
                [% ELSE %]
365
                    <p>Use the search form on the left to find invoices.</p>
275
                  All since [% shipmentdatefrom | $KohaDates %]
366
                [% END %]<!-- do_search -->
276
                [% END %]
367
            </main>
277
                </li>
368
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
278
              [% ELSE %]
279
                [% IF shipmentdateto %]
280
                  <li>Shipment date:
281
                    All until [% shipmentdateto | $KohaDates %]
282
                  </li>
283
                [% END %]
284
              [% END %]
285
              [% IF billingdatefrom %]
286
                <li>Billing date:
287
                [% IF billingdateto %]
288
                  From [% billingdatefrom | $KohaDates %]
289
                  To [% billingdateto | $KohaDates %]
290
                [% ELSE %]
291
                  All since [% billingdatefrom | $KohaDates %]
292
                [% END %]
293
                </li>
294
              [% ELSE %]
295
                [% IF billingdateto %]
296
                  <li>Billing date:
297
                    All until [% billingdateto | $KohaDates %]
298
                  </li>
299
                [% END %]
300
              [% END %]
301
              [% IF ( isbneanissn ) %]
302
                <li>ISBN/EAN/ISSN: [% isbneanissn | html %]</li>
303
              [% END %]
304
              [% IF ( title ) %]
305
                <li>Title: [% title | html %]</li>
306
              [% END %]
307
              [% IF ( author ) %]
308
                <li>Author: [% author | html %]</li>
309
              [% END %]
310
              [% IF ( publisher ) %]
311
                <li>Publisher: [% publisher | html %]</li>
312
              [% END %]
313
              [% IF ( publicationyear ) %]
314
                <li>Publication year: [% publicationyear | html %]</li>
315
              [% END %]
316
              [% IF ( branch ) %]
317
                <li>Library: [% Branches.GetName( branch ) | html %]</li>
318
              [% END %]
319
            </ul>
320
          </p>
321
        [% END %]<!-- invoices -->
322
      [% ELSE %]
323
        <p>Use the search form on the left to find invoices.</p>
324
      [% END %]<!-- do_search -->
325
    </main>
326
</div> <!-- /.col-sm-10.col-sm-push-2 -->
369
327
370
        <div class="col-sm-2 col-sm-pull-10">
371
            <aside>
372
                <form action="" method="get">
373
                    <fieldset class="sidebar brief">
374
                        <h3>Search filters</h3>
375
                        <ol>
376
                            <li>
377
                                <label for="invoicenumber">Invoice number</label>
378
                                <input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber | html %]"
379
                                    class="focus" />
380
                            </li>
381
                            <li>
382
                                <label for="supplier">Vendor:</label>
383
                                <select id="supplier" name="supplierid">
384
                                    <option value="">All</option>
385
                                    [% FOREACH supplier IN suppliers_loop %]
386
                                        [% IF ( supplier.selected ) %]
387
                                            <option selected="selected" value="[% supplier.booksellerid | html %]">[% supplier.suppliername | html %]</option>
388
                                        [% ELSE %]
389
                                            <option value="[% supplier.booksellerid | html %]">[% supplier.suppliername | html %]</option>
390
                                        [% END %]
391
                                    [% END %]
392
                                </select>
393
                            </li>
394
                            <li>
395
                                <fieldset class="brief">
396
                                    <legend>Shipment date</legend>
397
                                    <ol>
398
                                        <li>
399
                                            <label for="shipmentdatefrom">From:</label>
400
                                            <input type="text" id="shipmentdatefrom" name="shipmentdatefrom" size="10" value="[% shipmentdatefrom | $KohaDates %]" class="flatpickr" data-date_to="shipmentdateto" />
401
                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
402
                                        </li>
403
                                        <li>
404
                                            <label for="shipmentdateto">To:</label>
405
                                            <input type="text" id="shipmentdateto" name="shipmentdateto" size="10" value="[% shipmentdateto | $KohaDates %]" class="flatpickr" />
406
                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
407
                                        </li>
408
                                    </ol>
409
                                </fieldset>
410
                            </li>
411
                            <li>
412
                                <fieldset class="brief">
413
                                    <legend>Billing date</legend>
414
                                    <ol>
415
                                        <li>
416
                                            <label for="billingdatefrom">From:</label>
417
                                            <input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom | $KohaDates %]" class="flatpickr" data-date_to="billingdateto" />
418
                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
419
                                        </li>
420
                                        <li>
421
                                            <label for="billingdateto">To:</label>
422
                                            <input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto | $KohaDates %]" class="flatpickr" />
423
                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
424
                                        </li>
425
                                    </ol>
426
                                </fieldset>
427
                            </li>
428
                            <li>
429
                                <label for="isbneanissn">ISBN / EAN / ISSN:</label>
430
                                <input type="text" id="isbneanissn" name="isbneanissn" value="[% isbneanissn | html %]" />
431
                            </li>
432
                            <li>
433
                                <label for="title">Title:</label>
434
                                <input type="text" id="title" name="title" value="[% title | html %]" />
435
                            </li>
436
                            <li>
437
                                <label for="author">Author:</label>
438
                                <input type="text" id="author" name="author" value="[% author | html %]" />
439
                            </li>
440
                            <li>
441
                                <label for="publisher">Publisher:</label>
442
                                <input type="text" id="publisher" name="publisher" value="[% publisher | html %]" />
443
                            </li>
444
                            <li>
445
                                <label for="publicationyear">Publication year:</label>
446
                                <input type="text" id="publicationyear" name="publicationyear" value="[% publicationyear | html %]" />
447
                            </li>
448
                            <li>
449
                                <label for="branch">Library:</label>
450
                                <select id="branch" name="branch">
451
                                    <option value="">All</option>
452
                                    [%# FIXME Should not we filter the libraries %]
453
                                    [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %]
454
                                </select>
455
                            </li>
456
                        </ol>
457
                        <fieldset class="action">
458
                            <input type="submit" value="Search" />
459
                        </fieldset>
460
                    </fieldset> <!-- /.sidebar.brief -->
461
                    <input type="hidden" name="op" id="op" value="do_search" />
462
                </form>
463
                [% INCLUDE 'acquisitions-menu.inc' %]
464
            </aside>
465
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
466
    </div> <!-- /.row -->
467
=======
468
<div class="col-sm-2 col-sm-pull-10">
328
<div class="col-sm-2 col-sm-pull-10">
469
<aside>
329
<aside>
470
<div id="filters">
330
<div id="filters">
471
    <form action="" method="get">
331
    <form action="" method="get">
472
      <fieldset class="sidebar brief">
332
      <fieldset class="sidebar brief">
473
        <h4>Search filters</h4>
333
        <h3>Search filters</h3>
474
        <ol>
334
        <ol>
475
          <li>
335
          <li>
476
            <p for="invoicenumber">Invoice number
336
            <p for="invoicenumber">Invoice number
Lines 563-569 Link Here
563
  </aside>
423
  </aside>
564
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
424
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
565
</div> <!-- /.row -->
425
</div> <!-- /.row -->
566
>>>>>>> Bug 30952: Search bar
567
426
568
[% MACRO jsinclude BLOCK %]
427
[% MACRO jsinclude BLOCK %]
569
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
428
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
Lines 571-589 Link Here
571
    [% INCLUDE 'calendar.inc' %]
430
    [% INCLUDE 'calendar.inc' %]
572
    <script>
431
    <script>
573
        $(document).ready(function() {
432
        $(document).ready(function() {
574
            $('[id^="CheckAll"]').click( function() {
433
            $('#invoicestabs').tabs();
575
                var table_id = "#" + $(this).attr('data-cb') + "resultst";
576
                $(table_id).find('.select-invoice[type="checkbox"]').each( function() {
577
                    $(this).prop("checked" , true );
578
                });
579
            });
580
            $('[id^="UncheckAll"]').click( function() {
581
                var table_id = "#" + $(this).attr('data-cb') + "resultst";
582
                $(table_id).find('.select-invoice[type="checkbox"]').each( function() {
583
                    $(this).prop("checked" , false );
584
                });
585
            });
586
587
            $(".delete_invoice").click(function(){
434
            $(".delete_invoice").click(function(){
588
                return confirmDelete(_("Are you sure you want to delete this invoice?"));
435
                return confirmDelete(_("Are you sure you want to delete this invoice?"));
589
            });
436
            });
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-12 / +12 lines)
Lines 61-80 Link Here
61
        <div class="col-sm-10 col-sm-push-2">
61
        <div class="col-sm-10 col-sm-push-2">
62
            <main>
62
            <main>
63
63
64
<h1>
64
<h2>
65
    [% IF ( ordernumber ) %]
65
    [% IF ( ordernumber ) %]
66
        Modify order line
66
        Modify order line
67
    [% ELSE %]
67
    [% ELSE %]
68
        New order
68
        New order
69
    [% END %]
69
    [% END %]
70
</h1>
70
</h2>
71
71
72
<div class="dialog alert order_error" style="display:none"></div>
72
<div class="dialog alert order_error" style="display:none"></div>
73
73
74
[% IF ( basketno ) %]
74
[% IF ( basketno ) %]
75
    <div id="acqui_basket_summary">
75
    <div id="acqui_basket_summary">
76
    <fieldset class="rows">
76
    <fieldset class="rows">
77
        <legend>Basket details</legend>
77
        <h3>Basket details</h3>
78
        <ol>
78
        <ol>
79
        [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote | html %]</li>[% END %]
79
        [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote | html %]</li>[% END %]
80
        [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
80
        [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
Lines 101-107 Link Here
101
                <input type="hidden" value="mod_basket" name="op" />
101
                <input type="hidden" value="mod_basket" name="op" />
102
                <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
102
                <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
103
            </li>
103
            </li>
104
            <fieldset class="action"><input type="submit" value="Change basketgroup" /></fieldset>
104
            <fieldset class="action"><input type="submit" class="princial" value="Change basketgroup" /></fieldset>
105
        [% END %]
105
        [% END %]
106
        </form>
106
        </form>
107
        [% END %]
107
        [% END %]
Lines 113-119 Link Here
113
<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" class="validated noEnterSubmit" id="Aform" onsubmit="return Check(this);" >
113
<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" class="validated noEnterSubmit" id="Aform" onsubmit="return Check(this);" >
114
114
115
    <fieldset class="rows">
115
    <fieldset class="rows">
116
        <legend>Patrons</legend>
116
        <h3>Patrons</h3>
117
        <ol>
117
        <ol>
118
            <li>
118
            <li>
119
                <span class="label">To notify on receiving:</span>
119
                <span class="label">To notify on receiving:</span>
Lines 128-146 Link Here
128
                    </ul>
128
                    </ul>
129
                    <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids | html %]" />
129
                    <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids | html %]" />
130
                    <input type="hidden" id="op" name="op" value="mod_users" />
130
                    <input type="hidden" id="op" name="op" value="mod_users" />
131
                    <input type="button" id="add_user" onclick="UserSearchPopup();" value="Add user" />
131
                    <input type="button" id="add_user" class="principal" onclick="UserSearchPopup();" value="Add user" />
132
                </div>
132
                </div>
133
            </li>
133
            </li>
134
        </ol>
134
        </ol>
135
    </fieldset>
135
    </fieldset>
136
136
137
<fieldset class="rows">
137
<fieldset class="rows">
138
        <legend>
138
        <h3>
139
            Catalog details
139
            Catalog details
140
            [% IF ( biblionumber ) %]
140
            [% IF ( biblionumber ) %]
141
                <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | uri %]"> Edit record</a></span>
141
                <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | uri %]"> Edit record</a></span>
142
            [% END %]
142
            [% END %]
143
        </legend>
143
        </h3>
144
        [% UNLESS ( existing ) %]
144
        [% UNLESS ( existing ) %]
145
        <input type="hidden" name="existing" value="no" />
145
        <input type="hidden" name="existing" value="no" />
146
        [% END %]
146
        [% END %]
Lines 276-282 Link Here
276
276
277
    [% IF ( suggestionid ) %]
277
    [% IF ( suggestionid ) %]
278
        <fieldset class="rows">
278
        <fieldset class="rows">
279
        <legend>Suggestion</legend>
279
        <h3>Suggestion</h3>
280
        <ol>
280
        <ol>
281
          <li>
281
          <li>
282
            <span class="label">Suggested by: </span>
282
            <span class="label">Suggested by: </span>
Lines 318-324 Link Here
318
      </div>
318
      </div>
319
319
320
      <fieldset class="rows" id="itemfieldset">
320
      <fieldset class="rows" id="itemfieldset">
321
          <legend>Item</legend>
321
          <h3>Item</h3>
322
          [% IF ( NoACQframework ) %]
322
          [% IF ( NoACQframework ) %]
323
              <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
323
              <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
324
          [% END %]
324
          [% END %]
Lines 333-339 Link Here
333
      [% END %][%# | html UNLESS subscriptionid %]
333
      [% END %][%# | html UNLESS subscriptionid %]
334
    [% END %][%# IF (AcqCreateItemOrdering) %]
334
    [% END %][%# IF (AcqCreateItemOrdering) %]
335
    <fieldset class="rows">
335
    <fieldset class="rows">
336
        <legend>Accounting details</legend>
336
        <h3>Accounting details</h3>
337
        <ol>
337
        <ol>
338
            <li>
338
            <li>
339
                <label class="required" for="quantity">Quantity: </label>
339
                <label class="required" for="quantity">Quantity: </label>
Lines 500-506 Link Here
500
    </fieldset>
500
    </fieldset>
501
    <fieldset class="action">
501
    <fieldset class="action">
502
        <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
502
        <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
503
        <input type="submit" value="Save" />
503
        <input type="submit" class="principal" value="Save" />
504
        [% IF (suggestionid) %]
504
        [% IF (suggestionid) %]
505
            <a class="cancel" href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">Cancel</a>
505
            <a class="cancel" href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | html %]&amp;basketno=[% basketno | html %]">Cancel</a>
506
        [% ELSE %]
506
        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-1 / +3 lines)
Lines 49-55 Link Here
49
        <div class="col-sm-10 col-sm-push-2">
49
        <div class="col-sm-10 col-sm-push-2">
50
            <main>
50
            <main>
51
51
52
            <h1>Serials subscriptions</h1>
52
            <h2>Serials subscriptions</h2>
53
            [% IF (done_searched) %]
53
            [% IF (done_searched) %]
54
                <label for="show_only_renewed">
54
                <label for="show_only_renewed">
55
                    <input type="checkbox" style="vertical-align: middle;" id="show_only_renewed" />
55
                    <input type="checkbox" style="vertical-align: middle;" id="show_only_renewed" />
Lines 119-126 Link Here
119
119
120
<div class="col-sm-2 col-sm-pull-10">
120
<div class="col-sm-2 col-sm-pull-10">
121
    <aside>
121
    <aside>
122
    <div id="filters">
122
        [% INCLUDE 'subscriptions-search.inc' %]
123
        [% INCLUDE 'subscriptions-search.inc' %]
123
        [% INCLUDE 'acquisitions-menu.inc' %]
124
        [% INCLUDE 'acquisitions-menu.inc' %]
125
124
    </aside>
126
    </aside>
125
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
127
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
126
</div> <!-- /.row -->
128
</div> <!-- /.row -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-3 / +3 lines)
Lines 89-95 tr.selected td { Link Here
89
    <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
89
    <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
90
    <div class="row">
90
    <div class="row">
91
    <div class="col-sm-6">
91
    <div class="col-sm-6">
92
    <h1>Order from external source</h1>
92
    <h2>Order from external source</h2>
93
    <input type="hidden" name="op" id="op" value="do_search" />
93
    <input type="hidden" name="op" id="op" value="do_search" />
94
	    <fieldset class="rows">
94
	    <fieldset class="rows">
95
         <ol>
95
         <ol>
Lines 153-159 tr.selected td { Link Here
153
153
154
<div class="row">
154
<div class="row">
155
    <div class="col-md-12">
155
    <div class="col-md-12">
156
    <fieldset class="action"><input type="submit"  class="submit" value="Search" /> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Cancel</a></fieldset>
156
    <fieldset class="action"><input type="submit"  class="principal" value="Search" /> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Cancel</a></fieldset>
157
    </div>
157
    </div>
158
</div>
158
</div>
159
</form>
159
</form>
Lines 274-280 tr.selected td { Link Here
274
        [% IF ( show_nextbutton ) %]
274
        [% IF ( show_nextbutton ) %]
275
            <input type="button" name="changepage_next" value="Next page" data-currentpage="[% current_page | html %]" />
275
            <input type="button" name="changepage_next" value="Next page" data-currentpage="[% current_page | html %]" />
276
        [% END %]
276
        [% END %]
277
        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page | html %]" size="4" type="text" /> <input type="submit" name="changepage_goto" value="Go" />
277
        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page | html %]" size="4" type="text" /> <input type="submit" class="principal" name="changepage_goto" value="Go" />
278
    </form>
278
    </form>
279
279
280
    [% ELSE %]
280
    [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-4 / +6 lines)
Lines 176-182 Link Here
176
176
177
                            [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
177
                            [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
178
                                <div class="btn-group">
178
                                <div class="btn-group">
179
                                    <a class="btn btn-default btn-xs" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a>
179
                                    <a class="btn btn-default btn-xs lientype" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a>
180
                                </div>
180
                                </div>
181
                                <div class="btn-group">
181
                                <div class="btn-group">
182
                                    <button type="button" id="results_batch_ops" class="btn btn-default btn-xs dropdown-toggle disabled" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
182
                                    <button type="button" id="results_batch_ops" class="btn btn-default btn-xs dropdown-toggle disabled" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Lines 324-334 Link Here
324
                    </div> <!-- /#searchheader -->
324
                    </div> <!-- /#searchheader -->
325
325
326
                [% ELSE # /IF total %]
326
                [% ELSE # /IF total %]
327
                    <form method="post" name="fz3950" class="fz3950bigrpad">
328
                        <div id="toolbar" class="btn-toolbar" style="background-color:transparent"><div>
329
                            <button class="btn btn-default pat" type="button" id="z3950submit"><i class="fa fa-search"></i> Z39.50/SRU search</button>
330
                        </div></div>
331
                    </form>
327
332
328
                    <div id="searchheader">
333
                    <div id="searchheader">
329
                        <form method="post" name="fz3950" class="fz3950bigrpad">
330
                            <button class="btn btn-default" type="button" id="z3950submit"><i class="fa fa-search"></i> Z39.50/SRU search</button>
331
                        </form>
332
                        <h3>No results found</h3>
334
                        <h3>No results found</h3>
333
                        [% IF ( searchdesc ) %]
335
                        [% IF ( searchdesc ) %]
334
                            <p>
336
                            <p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt (-9 / +16 lines)
Lines 61-67 Link Here
61
        <div class="col-sm-12">
61
        <div class="col-sm-12">
62
            <main>
62
            <main>
63
                [% INCLUDE 'blocking_errors.inc' %]
63
                [% INCLUDE 'blocking_errors.inc' %]
64
<h1>Items for [% biblio.title | html %] [% IF ( biblio.author ) %] by [% biblio.author | html %][% END %] (Record #[% biblio.biblionumber | html %])</h1>
64
<h2>Items for [% biblio.title | html %] [% IF ( biblio.author ) %] by [% biblio.author | html %][% END %] (Record #[% biblio.biblionumber | html %])</h2>
65
65
66
[% IF ( barcode_not_unique ) %]<div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div>[% END %]
66
[% IF ( barcode_not_unique ) %]<div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div>[% END %]
67
[% IF ( no_next_barcode ) %]<div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div>[% END %]
67
[% IF ( no_next_barcode ) %]<div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div>[% END %]
Lines 73-78 Link Here
73
73
74
<div id="cataloguing_additem_itemlist">
74
<div id="cataloguing_additem_itemlist">
75
    [% IF items %]
75
    [% IF items %]
76
    <div id="searchresults">
76
        [% SET date_fields = [ 'dateaccessioned', 'onloan', 'datelastseen', 'datelastborrowed', 'replacementpricedate' ] %]
77
        [% SET date_fields = [ 'dateaccessioned', 'onloan', 'datelastseen', 'datelastborrowed', 'replacementpricedate' ] %]
77
        <div>
78
        <div>
78
        <table id="itemst">
79
        <table id="itemst">
Lines 107-113 Link Here
107
                    [% ELSE %]
108
                    [% ELSE %]
108
                      <td>
109
                      <td>
109
                          <div class="btn-group dropup">
110
                          <div class="btn-group dropup">
110
                          <a class="btn btn-default btn-xs dropdown-toggle" id="itemactions[% item.itemnumber | html %]" role="button" data-toggle="dropdown" href="#">
111
                          <a class="btn btn-default btn-xs dropdown-toggle lientype" id="itemactions[% item.itemnumber | html %]" role="button" data-toggle="dropdown" href="#">
111
                              Actions <b class="caret"></b>
112
                              Actions <b class="caret"></b>
112
                          </a>
113
                          </a>
113
                          <ul class="dropdown-menu" role="menu" aria-labelledby="itemactions[% item.itemnumber | html %]">
114
                          <ul class="dropdown-menu" role="menu" aria-labelledby="itemactions[% item.itemnumber | html %]">
Lines 140-150 Link Here
140
          </tbody>
141
          </tbody>
141
        </table>
142
        </table>
142
        </div>
143
        </div>
144
    </div>
143
    [% END %]
145
    [% END %]
144
146
145
<div class="row">
147
<div class="row">
146
    <div class="col-sm-2">
148
    <div class="col-sm-2">
149
    <aside>
147
        [% INCLUDE 'biblio-view-menu.inc' %]
150
        [% INCLUDE 'biblio-view-menu.inc' %]
151
    </aside>
148
    </div>
152
    </div>
149
    <div class="col-sm-10">
153
    <div class="col-sm-10">
150
154
Lines 155-165 Link Here
155
        <input type="hidden" name="popup" value="1" />
159
        <input type="hidden" name="popup" value="1" />
156
    [% END %]
160
    [% END %]
157
    <input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html %]" />
161
    <input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html %]" />
162
163
158
    [% IF op != 'saveitem' %]
164
    [% IF op != 'saveitem' %]
159
        <h2 id="additema">Add item [% IF (circborrowernumber) %]<em>(fast cataloging)</em>[% END %]</h2>
165
        <h2 id="additema">Add item [% IF (circborrowernumber) %]<em>(fast cataloging)</em>[% END %]</h2>
160
    [% ELSE %]
166
    [% ELSE %]
161
        <h2 id="edititem">Edit item #[% itemnumber | html %][% IF ( barcode ) %] / Barcode [% barcode | html %][% END %]</h2>
167
        <h2 id="edititem">Edit item #[% itemnumber | html %][% IF ( barcode ) %] / Barcode [% barcode | html %][% END %]</h2>
162
    [% END %]
168
    [% END %]
169
163
	<fieldset class="rows">
170
	<fieldset class="rows">
164
        [% PROCESS subfields_for_item subfields => subfields %]
171
        [% PROCESS subfields_for_item subfields => subfields %]
165
    </fieldset>
172
    </fieldset>
Lines 168-189 Link Here
168
    [% END %]
175
    [% END %]
169
176
170
<fieldset class="action">    [% IF op != 'saveitem' %]
177
<fieldset class="action">    [% IF op != 'saveitem' %]
171
    <input type="submit" name="phony_submit" value="phony_submit" id="phony_submit" style="display:none;" onclick="return false;" />
178
    <input type="submit" class="principal" name="phony_submit" value="phony_submit" id= "phony_submit" style="display:none;" onclick="return false;" />
172
    <!-- Note : We use here a false submit button because we have several submit buttons and we don't want the user to believe they validated the adding of multiple items
179
    <!-- Note : We use here a false submit button because we have several submit buttons and we don't want the user to believe they validated the adding of multiple items
173
		when pressing the enter key, while in fact it is the first submit button that is validated, in our case the "add (single) item" button.
180
		when pressing the enter key, while in fact it is the first submit button that is validated, in our case the "add (single) item" button.
174
		It is a bit tricky, but necessary in the sake of UI correctness.
181
		It is a bit tricky, but necessary in the sake of UI correctness.
175
    -->
182
    -->
176
    <span id="addsingle">
183
    <span id="addsingle">
177
        <input type="submit" name="add_submit" value="Add item" onclick="return Check(this.form)" />
184
        <input type="submit" name="add_submit" value="Add item" class="principal" onclick="return Check(this.form)" />
178
        <input type="submit" name="add_duplicate_submit" value="Add &amp; duplicate" onclick="return Check(this.form)" />
185
        <input type="submit" name="add_duplicate_submit" class="principal" value="Add &amp; duplicate" onclick="return Check(this.form)" />
179
    </span>
186
    </span>
180
    <span id="addmultiple">
187
    <span id="addmultiple">
181
        <input type="button" name="add_multiple_copies" id="add_multiple_copies" value="Add multiple copies of this item" />
188
        <input type="button" name="add_multiple_copies" class="principal" id="add_multiple_copies" value="Add multiple copies of this item" />
182
    </span>
189
    </span>
183
    <fieldset id="add_multiple_copies_span">
190
    <fieldset id="add_multiple_copies_span">
184
        <label for="number_of_copies">Number of copies of this item to add: </label>
191
        <label for="number_of_copies">Number of copies of this item to add: </label>
185
        <input type="text" id="number_of_copies" name="number_of_copies" value="" size="2" />
192
        <input type="text" id="number_of_copies" name="number_of_copies" value="" size="2" />
186
        <input type="submit" id="add_multiple_copies_submit" name="add_multiple_copies_submit" value="Add" onclick="javascript:return Check(this.form) && CheckMultipleAdd(this.form.number_of_copies.value);" /> <a href="#" id="cancel_add_multiple" class="cancel">Cancel</a>
193
        <input type="submit" id="add_multiple_copies_submit" class="principal" name="add_multiple_copies_submit" value="Add" onclick="javascript:return Check(this.form) && CheckMultipleAdd(this.form.number_of_copies.value);" /> <a href="#" id="cancel_add_multiple" class="cancel">Cancel</a>
187
        <div class="hint"><p>The barcode you enter will be incremented for each additional item.</p></div>
194
        <div class="hint"><p>The barcode you enter will be incremented for each additional item.</p></div>
188
    </fieldset>
195
    </fieldset>
189
196
Lines 191-198 Link Here
191
    [% IF op != 'add_item' %]
198
    [% IF op != 'add_item' %]
192
        <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
199
        <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
193
    [% END %]
200
    [% END %]
194
    <input type="submit" value="Save changes" onclick="return Check(this.form)">
201
    <input type="submit" class="principal" value="Save changes" onclick="return Check(this.form)">
195
    <input type="button" id="addnewitem" value="Add a new item">
202
    <input type="button" class="lientype" id="addnewitem" value="Add a new item">
196
    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Cancel</a>
203
    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Cancel</a>
197
    [% END %]</fieldset>
204
    [% END %]</fieldset>
198
205
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt (-70 / +73 lines)
Lines 20-26 Link Here
20
</head>
20
</head>
21
21
22
<body id="circ_reserveratios" class="circ">
22
<body id="circ_reserveratios" class="circ">
23
[% INCLUDE 'header.inc'form=formulaire %]
23
[% INCLUDE 'header.inc' form=formulaire %]
24
24
25
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
25
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
26
    <ol>
26
    <ol>
Lines 36-47 Link Here
36
            </a>
36
            </a>
37
        </li>
37
        </li>
38
    </ol>
38
    </ol>
39
    <ol>
39
        <ol>
40
        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
40
            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
41
    </ol>
41
        </ol>
42
    <ol>
42
        <ol>
43
        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
43
            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
44
    </ol>
44
        </ol>
45
</nav>
45
</nav>
46
46
47
<div class="main container-fluid">
47
<div class="main container-fluid">
Lines 49-55 Link Here
49
        <div class="col-sm-10 col-sm-push-2">
49
        <div class="col-sm-10 col-sm-push-2">
50
            <main>
50
            <main>
51
51
52
<h1>Hold ratios to calculate items needed</h1>
52
<h2>Hold ratios to calculate items needed</h2>
53
   <h3>Calculated on [% todaysdate | $KohaDates %]. From [% from | $KohaDates %]
53
   <h3>Calculated on [% todaysdate | $KohaDates %]. From [% from | $KohaDates %]
54
    to [% to | $KohaDates %]</h3>
54
    to [% to | $KohaDates %]</h3>
55
<p>These items have a hold ratio &ge; [% ratio | html %].</p>
55
<p>These items have a hold ratio &ge; [% ratio | html %].</p>
Lines 119-196 Link Here
119
                <p>
119
                <p>
120
                    [% IF ( reserveloo.thisratio_atleast1 ) %]
120
                    [% IF ( reserveloo.thisratio_atleast1 ) %]
121
                        [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.copies_to_buy | html %] -->
121
                        [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.copies_to_buy | html %] -->
122
                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;rr_quantity_to_order=[% reserveloo.copies_to_buy | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% reserveloo.copies_to_buy | html %] to order</a>
122
                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;rr_quantity_to_order=[% reserveloo.copies_to_buy | uri %]" class="btn btn-default btn-xs" id="lientype"><i class="fa fa-plus"></i> [% reserveloo.copies_to_buy | html %] to order</a>
123
                        [% ELSE %]
123
                        [% ELSE %]
124
                            <strong>[% reserveloo.copies_to_buy | html %] to order</strong>
124
                            <strong>[% reserveloo.copies_to_buy | html %] to order</strong>
125
                        [% END %]
125
                        [% END %]
126
                        [% IF ( reserveloo.pendingorders ) %]<br><strong>[% reserveloo.pendingorders | html %] pending</strong>[% END %]
126
                        [% IF ( reserveloo.pendingorders ) %]<br><strong>[% reserveloo.pendingorders | html %] pending</strong>[% END %]
127
                    [% ELSE %]
127
                    [% ELSE %]
128
                        <span>0 to order</span>
128
                        0 to order
129
                    [% END %]
129
                    [% END %]
130
                    </tbody>
130
                </p>
131
                </table>
131
            </td>
132
                [% ELSE %]
132
        </tr>
133
                    <strong>No items found.</strong>
133
      [% END %]
134
                [% END %]
134
      </tbody>
135
    </table>
136
    [% ELSE %]
137
        <strong>No items found.</strong>
138
    [% END %]
135
139
136
            </main>
140
            </main>
137
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
141
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
138
142
139
        <div class="col-sm-2 col-sm-pull-10">
143
        <div class="col-sm-2 col-sm-pull-10">
140
            <aside>
144
            <aside>
141
                <div id="filters">
145
142
                    <form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
146
<form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
143
                        <fieldset class="brief">
147
<aside>
144
                            <h4>Refine results</h4>
148
<div id="filters">
145
149
<fieldset class="brief">
146
                            <fieldset>
150
<h4>Refine results</h4>
147
                                <ol>
151
<ol>
148
                                    <li>
152
    <li>
149
                                        <p>Hold ratio (greater than or equal to):
153
        <p for="ratio">Hold ratio (greater than or equal to):
150
                                        <input type="text" size="5" id="ratio" name="ratio" value="[% ratio | html %]" /></p>
154
        <input type="text" size="5" id="ratio" name="ratio" value="[% ratio | html %]" /></p>
151
                                    </li>
155
    </li>
152
156
153
                                    <li class="checkbox">
157
    <li class="checkbox">
154
                                        <p>
158
        <p for="include_ordered">
155
                                        [% IF include_ordered %]
159
        [% IF include_ordered %]
156
                                            <input id="include_ordered" name="include_ordered" type="checkbox" checked="checked"/>
160
            <input id="include_ordered" name="include_ordered" type="checkbox" checked="checked"/>
157
                                        [% ELSE %]
161
        [% ELSE %]
158
                                            <input id="include_ordered" name="include_ordered" type="checkbox"/>
162
            <input id="include_ordered" name="include_ordered" type="checkbox"/>
159
                                        [% END %]
163
        [% END %]  Include ordered</p>
160
                                        Include ordered</p>
164
    </li>
161
                                    </li>
165
162
166
    <li class="checkbox">
163
                                    <li class="checkbox">
167
        <p for="include_suspended">
164
                                        <p>
168
        [% IF include_suspended %]
165
                                        [% IF include_suspended %]
169
            <input id="include_suspended" name="include_suspended" type="checkbox" checked="checked"/>
166
                                            <input id="include_suspended" name="include_suspended" type="checkbox" checked="checked"/>
170
        [% ELSE %]
167
                                        [% ELSE %]
171
            <input id="include_suspended" name="include_suspended" type="checkbox"/>
168
                                            <input id="include_suspended" name="include_suspended" type="checkbox"/>
172
        [% END %]  Include suspended</p>
169
                                        [% END %]
173
    </li>
170
                                        Include suspended</p>
174
171
                                    </li>
175
    <li>
172
176
        <p for="from">Start date:
173
                                    <li>
177
        <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" /></p>
174
                                        <p>Start date:
178
    </li>
175
                                        <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" /></p>
179
176
                                    </li>
180
    <li>
177
181
        <p for="to">End date:
178
                                    <li>
182
        <input size="10" id="to" name="to" value="[% to | $KohaDates %]" type="text" class="flatpickr" /></p>
179
                                        <p>End date:
183
    </li>
180
                                        <input size="10" id="to" name="to" value="[% to | $KohaDates %]" type="text" class="flatpickr" /></p>
184
</ol>
181
                                    </li>
185
(inclusive)
182
                                </ol>
186
183
                                <p>(inclusive)</p>
187
<fieldset class="action"><input type="submit" value="Go" class="principal"/></fieldset>
184
                                <button type="submit" class="submit" id="principal">Go</button>
188
</fieldset>
185
                            </fieldset>
189
</div>
186
                        </fieldset>
190
</aside>
187
191
[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]
188
                        [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]
192
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
189
                        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
193
<input type="hidden" name="basketno" value="[% basketno | html %]" />
190
                        <input type="hidden" name="basketno" value="[% basketno | html %]" />
194
[% END %]
191
                        [% END %]
195
</form>
192
                    </form>
196
193
                </div>
194
            </aside>
197
            </aside>
195
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
198
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
196
     </div> <!-- /.row -->
199
     </div> <!-- /.row -->
Lines 200-206 Link Here
200
    [% INCLUDE 'datatables.inc' %]
203
    [% INCLUDE 'datatables.inc' %]
201
    [% INCLUDE 'columns_settings.inc' %]
204
    [% INCLUDE 'columns_settings.inc' %]
202
    <script>
205
    <script>
203
        var table_settings = [% TablesSettings.GetTableSettings( 'circ', 'holdsratios', 'holds-ratios', 'json' ) | $raw %];
206
        var columns_settings = [% TablesSettings.GetColumns( 'circ', 'holdsratios', 'holds-ratios', 'json' ) | $raw %];
204
        $(document).ready(function() {
207
        $(document).ready(function() {
205
            KohaTable("holdst", {
208
            KohaTable("holdst", {
206
                "aaSorting": [ [2,'desc'], [3,'asc'] ],
209
                "aaSorting": [ [2,'desc'], [3,'asc'] ],
Lines 210-216 Link Here
210
                    ],
213
                    ],
211
                "sPaginationType": "full",
214
                "sPaginationType": "full",
212
                "autoWidth": false
215
                "autoWidth": false
213
            }, table_settings);
216
            }, columns_settings);
214
       });
217
       });
215
  </script>
218
  </script>
216
[% END %]
219
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt (-4 lines)
Lines 90-100 Link Here
90
	[% END %]
90
	[% END %]
91
91
92
92
93
<<<<<<< HEAD
94
    <fieldset class="brief"><legend><h1>Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]</h1></legend>
95
=======
96
    <fieldset class="brief"><h3>Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]</h3>
93
    <fieldset class="brief"><h3>Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]</h3>
97
>>>>>>> Bug 30952: Search bar
98
	<ol>
94
	<ol>
99
    <li><label for="newuserid">New username:</label>
95
    <li><label for="newuserid">New username:</label>
100
    <input type="hidden" name="member" value="[% patron.borrowernumber | html %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% patron.userid | html %]" /></li>
96
    <input type="hidden" name="member" value="[% patron.borrowernumber | html %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% patron.userid | html %]" /></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt (-1 / +1 lines)
Lines 22-28 Link Here
22
22
23
        [% PROCESS patron_search_table table_id => 'memberresultst' columns => columns %]
23
        [% PROCESS patron_search_table table_id => 'memberresultst' columns => columns %]
24
24
25
        <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div>
25
        <div id="closewindow"><a href="#" class="btn btn-default btn-default close cancel">Close</a></div>
26
26
27
    </div>
27
    </div>
28
</div>
28
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt (-2 / +1 lines)
Lines 268-274 Link Here
268
                            </fieldset>
268
                            </fieldset>
269
269
270
                            <fieldset id="process_images" class="action">
270
                            <fieldset id="process_images" class="action">
271
                                <button type="submit" class="btn btn-default btn-sm save_image">Process images</button>
271
                                <button type="submit" class="btn btn-default btn-sm save_image principal">Process images</button>
272
                                [% IF ( biblionumber ) %]
272
                                [% IF ( biblionumber ) %]
273
                                    <a class="cancel cancel_image" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Cancel</a>
273
                                    <a class="cancel cancel_image" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Cancel</a>
274
                                [% ELSE %]
274
                                [% ELSE %]
275
- 

Return to bug 30952