more font size tweaks.

[citadel.git] / webcit / static / t / listsub / display.html

diff --git a/webcit/static/t/listsub/display.html b/webcit/static/t/listsub/display.html
index 558a2e4688b714079750063a934acf7de5fe3198..a431f93d8076259f9bd27a1f57b0cfa1b659a4c1 100644 (file)
--- a/webcit/static/t/listsub/display.html
+++ b/webcit/static/t/listsub/display.html
@@ -27,7 +27,7 @@
 <a href="listsub"><?_("Go back...")></a>
 </center>
 <?!("X", 11)><??("COND:BSTR", 12, "__FAIL")>
-<font size=+1><b><?_("ERROR")>: <?IMPORTANTMESSAGE></b></font><br><br>
+<font size=+1><b><?_("ERROR")>: <?IMPORTANTMESSAGE("X")></b></font><br><br>
 <??("X", 12)>
 <?!("X", 10)>
 
@@ -47,13 +47,13 @@
 <a href="listsub"><?_("Back...")></a>
 </center>
 <?!("X", 21)><??("COND:BSTR", 22, "__FAIL")>
-<font SIZE=+1><b><?_("ERROR")>: <?IMPORTANTMESSAGE></b></font>
+<font SIZE=+1><b><?_("ERROR")>: <?IMPORTANTMESSAGE("X")></b></font>
 <br><br>
 <?!("X", 22)>
 <?!("X", 20)>
 
-<?!("COND:BSTR", 30, "cmd", "confirm")>
-<?!("COND:LISTSUB:EXECUTE:CONFIRM:SUBSCRIBE", 31)>
+<?!("COND:BSTR", 30, "cmd", "confirm_subscribe")>
+<?!("COND:LISTSUB:EXECUTE:CONFIRMSUBSCRIBE", 31)>
 <center><h1><?_("Confirmation successful!")></h1></center>
 <?!("X", 31)><??("COND:BSTR", 32, "__FAIL")>
 <center><h1><?_("Confirmation failed.")></h1></center>
@@ -62,10 +62,24 @@
 <li><?_("You waited too long to confirm your subscribe/unsubscribe request (the confirmation link is only valid for three days)")></li>
 <li><?_("You have <i>already</i> successfully confirmed your subscribe/unsubscribe request and are attempting to do it again.")></li>
 </ul>
-<?_("The error returned by the server was: ")><?IMPORTANTMESSAGE>
+<?_("The error returned by the server was: ")><?IMPORTANTMESSAGE("X")>
 <??("X", 32)>
 <??("X", 30)>
 
+<?!("COND:BSTR", 33, "cmd", "confirm_unsubscribe")>
+<?!("COND:LISTSUB:EXECUTE:CONFIRMUNSUBSCRIBE", 34)>
+<center><h1><?_("Confirmation successful!")></h1></center>
+<?!("X", 34)><??("COND:BSTR", 35, "__FAIL")>
+<center><h1><?_("Confirmation failed.")></h1></center>
+<?_("This could mean one of two things:")>
+<ul>
+<li><?_("You waited too long to confirm your subscribe/unsubscribe request (the confirmation link is only valid for three days)")></li>
+<li><?_("You have <i>already</i> successfully confirmed your subscribe/unsubscribe request and are attempting to do it again.")></li>
+</ul>
+<?_("The error returned by the server was: ")><?IMPORTANTMESSAGE("X")>
+<??("X", 35)>
+<??("X", 33)>
+
 <?!("COND:BSTR", 40, "cmd", "choose")>
 
 <form method="POST" action="listsub">
@@ -79,10 +93,10 @@
 <input type="text" name="email" value="<?BSTR('email', 'X')>" maxlength="128" size="60">
 <br><br>
 
-<?_("(If subscribing) preferred format: ")>
+<div style="display:none"><?_("(If subscribing) preferred format: ")>
 <input type="radio" name="subtype" value="list" CHECKED><?_("One message at a time")>&nbsp; 
 <input type="radio" name="subtype" value="digest"><?_("Digest format")>&nbsp; 
-<br><br>
+<br><br></div>
 <input type="submit" name="cmd" value="subscribe">
 <input type="submit" name="cmd" value="unsubscribe">
 <br><br>