This repository has been archived by the owner on Dec 23, 2017. It is now read-only.
Use Jinja blocks for flexible generic filters. #337
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This is great. How do you propose we deal with the merge conflict? I could remove all template changes from #336 and then commit just the CSS changes? It looks like none of the changes I made in the templates were related to the styles. |
|
Agreed, I think reverting the non-CSS changes in #336 would work. Or we could make a new PR that only includes the CSS changes--whatever's easier. |
|
I make a new PR here: There were some template changes, unfortunately. I had to create a new wrapping div with a new class. |
This fixes the filter panel on mobile by creating a new component element. It does not fix the template organization problem. This was done to make the merge conflict in fecgov#337 easier as it's less code that will be modified.
msecret
pushed a commit
to msecret/openFEC-web-app
that referenced
this pull request
Jul 20, 2015
- Rename the UI of the pop-out from "modal" to "panel". This was renamed because this UI will not be strictly a modal. It will act as a modal on mobile and as a split 50% panel on tablet, up. @noahmanger, please let me know if theres a better name. - Change the columns around to have an arrow column at the end of the rows. - Make the whole row clickable to open the panel, if you click on a link it will pass through and open the link. This needs some of the work done in fecgov#337, fecgov#338 in order to get expeditures working.
…nFEC-web-app into feature/generic-filters
|
I have another fix to do on the filter panel but this looks good. |
msecret
pushed a commit
that referenced
this pull request
Jul 21, 2015
Use Jinja blocks for flexible generic filters.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an implementation of reusable filter sidebars, as @msecret proposed, that doesn't require all filter fields to be template includes. This approach uses blocks, which are more flexible and easier to customize.
This will cause merge conflicts with #336, so if we merge this branch, I can cherry-pick the SCSS changes there, or we can resubmit #336.