Commit f017ce8b authored by Seamus Lee's avatar Seamus Lee Committed by GitHub

Merge pull request #14230 from eileenmcnaughton/5.13

Fixes to layout on activity date time on search page
parents 2c3458ff 0032e7af
......@@ -1314,7 +1314,7 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
$label,
$options,
$required,
NULL
['class' => 'crm-select2']
);
$attributes = ['format' => 'searchDate'];
$extra = ['time' => $isDateTime];
......
......@@ -89,9 +89,8 @@
</tr>
<tr>
<td>
{include file="CRM/Core/DatePickerRange.tpl" fieldName="activity_date_time"}
</td>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="activity_date_time" colspan="2"}
<td>&nbsp;</td>
</tr>
<tr>
<td>
......
{*
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| CiviCRM is free software; you can copy, modify, and distribute it |
| under the terms of the GNU Affero General Public License |
| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
| |
| CiviCRM is distributed in the hope that it will be useful, but |
| WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| See the GNU Affero General Public License for more details. |
| |
| You should have received a copy of the GNU Affero General Public |
| License and the CiviCRM Licensing Exception along |
| with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
{* Wrapper around DatePickerRange TPL file *}
<td {if $colspan} colspan="{$colspan}" {else} colspan="2" {/if} {if $class} class="{$class}" {/if}>
{include file="CRM/Core/DatePickerRange.tpl" fieldName=$fieldName}
</td>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment