Attachment #107952 for bug #24201

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

Lines 15-27 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc (-2 / +4 lines)
15	[% IF !Koha.Preference('IndependentBranchesTransfers') \|\| CAN_user_superlibrarian %]	15	[% IF !Koha.Preference('IndependentBranchesTransfers') \|\| CAN_user_superlibrarian %]
16	<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>	16	<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
17	[% END %]	17	[% END %]
18	[% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]	18	[% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
19	[% IF Koha.Preference('UseCirculationDesks') %]	19	[% IF Koha.Preference('UseCirculationDesks') %]
20	<li><a href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a></li>	20	<li><a href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a></li>
21	[% ELSE %]	21	[% ELSE %]
22	<li><a href="/cgi-bin/koha/circ/set-library.pl">Set library</a></li>	22	<li><a href="/cgi-bin/koha/circ/set-library.pl">Set library</a></li>
23	[% END %]	23	[% END %]
24	[% END %][% END %]	24	[% ELSIF Koha.Preference('UseCirculationDesks') %]
		25	<li><a href="/cgi-bin/koha/circ/set-library.pl">Set desk</a></li>
		26	[% END %]
25	[% IF ( fast_cataloging ) %][% IF ( CAN_user_editcatalogue_fast_cataloging ) %]	27	[% IF ( fast_cataloging ) %][% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
26	<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>	28	<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>
27	[% END %][% END %]	29	[% END %][% END %]




                    </li>
                    [% END %]

                    [% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
                    <li role="separator" class="loggedin-menu-label divider"></li>
                    [% IF ( IndependentBranches ) %]
                        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
                    <li>
                        [% IF Koha.Preference('UseCirculationDesks') %]
                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>

                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
                        [% END %]
                    </li>
                    [% ELSIF Koha.Preference('UseCirculationDesks') %]
                    <li role="separator" class="loggedin-menu-label divider"></li>
                    <li>
                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk</a>
                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>
                        [% ELSE %]
                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
                        [% END %]
                    </li>
                    [% END %]
                    [% IF EnableSearchHistory %]




[% ELSE %]

<form method="post" action="set-library.pl">
[% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
<fieldset class="rows">
    <legend>Set library</legend>
    <ol>
    [% IF ( singleBranchMode && !CAN_user_superlibrarian ) %]
        <li>SingleBranchMode is ON.</li>
    [% ELSE %]
        <li><label for="branch">Choose library:</label>
        <select name="branch" id="branch">
            [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
        </select></li>
    [% END %]
    </ol>
</fieldset>
[% END %]
[% IF Koha.Preference('UseCirculationDesks') && Desks.all %]
<fieldset class="rows">
    <legend>Set desk</legend>
    <ol>
- 

Return to bug 24201

Lines 130-138 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (-9 / +4 lines)
130	</li>	130	</li>
131	[% END %]	131	[% END %]
132		132
		133	[% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
133	<li role="separator" class="loggedin-menu-label divider"></li>	134	<li role="separator" class="loggedin-menu-label divider"></li>
134	[% IF ( IndependentBranches ) %]
135	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
136	<li>	135	<li>
137	[% IF Koha.Preference('UseCirculationDesks') %]	136	[% IF Koha.Preference('UseCirculationDesks') %]
138	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>	137	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>
Lines 140-153 Link Here
140	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>	139	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
141	[% END %]	140	[% END %]
142	</li>	141	</li>
143	[% END %]	142	[% ELSIF Koha.Preference('UseCirculationDesks') %]
144	[% ELSE %]	143	<li role="separator" class="loggedin-menu-label divider"></li>
145	<li>	144	<li>
146	[% IF Koha.Preference('UseCirculationDesks') %]	145	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk</a>
147	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>
148	[% ELSE %]
149	<a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
150	[% END %]
151	</li>	146	</li>
152	[% END %]	147	[% END %]
153	[% IF EnableSearchHistory %]	148	[% IF EnableSearchHistory %]

Lines 64-83 Updated:<ul> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt (-6 / +3 lines)
64	[% ELSE %]	64	[% ELSE %]
65		65
66	<form method="post" action="set-library.pl">	66	<form method="post" action="set-library.pl">
		67	[% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
67	<fieldset class="rows">	68	<fieldset class="rows">
68	<legend>Set library</legend>	69	<legend>Set library</legend>
69	<ol>	70	<ol>
70	[% IF ( singleBranchMode && !CAN_user_superlibrarian ) %]
71	<li>SingleBranchMode is ON.</li>
72	[% ELSE %]
73	<li><label for="branch">Choose library:</label>	71	<li><label for="branch">Choose library:</label>
74	<select name="branch" id="branch">	72	<select name="branch" id="branch">
75	[% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]	73	[% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
76	</select></li>	74	</select></li>
77	[% END %]
78	</ol>	75	</ol>
79	</fieldset>	76	</fieldset>
80	[% IF Desks.all %]	77	[% END %]
		78	[% IF Koha.Preference('UseCirculationDesks') && Desks.all %]
81	<fieldset class="rows">	79	<fieldset class="rows">
82	<legend>Set desk</legend>	80	<legend>Set desk</legend>
83	<ol>	81	<ol>
84	-