Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-05-17-16-30

[civicrm-core.git] / templates / CRM / Custom / Page / Option.tpl

diff --git a/templates/CRM/Custom/Page/Option.tpl b/templates/CRM/Custom/Page/Option.tpl
index 57a09723fb25259d50a5c15e41a3d2ef5a04a775..800693ef5e56671deedebf0d86a0d8f4cc6b85b7 100644 (file)
--- a/templates/CRM/Custom/Page/Option.tpl
+++ b/templates/CRM/Custom/Page/Option.tpl
@@ -39,7 +39,8 @@
       <div class="form-item">
         {strip}
         {* handle enable/disable actions*}
-         {include file="CRM/common/enableDisable.tpl"}
+         {include file="CRM/common/enableDisableApi.tpl"}
+         {include file="CRM/common/crmeditable.tpl"}
         <table class="selector">
           <tr class="columnheader">
             <th>{ts}Label{/ts}</th>
@@ -63,7 +64,7 @@
         {/strip}
 
         <div class="action-link">
-            <a href="{crmURL q="reset=1&action=add&fid=$fid&gid=$gid"}" class="button"><span><div class="icon add-icon"></div> {ts 1=$fieldTitle}Add Option for '%1'{/ts}</span></a>
+            <a href="{crmURL q="reset=1&action=add&fid=$fid&gid=$gid"}" class="button action-item"><span><div class="icon add-icon"></div> {ts 1=$fieldTitle}Add Option for '%1'{/ts}</span></a>
         </div>
       </div>
     </div>
@@ -72,10 +73,7 @@
     {if $action eq 16}
         <div class="messages status no-popup">
            <img src="{$config->resourceBase}i/Inform.gif" alt="{ts}status{/ts}"/>
-           {capture assign=crmURL}{crmURL p='civicrm/admin/custom/group/field/option' q="action=add&fid=$fid&gid=$gid"}{/capture}{ts 1=$fieldTitle 2=$crmURL}There are no multiple choice options for the custom field '%1', <a href='%2'>add one</a>.{/ts}
+           {capture assign=crmURL}{crmURL p='civicrm/admin/custom/group/field/option' q="action=add&fid=$fid&gid=$gid"}{/capture}{ts 1=$fieldTitle 2=$crmURL}There are no multiple choice options for the custom field '%1', <a href='%2' class="action-item">add one</a>.{/ts}
         </div>
     {/if}
 {/if}
-
-{include file="CRM/common/crmeditable.tpl"}
-