projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5593 from relldoesphp/CRM-15992
[civicrm-core.git]
/
templates
/
CRM
/
common
/
jcalendar.tpl
diff --git
a/templates/CRM/common/jcalendar.tpl
b/templates/CRM/common/jcalendar.tpl
index 5ad307a8568e7f52fce5688db4c02260e56a3e9f..0c20f896424f4036dc3c564e16f84a833a176c95 100644
(file)
--- a/
templates/CRM/common/jcalendar.tpl
+++ b/
templates/CRM/common/jcalendar.tpl
@@
-2,7
+2,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 4.6 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 4.6 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
4
|
+ | Copyright CiviCRM LLC (c) 2004-201
5
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-49,7
+49,8
@@
{$form.$elementName.html}
{/if}
{$form.$elementName.html}
{/if}
-{assign var='displayDate' value=$elementId|cat:"_display"}
+{* CRM-15804 - CiviEvent Date Picker broken in modal dialog *}
+{assign var='displayDate' value=$elementId|cat:"_display"|cat:"_$string"|uniqid}
{if $action neq 1028}
<input type="text" name="{$displayDate}" id="{$displayDate}" class="dateplugin" autocomplete="off"/>
{if $action neq 1028}
<input type="text" name="{$displayDate}" id="{$displayDate}" class="dateplugin" autocomplete="off"/>