diff --git a/src/postorius/doc/news.rst b/src/postorius/doc/news.rst index 35d2fa0..94cea12 100644 --- a/src/postorius/doc/news.rst +++ b/src/postorius/doc/news.rst @@ -31,6 +31,9 @@ * Fix untranslatable template strings. Contributed by Sumana Harihareswara (LP: 1157947). * Fix wrong labels in metrics template. Contributed by Sumana Harihareswara (LP: 1409033). * URLs now contain the list-id instead of the fqdn_listname. Contributed by Abhilash Raj (LP: 1201150). +* Fix small bug moderator/owner forms on list members page. Contributed by Pranjal Yadav (LP: 1308219). +* Fix broken translation string on the login page. Contributed by Pranjal Yadav. +* Show held message details in a modal window. Contributed by Abhilash Raj (LP: 1004049). 1.0 beta 1 -- "Year of the Parrot" diff --git a/src/postorius/static/postorius/css/style.css b/src/postorius/static/postorius/css/style.css index 6423b93..c3bbf3a 100755 --- a/src/postorius/static/postorius/css/style.css +++ b/src/postorius/static/postorius/css/style.css @@ -244,6 +244,11 @@ display: block; } +/* Held message details modal */ +.held-message-details { + text-align: left; +} + /* Mouseover help */ span.more_info { border-bottom: thin dotted; diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html index e63b5c9..0a8b3c6 100644 --- a/src/postorius/templates/postorius/lists/held_messages.html +++ b/src/postorius/templates/postorius/lists/held_messages.html @@ -25,12 +25,27 @@ {{ msg.sender }} {{ msg.reason }} {{ msg.hold_date }} + + {% trans 'View' %} + {% trans 'Accept' %} {% trans 'Defer' %} {% trans 'Reject' %} {% trans 'Discard' %} - + + diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py index a590707..2de305f 100644 --- a/src/postorius/views/list.py +++ b/src/postorius/views/list.py @@ -66,8 +66,6 @@ % request.POST['owner_email'])) except HTTPError as e: messages.error(request, _(e.msg)) - else: - owner_form = NewOwnerForm() if 'moderator_email' in request.POST: moderator_form = NewModeratorForm(request.POST) if moderator_form.is_valid(): @@ -79,8 +77,8 @@ % request.POST['moderator_email'])) except HTTPError as e: messages.error(request, _(e.msg)) - else: - moderator_form = NewModeratorForm() + owner_form = NewOwnerForm() + moderator_form = NewModeratorForm() return render_to_response('postorius/lists/members.html', {'list': self.mailing_list, 'owner_form': owner_form,