Move non-digested options above digested ones.

Do not put the "if-so" section if there is only the toggle, no other
options.  (This problem was exposed since i moved the non-digested
header and footer to nearer the other description info.  This should
be rectified better, eventually.)

1 files changed, 14 insertions, 14 deletions

diff --git a/cgi/admin b/cgi/admin
index e22d6e036..aec13da90 100755
--- a/cgi/admin
+++ b/cgi/admin
@@ -111,7 +111,7 @@ def FormatConfiguration(doc):
 	gui_item = GetGuiItem(item)
 	big_table.AddRow([item[4], gui_item])
 	# This wasn't handled too well.
-	if item[1] == mm_cfg.Toggle:
+	if item[1] == mm_cfg.Toggle and len(general) > 1:
 	    big_table.AddRow([htmlformat.Header(2, "If so:")])
 	    big_table.AddCellInfo(big_table.GetCurrentRowIndex(), 0, colspan=2)
 
@@ -119,34 +119,34 @@ def FormatConfiguration(doc):
     big_table.AddRow(['<br>'])
     big_table.AddCellInfo(big_table.GetCurrentRowIndex(), 0, colspan=2)
 
-    big_table.AddRow([htmlformat.Center(htmlformat.Header(2, 'Digest Options'))])
+    big_table.AddRow([htmlformat.Center(
+	htmlformat.Header(2, 'Non-Digest Options'))])
     big_table.AddCellInfo(big_table.GetCurrentRowIndex(), 0, colspan=2)
 
-    big_table.AddRow([htmlformat.Bold('Option'), htmlformat.Bold('Value')])
+    big_table.AddRow([htmlformat.Bold('Option'),
+		      htmlformat.Bold('Value')])
 
-    for item in digest:
+    for item in nodigest:
 	gui_item = GetGuiItem(item)
 	big_table.AddRow([item[4], gui_item])
-	# Yuck.
-	if item[1] == mm_cfg.Toggle:
+	# *sigh*
+	if item[1] == mm_cfg.Toggle and len(nodigest) > 1:
 	    big_table.AddRow([htmlformat.Header(2, "If so:")])
 	    big_table.AddCellInfo(big_table.GetCurrentRowIndex(), 0, colspan=2)
 
-
     big_table.AddRow(['<br>'])
     big_table.AddCellInfo(big_table.GetCurrentRowIndex(), 0, colspan=2)
 
-    big_table.AddRow([htmlformat.Center(htmlformat.Header(2, 
-						      'Non-Digested Options'))])
+    big_table.AddRow([htmlformat.Center(htmlformat.Header(2, 'Digest Options'))])
     big_table.AddCellInfo(big_table.GetCurrentRowIndex(), 0, colspan=2)
 
     big_table.AddRow([htmlformat.Bold('Option'), htmlformat.Bold('Value')])
 
-    for item in nodigest:
+    for item in digest:
 	gui_item = GetGuiItem(item)
 	big_table.AddRow([item[4], gui_item])
-	# *sigh*
-	if item[1] == mm_cfg.Toggle:
+	# Yuck.
+	if item[1] == mm_cfg.Toggle and len(digest) > 1:
 	    big_table.AddRow([htmlformat.Header(2, "If so:")])
 	    big_table.AddCellInfo(big_table.GetCurrentRowIndex(), 0, colspan=2)
 
@@ -158,7 +158,7 @@ def FormatConfiguration(doc):
 	gui_item = GetGuiItem(item)
 	big_table.AddRow([item[4], gui_item])
 	# This code sux...
-	if item[1] == mm_cfg.Toggle:
+	if item[1] == mm_cfg.Toggle  and len(bounce) > 1:
 	    big_table.AddRow([htmlformat.Header(2, "If so:")])
 	    big_table.AddCellInfo(big_table.GetCurrentRowIndex(), 0, colspan=2)
     
@@ -174,7 +174,7 @@ def FormatConfiguration(doc):
 	gui_item = GetGuiItem(item)
 	big_table.AddRow([item[4], gui_item])
 	# This code sux...
-	if item[1] == mm_cfg.Toggle:
+	if item[1] == mm_cfg.Toggle and len(archives) > 1:
 	    big_table.AddRow([htmlformat.Header(2, "If so:")])
 	    big_table.AddCellInfo(big_table.GetCurrentRowIndex(), 0, colspan=2)