Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-08-20-42-29

[civicrm-core.git] / templates / CRM / Campaign / Form / addCampaignToComponent.tpl

diff --git a/templates/CRM/Campaign/Form/addCampaignToComponent.tpl b/templates/CRM/Campaign/Form/addCampaignToComponent.tpl
index 79713ff537ed0c7c53d2c78a5736edffacb58a1f..20481ac0b7bbbf2e6dc5c9baecf1cbbe9d2b71cc 100644 (file)
--- a/templates/CRM/Campaign/Form/addCampaignToComponent.tpl
+++ b/templates/CRM/Campaign/Form/addCampaignToComponent.tpl
@@ -8,31 +8,6 @@
 
     <td class="{$campaignTdClass}">{$form.$elementName.label}<br />
     <div class="crm-select-container">{$form.$elementName.html}</div>
-       {literal}
-       <script type="text/javascript">
-       cj( "select[name=" + "'" + {/literal}'{$elementName}[]'{literal} + "'" + "]" ).crmasmSelect({
-           addItemTarget: 'bottom',
-           animate: true,
-           highlight: true,
-           sortable: true,
-           respectParents: true,
-     selectClass:'crmasmSelectCampaigns'
-       });
-
-       //lets disable the current and past campaign options.
-       cj(function(){
-              cj( 'select[id^="'+ 'crmasmSelectCampaigns' +'"] option' ).each( function( ) {
-                   value = cj(this).val();
-                   if ( value == 'current_campaign' || value == 'past_campaign' ) {
-                        cj(this).css( 'color', 'black' );
-                        cj(this).prop( 'disabled', true );
-                        cj(this).prop( 'selected', false);
-                        cj(this).addClass( 'asmOptionDisabled' );
-                   }
-              });
-       });
-       </script>
-       {/literal}
     </td>
 </tr>
 
@@ -41,11 +16,11 @@
 {if $campaignInfo.showAddCampaign}
 
     <tr class="{$campaignTrClass}">
-        <td class="label">{$form.campaign_id.label}</td>
+        <td class="label">{$form.campaign_id.label} {help id="id-campaign_id" file="CRM/Campaign/Form/addCampaignToComponent.hlp"}</td>
         <td class="view-value">
       {* lets take a call, either show campaign select drop-down or show add campaign link *}
             {if $campaignInfo.hasCampaigns}
-            {$form.campaign_id.html|crmAddClass:huge} {help id="id-campaign_id" file="CRM/Campaign/Form/addCampaignToComponent.hlp"}
+            {$form.campaign_id.html|crmAddClass:huge}
             {* show for add and edit actions *}
           {if ( $action eq 1 or $action eq 2 )
               and !$campaignInfo.alreadyIncludedPastCampaigns and $campaignInfo.includePastCampaignURL}
@@ -59,7 +34,7 @@
             <div class="status">
             {ts}There are currently no active Campaigns.{/ts}
             {if $campaignInfo.addCampaignURL}
-              {capture assign="link"}href="{$campaignInfo.addCampaignURL}" class="action-item action-item-first"{/capture}
+              {capture assign="link"}href="{$campaignInfo.addCampaignURL}" class="action-item"{/capture}
               {ts 1=$link}If you want to associate this record with a campaign, you can <a %1>create a campaign here</a>.{/ts}
             {/if} {help id="id-campaign_id" file="CRM/Campaign/Form/addCampaignToComponent.hlp"}
             </div>