X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2FCRM%2FContact%2FForm%2FInline%2FCommunicationPreferences.tpl;h=66230db102c1ecd792467af6b733f43cf898d514;hb=3f98995adabf8359c8e90c1329db5a30d4f8f8a4;hp=0e7e3ae67cfe1a2a2371320c1dd153b8b38616ce;hpb=e425a965789b9e5a86069069c8fa18c50d3e2b6a;p=civicrm-core.git

diff --git a/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl b/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
index 0e7e3ae67c..66230db102 100644
--- a/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
+++ b/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -65,9 +65,10 @@
       <div class="crm-summary-row">
         <div class="crm-label">
           {$form.preferred_mail_format.label}
+          {help id="id-emailFormat" file="CRM/Contact/Form/Contact.hlp"}
         </div>
         <div class="crm-content">
-          {$form.preferred_mail_format.html} {help id="id-emailFormat" file="CRM/Contact/Form/Contact.hlp"}
+          {$form.preferred_mail_format.html}
         </div>
       </div>
       {/if}
@@ -90,9 +91,11 @@
           <span id="email_greeting" {if !empty($email_greeting_display)} class="hiddenElement"{/if}>
             {$form.email_greeting_id.html|crmAddClass:big}
           </span>
-          <span 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>
-          </span>
+          {if !empty($email_greeting_display)}
+            <div data-id="email_greeting" class="replace-plain big" title="{ts}Click to edit{/ts}">
+              {$email_greeting_display}
+            </div>
+          {/if}
           {if !empty($form.email_greeting_custom)}
             <span id="email_greeting_id_html" class="hiddenElement">
               <br/>{$form.email_greeting_custom.html|crmAddClass:big}
@@ -101,7 +104,7 @@
          </div>
        </div>
       {/if}
-      
+
 
       {if !empty($form.postal_greeting_id)}
       <div class="crm-summary-row">
@@ -110,9 +113,11 @@
           <span id="postal_greeting" {if !empty($postal_greeting_display)} class="hiddenElement"{/if}>
             {$form.postal_greeting_id.html|crmAddClass:big}
           </span>
-          <span 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>
-          </span>
+          {if !empty($postal_greeting_display)}
+            <div data-id="postal_greeting" class="replace-plain big" title="{ts}Click to edit{/ts}">
+              {$postal_greeting_display}
+            </div>
+          {/if}
           {if !empty($form.postal_greeting_custom)}
             <span id="postal_greeting_id_html" class="hiddenElement">
               <br/>{$form.postal_greeting_custom.html|crmAddClass:big}
@@ -129,9 +134,11 @@
           <span id="addressee" {if !empty($addressee_display)} class="hiddenElement"{/if}>
             {$form.addressee_id.html|crmAddClass:big}
           </span>
-          <span 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>
-          </span>
+          {if !empty($addressee_display)}
+            <div data-id="addressee" class="replace-plain big" title="{ts}Click to edit{/ts}">
+              {$addressee_display}
+            </div>
+          {/if}
           {if !empty($form.addressee_custom)}
             <span id="addressee_id_html" class="hiddenElement">
               <br/>{$form.addressee_custom.html|crmAddClass:big}
@@ -140,44 +147,7 @@
          </div>
        </div>
       {/if}
- 
+
     </div>
  </div>
-
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-    var fields = new Array( 'postal_greeting', 'addressee', 'email_greeting');
-    for ( var i = 0; i < 3; i++ ) {
-      cj( "#" + fields[i] + "_id").change( function( ) {
-        var fldName = cj(this).attr( 'id' );
-        if ( cj(this).val( ) == 4 ) {
-          cj("#greetings1").show( );
-          cj("#greetings2").show( );
-          cj( "#" + fldName + "_html").show( );
-          cj( "#" + fldName + "_label").show( );
-        } else {
-          cj( "#" + fldName + "_html").hide( );
-          cj( "#" + fldName + "_label").hide( );
-          cj( "#" + 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"}
\ No newline at end of file