Merge lp:~raj-abhilash1/postorius/bug_1004049 into lp:postorius

Proposed by Abhilash Raj
Status: Merged
Merged at revision: 197
Proposed branch: lp:~raj-abhilash1/postorius/bug_1004049
Merge into: lp:postorius
Diff against target: 29 lines (+19/-0)
1 file modified
src/postorius/templates/postorius/lists/held_messages.html (+19/-0)
To merge this branch: bzr merge lp:~raj-abhilash1/postorius/bug_1004049
Reviewer Review Type Date Requested Status
Florian Fuchs Approve
Review via email: mp+246928@code.launchpad.net

Description of the change

Fixes #1004049

To post a comment you must log in.
Revision history for this message
Florian Fuchs (flo-fuchs) wrote :

Hi Abhilash,

thanks -- works just fine! As discussed on IRC, I am moving the "view" button to the same cell as the other action buttons.

Approving the merge.

Florian

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/postorius/templates/postorius/lists/held_messages.html'
--- src/postorius/templates/postorius/lists/held_messages.html 2015-01-17 17:23:59 +0000
+++ src/postorius/templates/postorius/lists/held_messages.html 2015-01-19 17:54:06 +0000
@@ -25,6 +25,25 @@
25 <td>{{ msg.sender }}</td>25 <td>{{ msg.sender }}</td>
26 <td>{{ msg.reason }}</td>26 <td>{{ msg.reason }}</td>
27 <td>{{ msg.hold_date }}</td>27 <td>{{ msg.hold_date }}</td>
28 <td><!-- Button trigger modal -->
29 <button type="button" class="btn btn-primary btn-small" data-toggle="modal" data-target="#msg-{{ msg.request_id }}">
30 View
31 </button>
32
33 <!-- Modal -->
34 <div class="modal fade" id="msg-{{ msg.request_id }}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
35 <div class="modal-dialog">
36 <div class="modal-content">
37 <div class="modal-header">
38 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
39 <h4 class="modal-title">Subject: {{ msg.subject }}</h4>
40 </div>
41 <div class="modal-body">
42 {{ msg.msg | linebreaks }}
43 </div>
44 </div>
45 </div>
46 </td>
28 <td class="mm_action">47 <td class="mm_action">
29 <a href="{% url 'accept_held_message' list.fqdn_listname msg.request_id %}" class="btn btn-mini btn-success">{% trans 'Accept' %}</a>48 <a href="{% url 'accept_held_message' list.fqdn_listname msg.request_id %}" class="btn btn-mini btn-success">{% trans 'Accept' %}</a>
30 <a href="{% url 'defer_held_message' list.fqdn_listname msg.request_id %}" class="btn btn-mini btn-warning">{% trans 'Defer' %}</a>49 <a href="{% url 'defer_held_message' list.fqdn_listname msg.request_id %}" class="btn btn-mini btn-warning">{% trans 'Defer' %}</a>

Subscribers

People subscribed via source and target branches