Index: openacs-4/contrib/packages/bcms-ui-base/resources/item-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/resources/item-list.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-base/resources/item-list.adp	27 Aug 2003 17:33:49 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-base/resources/item-list.adp	22 Sep 2003 07:36:46 -0000	1.2
@@ -43,100 +43,93 @@
   </script>
 </if>
 
-<script language="JavaScript" type="text/javascript">
-<!--// hide from non-javascript-aware browsers
-function highlightcell(o) {
-	o.style.backgroundColor = '#e0eaf5';
-	o.style.cursor = 'hand';
-}
-function normalcellwhite(o) {
-	o.style.backgroundColor = '#ffffff';
-}
-function normalcellgrey(o) {
-	o.style.backgroundColor = '#e4e4e4';
-}
-function normalcelldarkgrey(o) {
-	o.style.backgroundColor = '#c4c4c4';
-}
-//-->
-</script>
+<div class="@list_properties.class@">
 
-  <table class="@list_properties.class@" cellpadding="3" cellspacing="1">
+    <form name="@list_properties.name@" method="get">
 
+  <!-- actions start -->
+  <if @actions:rowcount@ gt 0>
+  <div class="list-actions">
+      <multiple name="actions">
+        <a href="@actions.url@" class="list-action" title="@actions.title@">@actions.label@</a>
+      </multiple>
+  </div>
+  </if>
+  <!-- actions edit -->
+
+  <!-- bulk action start -->
   <if @list_properties.bulk_actions@ not nil>
-    <form name="@list_properties.name@" method="get">
+    <div class="list-bulk-actions">
     @list_properties.bulk_action_export_chunk@
+
+  <noparse><if \@@list_properties.multirow@:rowcount@ gt 0></noparse>
+    <if @bulk_actions:rowcount@ gt 0>
+          <multiple name="bulk_actions">
+            <a href="#" id="@bulk_actions.label@-bulkaction" class="list-button" title="@bulk_actions.title@" 
+            onclick="ListBulkActionClick('@list_properties.name@', '@bulk_actions.url@')">@bulk_actions.label@</a>
+          </multiple>
+    </if>
+  <noparse></if></noparse>
+
+    </div>
   </if>
+  <!-- bulk action end -->
 
+  <!-- paginator start -->
   <if @list_properties.page_size@ not nil>
     <noparse>
       <if \@paginator.page_count@ gt 1>
-        <tr width="100%" class="list-paginator">
-          <td colspan="@elements:rowcount@" align="center">
+        <div class="list-paginator">
             <if \@paginator.group_count@ gt 1>
               <if \@paginator.previous_group_url@ not nil>
-                <a href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&lt;&lt;</a>
+                <a class="prev-group" href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@"><span class="img-alt">&lt;&lt;</span></a>
               </if>
-              <else>
-                &lt;&lt;
-              </else>
             </if>
+
             <if \@paginator.previous_page_url@ not nil>
-              &nbsp;<a href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@">&lt;</a>&nbsp;
+              <a class="prev-page" href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@"><span class="img-alt">&lt;</span></a>
             </if>
-            <else>
-              &nbsp;&lt;&nbsp;
-            </else>
 
             <multiple name="paginator_pages">
-              <if \@paginator.current_page@ ne \@paginator_pages.page@>
-                <if \@paginator_pages.page@ lt 10>&nbsp;&nbsp;</if><a 
-                href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a>
-              </if>
-              <else>
-                <if \@paginator_pages.page@ lt 10>&nbsp;&nbsp;</if><b>\@paginator_pages.page@</b>
-              </else>
+                <if \@paginator.current_page@ ne \@paginator_pages.page@>
+                  <a class="page" href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a>
+                </if>
+                <else>
+                  <span class="current-page">\@paginator_pages.page@</span>
+                </else>
             </multiple>
 
             <if \@paginator.next_page_url@ not nil>
-              &nbsp;<a href="\@paginator.next_page_url@" title="\@paginator.next_page_context@">&gt;</a>&nbsp;
+              <a class="next-page" href="\@paginator.next_page_url@" title="\@paginator.next_page_context@"><span class="img-alt">&gt;</span></a>
             </if>
-            <else>
-              &nbsp;&gt;&nbsp;
-            </else>
             <if \@paginator.group_count@ gt 1>
               <if \@paginator.next_group_url@ not nil>
-                <a href="\@paginator.next_group_url@" title="\@paginator.next_group_context@">&gt;&gt;</a>
+                <a class="next-group" href="\@paginator.next_group_url@" title="\@paginator.next_group_context@"><span class="img-alt">&gt;&gt;</span></a>
               </if>
-              <else>
-                &gt;&gt;
-              </else>
             </if>
-          </td>
-        </tr>
+        </div>
       </if>
     </noparse>
   </if>
+  <!-- paginator end -->
 
-<if @actions:rowcount@ gt 0>
-  <tr class="list-button-bar">
-    <td colspan="@elements:rowcount@" class="list-button-bar">
-      <multiple name="actions">
-        <span class="list-button-header"><a href="@actions.url@" class="list-button" title="@actions.title@">@actions.label@</a></span>
-      </multiple>
-    </td>
-  </tr>
-</if>
+  <!-- table data start -->
+  <table class="list-data">
 
-
+    <!-- table header start -->
     <multiple name="elements">
       <tr class="list-header">
         <group column="subrownum">
           <th class="@elements.class@"@elements.cell_attributes@>
             <if @elements.orderby_url@ not nil>
               <if @elements.ordering_p@ true>
-                <b>@elements.label@</b>
-                <a href="@elements.orderby_url@" title="@elements.orderby_html_title@"><if @elements.orderby_direction@ eq "desc">v</if><else>^</else></a>
+                    <if @elements.orderby_direction@ eq "desc">
+                        <a class="sort-desc" href="@elements.orderby_url@" title="@elements.orderby_html_title@"> <span class="img-alt">v</span>
+                    </if>
+                    <else>
+                        <a class="sort-asc" href="@elements.orderby_url@" title="@elements.orderby_html_title@"> <span class="img-alt">^</span>
+                    </else>
+                @elements.label@</a>
               </if>
               <else>
                 <a href="@elements.orderby_url@" title="@elements.orderby_html_title@">@elements.label@</a>
@@ -149,6 +142,7 @@
         </group>
       </tr>
     </multiple>
+    <!-- table header end -->
 
   <noparse>
     <if \@@list_properties.multirow@:rowcount@ eq 0>
@@ -162,38 +156,13 @@
       <multiple name="@list_properties.multirow@">
   </noparse>
         
-    <if @list_properties.groupby@ not nil>
-
-        <tr class="list-spacer">
-          <td colspan="@elements:rowcount@">
-            &nbsp;
-          </td>
-        </tr>
-
-        <tr class="list-subheader">
-          <td colspan="@elements:rowcount@">
-            @list_properties.groupby_label@: <listelement name="@list_properties.groupby@">
-          </td>
-        </tr>
-
-        <noparse>
-          <group column="@list_properties.groupby@">
-        </noparse>
-    </if>
-
           <multiple name="elements">
     <noparse>
               <if \@@list_properties.multirow@.rownum@ odd>
-                <tr class="list-odd" onMouseOver="highlightcell(this)"
-		  onMouseDown="highlightcell(this)"
-		  onMouseUp="normalcellwhite(this)"
-		  onMouseOut="normalcellwhite(this)">
+                <tr class="list-odd">
               </if>
               <else>
-                <tr class="list-even" onMouseOver="highlightcell(this)"
-		  onMouseDown="highlightcell(this)"
-		  onMouseUp="normalcellwhite(this)"
-		  onMouseOut="normalcellwhite(this)">
+                <tr class="list-even">
               </else>
     </noparse>
 
@@ -205,79 +174,71 @@
             </tr>
           </multiple>
 
-    <if @list_properties.groupby@ not nil>
-            <noparse><if \@@list_properties.multirow@.groupnum_last_p@ true></noparse>
-              <multiple name="elements">
-                <tr class="list-subheader">
-                  <group column="subrownum">
-                    <td class="@elements.class@"@elements.cell_attributes@>
-                      <if @elements.aggregate_group_label@ not nil>
-                        @elements.aggregate_group_label@
-                      </if>
-                      <if @elements.aggregate@ not nil>
-                        \@@list_properties.multirow@.@elements.aggregate_group_col@@
-                      </if>
-                    </td>
-                  </group>
-                </tr>
-              </multiple>
-            <noparse></if></noparse>
+    <noparse>
+        </multiple>
+      </else>
+    </noparse>
+  </table>
+  <!-- table data end -->
 
-         <noparse>
-          </group>
-        </noparse>
-    </if>
+  <!-- paginator start -->
+  <if @list_properties.page_size@ not nil>
+    <noparse>
+      <if \@paginator.page_count@ gt 1>
+        <div class="list-paginator">
+            <if \@paginator.group_count@ gt 1>
+              <if \@paginator.previous_group_url@ not nil>
+                <a class="prev-group" href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@"><span class="img-alt">&lt;&lt;</span></a>
+              </if>
+            </if>
 
-    <if @list_properties.aggregates_p@ true>
-      <noparse><if \@@list_properties.multirow@.rownum@ eq \@@list_properties.multirow@:rowcount@></noparse>
-        <if @list_properties.groupby@ not nil>
-          <tr class="list-spacer">
-            <td colspan="@elements:rowcount@">
-              &nbsp;
-            </td>
-          </tr>
-        </if>
-        <multiple name="elements">
-          <tr class="list-subheader">
-            <group column="subrownum">
-              <td class="@elements.class@"@elements.cell_attributes@>
-                <if @elements.aggregate_label@ not nil>
-                  @elements.aggregate_label@
+            <if \@paginator.previous_page_url@ not nil>
+              <a class="prev-page" href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@"><span class="img-alt">&lt;</span></a>
+            </if>
+
+            <multiple name="paginator_pages">
+                <if \@paginator.current_page@ ne \@paginator_pages.page@>
+                  <a class="page" href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a>
                 </if>
-                <if @elements.aggregate@ not nil>
-                  \@@list_properties.multirow@.@elements.aggregate_col@@
-                </if>
-              </td>
-            </group>
-          </tr>
-        </multiple>
-      <noparse></if></noparse>
-    </if>
+                <else>
+                  <span class="current-page">\@paginator_pages.page@</span>
+                </else>
+            </multiple>
 
-    <noparse>
-        </multiple>
-      </else>
+            <if \@paginator.next_page_url@ not nil>
+              <a class="next-page" href="\@paginator.next_page_url@" title="\@paginator.next_page_context@"><span class="img-alt">&gt;</span></a>
+            </if>
+            <if \@paginator.group_count@ gt 1>
+              <if \@paginator.next_group_url@ not nil>
+                <a class="next-group" href="\@paginator.next_group_url@" title="\@paginator.next_group_context@"><span class="img-alt">&gt;&gt;</span></a>
+              </if>
+            </if>
+        </div>
+      </if>
     </noparse>
+  </if>
+  <!-- paginator end -->
 
 
+  <!-- bulk action start -->
+  <if @list_properties.bulk_actions@ not nil>
+    <div class="list-bulk-actions">
+
   <noparse><if \@@list_properties.multirow@:rowcount@ gt 0></noparse>
     <if @bulk_actions:rowcount@ gt 0>
-      <tr class="list-button-bar">
-        <td colspan="@elements:rowcount@" class="list-button-bar">
           <multiple name="bulk_actions">
-            <span class="list-button-header" id="@bulk_actions.label@-bulkaction"><a href="#" class="list-button" title="@bulk_actions.title@" 
-            onclick="ListBulkActionClick('@list_properties.name@', '@bulk_actions.url@')">@bulk_actions.label@</a></span>
+            <a href="#" id="@bulk_actions.label@-bulkaction" class="list-button" title="@bulk_actions.title@" 
+            onclick="ListBulkActionClick('@list_properties.name@', '@bulk_actions.url@')">@bulk_actions.label@</a>
           </multiple>
-        </td>
-      </tr>
     </if>
   <noparse></if></noparse>
 
+    </div>
+  </if>
+  <!-- bulk action end -->
 
-  <if @list_properties.bulk_actions@ not nil>
     </form>
-  </if>
 
-  </table>
+  </div>