Project

General

Profile

Actions

Patch #26125

closed

Unify form#query_form on calendar/gantt views with issues/spent time views

Added by Mischa The Evil over 7 years ago. Updated over 7 years ago.

Status:
Closed
Priority:
Normal
Category:
UI
Target version:
Start date:
Due date:
% Done:

0%

Estimated time:

Description

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

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


Files

issues-current.png (6.82 KB) issues-current.png Mischa The Evil, 2017-06-08 23:47
spenttime-current.png (7.03 KB) spenttime-current.png Mischa The Evil, 2017-06-08 23:47
calendar-current.png (6.99 KB) calendar-current.png Mischa The Evil, 2017-06-08 23:47
gantt-current.png (8.29 KB) gantt-current.png Mischa The Evil, 2017-06-08 23:47
issues-fixed.png (6.82 KB) issues-fixed.png Mischa The Evil, 2017-06-08 23:48
spenttime-fixed.png (7.03 KB) spenttime-fixed.png Mischa The Evil, 2017-06-08 23:48
calendar-fixed.png (6.81 KB) calendar-fixed.png Mischa The Evil, 2017-06-08 23:48
gantt-fixed.png (8.09 KB) gantt-fixed.png Mischa The Evil, 2017-06-08 23:48
0001-Fix-HTML-structure-of-query_form-on-calendar-gantt-v.patch (2.81 KB) 0001-Fix-HTML-structure-of-query_form-on-calendar-gantt-v.patch Mischa The Evil, 2017-06-09 00:13
0002-Fix-source-indentation-and-newline-usage.patch (8.28 KB) 0002-Fix-source-indentation-and-newline-usage.patch Mischa The Evil, 2017-06-09 00:13
0003-Unify-query_form-structure-on-calendar-gantt-views.patch (2.25 KB) 0003-Unify-query_form-structure-on-calendar-gantt-views.patch Mischa The Evil, 2017-06-09 00:13
0004-Add-test-assertions-to-the-four-controller-test-case.patch (3.82 KB) 0004-Add-test-assertions-to-the-four-controller-test-case.patch Mischa The Evil, 2017-06-09 00:13

Related issues

Related to Redmine - Patch #28602: Move edit and delete buttons for queries to the buttons sectionClosedGo MAEDA

Actions
Actions #1

Updated by Mischa The Evil over 7 years ago

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.

Actions #2

Updated by Go MAEDA over 7 years ago

  • Target version set to 4.1.0

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.

Actions #3

Updated by Jean-Philippe Lang over 7 years ago

  • Status changed from New to Closed
  • Assignee set to Jean-Philippe Lang

Patches are committed, thanks!

Actions #4

Updated by Jean-Philippe Lang over 7 years ago

  • Target version changed from 4.1.0 to 4.0.0
Actions #5

Updated by Marius BÄ‚LTEANU over 6 years ago

  • Related to Patch #28602: Move edit and delete buttons for queries to the buttons section added
Actions

Also available in: Atom PDF