Index: openacs-4/packages/weblogger-portlet/www/weblogger-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/www/weblogger-portlet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/weblogger-portlet/www/weblogger-portlet.adp	22 Aug 2003 11:18:28 -0000	1.2
+++ openacs-4/packages/weblogger-portlet/www/weblogger-portlet.adp	17 Oct 2003 00:39:56 -0000	1.3
@@ -1,53 +1,35 @@
 <if @read_p@ true>
-<if @shaded_p@ ne "t">
+  <if @shaded_p@ ne "t">
 
-  <if @entries:rowcount@ gt 0>
-
-<%
-    set new_package_id ""
-    set old_package_id ""
-%>
-
-<multiple name="entries">
-
-<% set new_package_id $entries(package_id) %>
-
-    <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@ and @old_package_id@ ne "">
-      </ul>
+    <if @entries:rowcount@ gt 0>
+      <multiple name="entries">
+        @entries.parent_name@
+        <ul>
+          <group column="package_id">
+            <if @entries.entry_id@ not nil>
+              <li>
+                <p>
+                  <b><a href="@entries.view_url@" title="View this entry">@entries.title@</a></b> <br />
+                  @entries.content@
+                  <br><b>by @entries.poster_first_names@ @entries.poster_last_name@</b>
+                  <small>(@entries.posted_time_pretty@)</small>
+                </p>
+              </li>
+            </if>
+          </group>
+        </ul>
+        <if @entries.add_url@ not nil>
+          <p>
+            <b>&raquo;</b> <a href="@entries.add_url@">Add entry</a>
+          </p>
+        </if>
+      </multiple>
     </if>
-
-    <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
-      @entries.parent_name@
-      <ul>
-    </if>
-
-    <li>
-      <p>
-        <b><a href="@entries.view_url@" title="View this entry">@entries.title@</a></b> <br />
-        @entries.content@
-        <b>by @entries.poster_first_names@ @entries.poster_last_name@</b>
-        <small>(@entries.posted_time_pretty@)</small>
-      </p>
-    </li>
-
-<%
-    set old_package_id $new_package_id
-%>
-</multiple>
-
-  <if @write_p@ eq 1>
-    <p>
-      <b>&raquo;</b> <a href="@entries.add_url@">Add entry</a>
-    </p>
+    <else>
+      <small>No Entries</small>
+    </else>
   </if>
-
-  </if>
   <else>
-    <small>No Entries</small>
+  &nbsp;
   </else>
-
 </if>
-<else>
-&nbsp;
-</else>
-</if>