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

dev/core#824 Render contact type icons in std way on merge screen #13898

Merged
merged 2 commits into from
Mar 27, 2019

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Mar 27, 2019

Overview

Reduces clutter & increases available info & consistency by removing contact type from comparison table & putting icons next to the names

Before

The merge screen currently shows contact types as a row but that is meaningless as we don't currently
permit them to be changed when merging.

Screenshot 2019-03-27 17 44 59

After

Rendering as an icon is more consistent with elsewhere
and potentially the hover makes it easy to see salient information about the contact.
Screenshot 2019-03-27 17 44 21

Technical Details

Note this depends on related PR #13897

Comments

This does 3 things
1) reduces contact get queries from 3 to 1 since the 2 in the tpl layer are removed
2) adds created date to the merge summary information
3) makes it easier for extensions to replace/ extend this data (although core makes no
commitment to the tpl remaining unchanged so extension writers need to carry that risk)
The merge screen currently shows contact types as a row but that is meaningless as we don't currently
permit them to be changed when merging. Rendering as an icon is more consistent with elsewhere
and potentially the hover makes it easy to see salient information about the contact.
@civibot
Copy link

civibot bot commented Mar 27, 2019

(Standard links)

@civibot civibot bot added the master label Mar 27, 2019
@colemanw
Copy link
Member

colemanw commented Mar 27, 2019

This looks really good.
I've looked over the code and tested it out on the demo site and I'm happy to merge this as a UI improvement.

@colemanw colemanw merged commit 9174a88 into civicrm:master Mar 27, 2019
@colemanw colemanw deleted the merge_summary_2 branch March 27, 2019 14:13
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.

2 participants