From: Wilfried Goesgens <dothebart@citadel.org>
Date: Thu, 12 Jul 2012 14:03:16 +0000 (+0200)
Subject: SMTP-Queue: add information about currently processed mails
X-Git-Tag: v8.13~12
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=7ec3e70344150b2f62a40c33f5c8f947af883e36

SMTP-Queue: add information about currently processed mails

  - wrap boxes around the parts of the page
  - add box with a WHOLIST filtered for SYS_SMTP_Send; Now we show a list of currently active outbound SMTP-Connections.
---

diff --git a/webcit/static/t/view_mailq/footer.html b/webcit/static/t/view_mailq/footer.html
index d6c5574b5..af4612059 100644
--- a/webcit/static/t/view_mailq/footer.html
+++ b/webcit/static/t/view_mailq/footer.html
@@ -1,7 +1,12 @@
 </table></div>
+<?=("box_end")>
 <?!("COND:AIDE", 1)>
 <br><br><div align="center">
 <?_("You do not have permission to view this resource.")>
 </div><br><br>
 <?!("X", 1)>
 </div>
+<script type="text/javascript">
+ new Ajax.PeriodicalUpdater('mailq_sessions', 'do_template?template=who_active_smtpsessions',
+                            { method: 'get', frequency: 10 }  );
+</script>
diff --git a/webcit/static/t/view_mailq/header.html b/webcit/static/t/view_mailq/header.html
index 335ffe7d4..da327ea27 100644
--- a/webcit/static/t/view_mailq/header.html
+++ b/webcit/static/t/view_mailq/header.html
@@ -17,16 +17,29 @@
 -->
 
 <div id="runqueue" class="runqueue" style="display:none">
+<?=("box_begin_1")><?_("HINT")><?=("box_begin_2")>
 <?_("Citadel reattempts sending mail per interval; it starts at 60 second, and doubles each time. You can however bypass this mechanism once; all messages will be reattempted on the next queue run.")>
 <a href="javascript:ToggleVisibility('runqueue_help1')"><?_("OK, got you, lets go!")></a>
+<?=("box_end")>
 </div>
+&nbsp;
 
 <div id="runqueue_help1" style="display:none">
+<?=("box_begin_1")><?=("box_begin_2")>
 <br><a href="javascript:SMTPRunQueue();"><?_("Reschedule all messages for delivery on next queue run")></a>
+<?=("box_end")>
 </div>
+&nbsp;
 
+<?=("box_begin_1")><?_("Currently active mail delivery jobs; Remote Sites:")><?=("box_begin_2")>
 <div align="center">
-<a href="javascript:RefreshSMTPqueueDisplay();"><?_("Refresh this page")></a>
+<?=("who_active_smtpsessions")>
 </div>
+<?=("box_end")>
+&nbsp;
 
+<?=("box_begin_1")><?_("Jobs waiting for further processing:")><?=("box_begin_2")>
+<div align="center">
+<a href="javascript:RefreshSMTPqueueDisplay();"><?_("Refresh this page")></a>
+</div>
 <?=("view_mailq_table")>
diff --git a/webcit/static/t/who/active_smtpsessions.html b/webcit/static/t/who/active_smtpsessions.html
new file mode 100644
index 000000000..80920446d
--- /dev/null
+++ b/webcit/static/t/who/active_smtpsessions.html
@@ -0,0 +1,5 @@
+<div id="mailq_sessions">
+<table class="altern">
+<?ITERATE("WHOLIST", ="who_activesmtpsessions_one", "SYS_SMTP_Send")>
+</table>
+</div>
diff --git a/webcit/static/t/who/activesmtpsessions_one.html b/webcit/static/t/who/activesmtpsessions_one.html
new file mode 100644
index 000000000..8c5046a97
--- /dev/null
+++ b/webcit/static/t/who/activesmtpsessions_one.html
@@ -0,0 +1,8 @@
+<tr class="<?ITERATE:ODDEVEN>">
+	<!-- hostname -->
+	<td class="host_col">
+		<?WHO:HOST("X")>
+			<?!("WHO:REALHOST", 8)><br><i> <?WHO:REALHOST("X")></i>
+		<?!("X", 8)>
+	</td>
+</tr>
diff --git a/webcit/static/t/who/box_list_static.html b/webcit/static/t/who/box_list_static.html
index d1f05deaf..be05a9e9f 100644
--- a/webcit/static/t/who/box_list_static.html
+++ b/webcit/static/t/who/box_list_static.html
@@ -7,7 +7,7 @@
   			<th><?_("Room")></th>
   			<th class="host_col"><?_("From host")></th>
 		</tr>
-		<?ITERATE("WHOLIST", ="who_section")>
+		<?ITERATE("WHOLIST", ="who_section", 0)>
 	</table>
 </div>