Index: modules/zadministration/civicspace.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/zadministration/civicspace.css,v
retrieving revision 1.1
diff -u -r1.1 civicspace.css
--- modules/zadministration/civicspace.css	28 Feb 2006 00:24:57 -0000	1.1
+++ modules/zadministration/civicspace.css	10 Mar 2006 10:56:15 -0000
@@ -59,12 +59,17 @@
 	color:#AAAAAA;
 }
 
-div.dashboard-panel #col1 {
+div.dashboard-panel div.dashboard-admin {
 	float: left;
 	width: 50%;
 }
 
-div.dashboard-panel #col2 {
+div.dashboard-panel div.dashboard-help {
+	float: left;
+	width: 50%;
+}
+
+div.dashboard-panel div.dashboard-extra {
 	float: left;
 	width: 50%;
 }
Index: modules/zadministration/civicspace.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/zadministration/civicspace.inc,v
retrieving revision 1.1
diff -u -r1.1 civicspace.inc
--- modules/zadministration/civicspace.inc	28 Feb 2006 00:24:57 -0000	1.1
+++ modules/zadministration/civicspace.inc	10 Mar 2006 10:52:43 -0000
@@ -38,6 +38,7 @@
       'admin/help' => array(
         'title' => 'help',
         'description' => 'Application (Module) help',
+        'class' => 'dashboard-help',
       ),
       'sadmin/features/support' => array(
         'title' => 'get support',
@@ -46,18 +47,22 @@
         'long-desc' => 'This exists as an example of what the long-desc will do',
         'callback' => 'administration_offsite',
         'callback arguments' => array('http://drupal.org/support'),
+        'class' => 'dashboard-help',
       ),
       'admin/modules' => array(
         'title' => 'activate/deactivate',
         'description' => 'Turn on and off applications (modules)',
+        'class' => 'dashboard-admin',
       ),
        'admin/settings' => array(
         'title' => 'configure modules',
         'description' => "Configure my site's module settings",
+        'class' => 'dashboard-admin',
       ),
       'admin' => array(
         'title' => 'other',
         'description' => "Configure uncategorized items for modules",
+        'class' => 'dashboard-admin',
       ),
       'chat' => array(
         'title' => 'chat',
@@ -65,6 +70,7 @@
         'short-desc' => 'Well researched questions may be answered',
         'callback' => 'administration_offsite',
         'callback arguments' => array('http://drupal.org/support'),
+        'class' => 'dashboard-help',
       ),
     ),
   );
@@ -81,23 +87,28 @@
       'admin/comment' => array(
         'title' => 'manage comments',
         'description' => "Moderate and publish comments",
+        'class' => 'dashboard-admin',
       ),
       'admin/taxonomy' => array(
         'title' => 'manage categories',
         'description' => "Set up and maintain your site's categories (vocabularies/taxonomy)",
+        'class' => 'dashboard-admin',
       ),
       'node/add' => array(
         'title' => 'create content',
         'description' => "Add new web pages (content) to your site",
+        'class' => 'dashboard-admin',
       ),
       'sadmin/content/no-link1' => array(
         'title' => 'apply tags',
         'description' => 'Apply tags to web pages (content)',
         'callback' => 'drupal_not_found',
+        'class' => 'dashboard-admin',
       ),
       'admin/node' => array(
         'title' => 'organize',
         'description' => 'Order and organize web pages (content)',
+        'class' => 'dashboard-admin',
       ),
     ),
   );
@@ -115,23 +126,28 @@
         'title' => 'install modules',
         'description' => 'Install new modules',
         'short-desc' => 'Download module files, database install',
-        'callback' => 'drupal_not_found'
+        'callback' => 'drupal_not_found',
+        'class' => 'dashboard-admin',
       ),
       'admin/menu' => array(
         'title' => 'menus',
         'description' => "Create and configure menus",
+        'class' => 'dashboard-admin',
       ),
       'admin/access' => array(
         'title' => 'access control',
         'description' => "Setup site security (access control to site features)",
+        'class' => 'dashboard-admin',
       ),
       'admin/path' => array(
         'title' => 'url aliases',
         'description' => "Create and manage URL aliases",
+        'class' => 'dashboard-admin',
       ),
       'admin/filters' => array(
         'title' => 'input formats',
         'description' => "Configure allowable input formats/input filters",
+        'class' => 'dashboard-admin',
       ),
     ),
   );
@@ -148,21 +164,25 @@
       'admin/themes' => array(
         'title' => 'themes',
         'description' => "Activate/configure themes",
+        'class' => 'dashboard-admin',
       ),
       'admin/block' => array(
         'title' => 'blocks',
         'description' => "Activate/configure blocks",
+        'class' => 'dashboard-admin',
       ),
       'sadmin/style/no-link1' => array(
         'title' => 'fix themes',
         'description' => 'Fix theme problems',
         'callback' => 'drupal_not_found',
+        'class' => 'dashboard-admin',
       ),
       'sadmin/style/no-link2' => array(
         'title' => 'page layout',
         'description' => 'Page layout',
         'short-desc' => 'Page layouts, front pages, number of columns',
-        'callback' => 'drupal_not_found'
+        'callback' => 'drupal_not_found',
+        'class' => 'dashboard-admin',
       ),
     ),
   );
@@ -179,14 +199,17 @@
       'admin/user' => array(
         'title' => 'manage users',
         'description' => "Change or add users",
+        'class' => 'dashboard-admin',
       ),
       'admin/node' => array(
         'title' => 'manage content',
         'description' => "Moderate, promote and manage your web pages",
+        'class' => 'dashboard-admin',
       ),
       'admin/logs' => array(
         'title' => 'logs',
         'description' => "Site errors and other logs",
+        'class' => 'dashboard-admin',
       ),
     ),
   );
@@ -204,10 +227,12 @@
         'title' => 'mailing lists',
         'description' => 'Mailing lists',
         'callback' => 'drupal_not_found',
+        'class' => 'dashboard-admin',
       ),
       'admin/aggregator' => array(
         'title' => 'news feeds',
         'description' => "Manage my news feeds",
+        'class' => 'dashboard-admin',
       ),
     ),
   );
@@ -219,6 +244,7 @@
     'callback'    => '_administration_sub_dashboard_page',
     'panel_theme' => 'administration_statistics',
     'sub_panel_css' => 'dashboard',
+    'class' => 'dashboard-admin',
   );
   
   // This special one clones the system settings section so it goes into the
@@ -227,6 +253,7 @@
     'title'       => t('site settings'),
     'description' => t('Configure site-wide settings'),
     'callback'    => 'system_site_settings',
+    'class' => 'dashboard-admin',
   );
 
   // overrides to repoint a couple of settings.
@@ -234,6 +261,7 @@
     'title' => t('configure modules'),
     'description' => t("Configure my site's module settings"),
     'callback'    => '_administration_settings_page',
+    'class' => 'dashboard-admin',
   );
   
   // overrides to repoint a couple of settings.
@@ -241,6 +269,7 @@
     'title' => t('configure modules'),
     'description' => t("Configure uncategorized module settings"),
     'callback'    => '_administration_sub_dashboard_page',
+    'class' => 'dashboard-admin',
   );
 
   $config['dashboard']['dashboard'] = array(
@@ -262,39 +291,39 @@
   $config = _administration_menu_config();
   $menu = menu_get_menu();
   $mid = $menu['path index'][$path];
-  $output .= '<div class=dashboard-panel>';
-  $output .= '<div class=dashboard-panel-head>';
-  $output .= $menu['items'][$mid]['description'];
-  $output .= '</div>';
-  $output .= '<div class=dashboard-panel-body>';
-  $output .= '<div class=dashboard-panel-desc>';
-  $output .= $config['section'][$path]['long-desc']; 
-  $output .= '</div>';
-  $col1 = '<div id="col1"><ul>';
-  $col2 = '<div id="col2"><ul>';
+  
+  $output .= "  <!-- START administration menu panel -->\n";
+  $output .= "  <div class=\"dashboard-panel\">\n";
+  $output .= "    <div class=\"dashboard-panel-head\">" . $menu['items'][$mid]['description'] . "</div>\n";
+  $output .= "    <div class=\"dashboard-panel-body\">\n";
+  $output .= "      <div class=\"dashboard-panel-desc\">". $config['section'][$path]['long-desc'] . "</div>\n";
   $counter = 0;
   foreach ($menu['visible'][$mid]['children'] as $cid) {
     $item = '';
-    $item .= '<li>';
+    $item .= '          <li>';
     $title = !empty($menu['items'][$cid]['description']) ? $menu['items'][$cid]['description'] : $menu['items'][$cid]['title'];
     $item .= l($title, $menu['items'][$cid]['path'], array('title' => $menu['items'][$cid]['title']));
     $longdesc = $config['section'][$path]['items'][$menu['items'][$cid]['path']]['short-desc'];
+    $class = $config['section'][$path]['items'][$menu['items'][$cid]['path']]['class'];
     if ($longdesc) {
       $item .= " $longdesc";
     }
-    $item .= '</li>';
-    if ($counter++ % 2 == 0) {
-      $col1 .= $item;
-    }
-    else {
-      $col2 .= $item;
-    }
+    $item .= "</li>\n";
+    $group[$class] .= $item;
   }
-  $col1 .= '</ul></div>';
-  $col2 .= '</ul></div>';
-  $output .= $col1 . $col2;
-  $output .= '</div>';
-  $output .= '</div>';
+  ksort($group);
+  foreach($group as $class => $text) {
+    if(!$class) $class = 'dashboard-extra';
+    $output   .= "      <div class=\"$class\">\n";
+    $output   .= "        <ul>\n";
+    $output   .= $text;
+    $output   .= "        </ul>\n";
+    $output   .= "      </div>\n";
+
+  }
+  $output .= "    </div>\n";
+  $output .= "  </div>\n";
+  $output .= "  <!-- END administration menu panel -->\n";
   return $output;
 }
 
@@ -305,30 +334,26 @@
   $mid = menu_get_active_item();
   $path = $menu['items'][$mid]['path'];
 
-  $output .= '<div class=dashboard-panel>';
-  $output .= '<div class=dashboard-panel-head>';
-  $output .= $menu['items'][$mid]['description'];
-  $output .= '</div>';
-  $output .= '<div class=dashboard-panel-body>';
-
-  $output .= '<div class=dashboard-panel-desc>';
-  $output .= $config['section'][$path]['long-desc']; 
-  $output .= '</div>';
-
-  $output .= '<ul>';
+  $output .= "  <!-- START administration sub menu panel -->\n";
+  $output .= "  <div class=\"dashboard-panel\">\n";
+  $output .= "    <div class=\"dashboard-panel-head\">".$menu['items'][$mid]['description'] . "</div>\n";
+  $output .= "    <div class=\"dashboard-panel-body\">\n";
+  $output .= "      <div class=\"dashboard-panel-desc\">".$config['section'][$path]['long-desc'] . "</div>\n";
+  $output .= "      <ul>\n";
   foreach ($menu['visible'][$mid]['children'] as $cid) {
-    $output .= '<li>';
+    $output .= '        <li>';
     $title = !empty($menu['items'][$cid]['description']) ? $menu['items'][$cid]['description'] : $menu['items'][$cid]['title'];
     $output .= l($title, $menu['items'][$cid]['path'], array('title' => $menu['items'][$cid]['title']));
     $longdesc = $config['section'][$path]['items'][$menu['items'][$cid]['path']]['long-desc'];
     if ($longdesc) {
       $output .= " $longdesc";
     }
-    $output .= '</li>';
+    $output .= "</li>\n";
   }
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '</div>';
+  $output .= "      </ul>\n";
+  $output .= "    </div>\n";
+  $output .= "  </div>\n";
+  $output .= "  <!-- END administration sub menu panel -->\n";
   return $output;
 }
 
@@ -342,30 +367,30 @@
   else {
     $mid = $menu['path index'][$path];
   }
+  $output .= "  <!-- START administration statistics panel -->\n";
+  $output .= "  <div class=\"dashboard-panel\">\n";
+  $output .= "    <div class=\"dashboard-panel-head\">". $menu['items'][$mid]['description'] . "</div>\n";
+  
+  $output .= "    <div class=\"dashboard-panel-body\">\n";
+  $output .= "      <div class=\"dashboard-panel-desc\">". $config['section'][$path]['long-desc'] . "</div>\n";
 
-  $output .= '<div class=dashboard-panel>';
-  $output .= '<div class=dashboard-panel-head>';
-  $output .= $menu['items'][$mid]['description'];
-  $output .= '</div>';
-  $output .= '<div class=dashboard-panel-body>';
-
-  $output .= '<div class=dashboard-panel-desc>';
-  $output .= $config['section'][$path]['long-desc']; 
-  $output .= '</div>';
-
-  $output .= '<table>';
+  $output .= "      <table>\n";
   $counter = 0;
   $last = count($stats);
   foreach ($stats as $stat) {
-    $item .= "<th>$stat[title]</th><td>$stat[value]</td>";
+    $item .= "          <th>$stat[title]</th>\n";
+    $item .= "          <td>$stat[value]</td>\n";
     if ($counter++ % 2 == 1 || $counter == $last) {
-      $output .= "<tr>$item</tr>\n";
+      $output .= "       <tr>\n";
+      $output .= $item;
+      $output .= "       </tr>\n";
       $item = "";
     }
   }
-  $output .= '</table>';
-  $output .= '</div>';
-  $output .= '</div>';
+  $output .= "      </table>\n";
+  $output .= "    </div>\n";
+  $output .= "  </div>\n";
+  $output .= "  <!-- END administration statistics panel -->\n";
   return $output;
 
 }
Index: modules/zadministration/zadministration.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/zadministration/zadministration.module,v
retrieving revision 1.2
diff -u -r1.2 zadministration.module
--- modules/zadministration/zadministration.module	28 Feb 2006 02:04:35 -0000	1.2
+++ modules/zadministration/zadministration.module	10 Mar 2006 01:58:49 -0000
@@ -471,7 +471,8 @@
   if (!$default_theme) {
     $default_theme = 'administration_sub_menu_panel';
   }
-  $output = '<div class=' . $css_class . '>';
+  $output = "<!-- START theme_administration_dashboard_container -->\n";
+  $output .= '<div class=' . $css_class . '>' . "\n";
   $i = 0;
   $total = count($panels);
   foreach ($panels as $id => $panel) {
@@ -485,7 +486,8 @@
       $output .= theme($theme_func, $id, $css_class, $i, $total);
       $i++;
   }
-  $output .= '</div>';
+  $output .= "</div>\n";
+  $output .= "<!-- END theme_administration_dashboard_container -->\n";
   return $output;
 }