-
-
Notifications
You must be signed in to change notification settings - Fork 825
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Convert event search to datepicker and cleanup template #12978
Convert event search to datepicker and cleanup template #12978
Conversation
(Standard links)
|
<div class="crm-select-container">{$form.$elementName.html}</div> | ||
<td class="{$campaignTdClass}"> | ||
<label>{$form.$elementName.label}</label> | ||
{$form.$elementName.html} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel good about this PR except for the changes to this file. This isn't directly related to events or dates, and i'm not sure about the change. Quickform already generates a <label>
tag so I think this would result in <label><label>Label</label></label>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@colemanw You are correct, we don't need the <label>
tags here. The div is not required as the select element supplies it's own. And removing the <br />
means the elements takes up less vertical space on the screen - it also appears on contribution search and the change to single line helps I think. Happy to put this as a separate PR if you prefer?
a887738
to
7a02177
Compare
@colemanw Just need to you to confirm you are happy with the changes in response to your comments? |
Yes, although I'm confused by the screenshots -- there don't appear to be any datepicker elements in either screenshot? |
@colemanw Must be your eyes... I've updated the after screenshot to show the "Search ALL or by date range" selected at which point two datepickers magically appear :-) |
@agh1 Not directly related to this PR.. but any idea why I always get two "date" icons for datepickers like in the screenshot above? This was happening both before and after the date icon was changed. |
@mattwire that's weird--when I visit http://core-12978-ej5g.test-1.civicrm.org:8001/civicrm/event/manage?reset=1 I get this: |
Jenkins re-test this please. If the problem was introduced by #13003 it wouldn't be reflected in the test output because this test ran before that was merged. |
@mattwire I tried it with the new test build, and it looks correct: |
@agh1 Thanks for taking a look, must be something unique with my setup :-) |
@seamuslee001 @eileenmcnaughton So I think this is good to merge? |
merging based on @agh1 review & general concept approval for killing datepickers |
Overview
Convert form to use datepicker:
Partial from #12973
Before
Using old jcalendar.
![localhost_8000_civicrm_event_manage_reset 1 2](https://user-images.githubusercontent.com/2052161/47265216-5b28c800-d51c-11e8-8aae-380bcaff45fc.png)
After
Using "new" datepicker.
![localhost_8000_civicrm_event_manage_reset 1 3](https://user-images.githubusercontent.com/2052161/47556495-58f0b000-d906-11e8-8c90-b6717f486e4a.png)