| Message ID | 20191020185711.14469-3-metepolat2000@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Add submission relations | expand |
Mete Polat <metepolat2000@gmail.com> writes: > Move the series patch list from 'Related' to 'Series' and display the > series name, its patches and a detailed link in the same row. This > allows to use the 'Related' row for actually showing submission > relations instead. I get what you're trying to do here, and it makes sense. Having said that, I'm not really a fan, but I can't quite put my finger on why. Here's what I'd like to try: 1) Remove Related, as you do. 2) atm you have "Series: show SeriesName". Swap SeriesName and show. This will also mean that SeriesName doesn't move left and right when you click on show/hide 3) Rename show/hide to ... something, I think expand/collapse, maybe expand/hide - your call 4) Make the series name clickable and link to the series view. Delete your detailed view link. 5) Insert some sort of delimiter between the series name link and the expand/collapse link so it's obvious that they're different actions. I'd suggest '|' but the choice is yours. I think that will satisfy my ill-defined feelings about how patchwork should look and feel - I'm sorry I don't have good design language with which to explain and justify what I'm going for! Feel free to push back if you try this and it turns out to be ugly or confusing. (And, in general, if ever you think I'm wrong!) Regards, Daniel > > Signed-off-by: Mete Polat <metepolat2000@gmail.com> > --- > htdocs/css/style.css | 2 +- > patchwork/templates/patchwork/submission.html | 65 +++++++++---------- > 2 files changed, 31 insertions(+), 36 deletions(-) > > diff --git a/htdocs/css/style.css b/htdocs/css/style.css > index b9fb9eb..243caa0 100644 > --- a/htdocs/css/style.css > +++ b/htdocs/css/style.css > @@ -192,7 +192,7 @@ table.patchmeta tr th, table.patchmeta tr td { > vertical-align: top; > } > > -.patchrelations ul { > +.submissionlist ul { > list-style-type: none; > padding: 0; > margin: 0; > diff --git a/patchwork/templates/patchwork/submission.html b/patchwork/templates/patchwork/submission.html > index b5b55db..032b364 100644 > --- a/patchwork/templates/patchwork/submission.html > +++ b/patchwork/templates/patchwork/submission.html > @@ -72,43 +72,38 @@ function toggle_div(link_id, headers_id) > <tr> > <th>Series</th> > <td> > - <a href="{% url 'patch-list' project_id=project.linkname %}?series={{ submission.series.id }}"> > - {{ submission.series }} > - </a> > - </td> > - </tr> > - <tr> > - <th>Related</th> > - <td> > - <a id="togglepatchrelations" > - href="javascript:toggle_div('togglepatchrelations', 'patchrelations')" > - >show</a> > - <div id="patchrelations" class="patchrelations" style="display:none;"> > + <a id="togglepatchseries" > + href="javascript:toggle_div('togglepatchseries', 'patchseries')" > + >show</a> {{ submission.series.name }} > + <div id="patchseries" class="submissionlist" style="display:none;"> > <ul> > - {% with submission.series.cover_letter as cover %} > - <li> > - {% if cover %} > - {% if cover == submission %} > - {{ cover.name|default:"[no subject]"|truncatechars:100 }} > - {% else %} > - <a href="{% url 'cover-detail' project_id=project.linkname msgid=cover.url_msgid %}"> > - {{ cover.name|default:"[no subject]"|truncatechars:100 }} > - </a> > - {% endif %} > - {% endif %} > - </li> > - {% endwith %} > - {% for sibling in submission.series.patches.all %} > - <li> > - {% if sibling == submission %} > - {{ sibling.name|default:"[no subject]"|truncatechars:100 }} > - {% else %} > - <a href="{% url 'patch-detail' project_id=project.linkname msgid=sibling.url_msgid %}"> > - {{ sibling.name|default:"[no subject]"|truncatechars:100 }} > - </a> > + {% with submission.series.cover_letter as cover %} > + <li> > + {% if cover %} > + {% if cover == submission %} > + {{ cover.name|default:"[no subject]"|truncatechars:100 }} > + {% else %} > + <a href="{% url 'cover-detail' project_id=project.linkname msgid=cover.url_msgid %}"> > + {{ cover.name|default:"[no subject]"|truncatechars:100 }} > + </a> > + {% endif %} > {% endif %} > - </li> > - {% endfor %} > + </li> > + {% endwith %} > + {% for sibling in submission.series.patches.all %} > + <li> > + {% if sibling == submission %} > + {{ sibling.name|default:"[no subject]"|truncatechars:100 }} > + {% else %} > + <a href="{% url 'patch-detail' project_id=project.linkname msgid=sibling.url_msgid %}"> > + {{ sibling.name|default:"[no subject]"|truncatechars:100 }} > + </a> > + {% endif %} > + </li> > + {% endfor %} > + <a href="{% url 'patch-list' project_id=project.linkname %}?series={{ submission.series.id }}"> > + (Detailed view) > + </a> > </ul> > </div> > </td> > -- > 2.23.0 > > _______________________________________________ > Patchwork mailing list > Patchwork@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/patchwork
Hi Daniel, On 31.10.19 14:42, Daniel Axtens wrote: > Mete Polat <metepolat2000@gmail.com> writes: > >> Move the series patch list from 'Related' to 'Series' and display the >> series name, its patches and a detailed link in the same row. This >> allows to use the 'Related' row for actually showing submission >> relations instead. > > I get what you're trying to do here, and it makes sense. > > Having said that, I'm not really a fan, but I can't quite put my finger > on why. > > Here's what I'd like to try: > > 1) Remove Related, as you do. > > 2) atm you have "Series: show SeriesName". Swap SeriesName and > show. This will also mean that SeriesName doesn't move left and > right when you click on show/hide > > 3) Rename show/hide to ... something, I think expand/collapse, maybe > expand/hide - your call > > 4) Make the series name clickable and link to the series view. Delete > your detailed view link. > > 5) Insert some sort of delimiter between the series name link and the > expand/collapse link so it's obvious that they're different > actions. I'd suggest '|' but the choice is yours. > > I think that will satisfy my ill-defined feelings about how patchwork > should look and feel - I'm sorry I don't have good design language with > which to explain and justify what I'm going for! > > Feel free to push back if you try this and it turns out to be ugly or > confusing. (And, in general, if ever you think I'm wrong!) Funny, that was quite the design I had when I started working on this patch several months ago but I thought not breaking the principle the other rows are following would rather satisfy your design feelings ;). I will try it again. Best Regards, Mete > Regards, > Daniel >> >> Signed-off-by: Mete Polat <metepolat2000@gmail.com> >> --- >> htdocs/css/style.css | 2 +- >> patchwork/templates/patchwork/submission.html | 65 +++++++++---------- >> 2 files changed, 31 insertions(+), 36 deletions(-) >> >> diff --git a/htdocs/css/style.css b/htdocs/css/style.css >> index b9fb9eb..243caa0 100644 >> --- a/htdocs/css/style.css >> +++ b/htdocs/css/style.css >> @@ -192,7 +192,7 @@ table.patchmeta tr th, table.patchmeta tr td { >> vertical-align: top; >> } >> >> -.patchrelations ul { >> +.submissionlist ul { >> list-style-type: none; >> padding: 0; >> margin: 0; >> diff --git a/patchwork/templates/patchwork/submission.html b/patchwork/templates/patchwork/submission.html >> index b5b55db..032b364 100644 >> --- a/patchwork/templates/patchwork/submission.html >> +++ b/patchwork/templates/patchwork/submission.html >> @@ -72,43 +72,38 @@ function toggle_div(link_id, headers_id) >> <tr> >> <th>Series</th> >> <td> >> - <a href="{% url 'patch-list' project_id=project.linkname %}?series={{ submission.series.id }}"> >> - {{ submission.series }} >> - </a> >> - </td> >> - </tr> >> - <tr> >> - <th>Related</th> >> - <td> >> - <a id="togglepatchrelations" >> - href="javascript:toggle_div('togglepatchrelations', 'patchrelations')" >> - >show</a> >> - <div id="patchrelations" class="patchrelations" style="display:none;"> >> + <a id="togglepatchseries" >> + href="javascript:toggle_div('togglepatchseries', 'patchseries')" >> + >show</a> {{ submission.series.name }} >> + <div id="patchseries" class="submissionlist" style="display:none;"> >> <ul> >> - {% with submission.series.cover_letter as cover %} >> - <li> >> - {% if cover %} >> - {% if cover == submission %} >> - {{ cover.name|default:"[no subject]"|truncatechars:100 }} >> - {% else %} >> - <a href="{% url 'cover-detail' project_id=project.linkname msgid=cover.url_msgid %}"> >> - {{ cover.name|default:"[no subject]"|truncatechars:100 }} >> - </a> >> - {% endif %} >> - {% endif %} >> - </li> >> - {% endwith %} >> - {% for sibling in submission.series.patches.all %} >> - <li> >> - {% if sibling == submission %} >> - {{ sibling.name|default:"[no subject]"|truncatechars:100 }} >> - {% else %} >> - <a href="{% url 'patch-detail' project_id=project.linkname msgid=sibling.url_msgid %}"> >> - {{ sibling.name|default:"[no subject]"|truncatechars:100 }} >> - </a> >> + {% with submission.series.cover_letter as cover %} >> + <li> >> + {% if cover %} >> + {% if cover == submission %} >> + {{ cover.name|default:"[no subject]"|truncatechars:100 }} >> + {% else %} >> + <a href="{% url 'cover-detail' project_id=project.linkname msgid=cover.url_msgid %}"> >> + {{ cover.name|default:"[no subject]"|truncatechars:100 }} >> + </a> >> + {% endif %} >> {% endif %} >> - </li> >> - {% endfor %} >> + </li> >> + {% endwith %} >> + {% for sibling in submission.series.patches.all %} >> + <li> >> + {% if sibling == submission %} >> + {{ sibling.name|default:"[no subject]"|truncatechars:100 }} >> + {% else %} >> + <a href="{% url 'patch-detail' project_id=project.linkname msgid=sibling.url_msgid %}"> >> + {{ sibling.name|default:"[no subject]"|truncatechars:100 }} >> + </a> >> + {% endif %} >> + </li> >> + {% endfor %} >> + <a href="{% url 'patch-list' project_id=project.linkname %}?series={{ submission.series.id }}"> >> + (Detailed view) >> + </a> >> </ul> >> </div> >> </td> >> -- >> 2.23.0 >> >> _______________________________________________ >> Patchwork mailing list >> Patchwork@lists.ozlabs.org >> https://lists.ozlabs.org/listinfo/patchwork
diff --git a/htdocs/css/style.css b/htdocs/css/style.css index b9fb9eb..243caa0 100644 --- a/htdocs/css/style.css +++ b/htdocs/css/style.css @@ -192,7 +192,7 @@ table.patchmeta tr th, table.patchmeta tr td { vertical-align: top; } -.patchrelations ul { +.submissionlist ul { list-style-type: none; padding: 0; margin: 0; diff --git a/patchwork/templates/patchwork/submission.html b/patchwork/templates/patchwork/submission.html index b5b55db..032b364 100644 --- a/patchwork/templates/patchwork/submission.html +++ b/patchwork/templates/patchwork/submission.html @@ -72,43 +72,38 @@ function toggle_div(link_id, headers_id) <tr> <th>Series</th> <td> - <a href="{% url 'patch-list' project_id=project.linkname %}?series={{ submission.series.id }}"> - {{ submission.series }} - </a> - </td> - </tr> - <tr> - <th>Related</th> - <td> - <a id="togglepatchrelations" - href="javascript:toggle_div('togglepatchrelations', 'patchrelations')" - >show</a> - <div id="patchrelations" class="patchrelations" style="display:none;"> + <a id="togglepatchseries" + href="javascript:toggle_div('togglepatchseries', 'patchseries')" + >show</a> {{ submission.series.name }} + <div id="patchseries" class="submissionlist" style="display:none;"> <ul> - {% with submission.series.cover_letter as cover %} - <li> - {% if cover %} - {% if cover == submission %} - {{ cover.name|default:"[no subject]"|truncatechars:100 }} - {% else %} - <a href="{% url 'cover-detail' project_id=project.linkname msgid=cover.url_msgid %}"> - {{ cover.name|default:"[no subject]"|truncatechars:100 }} - </a> - {% endif %} - {% endif %} - </li> - {% endwith %} - {% for sibling in submission.series.patches.all %} - <li> - {% if sibling == submission %} - {{ sibling.name|default:"[no subject]"|truncatechars:100 }} - {% else %} - <a href="{% url 'patch-detail' project_id=project.linkname msgid=sibling.url_msgid %}"> - {{ sibling.name|default:"[no subject]"|truncatechars:100 }} - </a> + {% with submission.series.cover_letter as cover %} + <li> + {% if cover %} + {% if cover == submission %} + {{ cover.name|default:"[no subject]"|truncatechars:100 }} + {% else %} + <a href="{% url 'cover-detail' project_id=project.linkname msgid=cover.url_msgid %}"> + {{ cover.name|default:"[no subject]"|truncatechars:100 }} + </a> + {% endif %} {% endif %} - </li> - {% endfor %} + </li> + {% endwith %} + {% for sibling in submission.series.patches.all %} + <li> + {% if sibling == submission %} + {{ sibling.name|default:"[no subject]"|truncatechars:100 }} + {% else %} + <a href="{% url 'patch-detail' project_id=project.linkname msgid=sibling.url_msgid %}"> + {{ sibling.name|default:"[no subject]"|truncatechars:100 }} + </a> + {% endif %} + </li> + {% endfor %} + <a href="{% url 'patch-list' project_id=project.linkname %}?series={{ submission.series.id }}"> + (Detailed view) + </a> </ul> </div> </td>
Move the series patch list from 'Related' to 'Series' and display the series name, its patches and a detailed link in the same row. This allows to use the 'Related' row for actually showing submission relations instead. Signed-off-by: Mete Polat <metepolat2000@gmail.com> --- htdocs/css/style.css | 2 +- patchwork/templates/patchwork/submission.html | 65 +++++++++---------- 2 files changed, 31 insertions(+), 36 deletions(-)