From 63932b55b7a370fe7076dce8e7c7ace842b98ebd Mon Sep 17 00:00:00 2001 From: bshuttle Date: Mon, 10 Apr 2006 08:23:24 +0000 Subject: [PATCH] improve the flow around conditional md. --- templates/ktcore/metadata/conditional/manageConditional.smarty | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/templates/ktcore/metadata/conditional/manageConditional.smarty b/templates/ktcore/metadata/conditional/manageConditional.smarty index 9d6a670..b295638 100644 --- a/templates/ktcore/metadata/conditional/manageConditional.smarty +++ b/templates/ktcore/metadata/conditional/manageConditional.smarty @@ -15,7 +15,7 @@ how the user was allowed to select the specific street (given another field).{/i {* don't show warnings until the basics are done. *} {if ($oMasterField && empty($free_fields))} -{if $sIncomplete || !$oFieldset->getIsComplete()} +{if $sIncomplete}

{i18n}This conditional fieldset is marked such that it cannot be used. This happens when the fieldset has been edited and has @@ -29,16 +29,16 @@ check to see if the fieldset is usable by the user.{/i18n}

{i18n}This error prevents this fieldset from being set to complete{/i18n}: {$sIncomplete|escape}

-{else} +{/if} +{/if} -{i18n}Try to set to complete{/i18n}: +

{i18n}View Overview{/i18n}

- - - + + +
-{/if} -{/if} +

{i18n}Conditional type{/i18n}

@@ -163,3 +163,12 @@ $this->assign("oChildField", DocumentField::get($this->_tpl_vars['aRow']['child_ {/if} {/if} + + + +

{i18n}Rename Behaviours{/i18n}

+
+ + + +
\ No newline at end of file -- libgit2 0.21.4