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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-4 / +4 lines)
Lines 41-47 Link Here
41
                        </a>
41
                        </a>
42
                        <div aria-labelledby="listsmenu" role="menu" class="dropdown-menu">
42
                        <div aria-labelledby="listsmenu" role="menu" class="dropdown-menu">
43
                            [% IF some_public_shelves.count %]
43
                            [% IF some_public_shelves.count %]
44
                                <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=2" tabindex="-1" role="menuitem"><strong>Public lists</strong></a>
44
                                <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=1" tabindex="-1" role="menuitem"><strong>Public lists</strong></a>
45
                                [% SET number_of_public_shelves = 0 %]
45
                                [% SET number_of_public_shelves = 0 %]
46
                                [% FOREACH s IN some_public_shelves %]
46
                                [% FOREACH s IN some_public_shelves %]
47
                                    <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]&amp;sortfield=[% s.sortfield | uri %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a>
47
                                    <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]&amp;sortfield=[% s.sortfield | uri %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a>
Lines 49-62 Link Here
49
                                    [% IF number_of_public_shelves >= 10 %][% LAST %][% END %]
49
                                    [% IF number_of_public_shelves >= 10 %][% LAST %][% END %]
50
                                [% END %]
50
                                [% END %]
51
                                [% IF some_public_shelves > 10 %]
51
                                [% IF some_public_shelves > 10 %]
52
                                    <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=2" tabindex="-1" role="menuitem">View all</a>
52
                                    <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=1" tabindex="-1" role="menuitem">View all</a>
53
                                [% END %]
53
                                [% END %]
54
                            [% END %]
54
                            [% END %]
55
                            [% IF some_public_shelves.count > 0 %]
55
                            [% IF some_public_shelves.count > 0 %]
56
                                <div class="dropdown-divider"></div>
56
                                <div class="dropdown-divider"></div>
57
                            [% END %]
57
                            [% END %]
58
                            [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
58
                            [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
59
                                <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1" tabindex="-1" role="menuitem"><strong>Your lists</strong></a>
59
                                <a class="dropdown-item" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=0" tabindex="-1" role="menuitem"><strong>Your lists</strong></a>
60
                                [% IF loggedinusername %]
60
                                [% IF loggedinusername %]
61
                                    [% IF some_private_shelves.count %]
61
                                    [% IF some_private_shelves.count %]
62
                                        [% SET number_of_private_shelves = 0 %]
62
                                        [% SET number_of_private_shelves = 0 %]
Lines 66-72 Link Here
66
                                            [% IF number_of_private_shelves >= 10 %][% LAST %][% END %]
66
                                            [% IF number_of_private_shelves >= 10 %][% LAST %][% END %]
67
                                        [% END %]
67
                                        [% END %]
68
                                        [% IF some_private_shelves > 10 %]
68
                                        [% IF some_private_shelves > 10 %]
69
                                            <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1" tabindex="-1" role="menuitem">View all</a>
69
                                            <a class="dropdown-item listmenulink" href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=0" tabindex="-1" role="menuitem">View all</a>
70
                                        [% END %]
70
                                        [% END %]
71
                                    [% ELSE %]
71
                                    [% ELSE %]
72
                                        <a class="dropdown-item disabled" href="#" tabindex="-1" role="menuitem">No private lists</a>
72
                                        <a class="dropdown-item disabled" href="#" tabindex="-1" role="menuitem">No private lists</a>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc (-1 / +1 lines)
Lines 109-115 Link Here
109
                [% ELSE %]
109
                [% ELSE %]
110
                    <li>
110
                    <li>
111
                [% END %]
111
                [% END %]
112
                <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1">your lists</a></li>
112
                <a href="/cgi-bin/koha/opac-shelves.pl?op=list">your lists</a></li>
113
            [% END %]
113
            [% END %]
114
114
115
            [% IF Koha.Preference( 'RoutingSerials' ) && logged_in_user && logged_in_user.get_routing_lists.count %]
115
            [% IF Koha.Preference( 'RoutingSerials' ) && logged_in_user && logged_in_user.get_routing_lists.count %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt (-2 / +2 lines)
Lines 17-25 Link Here
17
                    [% END %]
17
                    [% END %]
18
                    <li class="breadcrumb-item">
18
                    <li class="breadcrumb-item">
19
                        [% IF shelf.category == 1 %]
19
                        [% IF shelf.category == 1 %]
20
                            <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1">Your lists</a>
20
                            <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=0">Your lists</a>
21
                        [% ELSE %]
21
                        [% ELSE %]
22
                            <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=2">Public lists</a>
22
                            <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=1">Public lists</a>
23
                        [% END %]
23
                        [% END %]
24
                    </li>
24
                    </li>
25
                    <li class="breadcrumb-item active">
25
                    <li class="breadcrumb-item active">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt (-3 / +3 lines)
Lines 71-77 Link Here
71
                        [% IF errcode==8 %]
71
                        [% IF errcode==8 %]
72
                            <div class="alert alert-warning">As owner of a list you cannot accept an invitation for sharing it.</div>
72
                            <div class="alert alert-warning">As owner of a list you cannot accept an invitation for sharing it.</div>
73
                        [% END %]
73
                        [% END %]
74
                        <p><a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1">Return to your lists</a></p>
74
                        <p><a href="/cgi-bin/koha/opac-shelves.pl?op=list">Return to your lists</a></p>
75
75
76
                    [% ELSIF op=='invite' %]
76
                    [% ELSIF op=='invite' %]
77
                        <div id="invite">
77
                        <div id="invite">
Lines 92-98 Link Here
92
                                </fieldset>
92
                                </fieldset>
93
                                <fieldset class="action">
93
                                <fieldset class="action">
94
                                    <input type="submit" value="Send" class="btn btn-primary" />
94
                                    <input type="submit" value="Send" class="btn btn-primary" />
95
                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1" class="cancel">Cancel</a>
95
                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=list" class="cancel">Cancel</a>
96
                                </fieldset>
96
                                </fieldset>
97
                            </form> <!-- /#share_list -->
97
                            </form> <!-- /#share_list -->
98
                        </div> <!-- /#invite -->
98
                        </div> <!-- /#invite -->
Lines 108-114 Link Here
108
                            [% IF approvedaddress %]
108
                            [% IF approvedaddress %]
109
                                <p>You will receive an email notification if someone accepts your share before it expires.</p>
109
                                <p>You will receive an email notification if someone accepts your share before it expires.</p>
110
                            [% END %]
110
                            [% END %]
111
                            <p><a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=1">Return to your lists</a></p>
111
                            <p><a href="/cgi-bin/koha/opac-shelves.pl?op=list">Return to your lists</a></p>
112
                        </div>
112
                        </div>
113
113
114
                    [% ELSIF op=='accept' %]
114
                    [% ELSIF op=='accept' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt (-3 / +2 lines)
Lines 630-636 Link Here
630
                                [% IF referer == 'view' %]
630
                                [% IF referer == 'view' %]
631
                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel">Cancel</a>
631
                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel">Cancel</a>
632
                                [% ELSE %]
632
                                [% ELSE %]
633
                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;public=0" class="cancel">Cancel</a>
633
                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=list" class="cancel">Cancel</a>
634
                                [% END %]
634
                                [% END %]
635
                            </fieldset>
635
                            </fieldset>
636
                        </form>
636
                        </form>
Lines 1047-1053 function AdjustRemark() { Link Here
1047
        [% ELSE %]
1047
        [% ELSE %]
1048
            $("#anyone_remark").hide();
1048
            $("#anyone_remark").hide();
1049
        [% END %]
1049
        [% END %]
1050
    } else { // category==2
1050
    } else { // public==1
1051
        $("#anyone_remark").hide();
1051
        $("#anyone_remark").hide();
1052
    }
1052
    }
1053
}
1053
}
1054
- 

Return to bug 28959