From 739b5ec6e2ed6cea7ca681b54c8b42f8aa97285d Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Mon, 13 Nov 2006 17:21:15 +0000
Subject: [PATCH] More work on the rules editor

---
 webcit/calendar_view.c   |   2 +-
 webcit/sieve.c           |  49 +++++++++++++++++++++++++++------------
 webcit/static/delete.gif | Bin 235 -> 330 bytes
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 798579c7e..c834ccc21 100644
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -518,7 +518,7 @@ void calendar_brief_month_view(int year, int month, int day) {
 		if ((i % 7) == 0) {
 			wc_strftime(&weeknumber[0], sizeof(weeknumber), "%U", &tm);
 			wprintf("<table border='0' bgcolor=\"#EEEECC\" width='100%'> <tr><th colspan='4'>%s %s</th></tr>"
-					"   <tr><td>%s</td><td width='70%'>%s</td><td>%s</td><td>%s</td></tr>\n",
+					"   <tr><td>%s</td><td width=70%%>%s</td><td>%s</td><td>%s</td></tr>\n",
 					_("Week"), 
 					weeknumber,
 					_("Hours"),
diff --git a/webcit/sieve.c b/webcit/sieve.c
index 210345ec7..b603d41fd 100644
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -418,14 +418,17 @@ void display_rules_editor_inner_div(void) {
 		"    if (d == 'all') {							\n"
 		"      $('div_size'+i).style.display = 'none';	 			\n"
 		"      $('div_compare'+i).style.display = 'none';			\n"
+		"      $('div_nocompare'+i).style.display = 'block';			\n"
 		"    }									\n"
 		"    else if (d == 'size') {						\n"
 		"      $('div_size'+i).style.display = 'block';	 			\n"
 		"      $('div_compare'+i).style.display = 'none';			\n"
+		"      $('div_nocompare'+i).style.display = 'none';			\n"
 		"    }									\n"
 		"    else {								\n"
 		"      $('div_size'+i).style.display = 'none';	 			\n"
 		"      $('div_compare'+i).style.display = 'block';			\n"
+		"      $('div_nocompare'+i).style.display = 'none';			\n"
 		"    }									\n"
 		"    d = ($('action'+i).options[$('action'+i).selectedIndex].value);	\n"
 		"    if (d == 'fileinto') {						\n"
@@ -513,32 +516,43 @@ void display_rules_editor_inner_div(void) {
 
 	wprintf("<br />");
 
-	wprintf("<table border=1 cellpadding=2 width=100%%>");
+	wprintf("<table cellpadding=2 width=100%%>");
 
 	for (i=0; i<MAX_RULES; ++i) {
 		
-		wprintf("<tr id=\"rule%d\">", i);
+		wprintf("<tr id=\"rule%d\" bgcolor=\"#%s\">",
+			i,
+			((i%2) ? "DDDDDD" : "FFFFFF")
+		);
 
-		wprintf("<td>");
+		wprintf("<td width=5%% align=\"center\">");
 
 		wprintf("<div style=\"display:none\">");
 		wprintf("<input type=\"checkbox\" id=\"active%d\">", i);
 		wprintf("</div>");
 
 		if (i>0) wprintf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
-			"<img border=\"0\" src=\"static/up_pointer.gif\" /></a>", i-1, i);
+			"<img border=\"0\" src=\"static/up_pointer.gif\" "
+			"title=\"%s\"/></a>",
+			i-1, i, _("Move rule up") );
 
 		wprintf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
-			"<img id=\"movedown%d\" border=\"0\" src=\"static/down_pointer.gif\" /></a>",
-			i, i+1, i);
+			"<img id=\"movedown%d\" border=\"0\" src=\"static/down_pointer.gif\" "
+			"title=\"%s\"/></a>",
+			i, i+1, i, _("Move rule down") );
 
 		wprintf("<a href=\"javascript:DeleteRule(%d);UpdateRules();\">"
-			"<img id=\"delete%d\" border=\"0\" src=\"static/delete.gif\" /></a>",
-			i, i);
+			"<img id=\"delete%d\" border=\"0\" src=\"static/delete.gif\" "
+			"title=\"%s\"/></a>",
+			i, i, _("Delete rule") );
+
+		wprintf("</td>");
 
-		wprintf("&nbsp;%d.&nbsp;%s</td>", i+1, _("If") );
+		wprintf("<td width=5%% align=\"center\">");
+		wprintf("<font size=+2>%d</font>", i+1);
+		wprintf("</td>");
 
-		wprintf("<td>");
+		wprintf("<td width=20%%>%s ", _("If") );
 
 		wprintf("<select id=\"hfield%d\" name=\"hfield%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
@@ -555,11 +569,11 @@ void display_rules_editor_inner_div(void) {
 		wprintf("<option value=\"xspamflag\">%s</option>", _("X-Spam-Flag"));
 		wprintf("<option value=\"xspamstatus\">%s</option>", _("X-Spam-Status"));
 		wprintf("<option value=\"size\">%s</option>", _("Message size"));
-		wprintf("<option value=\"all\">%s</option>", _("(All messages)"));
+		wprintf("<option value=\"all\">%s</option>", _("All"));
 		wprintf("</select>");
 		wprintf("</td>");
 
-		wprintf("<td>");
+		wprintf("<td width=20%%>");
 
 		wprintf("<div id=\"div_compare%d\">", i);
 		wprintf("<select id=\"compare%d\" name=\"compare%d\" size=1 onChange=\"UpdateRules();\">",
@@ -573,6 +587,10 @@ void display_rules_editor_inner_div(void) {
 		wprintf("<input type=\"text\" id=\"htext%d\" name=\"htext%d\">", i, i);
 		wprintf("</div>");
 
+		wprintf("<div id=\"div_nocompare%d\">", i);
+		wprintf("%s", _("(All messages)"));
+		wprintf("</div>");
+
 		wprintf("<div id=\"div_size%d\">", i);
 		wprintf("<select id=\"sizecomp%d\" name=\"sizecomp%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
@@ -586,7 +604,7 @@ void display_rules_editor_inner_div(void) {
 
 		wprintf("</td>");
 
-		wprintf("<td>");
+		wprintf("<td width=20%%>");
 		wprintf("<select id=\"action%d\" name=\"action%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
 		wprintf("<option value=\"keep\">%s</option>", _("Keep"));
@@ -619,6 +637,7 @@ void display_rules_editor_inner_div(void) {
 
 		wprintf("<div id=\"div_automsg%d\">", i);
 		wprintf(_("Message:"));
+		wprintf("<br />");
 		wprintf("<textarea name=\"automsg%d\" id=\"automsg%d\" wrap=soft rows=5>\n", i, i);
 		wprintf("</textarea>");
 		wprintf("</div>");
@@ -627,9 +646,9 @@ void display_rules_editor_inner_div(void) {
 
 
 
-		wprintf("<td>%s</td>", _("and then") );
+		wprintf("<td width=10%% align=\"center\">%s</td>", _("and then") );
 
-		wprintf("<td>");
+		wprintf("<td width=20%%>");
 		wprintf("<select name=\"final%d\" id=\"final%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
 		wprintf("<option value=\"stop\">%s</option>", _("stop"));
diff --git a/webcit/static/delete.gif b/webcit/static/delete.gif
index 6c96cc1a4b5ff4166a406315b2705c30fb863856..430986304aa7369ac003b6f0f5659baa0883f138 100644
GIT binary patch
delta 243
zcmaFOc#4U~-P6s&GEsy<gkdSiM4rU@|1<`QKUo+>7{nNK7=Qp|EdyJ+LwA9Pj#U4N
zB}FIWa;)Yb?q%27lVWwnL+x^hgfi!nMIS3F+UJ~+)YP0W&dY0@Xy72%tG*<!!Aqh+
zz?ZLql|_U{)SFpCg2`D}qRV6ABv;mHZp;h}?Cwkq%x?0`MIP)6L&T)|#T*%|0aH+i
ASpWb4

delta 147
zcmX@b^qP^!-P6s&GEsy<gy9IoM4rSt#h)xJA`Jf-bQpjDB+S5?p`g^4k~uG9)w-P5
z`yM}IH7H7z{p%Ka&1IPf)6xtZxdVdglWka4+!GQmUf3YS#{A^sg^dc4&E;QHW+>{m
z?{rvTptYKjO?iU?lQ7Snnb#-lu-2(DGcd5LGcho$$uoy(uy>hqNHHlXGFSrup|LG}

-- 
2.30.2