From 5b8129c3b419d4d88da2d5d176a426e7be7f797e Mon Sep 17 00:00:00 2001
From: Aleisha <aleishaamohia@hotmail.com>
Date: Thu, 17 Mar 2016 23:15:40 +0000
Subject: [PATCH] [SIGNED-OFF] Bug 16097: Making messages for subscription
 fields more user friendly
Content-Type: text/plain; charset="utf-8"

To test:
1) Go to Serials -> Add Subscription fields
2) Create a field, confirm message.
3) Attempt to create a new field that has the same name as an existing
   field, confirm message.
4) Create another field with a different name. Attempt to edit this
   field to have the same name as another field. Confirm message
5) Edit field (change name to something different)
6) Delete field, confirm message.
6) Turn off permissions to delete subcriptions ONLY. Attempt to delete a
   field, confirm message.

Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
---
 .../intranet-tmpl/prog/en/modules/serials/add_fields.tt      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
index a7f847b..d84df87 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
@@ -62,21 +62,21 @@
     [% FOR message IN messages %]
       [% IF message.code == 'insert' %]
         [% IF message.number > 0 %]
-          <div class="dialog message">The field has been inserted</div>
+          <div class="dialog message">Field created.</div>
         [% ELSE %]
-          <div class="dialog alert">The field has not been inserted (name still exist?)</div>
+          <div class="dialog alert">The field could not be created. Perhaps the name already exists?</div>
         [% END %]
       [% ELSIF message.code == 'update' %]
         [% IF message.number > 0 %]
-          <div class="dialog message">The field has been updated</div>
+          <div class="dialog message">Field updated.</div>
         [% ELSE %]
-          <div class="dialog alert">The field has not been updated (name still exist?)</div>
+          <div class="dialog alert">The field could not be updated. Perhaps the name already exists?</div>
         [% END %]
       [% ELSIF message.code == 'delete' %]
         [% IF message.number > 0 %]
-          <div class="dialog message">The field has been deleted</div>
+          <div class="dialog message">Field deleted.</div>
         [% ELSE %]
-          <div class="dialog alert">The field has not been deleted</div>
+          <div class="dialog alert">The field could not be deleted. Check the log for errors.</div>
         [% END %]
       [% END %]
     [% END %]
-- 
2.1.4