Skip to content
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

Merged

Conversation

mattwire
Copy link
Contributor

@mattwire mattwire commented Oct 21, 2018

Overview

Convert form to use datepicker:

  • Event Search (On ManageEvent page - also cleaned up layout) - Before/After screenshot below.

Partial from #12973

Before

Using old jcalendar.
localhost_8000_civicrm_event_manage_reset 1 2

After

Using "new" datepicker.
localhost_8000_civicrm_event_manage_reset 1 3

@civibot
Copy link

civibot bot commented Oct 21, 2018

(Standard links)

<div class="crm-select-container">{$form.$elementName.html}</div>
<td class="{$campaignTdClass}">
<label>{$form.$elementName.label}</label>
{$form.$elementName.html}
Copy link
Member

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>

Copy link
Contributor Author

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?

@mattwire mattwire changed the title Convert event search to datepicker and cleanup template WIP Convert event search to datepicker and cleanup template Oct 21, 2018
@mattwire mattwire force-pushed the datepicker_manageevent_search branch from a887738 to 7a02177 Compare October 23, 2018 20:19
@mattwire mattwire changed the title WIP Convert event search to datepicker and cleanup template Convert event search to datepicker and cleanup template Oct 25, 2018
@mattwire
Copy link
Contributor Author

@colemanw Just need to you to confirm you are happy with the changes in response to your comments?

@colemanw
Copy link
Member

Yes, although I'm confused by the screenshots -- there don't appear to be any datepicker elements in either screenshot?

@mattwire
Copy link
Contributor Author

@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 :-)

@mattwire
Copy link
Contributor Author

@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.

@agh1
Copy link
Contributor

agh1 commented Oct 26, 2018

@mattwire that's weird--when I visit http://core-12978-ej5g.test-1.civicrm.org:8001/civicrm/event/manage?reset=1 I get this:
image

@agh1
Copy link
Contributor

agh1 commented Oct 26, 2018

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.

@agh1
Copy link
Contributor

agh1 commented Oct 26, 2018

@mattwire I tried it with the new test build, and it looks correct:
image

@mattwire
Copy link
Contributor Author

@agh1 Thanks for taking a look, must be something unique with my setup :-)

@mattwire
Copy link
Contributor Author

@seamuslee001 @eileenmcnaughton So I think this is good to merge?

@eileenmcnaughton
Copy link
Contributor

merging based on @agh1 review & general concept approval for killing datepickers

@eileenmcnaughton eileenmcnaughton merged commit b4cbce3 into civicrm:master Oct 29, 2018
@mattwire mattwire deleted the datepicker_manageevent_search branch October 29, 2018 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants