From cf99fc78ff973abd394cfdb2066a1c3cc60510bf Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@esilibrary.com>
Date: Mon, 15 Aug 2016 14:07:21 -0400
Subject: [PATCH] LP#1613381: combine two tables in patron notification
 preferences

This patch consolidates the two tables in the public catalog
notification preferences page into one table, as patrons have
no reason to care about the distinction between A/T opt-in
settings and the hold, phone, and SMS user settings.

This patch also adds a <label> element for opt-in setting
names.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 .../src/templates/opac/myopac/prefs_notify.tt2     | 35 ++++++++--------------
 .../OPAC/combine_notice_prefs_tables.adoc          |  7 +++++
 2 files changed, 19 insertions(+), 23 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/combine_notice_prefs_tables.adoc

diff --git a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
index d938773cc1..47b7f72677 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
@@ -84,32 +84,21 @@
                 </td>
             </tr>
             [% END %]
-        </tbody>
-    </table>
-
-    [% IF ctx.opt_in_settings.size > 0 %]
-    <div class='user_opt_in_settings'>
-      <table>
-        <thead><tr>
-            <th>[% l('Notification Type') %]</th>
-            <th>[% l('Enabled') %]</th>
-        </tr></thead>
-        <tbody class='data_grid'>
             [% FOR optin IN ctx.opt_in_settings %]
-                <tr>
-                    <td>[% optin.cust.label | html %]</td>
-                    <td>
-                        <input type='checkbox' name='setting' 
-                            value='[% optin.cust.name | uri %]' 
-                            title="[% optin.cust.label | html %]"
-                            [% IF optin.value %] checked='checked' [% END %]/>
-                    </td>
-                </tr>
+            <tr>
+                <td><label for='[% optin.cust.name | uri %]'>[% optin.cust.label | html %]</label></td>
+                <td>
+                    <input type='checkbox' name='setting' 
+                        value='[% optin.cust.name | uri %]' 
+                        id='[% optin.cust.name | uri %]' 
+                        title="[% optin.cust.label | html %]"
+                        [% IF optin.value %] checked='checked' [% END %]/>
+                </td>
+            </tr>
             [% END %]
         </tbody>
-      </table>
-    </div>
-    [% END %]
+    </table>
+
     <input type='submit' value="[% l('Save') %]" class="opac-button" />
 </form>
 [% END %]
diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/combine_notice_prefs_tables.adoc b/docs/RELEASE_NOTES_NEXT/OPAC/combine_notice_prefs_tables.adoc
new file mode 100644
index 0000000000..d9e4b292a4
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/OPAC/combine_notice_prefs_tables.adoc
@@ -0,0 +1,7 @@
+Merge Notification Preferences Tables in TPAC
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The patron notification preference page in the public catalog
+used to have two tables, separating notification settings
+based on their source. Since that distinction does not matter
+to patrons, and since the two tables aren't styled consistently,
+they are merged together.
-- 
2.11.0