CRM-15789 - Cleanup editable icons/styles

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

diff --git a/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl b/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
index 629a62e00a328ce0197108a2a1acac89baff2d69..66230db102c1ecd792467af6b733f43cf898d514 100644 (file)
--- a/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
+++ b/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
@@ -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}
@@ -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}
@@ -143,41 +150,4 @@
 
     </div>
  </div>
-
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-    var fields = ['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"}
\ No newline at end of file