version fixes

[civicrm-core.git] / templates / CRM / Contact / Form / Edit / CommunicationPreferences.tpl

diff --git a/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl b/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
index 63cc740b65dd3767207591a92c82b63902d357a1..25290c16e4812c1d8012a0873b752b4c20a60deb 100644 (file)
--- a/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
+++ b/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -57,7 +57,9 @@
                 <td>
                     <span id="email_greeting" {if !empty($email_greeting_display) and $action eq 2} class="hiddenElement"{/if}>{$form.email_greeting_id.html|crmAddClass:big}</span>
                     {if !empty($email_greeting_display) and $action eq 2}
-                        <div id="email_greeting_display" class="view-data">{$email_greeting_display}&nbsp;&nbsp;<a href="#" onclick="showGreeting('email_greeting');return false;"><img src="{$config->resourceBase}i/edit.png" border="0" title="{ts}Edit{/ts}"></a></div>
+                      <div data-id="email_greeting" class="replace-plain" title="{ts}Click to edit{/ts}">
+                        {$email_greeting_display}
+                      </div>
                     {/if}
                 </td>
             {/if}
@@ -65,7 +67,9 @@
                 <td>
                     <span id="postal_greeting" {if !empty($postal_greeting_display) and $action eq 2} class="hiddenElement"{/if}>{$form.postal_greeting_id.html|crmAddClass:big}</span>
                     {if !empty($postal_greeting_display) and $action eq 2}
-                        <div id="postal_greeting_display" class="view-data">{$postal_greeting_display}&nbsp;&nbsp;<a href="#" onclick="showGreeting('postal_greeting');return false;"><img src="{$config->resourceBase}i/edit.png" border="0" title="{ts}Edit{/ts}"></a></div>
+                      <div data-id="postal_greeting" class="replace-plain" title="{ts}Click to edit{/ts}">
+                        {$postal_greeting_display}
+                      </div>
                     {/if}
                 </td>
             {/if}
@@ -73,7 +77,9 @@
                 <td>
                     <span id="addressee" {if !empty($addressee_display) and $action eq 2} class="hiddenElement"{/if}>{$form.addressee_id.html|crmAddClass:big}</span>
                     {if !empty($addressee_display) and $action eq 2}
-                        <div id="addressee_display" class="view-data">{$addressee_display}&nbsp;&nbsp;<a href="#" onclick="showGreeting('addressee');return false;"><img src="{$config->resourceBase}i/edit.png" border="0" title="{ts}Edit{/ts}"></a></div>
+                      <div data-id="addressee" class="replace-plain" title="{ts}Click to edit{/ts}">
+                        {$addressee_display}
+                      </div>
                     {/if}
                 </td>
             {/if}
@@ -101,18 +107,16 @@
             {/if}
         </tr>
         <tr>
-            {foreach key=key item=item from=$commPreference}
-                <td>
-                    <br /><span class="label">{$form.$key.label}</span> {help id="id-$key" file="CRM/Contact/Form/Contact.hlp"}
-                    {foreach key=k item=i from=$item}
-                     <br />{$form.$key.$k.html}
-                    {/foreach}
-                </td>
-            {/foreach}
-                 <td>
-                     <br /><span class="label">{$form.preferred_language.label}</span>
-                     <br />{$form.preferred_language.html}
-                </td>
+          {foreach key=key item=item from=$commPreference}
+            <td>
+              <br/><span class="label">{$form.$key.label}</span> {help id="id-$key" file="CRM/Contact/Form/Contact.hlp"}
+              <br/>{$form.$key.html}
+            </td>
+          {/foreach}
+          <td>
+            <br/><span class="label">{$form.preferred_language.label}</span>
+            <br/>{$form.preferred_language.html}
+          </td>
         </tr>
         <tr>
             <td>{$form.is_opt_out.html} {$form.is_opt_out.label} {help id="id-optOut" file="CRM/Contact/Form/Contact.hlp"}</td>
@@ -125,43 +129,4 @@
     </table>
  </div><!-- /.crm-accordion-body -->
 </div><!-- /.crm-accordion-wrapper -->
-
-
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-    var fields = new Array( 'postal_greeting', 'addressee', 'email_greeting');
-    for ( var i = 0; i < 3; i++ ) {
-        $( "#" + fields[i] + "_id").change( function( ) {
-            var fldName = $(this).attr( 'id' );
-            if ( $(this).val( ) == 4 ) {
-                $("#greetings1").show( );
-                $("#greetings2").show( );
-                $( "#" + fldName + "_html").show( );
-                $( "#" + fldName + "_label").show( );
-            } else {
-                $( "#" + fldName + "_html").hide( );
-                $( "#" + fldName + "_label").hide( );
-                $( "#" + fldName.slice(0, -3) + "_custom" ).val('');
-            }
-        });
-    }
-});
-
-function showGreeting( element ) {
-    cj("#" + element ).show( );
-    cj("#" + element + '_display' ).hide( );
-
-    // TO DO fix for custom greeting
-    var fldName = '#' + element + '_id';
-    if ( cj( fldName ).val( ) == 4 ) {
-        cj("#greetings1").show( );
-        cj("#greetings2").show( );
-        cj( fldName + "_html").show( );
-        cj( fldName + "_label").show( );
-    }
-}
-
-
-</script>
-{/literal}
+{include file="CRM/Contact/Form/Edit/CommunicationPreferences.js.tpl"}