Vote #78531
完了Unify form#query_form on calendar/gantt views with issues/spent time views
0%
説明
I noticed a difference between the rendering of the query filter forms on the issues & spent time views and the query filter forms on the calendar and gantt views. I fixed it with the following changes:
- 1. Fix HTML structure of form#query_form on calendar/gantt views. This unifies the HTML structure of the query form on the calendars/show and gantts/show views to be the same as it is currently for the issues and spent time views, which were themself unified into the new queries/_query_form partial in r15649.
- 2. Fix source indentation and newline usage. This unifies the source layout of the query form on the calendars/show and the gantts/show views with the queries/_query_form partial.
- 3. Unify form#query_form structure on calendar/gantt views. This: ** moves the p with inline style on the calendar view (which wraps the navigation buttons) out of div#query_form_content and adds the contextual class to the element to unify this with the gantt view (and to remove the inline style from the element now that it's styled through a stylesheets' style [.contextual in fact]); ** restores the 12px font-size of the calendar navigation buttons; ** increases the font-size of the gantt zoom buttons to 12px; ** increases the margin of the calendar navigation and gantt zoom buttons to 12px 0px.
- 4. Add test assertions to the four controller test cases.
To make the changes a bit more visual, here some ASCII and image graphics:
|.view |.was |_.becomes |
|issues |
form#query_form|
inputs
div#query_form_with_buttons.hide-when-print
div#query_form_content
fieldset#filters.collapsible
fieldset#options
p.buttons
form#query_form|
inputs
div#query_form_with_buttons.hide-when-print
div#query_form_content
fieldset#filters.collapsible
fieldset#options
p.buttons
| |!issues-current.png! |!issues-fixed.png! |
|spenttime |
form#query_form|
inputs
div#query_form_with_buttons.hide-when-print
div#query_form_content
fieldset#filters.collapsible
fieldset#options
p.buttons
form#query_form|
inputs
div#query_form_with_buttons.hide-when-print
div#query_form_content
fieldset#filters.collapsible
fieldset#options
p.buttons
| |!spenttime-current.png! |!spenttime-fixed.png! |
|calendar |
form#query_form|
inputs
fieldset#filters.collapsible
p(inlineStyles)
p.buttons
form#query_form|
inputs
div#query_form_with_buttons.hide-when-print
div#query_form_content
fieldset#filters.collapsible
p.contextual
p.buttons
| |!calendar-current.png! |!calendar-fixed.png! |
|gantt |
form#query_form|
inputs
fieldset#filters.collapsible
fieldset#options
p.contextual
p.buttons
form#query_form|
inputs
div#query_form_with_buttons.hide-when-print
div#query_form_content
fieldset#filters.collapsible
fieldset#options
p.contextual
p.buttons
| |!gantt-current.png! |!gantt-fixed.png! |
I'll attach four patches implementing these changes. This patch serial, against current source:/trunk@16643, is produced using @git format-patch@ which makes the individual patches apply-able using "@patch -p1 < 0001-...@".
Environment:
Environment: Redmine version 3.3.3.devel@r16643 Ruby version 2.3.3-p222 (2016-11-21) [x86_64-linux] Rails version 4.2.8 Environment production Database adapter Mysql2 SCM: Subversion 1.8.8 Git 1.9.1 Filesystem Redmine plugins: no plugin installed
journals
Edit: seems like using thumbnails in tables causes some issues; replaced with regular image tags.
Edit 2: for anyone searching for the visual differences: only the calendar and gantt views are affected by these changes
Also attaching the patches.
--------------------------------------------------------------------------------
Looks good to me. Passed all test.
Since we are freezing 3.4.0 now and this issue is a kind of refactoring, I think it would be better to set target version to 3.5.0 instead of 3.4.0.
--------------------------------------------------------------------------------
Patches are committed, thanks!
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
related_issues
relates,Closed,28602,Move edit and delete buttons for queries to the buttons section