From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 4 Nov 2014 02:17:16 +0000 (-0500)
Subject: Fix Custom/Page/Option.tpl to separate form from page
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5e80a94bebe0f0023bfc66c782de42194143ff48;p=civicrm-core.git

Fix Custom/Page/Option.tpl to separate form from page
---

diff --git a/templates/CRM/Custom/Page/Option.tpl b/templates/CRM/Custom/Page/Option.tpl
index 9608786b32..68755e4448 100644
--- a/templates/CRM/Custom/Page/Option.tpl
+++ b/templates/CRM/Custom/Page/Option.tpl
@@ -25,9 +25,8 @@
 *}
 {if $action eq 1 or $action eq 2 or $action eq 4 or $action eq 8}
     {include file="CRM/Custom/Form/Option.tpl"}
-{/if}
-
-{if $customOption}
+{else}
+  {if $customOption}
     {if $reusedNames}
         <div class="message status">
             <div class="icon inform-icon"></div> &nbsp; {ts 1=$reusedNames}These Multiple Choice Options are shared by the following custom fields: %1{/ts}
@@ -70,11 +69,12 @@
       </div>
     </div>
 
-{else}
+  {else}
     {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' class="action-item">add one</a>.{/ts}
+           {ts}None found.{/ts}
         </div>
     {/if}
+  {/if}
 {/if}