From 31e58b32d6f2c15e3e706f59b959e4e8deaa5fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Tue, 3 Jul 2018 08:31:05 +0200
Subject: [PATCH] backoffice: adjust location of form digests (#23923)

---
 wcs/backoffice/management.py        | 17 ++++++++---------
 wcs/qommon/static/css/dc2/admin.css |  5 +++++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/wcs/backoffice/management.py b/wcs/backoffice/management.py
index ad60c178..c17ce743 100644
--- a/wcs/backoffice/management.py
+++ b/wcs/backoffice/management.py
@@ -861,12 +861,12 @@ class ManagementDirectory(Directory):
             r += htmltext('<td %s></td>' % style) # lock
             if include_submission_channel:
                 r += htmltext('<td>%s</td>') % formdata.get_submission_channel_label()
-            r += htmltext('<td>%s</td>') % formdata.formdef.name
-            r += htmltext('<td><a href="%s">%s</a>') % (
-                    formdata.get_url(backoffice=True), formdata.get_display_id())
+            r += htmltext('<td>%s') % formdata.formdef.name
             if formdata.digest:
-                r += htmltext(' <small>(%s)</small>') % formdata.digest
+                r += htmltext(' <small>%s</small>') % formdata.digest
             r += htmltext('</td>')
+            r += htmltext('<td><a href="%s">%s</a></td>') % (
+                    formdata.get_url(backoffice=True), formdata.get_display_id())
             r += htmltext('<td class="cell-time">%s</td>') % misc.localstrftime(
                     formdata.receipt_time)
             r += htmltext('<td class="cell-time">%s</td>') % misc.localstrftime(
@@ -2158,7 +2158,7 @@ class FormBackOfficeStatusPage(FormStatusPage):
                         cat_formdatas = formdata_by_category[cat.id]
                 else:
                     cat_formdatas = formdatas
-                r += htmltext('<ul>')
+                r += htmltext('<ul class="user-formdatas">')
                 for formdata in cat_formdatas:
                     status = formdata.get_status()
                     if status:
@@ -2176,13 +2176,12 @@ class FormBackOfficeStatusPage(FormStatusPage):
                             formdata.get_url(backoffice=True),
                             formdata.formdef.name)
 
-                    r += htmltext('(<span class="id">%s') % formdata.get_display_id()
-                    if formdata.digest:
-                        r += htmltext(', %s') % formdata.digest
-                    r += htmltext('</span>), ')
+                    r += htmltext('(<span class="id">%s</span>), ') % formdata.get_display_id()
                     r += htmltext('<span class="datetime">%s</span> '
                                   '<span class="status">(%s)</span>') % (
                             submit_date, status_label)
+                    if formdata.digest:
+                        r += htmltext('<small>%s</small>') % formdata.digest
                     r += htmltext('</li>')
                 r += htmltext('</ul>')
             r += htmltext('</div>')
diff --git a/wcs/qommon/static/css/dc2/admin.css b/wcs/qommon/static/css/dc2/admin.css
index 01776a7d..8aeb254f 100644
--- a/wcs/qommon/static/css/dc2/admin.css
+++ b/wcs/qommon/static/css/dc2/admin.css
@@ -1673,3 +1673,8 @@ div.widget input[type=text][readonly] {
 table div.file-field img {
 	display: none;
 }
+
+table small,
+ul.user-formdatas small {
+	display: block;
+}
-- 
2.18.0