[open-ils-commits] [GIT] Evergreen ILS branch master updated. 079d0ed5f08da74201b79f53275f559aba8a19f2

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  079d0ed5f08da74201b79f53275f559aba8a19f2 (commit)
      from  4e4525c85e795a42231ffbb0e8e10c027d50a682 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 079d0ed5f08da74201b79f53275f559aba8a19f2
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Aug 15 14:07:21 2016 -0400

    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 at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
index d938773..47b7f72 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 0000000..d9e4b29
--- /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.

-----------------------------------------------------------------------

Summary of changes:
 .../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


hooks/post-receive
-- 
Evergreen ILS