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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/holds.scss (+36 lines)
Line 0 Link Here
1
.hold_title {
2
    border: 1px solid #b9d8d9;
3
    border-bottom-color: darken( #b9d8d9, 15% );
4
    border-top-color: lighten( #b9d8d9, 10% );
5
    border-radius: 5px;
6
    margin: .5em 0;
7
    padding-bottom: 1em;
8
    padding: 1em;
9
}
10
11
.holds_table {
12
    margin-bottom: 1em;
13
    width: 100%;
14
}
15
16
.holds_by_library,
17
.holds_by_itemtype {
18
    margin-bottom: 1em;
19
    margin-left: 1em;
20
21
    &:last-child {
22
        .holds_table {
23
            margin-bottom: 0;
24
        }
25
    }
26
}
27
28
.holds_by_library {
29
    .itemtype_holds {
30
        color: #5D6A8A;
31
    }
32
33
    &:last-child {
34
        margin-bottom: 0;
35
    }
36
}
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (+10 lines)
Lines 927-932 fieldset { Link Here
927
                    }
927
                    }
928
                }
928
                }
929
            }
929
            }
930
931
            table {
932
                display: inline-block;
933
                font-size: 105%;
934
                margin: 0;
935
            }
930
        }
936
        }
931
937
932
        p {
938
        p {
Lines 2460-2465 td { Link Here
2460
    font-size: 105%;
2466
    font-size: 105%;
2461
    line-height: 200%;
2467
    line-height: 200%;
2462
2468
2469
    h3 & {
2470
        font-size: 70%;
2471
    }
2472
2463
    a,
2473
    a,
2464
    span {
2474
    span {
2465
        background-color: #E4ECF5;
2475
        background-color: #E4ECF5;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (-6 / +13 lines)
Lines 190-204 Link Here
190
        [%- END -%]
190
        [%- END -%]
191
            [%- END -%]
191
            [%- END -%]
192
            <td>
192
            <td>
193
                <a class="cancel-hold" title="Cancel hold" data-borrowernumber="[% hold.borrowernumber | html %]" data-biblionumber="[% hold.biblionumber | html %]" data-id="[% hold.reserve_id | html %]" href="request.pl?action=cancel&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
193
                <a class="btn btn-default btn-xs cancel-hold" data-borrowernumber="[% hold.borrowernumber | html %]" data-biblionumber="[% hold.biblionumber | html %]" data-id="[% hold.reserve_id | html %]" href="request.pl?action=cancel&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
194
                    <img src="[% interface | html %]/[% theme | html %]/img/x.png" alt="Cancel" />
194
                    <i class="fa fa-trash" aria-hidden="true"></i> Cancel
195
                </a>
195
                </a>
196
            </td>
196
            </td>
197
            <td>
197
            <td>
198
                [%- IF Koha.Preference('SuspendHoldsIntranet') -%]
198
                [% IF Koha.Preference('SuspendHoldsIntranet') %]
199
                    [%- UNLESS ( hold.found ) -%]
199
                    [% UNLESS ( hold.found ) %]
200
                        <input type="button" value="[% IF ( hold.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&amp;reserve_id=[% hold.reserve_id | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;date=[% hold.date | html %]&amp;suspend_until=' + $('#suspend_until_[% hold.reserve_id | html %]').val()" />
200
                        <button class="btn btn-default btn-xs" onclick="window.location.href='request.pl?action=toggleSuspend&amp;reserve_id=[% hold.reserve_id | html %]&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;date=[% hold.date | html %]&amp;suspend_until=' + $('#suspend_until_[% hold.reserve_id | html %]').val()">
201
                        [%- IF Koha.Preference('AutoResumeSuspendedHolds') -%]
201
                            [% IF ( hold.suspend ) %]
202
                                <i class="fa fa-play" aria-hidden="true"></i> Unsuspend
203
                            [% ELSE %]
204
                                <i class="fa fa-pause" aria-hidden="true"></i> Suspend
205
                            [% END %]
206
                        </button>
207
208
                        [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
202
                            <label for="suspend_until_[% hold.reserve_id | html %]">[% IF ( hold.suspend ) %] on [% ELSE %] until [% END %]</label>
209
                            <label for="suspend_until_[% hold.reserve_id | html %]">[% IF ( hold.suspend ) %] on [% ELSE %] until [% END %]</label>
203
                            <input type="text" name="suspend_until_[% hold.reserve_id | html %]" id="suspend_until_[% hold.reserve_id | html %]" size="10" value="[% hold.suspend_until | $KohaDates %]" class="suspend_until_datepicker" />
210
                            <input type="text" name="suspend_until_[% hold.reserve_id | html %]" id="suspend_until_[% hold.reserve_id | html %]" size="10" value="[% hold.suspend_until | $KohaDates %]" class="suspend_until_datepicker" />
204
                        [%- ELSE -%]
211
                        [%- ELSE -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-101 / +159 lines)
Lines 10-15 Link Here
10
[% USE AuthorisedValues %]
10
[% USE AuthorisedValues %]
11
[% USE Price %]
11
[% USE Price %]
12
[% USE TablesSettings %]
12
[% USE TablesSettings %]
13
[% PROCESS 'i18n.inc' %]
13
[% SET footerjs = 1 %]
14
[% SET footerjs = 1 %]
14
[% INCLUDE 'doc-head-open.inc' %]
15
[% INCLUDE 'doc-head-open.inc' %]
15
[% UNLESS ( multi_hold ) %]
16
[% UNLESS ( multi_hold ) %]
Lines 18-23 Link Here
18
    <title>Confirm holds &rsaquo; Holds &rsaquo; Circulation &rsaquo; Koha</title>
19
    <title>Confirm holds &rsaquo; Holds &rsaquo; Circulation &rsaquo; Koha</title>
19
[% END %]
20
[% END %]
20
[% INCLUDE 'doc-head-close.inc' %]
21
[% INCLUDE 'doc-head-close.inc' %]
22
[% Asset.css("css/holds.css") | $raw %]
21
</head>
23
</head>
22
24
23
<body id="circ_request" class="catalog">
25
<body id="circ_request" class="catalog">
Lines 54-62 Link Here
54
                <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
56
                <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
55
            </li>
57
            </li>
56
            <li>
58
            <li>
57
                <a href="#" aria-current="page">
59
                [% IF ( patron ) %]
58
                    Confirm holds
60
                    <a href="#" aria-current="page">
59
                </a>
61
                        Place holds
62
                    </a>
63
                [% ELSE %]
64
                    [% IF clubcount %]
65
                        <a href="#" aria-current="page">
66
                            Search patrons or clubs
67
                        </a>
68
                    [% ELSE %]
69
                        <a href="#" aria-current="page">
70
                            Search patrons
71
                        </a>
72
                    [% END %]
73
                [% END %]
60
            </li>
74
            </li>
61
        </ol>
75
        </ol>
62
    </nav>
76
    </nav>
Lines 102-113 Link Here
102
                </div>
116
                </div>
103
            [% END %]
117
            [% END %]
104
118
105
            [% UNLESS ( nobiblio ) %]
119
            [% UNLESS ( multi_hold ) %]
106
                [% UNLESS ( multi_hold ) %]
120
                <h1>Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %]</h1>
107
                        <h1>Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %]</h1>
121
            [% ELSE %]
108
                [% ELSE %]
122
                <h1>
109
                    <h1>Confirm holds</h1>
123
                    [% IF ( patron ) %]
110
                [% END %]
124
                        Place holds
125
                    [% ELSE %]
126
                        [% IF clubcount %]
127
                            Search patrons or clubs
128
                        [% ELSE %]
129
                            Search patrons
130
                        [% END %]
131
                    [% END %]
132
                </h1>
111
            [% END %]
133
            [% END %]
112
134
113
            [% UNLESS club OR patron OR patron.borrowernumber OR noitems OR nobiblio %]
135
            [% UNLESS club OR patron OR patron.borrowernumber OR noitems OR nobiblio %]
Lines 125-134 Link Here
125
                    </div>
147
                    </div>
126
                [% END %]
148
                [% END %]
127
                <fieldset class="brief">
149
                <fieldset class="brief">
128
                    [% IF clubcount %]
150
                    [% UNLESS multi_hold %]
129
                        <label>Search patrons or clubs</label>
151
                        [% IF clubcount %]
130
                    [% ELSE %]
152
                            <label>Search patrons or clubs</label>
131
                        <label>Search patrons</label>
153
                        [% ELSE %]
154
                            <label>Search patrons</label>
155
                        [% END %]
132
                    [% END %]
156
                    [% END %]
133
                    <div id="circ_holds_select" class="toptabs">
157
                    <div id="circ_holds_select" class="toptabs">
134
                        <ul>
158
                        <ul>
Lines 250-256 Link Here
250
                                    [% END %]
274
                                    [% END %]
251
                                </li>
275
                                </li>
252
                            [% END %]
276
                            [% END %]
253
                        </ol>
254
                        [% UNLESS ( multi_hold ) %]
277
                        [% UNLESS ( multi_hold ) %]
255
                            <fieldset class="action">
278
                            <fieldset class="action">
256
                                <input type="submit" value="Place hold" />
279
                                <input type="submit" value="Place hold" />
Lines 911-1022 Link Here
911
934
912
                        [% FOREACH biblioloo IN biblioloop %]
935
                        [% FOREACH biblioloo IN biblioloop %]
913
                            [% IF ( biblioloo.reserveloop ) %]
936
                            [% IF ( biblioloo.reserveloop ) %]
914
                                [% IF ( multi_hold ) %]
937
                                <div class="hold_title" id="hold_title_[% biblioloo.biblionumber | html %]">
915
                                    <h3>
938
                                    [% IF ( multi_hold ) %]
916
                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]">
939
                                        <h3>
917
                                            [% biblioloo.title | html %]
940
                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]">
918
                                        </a>
941
                                                [% biblioloo.title | html %]
919
                                    </h3>
942
                                            </a> <span class="number_box"><span>[% biblioloo.reserveloop.size | html %] [% tn('Hold', 'Holds', biblioloo.reserveloop.size) | $raw %]</span></span>
920
                                [% END %]
943
                                        </h3>
944
                                    [% END %]
921
945
922
                                [% IF Koha.Preference('HoldsSplitQueue') == 'branch' %]
946
                                    [% IF Koha.Preference('HoldsSplitQueue') == 'branch' %]
923
                                    [% SET branchcodes = [] %]
924
947
925
                                    [% FOREACH h IN biblioloo.reserveloop %]
948
                                        [% SET branchcodes = [] %]
926
                                        [% branchcodes.push( h.branchcode ) %]
927
                                    [% END %]
928
                                    [% branchcodes = branchcodes.unique %]
929
949
930
                                    [% FOREACH b IN branchcodes.sort %]
931
                                        [% SET holds_by_branch = [] %]
932
                                        [% FOREACH h IN biblioloo.reserveloop %]
950
                                        [% FOREACH h IN biblioloo.reserveloop %]
933
                                            [% IF h.branchcode == b %]
951
                                            [% branchcodes.push( h.branchcode ) %]
934
                                                [% holds_by_branch.push( h ) %]
935
                                            [% END %]
936
                                        [% END %]
952
                                        [% END %]
937
                                        <fieldset>
953
                                        [% branchcodes = branchcodes.unique %]
938
                                            <legend>[% Branches.GetName( b ) | html %]</legend>
954
                                        [% IF ( branchcodes.empty ) %]
939
                                            [% INCLUDE holds_table.inc holds=holds_by_branch %]
955
                                            <div class="note">
940
                                        </fieldset>
956
                                                There are no holds on this title.
941
                                    [% END # /FOREACh b %]
957
                                            </div>
942
                                [% ELSIF Koha.Preference('HoldsSplitQueue') == 'itemtype' %]
958
                                        [% ELSE %]
943
                                    [% SET itemtypes = [] %]
959
944
960
                                            [% FOREACH b IN branchcodes.sort %]
945
                                    [% FOREACH h IN biblioloo.reserveloop %]
961
                                                [% SET holds_by_branch = [] %]
946
                                        [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
962
                                                [% FOREACH h IN biblioloo.reserveloop %]
947
                                        [% itemtypes.push( hold_itemtype ) %]
963
                                                    [% IF h.branchcode == b %]
948
                                    [% END %]
964
                                                        [% holds_by_branch.push( h ) %]
949
                                    [% itemtypes = itemtypes.unique %]
965
                                                    [% END %]
966
                                                [% END %]
967
                                                <div class="holds_by_library">
968
                                                    <h4>[% Branches.GetName( b ) | html %]</h4>
969
970
                                                    [% INCLUDE holds_table.inc holds=holds_by_branch %]
971
                                                </div>
972
                                            [% END # /FOREACh b %]
973
                                        [% END # /IF ( branchcodes.empty ) %]
974
975
                                    [% ELSIF Koha.Preference('HoldsSplitQueue') == 'itemtype' %]
976
977
                                        [% SET itemtypes = [] %]
950
978
951
                                    [% FOREACH i IN itemtypes.sort %]
952
                                        [% SET holds_by_itemtype = [] %]
953
                                        [% FOREACH h IN biblioloo.reserveloop %]
979
                                        [% FOREACH h IN biblioloo.reserveloop %]
954
                                            [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
980
                                            [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
955
                                            [% IF hold_itemtype == i %]
981
                                            [% itemtypes.push( hold_itemtype ) %]
956
                                                [% holds_by_itemtype.push( h ) %]
957
                                            [% END %]
958
                                        [% END %]
982
                                        [% END %]
959
983
                                        [% itemtypes = itemtypes.unique %]
960
                                        <fieldset>
984
                                        [% IF ( itemtypes.empty ) %]
961
                                            [% IF i %]
985
                                            <div class="note">
962
                                                <legend>[% ItemTypes.GetDescription( i ) | html %]</legend>
986
                                                There are no holds on this title.
963
                                            [% ELSE %]
987
                                            </div>
964
                                                <legend>Any item type</legend>
988
                                        [% ELSE %]
965
                                            [% END %]
966
                                            [% INCLUDE holds_table.inc holds=holds_by_itemtype %]
967
                                        </fieldset>
968
                                    [% END # /FOREACH i %]
969
                                [% ELSIF Koha.Preference('HoldsSplitQueue') == 'branch_itemtype' %]
970
                                    [% SET branchcodes = [] %]
971
972
                                    [% FOREACH h IN biblioloo.reserveloop %]
973
                                        [% branchcodes.push( h.branchcode ) %]
974
                                    [% END %]
975
                                    [% branchcodes = branchcodes.unique %]
976
977
                                    [% FOREACH b IN branchcodes.sort %]
978
                                        <fieldset>
979
                                            <legend>[% Branches.GetName( b ) | html %]</legend>
980
                                            [% SET holds_by_branch = [] %]
981
                                            [% FOREACH h IN biblioloo.reserveloop %]
982
                                                [% IF h.branchcode == b %]
983
                                                    [% holds_by_branch.push( h ) %]
984
                                                [% END %]
985
                                            [% END %]
986
987
                                            [% SET itemtypes = [] %]
988
                                            [% FOREACH h IN holds_by_branch %]
989
                                                [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
990
                                                [% itemtypes.push( hold_itemtype ) %]
991
                                            [% END %]
992
                                            [% itemtypes = itemtypes.unique %]
993
989
994
                                            [% FOREACH i IN itemtypes.sort %]
990
                                            [% FOREACH i IN itemtypes.sort %]
995
                                                [% IF i %]
996
                                                    <h3>[% ItemTypes.GetDescription( i ) | html %]</h3>
997
                                                [% ELSE %]
998
                                                    <h3>Any item type</h3>
999
                                                [% END %]
1000
1001
                                                [% SET holds_by_itemtype = [] %]
991
                                                [% SET holds_by_itemtype = [] %]
1002
                                                [% FOREACH h IN holds_by_branch %]
992
                                                [% FOREACH h IN biblioloo.reserveloop %]
1003
                                                    [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
993
                                                    [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
1004
                                                    [% IF hold_itemtype == i %]
994
                                                    [% IF hold_itemtype == i %]
1005
                                                        [% holds_by_itemtype.push( h ) %]
995
                                                        [% holds_by_itemtype.push( h ) %]
1006
                                                    [% END %]
996
                                                    [% END %]
1007
                                                [% END %]
997
                                                [% END %]
1008
                                                [% INCLUDE holds_table.inc holds=holds_by_itemtype %]
1009
                                            [% END %]
1010
                                        </fieldset>
1011
                                    [% END # /FOREACH b %]
1012
                                [% ELSE %]
1013
                                    [% INCLUDE holds_table.inc holds=biblioloo.reserveloop %]
1014
                                [% END # /IF HoldsSplitQueue %]
1015
998
999
                                                <div class="holds_by_itemtype">
1000
                                                    [% IF i %]
1001
                                                        <h4>[% ItemTypes.GetDescription( i ) | html %]</h4>
1002
                                                    [% ELSE %]
1003
                                                        <h4>Any item type</h4>
1004
                                                    [% END %]
1005
                                                    [% INCLUDE holds_table.inc holds=holds_by_itemtype %]
1006
                                                </div>
1007
                                            [% END # /FOREACH i %]
1008
                                        [% END # /IF ( itemtypes.empty ) %]
1009
1010
                                    [% ELSIF Koha.Preference('HoldsSplitQueue') == 'branch_itemtype' %]
1011
                                        [% SET branchcodes = [] %]
1012
1013
                                        [% FOREACH h IN biblioloo.reserveloop %]
1014
                                            [% branchcodes.push( h.branchcode ) %]
1015
                                        [% END %]
1016
                                        [% branchcodes = branchcodes.unique %]
1017
                                        [% IF ( branchcodes.empty ) %]
1018
                                            <div class="note">
1019
                                                There are no holds on this title.
1020
                                            </div>
1021
                                        [% ELSE %]
1022
1023
                                            [% FOREACH b IN branchcodes.sort %]
1024
                                                <div class="holds_by_library">
1025
                                                    <h4 class="library_holds">[% Branches.GetName( b ) | html %]</h4>
1026
                                                    [% SET holds_by_branch = [] %]
1027
                                                    [% FOREACH h IN biblioloo.reserveloop %]
1028
                                                        [% IF h.branchcode == b %]
1029
                                                            [% holds_by_branch.push( h ) %]
1030
                                                        [% END %]
1031
                                                    [% END %]
1032
1033
                                                    [% SET itemtypes = [] %]
1034
                                                    [% FOREACH h IN holds_by_branch %]
1035
                                                        [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
1036
                                                        [% itemtypes.push( hold_itemtype ) %]
1037
                                                    [% END %]
1038
                                                    [% itemtypes = itemtypes.unique %]
1039
1040
                                                    [% FOREACH i IN itemtypes.sort %]
1041
                                                        <div class="holds_by_itemtype">
1042
                                                            <h5 class="itemtype_holds">
1043
                                                                [% IF i %]
1044
                                                                    [% ItemTypes.GetDescription( i ) | html %]
1045
                                                                [% ELSE %]
1046
                                                                    Any item type
1047
                                                                [% END %]
1048
                                                            </h5>
1049
1050
                                                            [% SET holds_by_itemtype = [] %]
1051
                                                            [% FOREACH h IN holds_by_branch %]
1052
                                                                [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
1053
                                                                [% IF hold_itemtype == i %]
1054
                                                                    [% holds_by_itemtype.push( h ) %]
1055
                                                                [% END %]
1056
                                                            [% END %]
1057
                                                            [% INCLUDE holds_table.inc holds=holds_by_itemtype %]
1058
                                                        </div> <!-- /.holds_by_itemtype -->
1059
                                                    [% END %]
1060
                                                </div> <!-- /.holds_by_library -->
1061
                                            [% END # /FOREACH b %]
1062
                                        [% END # /IF ( branchcodes.empty ) %]
1063
1064
                                    [% ELSE %]
1065
1066
                                        [% IF ( biblioloo.reserveloop.size ) %]
1067
                                            [% INCLUDE holds_table.inc holds=biblioloo.reserveloop %]
1068
                                        [% ELSE %]
1069
                                            <div class="note">
1070
                                                There are no holds on this title.
1071
                                            </div>
1072
                                        [% END %]
1073
1074
                                    [% END # /IF HoldsSplitQueue %]
1075
                                </div> <!-- /hold_title -->
1016
                            [% END # /IF biblioloo.reserveloop %]
1076
                            [% END # /IF biblioloo.reserveloop %]
1017
                        [% END # FOREACH biblioloo %]
1077
                        [% END # FOREACH biblioloo %]
1018
                        </fieldset> <!-- /.rows -->
1078
                    </form> <!-- /#existing_holds -->
1019
                    </form> <!-- /name=TTime -->
1020
                [% END # IF reserveloop %]
1079
                [% END # IF reserveloop %]
1021
            [% END # UNLESS patron %]
1080
            [% END # UNLESS patron %]
1022
1081
1023
- 

Return to bug 28816