From 6f06e66957998114f028df9f29ab35a6c7572d67 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Wed, 14 Jun 2017 11:10:56 +0200
Subject: [PATCH] Bug 18800: Patron card images: Add some more explanation to
 upload page and fix small translatabiity issue

The file
koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt
has a small translatability issue (sentence splitting by html tags).

This patch fixes it and adds a little bit more explanation about
uploading, using and replacing such images.

To test:
- Verify that text changes make sense
- Apply patch
- Go to Home > Tools > Patron card creator > Images and verify
  that the page displays properly

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 053fbaf9267cce79ba80d23389b26f46a91111f8)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit e5ad6741bac0996d635c61ea2b3aee403c46954e)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../prog/en/modules/help/patroncards/image-manage.tt  |  8 ++++++--
 .../prog/en/modules/patroncards/image-manage.tt       | 11 +++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt
index f0bd34da2a..83b02e144c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt
@@ -2,6 +2,8 @@
 
 <h1>Manage Images</h1>
 
+<p>Upload additional images to use as logo, decoration or background on a patron card layout.</p>
+
 <p>Images uploaded using this tool will appear on the menu when creating patron card layouts. You are limited in how many images you can upload (not counting patron images) by the ImageLimit system preference.</p>
 
 <p>Images must be under 500k in size.</p>
@@ -12,10 +14,12 @@
 
 <p>Once the file is uploaded you will be presented with a confirmation message.</p>
 
-<p>And the image will be listed with all of your others on the right hand side of the page.</p>
+<p>All uploaded images will be listed on the right hand side of this page.</p>
 
 <p>To delete one or multiple of these images, click the checkbox to the right of each image you want to delete and click the 'Delete' button.</p>
 
+<p>To replace an image, delete it, upload a new file and give it the same image name.</p>
+
 <p><strong>See the full documentation for Managing Images in the <a href="http://manual.koha-community.org/[% helpVersion %]/en/patroncardcreator.html#managecardimages">manual</a> (online).</strong></p>
 
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
index 398666bb79..d07986c83a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
@@ -69,12 +69,11 @@
                 [% INCLUDE 'patroncards-errors.inc' %]
                 <div class="yui-g">
                     <div class="yui-u first">
-                        <h1>Upload images</h1>
+                        <h1>Upload additional images for patron cards</h1>
+                        <p>Manage additional images to use as logo, decoration or background on a patron card layout.</p>
                         <form name="upload_images" method="post" action="/cgi-bin/koha/patroncards/image-manage.pl" enctype="multipart/form-data">
                             <fieldset class="brief">
-                                <div class="hint">
-                                    <b>NOTE:</b> Only PNG, GIF, JPEG, XPM formats are supported. Images <b>must</b> be less than 500KB.
-                                </div>
+                                <div class="hint">Only PNG, GIF, JPEG, XPM formats are supported. Maximum image size is 500KB.</div>
                                 <ol>
                                 <li>
                                     <label for="uploadfile">Select the file to upload: </label>
@@ -86,6 +85,10 @@
                                     <div class="hint">
                                         This will be the name by which you will refer to this image in the patron card layout editor.
                                     </div>
+                                    <div class="hint">
+                                        To replace an image, delete it, upload a new file and give it the same image name.
+                                    </div>
+
                                     <input type="text" id="image_name" name="image_name" size="20" />
                                 </li>
                                 </ol>
-- 
2.39.5