X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2FCRM%2Fcommon%2Fjcalendar.tpl;h=b4e25f3d0dbd02e30298f4fdd47330ee1aa42daf;hb=cf7754d71abb04c50f7501894881da003baa7f59;hp=98b67ed1681776781554ef0b46205c5d7c5fc988;hpb=39e14733f1d71bf49d9ee83ce3c0425fefde2227;p=civicrm-core.git
diff --git a/templates/CRM/common/jcalendar.tpl b/templates/CRM/common/jcalendar.tpl
index 98b67ed168..b4e25f3d0d 100644
--- a/templates/CRM/common/jcalendar.tpl
+++ b/templates/CRM/common/jcalendar.tpl
@@ -1,8 +1,8 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.4 |
+ | CiviCRM version 4.5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013 |
+ | Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@ -43,7 +43,9 @@
{$form.$blockSection.$blockId.$tElement.html|crmAddClass:six}
{/if}
{else}
- {assign var='elementId' value=$form.$elementName.id}
+ {if !$elementId}
+ {assign var='elementId' value=$form.$elementName.id}
+ {/if}
{assign var="timeElement" value=$elementName|cat:'_time'}
{$form.$elementName.html}
{/if}
@@ -64,16 +66,17 @@
{/if}
{if $action neq 1028}
- ({ts}clear{/ts})
+
{/if}
{/strip}