Bug 7122 - Add a div to opac-messaging.tt to facilitate consistent styling across...

[koha.git] / koha-tmpl / opac-tmpl / prog / en / modules / opac-messaging.tt

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
index ebb1e26..a92d71d 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
@@ -22,7 +22,7 @@
 [% INCLUDE 'masthead.inc' %]
 
        <div id="yui-main">
-       <div class="yui-b">
+       <div class="yui-b"><div class="yui-g" id="usermessaging">
 
 [% FOREACH BORROWER_INF IN BORROWER_INFO %]
 <h3><a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INF.firstname %] [% BORROWER_INF.surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your Messaging Settings</h3>
@@ -59,29 +59,56 @@
       <td>-</td>
       [% END %]
       [% IF ( messaging_preference.transport_sms ) %]
-      [% IF ( SMSSendDriver ) %]<td><input type="checkbox"
-                 id="sms[% messaging_preference.message_attribute_id %]"
-                 name="[% messaging_preference.message_attribute_id %]"
-                 value="sms" [% messaging_preference.transport_sms %] onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /></td>[% END %]
+        [% IF ( SMSSendDriver ) %]
+        <td>
+          [% IF ( messaging_preference.transports_sms ) %]
+          <input type="checkbox"
+                     id="sms[% messaging_preference.message_attribute_id %]"
+                     name="[% messaging_preference.message_attribute_id %]"
+                     value="sms" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+          [% ELSE %]
+          <input type="checkbox"
+                     id="sms[% messaging_preference.message_attribute_id %]"
+                     name="[% messaging_preference.message_attribute_id %]"
+                     value="sms" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+          [% END %]
+        </td>
+        [% END %]
       [% ELSE %]
-      <td>-</td>
+        <td>-</td>
       [% END %]
 
       [% IF ( messaging_preference.transport_email ) %]
-      <td><input type="checkbox"
-                 id="email[% messaging_preference.message_attribute_id %]"
-                 name="[% messaging_preference.message_attribute_id %]"
-                 value="email"   [% messaging_preference.transport_email %] onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+      <td>
+        [% IF ( messaging_preference.transports_email ) %]
+        <input type="checkbox"
+                   id="email[% messaging_preference.message_attribute_id %]"
+                   name="[% messaging_preference.message_attribute_id %]"
+                   value="email" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+        [% ELSE %]
+        <input type="checkbox"
+                   id="email[% messaging_preference.message_attribute_id %]"
+                   name="[% messaging_preference.message_attribute_id %]"
+                   value="email" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+        [% END %]
       </td>
       [% ELSE %]
       <td>-</td>
       [% END %]
 
       [% IF ( messaging_preference.has_digest ) %]
-      <td><input type="checkbox"
+      <td>
+      [% IF ( messaging_preference.digest ) %]
+      <input type="checkbox"
                  id="digest[% messaging_preference.message_attribute_id %]"
                  value="[% messaging_preference.message_attribute_id %]"
-                 name="digest"   [% messaging_preference.digest %] onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+                 name="digest" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+      [% ELSE %]
+      <input type="checkbox"
+                 id="digest[% messaging_preference.message_attribute_id %]"
+                 value="[% messaging_preference.message_attribute_id %]"
+                 name="digest" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+      [% END %]
       </td>
       [% ELSE %]
       <td>-</td>
@@ -113,10 +140,10 @@
 </form>
 </div>
 </div>
+</div>
 <div class="yui-b">
 <div id="leftmenus" class="container">
-[% INCLUDE 'navigation.inc' %]
-[% INCLUDE 'usermenu.inc' %]
+[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
 </div>
 </div>
 </div>