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 <metepolat2...@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
