Skip to content

Commit

Permalink
Merge pull request #22705 from eileenmcnaughton/notice2
Browse files Browse the repository at this point in the history 
Enotice fixes with datepicker
  • Loading branch information
@demeritcowboy
demeritcowboy authored Feb 5, 2022
2 parents b056741 + 2b85023 commit 87d25a7
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 33 deletions.
2 changes: 1 addition & 1 deletion ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<td class="label" for="receive_date_relative">
<label>{ts}Contribution Dates{/ts}</label>
</td>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="receive_date" colspan="2"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="receive_date" to='' from='' colspan="2" class='' hideRelativeLabel=0}
</tr>
<tr class="crm-contact-custom-search-contributionDetails-form-block-financial_type">
<td class="label" for="financial_type_id">
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Activity/Form/Search/Common.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
{/if}

<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="activity_date_time" colspan="2"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="activity_date_time" to='' from='' colspan="2" hideRelativeLabel=0 class =''}
<td>&nbsp;</td>
</tr>
<tr>
Expand Down
4 changes: 2 additions & 2 deletions templates/CRM/Case/Form/Search/Common.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
</tr>

<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="case_start_date" hideRelativeLabel=0}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="case_start_date" to='' from='' colspan='' class ='' hideRelativeLabel=0}
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="case_end_date" hideRelativeLabel=0}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="case_end_date" to='' from='' colspan='' class ='' hideRelativeLabel=0 }
</tr>

<tr id='case_search_form'>
Expand Down
4 changes: 2 additions & 2 deletions templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
<div id="changelog" class="form-item">
<table class="form-layout">
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="modified_date"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="modified_date" to='' from='' class='' colspan='' hideRelativeLabel=0}
<td>
<span class="modifiedBy"><label>{ts}Modified By{/ts}</label></span></br>
{$form.changed_by.html}<br><span class="description">{ts}Note this field just filters on who made a change no matter when that change happened, It doesn't have any link to the modified date field.{/ts}</span>
</td>
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="created_date"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="created_date" to='' from='' colspan='' class='' hideRelativeLabel=0}
</tr>
</table>
</div>
4 changes: 2 additions & 2 deletions templates/CRM/Contact/Form/Search/Criteria/Demographics.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div id="demographics" class="form-item">
<table class="form-layout">
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="birth_date"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="birth_date" to='' from='' colspan='' class='' hideRelativeLabel=0}
</tr>
<tr>
<td>
Expand All @@ -27,7 +27,7 @@
</td>
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="deceased_date"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="deceased_date" to='' from='' colspan='' class='' hideRelativeLabel=0}
</tr>
<tr>
<td>
Expand Down
6 changes: 3 additions & 3 deletions templates/CRM/Contact/Form/Search/Criteria/Relationship.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@
</td>
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="relationship_start_date"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="relationship_start_date" to='' from='' colspan='' class='' hideRelativeLabel=0}
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="relationship_end_date"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="relationship_end_date" to='' from='' colspan='' class='' hideRelativeLabel=0}
</tr>
<tr>
<td colspan="2"><label>{ts}Active Period{/ts}</label> {help id="id-relationship-active-period" file="CRM/Contact/Form/Search/Advanced.hlp"}<br /></td>
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="relation_active_period_date" hideRelativeLabel=1}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="relation_active_period_date" to='' from='' colspan='' class ='' hideRelativeLabel=1 }
</tr>
{if !empty($relationshipGroupTree)}
<tr>
Expand Down
4 changes: 2 additions & 2 deletions templates/CRM/Contribute/Form/Search/Common.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*}

<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="receive_date" colspan="2"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="receive_date" to='' from='' colspan="2" class='' hideRelativeLabel=0}
</tr>
<tr>
<td><label>{ts}Contribution Amounts{/ts}</label> <br />
Expand Down Expand Up @@ -159,7 +159,7 @@
</td>
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_cancel_date" colspan="2"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_cancel_date" to='' from='' colspan="2" class='' hideRelativeLabel=0}
</tr>
<tr>
<td>
Expand Down
12 changes: 6 additions & 6 deletions templates/CRM/Contribute/Form/Search/ContributionRecur.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@
</tr>
<tr>
<td><label for="contribution_recur_start_date_relative">{$form.contribution_recur_start_date_relative.label}</label></td>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_recur_start_date" colspan="2" hideRelativeLabel=1}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_recur_start_date" to='' from='' colspan="2" hideRelativeLabel=1 class =''}
</tr>
<tr>
<td><label for="contribution_recur_end_date_relative">{$form.contribution_recur_end_date_relative.label}</label></td>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_recur_end_date" colspan="2" hideRelativeLabel=1}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_recur_end_date" to='' from='' colspan="2" hideRelativeLabel=1 class =''}
</tr>
<tr>
<td><label for="contribution_recur_modified_date_relative">{$form.contribution_recur_modified_date_relative.label}</label></td>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_recur_modified_date" colspan="2" hideRelativeLabel=1}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_recur_modified_date" to='' from='' colspan="2" class ='' hideRelativeLabel=1}
</tr>
<tr>
<td><label for="contribution_recur_next_sched_contribution_date_relative">{$form.contribution_recur_next_sched_contribution_date_relative.label}</label></td>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_recur_next_sched_contribution_date" colspan="2" hideRelativeLabel=1}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_recur_next_sched_contribution_date" to='' from='' colspan="2" hideRelativeLabel=1 class=''}
</tr>
<tr>
<td><label for="contribution_recur_failure_rety_date_relative">{$form.contribution_recur_failure_retry_date_relative.label}</label></td>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_recur_failure_retry_date" colspan="2" hideRelativeLabel=1}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_recur_failure_retry_date" to='' from='' colspan="2" hideRelativeLabel=1 class=''}
</tr>
<tr>
<td><label for="contribution_recur_cancel_date_relative">{$form.contribution_recur_cancel_date_relative.label}</label></td>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_recur_cancel_date" colspan="2" hideRelativeLabel=1}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="contribution_recur_cancel_date" to='' from='' colspan="2" hideRelativeLabel=1 class=''}
</tr>
<tr>
<td>{ts}Status{/ts}</td>
Expand Down
1 change: 0 additions & 1 deletion templates/CRM/Core/DatePickerRangeWrapper.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*}
{* Wrapper around DatePickerRange TPL file *}
<td {if !empty($colspan)} colspan="{$colspan}" {else} colspan="2" {/if} {if !empty($class)} class="{$class}" {/if}>
{assign var='hideRelativeLabel' value=$hideRelativeLabel|default:0}
{assign var='from' value=$from|default:'_low'}
{assign var='to' value=$to|default:'_high'}
{include file="CRM/Core/DatePickerRange.tpl" fieldName=$fieldName hideRelativeLabel=$hideRelativeLabel to=$to from=$from}
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Custom/Form/Search.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{$form.$element_name_from.html|crmAddClass:six}
&nbsp;&nbsp;{$form.$element_name_to.label}&nbsp;&nbsp;{$form.$element_name_to.html|crmAddClass:six}
{elseif empty($element.skip_calendar)}
{include file="CRM/Core/DatePickerRangeCustomField.tpl" fieldName=$element_name hideRelativeLabel=0}<td>
{include file="CRM/Core/DatePickerRangeCustomField.tpl" fieldName=$element_name to='' from='' colspan='' class='' hideRelativeLabel=0}<td>
{/if}
{else}
<td class="label">{$form.$element_name.label}</td><td>
Expand Down
4 changes: 2 additions & 2 deletions templates/CRM/Event/Form/Search/Common.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<td class="crm-event-form-block-event_type_id"> {$form.event_type_id.label}<br />{$form.event_type_id.html} </td>
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="event" colspan="2"}</tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="event" to='' from='' colspan="2" class='' hideRelativeLabel=0}</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="participant_register_date" colspan="2"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="participant_register_date" to='' from='' colspan="2" class='' hideRelativeLabel=0}
</tr>
<tr>
<td class="crm-event-form-block-participant_status"><label>{$form.participant_status_id.label}</label>
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Mailing/Form/Search.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</td>
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="mailing" colspan='2'}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="mailing" to='' from='' colspan='2' class='' hideRelativeLabel=0}
</tr>
<tr>
<td colspan="1">{$form.sort_name.label} {help id="id-create_sort_name"}<br />
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Mailing/Form/Search/Common.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</td>
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="mailing_job_start_date"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="mailing_job_start_date" to='' from='' colspan='' class='' hideRelativeLabel=0}
</tr>
<tr>
<td>
Expand Down
6 changes: 3 additions & 3 deletions templates/CRM/Member/Form/Search/Common.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
<td>{$form.member_is_override.label}{help id="id-member_is_override" file="CRM/Member/Form/Search.hlp"}{$form.member_is_override.html}</td>
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="membership_join_date" colspan='2'}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="membership_join_date" to='' from='' colspan='2' class='' hideRelativeLabel=0}
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="membership_start_date" colspan='2'}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="membership_start_date" to='' from='' colspan='2' class='' hideRelativeLabel=0}
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="membership_end_date" colspan='2'}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="membership_end_date" to='' from='' colspan='2' class='' hideRelativeLabel=0}
</tr>

{* campaign in membership search *}
Expand Down
8 changes: 4 additions & 4 deletions templates/CRM/Pledge/Form/Search/Common.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*}

<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="pledge_payment_scheduled_date" colspan="2"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="pledge_payment_scheduled_date" to='' from='' colspan="2" class='' hideRelativeLabel=0}
</tr>
<tr>
<td colspan="2">
Expand All @@ -29,13 +29,13 @@
</td>
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="pledge_create_date" colspan="2"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="pledge_create_date" to='' from='' colspan="2" class='' hideRelativeLabel=0}
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="pledge_start_date" colspan="2"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="pledge_start_date" to='' from='' colspan="2" class='' hideRelativeLabel=0}
</tr>
<tr>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="pledge_end_date" colspan="2"}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="pledge_end_date" to='' from='' colspan="2" class='' hideRelativeLabel=0}
</tr>
<tr>
<td>
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Report/Form/Tabs/Filters.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{if !empty($field.operatorType) && $field.operatorType & 4}
<tr class="report-contents crm-report crm-report-criteria-filter crm-report-criteria-filter-{$tableName}">
<td class="label report-contents">{if !empty($field.title)}{$field.title}{/if}</td>
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName=$fieldName hideRelativeLabel=1 from='_from' to='_to'}
{include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName=$fieldName hideRelativeLabel=1 from='_from' to='_to' class='' colspan=''}
</tr>
{elseif $form.$fieldOp.html}
<tr class="report-contents crm-report crm-report-criteria-filter crm-report-criteria-filter-{$tableName}" {if !empty($field.no_display)} style="display: none;"{/if}>
Expand Down

0 comments on commit 87d25a7

Please sign in to comment.