Bugzilla – Attachment 107951 Details for
Bug 24201
Attach desk to intranet session
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24201: (QA follow-up) Add 'and desk' to menus and title
Bug-24201-QA-follow-up-Add-and-desk-to-menus-and-t.patch (text/plain), 4.73 KB, created by
Martin Renvoize (ashimema)
on 2020-08-07 10:53:58 UTC
(
hide
)
Description:
Bug 24201: (QA follow-up) Add 'and desk' to menus and title
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2020-08-07 10:53:58 UTC
Size:
4.73 KB
patch
obsolete
>From e5716a1d05af2b6b0c71fda3a28b90c14fc48aee Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Fri, 7 Aug 2020 11:47:39 +0100 >Subject: [PATCH] Bug 24201: (QA follow-up) Add 'and desk' to menus and title > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc | 5 +++++ > koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 8 ++++++++ > .../prog/en/modules/circ/circulation-home.tt | 4 ++++ > .../intranet-tmpl/prog/en/modules/circ/set-library.tt | 4 ++++ > 4 files changed, 21 insertions(+) > >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 979871a0b9..03b7c0bd0b 100644 >--- 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 ca3bae3a17..39642d1d11 100644 >--- 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 fbabec6745..2c5a6c666b 100644 >--- 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 95d92375b4..3974687940 100644 >--- 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 › Circulation › Set library and desk</title> >+[% ELSE %] > <title>Koha › Circulation › Set library</title> >+[% END %] > [% INCLUDE 'doc-head-close.inc' %] > <style> > .noshow {display: none;} >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 24201
:
96158
|
96164
|
96165
|
96166
|
101452
|
101564
|
101684
|
101697
|
101704
|
101705
|
101848
|
101865
|
101866
|
101877
|
101878
|
101879
|
101880
|
101881
|
101882
|
101883
|
103839
|
103840
|
105795
|
105869
|
105873
|
105874
|
105875
|
106576
|
107089
|
107090
|
107091
|
107092
|
107093
|
107094
|
107095
|
107096
|
107097
|
107667
|
107668
|
107669
|
107670
|
107671
|
107672
|
107673
|
107674
|
107675
|
107676
|
107677
|
107678
|
107679
|
107680
|
107728
|
107729
|
107730
|
107731
|
107732
|
107750
|
107751
|
107752
|
107815
|
107816
|
107817
|
107818
| 107951 |
107952
|
107967
|
107968
|
107980
|
107981