Bugzilla – Attachment 139373 Details for
Bug 29144
Move branches.opac_info to AdditionalContents allowing multi language
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29144: Adjust libraries form
Bug-29144-Adjust-libraries-form.patch (text/plain), 3.92 KB, created by
Martin Renvoize (ashimema)
on 2022-08-18 12:54:48 UTC
(
hide
)
Description:
Bug 29144: Adjust libraries form
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-08-18 12:54:48 UTC
Size:
3.92 KB
patch
obsolete
>From 0b743aa7142e2a89dd53931d4f905237c8aa2d95 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Wed, 3 Aug 2022 14:59:49 +0000 >Subject: [PATCH] Bug 29144: Adjust libraries form > >Test plan: >[1] Go to Administration / libraries. >[2] Check list view. >[3] Check view on individual library with/without opac info. >[4] Edit individual library with/without opac info. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > admin/branches.pl | 1 - > .../prog/en/modules/admin/branches.tt | 19 +++++++++++++++---- > 2 files changed, 15 insertions(+), 5 deletions(-) > >diff --git a/admin/branches.pl b/admin/branches.pl >index 134321a2bd..17b6a47d3c 100755 >--- a/admin/branches.pl >+++ b/admin/branches.pl >@@ -78,7 +78,6 @@ if ( $op eq 'add_form' ) { > issuing > branchip > branchnotes >- opac_info > marcorgcode > pickup_location > public >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index 11185bd235..a0674f355f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -4,6 +4,8 @@ > [% SET footerjs = 1 %] > [% USE TablesSettings %] > [% INCLUDE 'doc-head-open.inc' %] >+[% IF library %][% SET OpacLibraryInfo = library.opac_info( lang => lang ) %][% END %] >+ > <title> > [% IF op == 'add_form' %] > [% IF library %] >@@ -248,7 +250,14 @@ Libraries › Administration › Koha > </select> > </li> > <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl" size="80" value="[% library.branchurl | html %]" class="url" /></li> >- <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% library.opac_info | $raw %]</textarea></li> >+ <li><label for="opac_info">OPAC info: </label> >+ [% IF OpacLibraryInfo %]<!-- opac_info --> >+ <div>[% OpacLibraryInfo.content | $raw %]</div> >+ <div class="hint"><a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations&op=add_form&id=[% OpacLibraryInfo.id | $raw %]&editmode=wysiwyg" target="_blank">Edit html content</a></div> >+ [% ELSE %] >+ <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations&op=add_form&editmode=wysiwyg" target="_blank">Add html content</a> >+ [% END %] >+ </li> > <li> > <label for="branchip">IP: </label> > <input type="text" name="branchip" id="branchip" size="15" maxlength="15" value="[% library.branchip | html %]" /> >@@ -461,12 +470,12 @@ Libraries › Administration › Koha > </div> <!-- /.rows --> > </div> <!-- /.col-sm-6 --> > </div> <!-- /.row --> >- [% IF ( library.opac_info ) %] >+ [% IF OpacLibraryInfo %]<!-- opac_info --> > <hr /> > <div class="row"> > <div class="col-sm-12"> > <h2>OPAC information</h2> >- [% library.opac_info | $raw %] >+ <div>[% OpacLibraryInfo.content | $raw %]</div> > </div> > </div> > [% END %] >@@ -659,7 +668,9 @@ Libraries › Administration › Koha > "orderable": false > }, > { >- "data": "opac_info", >+ "data": function( row, type, val, meta ) { >+ return ''; // provisional placeholder for opac_info >+ }, > "searchable": true, > "visible": false, > "orderable": false >-- >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 29144
:
138473
|
138474
|
138527
|
138528
|
138599
|
138600
|
138601
|
138602
|
138603
|
138604
|
138605
|
138606
|
138607
|
138608
|
138609
|
139182
|
139183
|
139184
|
139185
|
139186
|
139187
|
139188
|
139189
|
139190
|
139191
|
139192
|
139197
|
139198
|
139199
|
139200
|
139201
|
139202
|
139203
|
139204
|
139205
|
139206
|
139207
|
139208
|
139366
|
139367
|
139368
|
139369
|
139370
|
139371
|
139372
|
139373
|
139374
|
139375
|
139376
|
139377
|
140020
|
140021
|
140022
|
140023
|
140024
|
140025
|
140026
|
140027
|
140028
|
140029
|
140030
|
140707