From e5fe901147f203fe4df311b908beef07d199216a Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Fri, 26 May 2017 16:46:34 +0200
Subject: [PATCH] finish converting index, delete_list and edit_member

---
 majordomo/digest_form.cgi  |  3 ++-
 majordomo/edit_info.cgi    |  2 +-
 majordomo/edit_members.cgi | 38 +++++++++++++++++++-------------------
 majordomo/index.cgi        |  8 +++++---
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/majordomo/digest_form.cgi b/majordomo/digest_form.cgi
index fd95b5b84..a4c07189d 100755
--- a/majordomo/digest_form.cgi
+++ b/majordomo/digest_form.cgi
@@ -40,7 +40,8 @@ print <<EOF;
 	 <input type=radio name=mode value=1> $lines</td> </tr>
 
 </table></td></tr></table>
-<input type=submit value="$text{'create'}"></form>
+EOF
+print &ui_submit($text{'create'}),"</form>";
 EOF
 &ui_print_footer("", $text{'index_return'});
 
diff --git a/majordomo/edit_info.cgi b/majordomo/edit_info.cgi
index e190dc521..9e106bb93 100755
--- a/majordomo/edit_info.cgi
+++ b/majordomo/edit_info.cgi
@@ -45,7 +45,7 @@ close(INTRO);
 print "</textarea></td> </tr>\n";
 
 print "</table></td></tr></table>\n";
-print "<input type=submit value=\"$text{'save'}\"></form>\n";
+print &ui_submit($text{'save'}),"</form>\n";
 
 &ui_print_footer("edit_list.cgi?name=$in{'name'}", $text{'edit_return'});
 
diff --git a/majordomo/edit_members.cgi b/majordomo/edit_members.cgi
index 52f9c0a96..f291e43e2 100755
--- a/majordomo/edit_members.cgi
+++ b/majordomo/edit_members.cgi
@@ -10,12 +10,16 @@ $list = &get_list($in{'name'}, &get_config());
 $desc = &text('edit_for', "<tt>".&html_escape($in{'name'})."</tt>");
 &ui_print_header($desc, $text{'members_title'}, "");
 
+print "<table border width=100%>\n";
+print "<tr $tb> <td><b>";
 if ($access{'edit'}) {
-	print "$text{'members_desc'}<br>\n";
+	print "$text{'members_desc'}\n";
 	}
 else {
-	print "$text{'members_rodesc'}<br>\n";
+	print "$text{'members_rodesc'}\n";
 	}
+print "</b></td> </tr>\n";
+print "<tr $cb> <td><table width=100%>\n";
 print "<form action=save_members.cgi method=post enctype=multipart/form-data>\n";
 print "<input type=hidden name=name value='$in{'name'}'>\n";
 print "<textarea rows=15 cols=60 name=members>\n";
@@ -26,28 +30,26 @@ while(<MEMS>) {
 close(MEMS);
 print "</textarea>\n";
 if (!$access{'edit'}) {
-	print "<p>\n";
+	print "<p></form></table>\n";
 	}
 else {
-	print "<br><input type=submit value=\"$text{'save'}\" name=update>\n";
-	print &ui_hr();
+	print "<br> <input class=\"btn btn-success\" type=submit value=\"$text{'save'}\" name=update>\n";
 
-	print "<table>\n";
+	print "<table width=100%>\n";
 	print "<tr> <td><b>$text{'members_sub'}</b></td>\n";
 	print "<td><input name=addr_a size=40> ",
-	      "<input type=submit name=add ",
-	      "value=\"$text{'members_add'}\"></td> </tr>\n";
+	      &ui_submit($text{'members_add'}, "add"),"</td> </tr>\n";
 
 	print "<tr> <td><b>$text{'members_unsub'}</b></td>\n";
-	print "<td><input name=addr_r size=40> ",
-	      "<input type=submit name=remove ",
-	      "value=\"$text{'members_rem'}\"></td> </tr>\n";
-	print "</table></form>\n";
+	print "<td width=500><input name=addr_r size=40> ",
+	      &ui_submit($text{'delete'}, "remove"), "</td> </tr>\n";
+	print "</table></form></table>\n";
 
-	print &ui_hr();
 	print "<form action=save_auto.cgi>\n";
 	print "<input type=hidden name=name value='$in{'name'}'>\n";
-	print "<table>\n";
+	print "<table border width=100%>\n";
+	print "<tr $tb> <td><small><strong>$text{'misc_header'}<strong></small></td> </tr>\n";
+	print "<tr $cba><table width=100%>\n";
 	$sync = $config{"sync_$in{'name'}"};
 	print "<tr> <td><b>$text{'members_sync'}</b></td> <td>\n";
 	printf "<input type=radio name=sync value=1 %s> %s\n",
@@ -57,11 +59,9 @@ else {
 
 	$shost = $config{"shost_$in{'name'}"};
 	print "<tr><td><b>$text{'members_dom'}</b></td>\n";
-	print "<td><input name=shost size=40 value='$shost'>\n";
-	print "<input type=submit value=\"$text{'save'}\"></td> </tr>\n";
-
-	print "</table></form>\n";
+	print "<td width=500><input name=shost size=40 value='$shost'>\n";
+	print &ui_submit($text{'save'}),"</td> </tr>\n";
+	print "</table></td></tr></table></form>\n";
 	}
 
 &ui_print_footer("edit_list.cgi?name=$in{'name'}", $text{'edit_return'});
-
diff --git a/majordomo/index.cgi b/majordomo/index.cgi
index 321136fc4..5400bb49e 100755
--- a/majordomo/index.cgi
+++ b/majordomo/index.cgi
@@ -139,8 +139,10 @@ if (@lists) {
 	close(INFO);
 	#push(@cols, $l . "-owner");
 	push(@cols, "<em>". &find_value('reply_to', $conf) ."</em>");
-	push(@cols, "<center><em>". $text{&find_value('moderate', $conf)} ."</em></center>");
-	push(@cols, "<center>".`cat $list->{'members'} | wc -l` . "&nbsp;&nbsp;<em><a href=edit_members.cgi?name=$l><span>edit</span></a></em></center>");
+	push(@cols, "<center><em>". $text{&find_value('moderate', $conf)} .
+		"</em>" ."&nbsp;&nbsp;<em><a href=edit_subs.cgi?name=$l><span>edit</span></a></em><center>");
+	push(@cols, "<center>".`cat $list->{'members'} | wc -l` .
+		"&nbsp;&nbsp;<em><a href=edit_members.cgi?name=$l><span>edit</span></a></em></center>");
 	print&ui_columns_row(\@cols, \@tds);
 	}
 } else {
@@ -156,7 +158,7 @@ if ($access{'global'}) {
 &ui_print_footer("/", $text{'index'});
 print 	"<script>",
        	"f__lnk_t_btn(['/majordomo/', '/majordomo/index.cgi'], 'table tbody td',",
-       	" 'a[href*=\"edit_info.cgi?\"], a[href*=\"edit_members.cgi?\"]',",
+       	" 'a[href*=\"edit_info.cgi?\"], a[href*=\"edit_members.cgi?\"], a[href*=\"edit_subs.cgi?\"]',",
        	" 'btn btn-transparent btn-xs vertical-align-top margined-top-2', 'fa-edit');",
 	"document.querySelectorAll('tbody td .btn.btn-transparent').forEach(function(button) {",
 		" button.innerHTML=button.innerHTML.replace(/<\\/i>.*edit/,'');});",