Bug 24201: (QA follow-up) Add 'and desk' to menus and title

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
index 979871a..03b7c0b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% USE Branches %]
 <div id="navmenu">
     <div id="navmenulist">
@@ -15,7 +16,11 @@
                 <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
             [% END %]
             [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]
+                [% IF Koha.Preference('UseCirculationDesks') %]
+                <li><a href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a></li>
+                [% ELSE %]
                 <li><a href="/cgi-bin/koha/circ/set-library.pl">Set library</a></li>
+                [% END %]
             [% END %][% END %]
             [% IF ( fast_cataloging ) %][% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
                 <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index ca3bae3..39642d1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -134,12 +134,20 @@
                     [% 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>
+                        [% ELSE %]
                         <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
+                        [% END %]
                     </li>
                         [% END %]
                     [% ELSE %]
                     <li>
+                        [% IF Koha.Preference('UseCirculationDesks') %]
+                        <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 %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
index fbabec6..2c5a6c6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
@@ -30,7 +30,11 @@
                     </li>
                     [% UNLESS IndependentBranches %]
                         <li>
+                            [% IF Koha.Preference('UseCirculationDesks') %]
+                            <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library and desk</a>
+                            [% ELSE %]
                             <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library</a>
+                            [% END %]
                         </li>
                     [% END %]
                     [% IF ( fast_cataloging ) %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
index 95d9237..3974687 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
@@ -5,7 +5,11 @@
 [% USE Koha %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
+[% IF Koha.Preference('UseCirculationDesks') %]
+<title>Koha &rsaquo; Circulation &rsaquo; Set library and desk</title>
+[% ELSE %]
 <title>Koha &rsaquo; Circulation &rsaquo; Set library</title>
+[% END %]
 [% INCLUDE 'doc-head-close.inc' %]
 <style>
     .noshow {display: none;}