Index: openacs-4/packages/news/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/index.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/news/www/index.adp	8 Sep 2003 19:47:31 -0000	1.10
+++ openacs-4/packages/news/www/index.adp	2 Feb 2005 23:30:49 -0000	1.11
@@ -1,70 +1,52 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="title">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+  <property name="title">@title;noquote@</property>
 
-<if @news_admin_p@ ne 0>
-  <p>
-    <table width="100%">
-     <tr>
-      <th align=right>
-       [<a href="admin/">#news.Administer#</a>]
-      </th>
-     </tr>
-    </table>	
-</if>
+  <if @news_admin_p@ ne 0>
+    <div style="float: right;">[<a href="admin/">#news.Administer#</a>]</div>
+  </if>
 
 
-<if @news_items:rowcount@ eq 0>
- <p><i>#news.lt_There_are_no_news_ite#</i>
-</if>
-<else>
-<p>
- <if @allow_search_p@ eq "1" and @search_url@ ne "">
- <table>
-  <tr valign=top> 
-      <td>#news.Search#</td>
-      <td > 
-      <form action=@search_url@search>
-      <input type=text  name=q value="">
-      </form> </td>
-  </tr>
- </table>
- </if>
+  <if @news_items:rowcount@ eq 0>
+    <p><i>#news.lt_There_are_no_news_ite#</i></p>
+  </if>
+  <else>
+    <if @allow_search_p@ eq "1" and @search_url@ ne "">
+      <div>#news.Search#
+        <form action="@search_url@search">
+          <input type="text"  name="q" value="" />
+          <input type="submit" name="search" value="Search" />
+        </form>
+      </div>
+    </if>
 
-<ul>
- <multiple name=news_items>
-   <li> @news_items.publish_date@: <a href=item?item_id=@news_items.item_id@>@news_items.publish_title@</a>
- </multiple>
-</ul>
+    <ul>
+      <multiple name=news_items>
+        <li> @news_items.publish_date@: <a href="item?item_id=@news_items.item_id@">@news_items.publish_title@</a></li>
+      </multiple>
+    </ul>
 
+    <p>@pagination_link;noquote@</p>
+  </else>
+  <if @news_admin_p@ ne 0> 
+    <ul>
+      <li><a href=item-create>#news.Create_a_news_item#</a></li>
+    </ul>  
+  </if>
+  <else>
+    <if @news_create_p@ ne 0> 
+      <ul>
+        <li><a href=item-create>#news.Submit_a_news_item#</a></li>
+      </ul>
+    </if>
+  </else>
 
-<p>
-
-<center>
-  @pagination_link;noquote@
-</center>
-</else>
-
-<p>
-<if @news_admin_p@ ne 0> 
-<ul>
-  <li><a href=item-create>#news.Create_a_news_item#</a>
-</ul>  
-</if>
-<else>
-   <if @news_create_p@ ne 0> 
+  <if @view_switch_link@ ne "">
     <ul>
-     <li><a href=item-create>#news.Submit_a_news_item#</a>
+      <li>@view_switch_link;noquote@</li>
     </ul>
-   </if>
-</else>
+  </if>
 
-<if @view_switch_link@ ne "">
-<ul>
-  <li>@view_switch_link;noquote@
-</ul>
-</if>
 
 
 
-