Index: openacs-4/contrib/packages/mailing-lists/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/mailing-lists/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/mailing-lists/www/index.adp	1 Oct 2003 05:01:54 -0000	1.1
+++ openacs-4/contrib/packages/mailing-lists/www/index.adp	21 Jan 2004 19:22:15 -0000	1.2
@@ -6,46 +6,43 @@
   <ul><li><a href="madmin/">Administer Mailing Lists</a></li></ul>
 </if>
 
-<if @subscribed_lists:rowcount@ gt 0>
-  <h3>Mailing Lists you are already subscribed to</h3>
-  <form method=post action=list-toggle-subscribe>
-    <input type=hidden name=unsubscribe value=1>
-    <ul>
-      <multiple name="subscribed_lists">
-        <li><input type=checkbox name=list_ids value="@subscribed_lists.list_id@"> @subscribed_lists.name@</li>
-      </multiple>
-    </ul>
-    <input type=submit name=ok_button value=Unsubscribe>
-  </form>
-</if>
+<if @email_verified_p@ eq t>
+  <if @subscribed_lists:rowcount@ gt 0>
+    <h3>Mailing Lists you are already subscribed to</h3>
+    <form method=post action=list-toggle-subscribe>
+      <input type=hidden name=unsubscribe value=1>
+      <ul>
+        <multiple name="subscribed_lists">
+          <li><input type=checkbox name=list_ids value="@subscribed_lists.list_id@"> @subscribed_lists.name@</li>
+        </multiple>
+      </ul>
+      <input type=submit name=ok_button value=Unsubscribe>
+    </form>
+  </if>
 
-<form action="." method=get>
-  <select name=locale>
-    <multiple name=languages>
-      <option value="@languages.locale@"<if @locale@ eq @languages.locale@> selected</if>>@languages.label@
-    </multiple>
-  </select>
-  <input type=submit name=xx value="Change Language">
-</form>
-
-<h2>Available Mailing Lists</h2>
-<if @lists:rowcount@ gt 0>
-  <form method=post action=list-toggle-subscribe>
-    <ul>
-      <multiple name="lists">
-        <h3>@lists.tree_name@</h3>
-          <group column=tree_id>
-            <b>@lists.category_name@</b><ul>
-              <group column=category_id>
-                <li><input type=checkbox name=list_ids value="@lists.list_id@"> @lists.name@
-                <br>@lists.teaser@</li>
-              </group>
-            </ul>
-          </group>
+  <form action="." method=get>
+    <select name=locale>
+      <multiple name=languages>
+        <option value="@languages.locale@"<if @locale@ eq @languages.locale@> selected</if>>@languages.label@
       </multiple>
-    </ul>
-    <input type=submit name=ok_button value=Subscribe>
+    </select>
+    <input type=submit name=xx value="Change Language">
   </form>
+
+  <h2>Available Mailing Lists</h2>
+  <if @lists:rowcount@ gt 0>
+    <form method=post action=list-toggle-subscribe>
+      <ul>
+        <multiple name="lists">
+                  <li><input type=checkbox name=list_ids value="@lists.list_id@"> @lists.name@
+                  <br>@lists.teaser@<p></li>
+        </multiple>
+      </ul>
+      <input type=submit name=ok_button value=Subscribe>
+    </form>
+  </if><else>
+    No mailing lists available in this language.
+  </else>
 </if><else>
-  No mailing lists available in this language.
+  <h3>Please check your email and confirm your email adress by clicking on the link provided in the email we sent you.</h3>
 </else>