Index: trunk/deployment/webadmin/webapp/resources/default/default/default.css
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.css (revision 2015)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.css (revision 2032)
@@ -933,27 +933,51 @@
 }
 li.folder {
-  list-style-image: url(../../resources/catIcon.gif);
+  list-style-image: url("../../resources/catIcon.gif");
 }
 li.calendar {
-  list-style-image: url(../../resources/calIcon-sm.gif);
+  list-style-image: url("../../resources/calIcon-sm.gif");
+}
+li.categories {
+  list-style-image: url("../../resources/categoryIcon.gif");
+}
+li.calsuites {
+  list-style-image: url("../../resources/calsuitesIcon.gif");
+}
+li.upload {
+  list-style-image: url("../../resources/uploadIcon.gif");
+}
+li.prefs {
+  list-style-image: url("../../resources/prefsIcon.gif");
+}
+li.timezones {
+  list-style-image: url("../../resources/clockIcon-sm.gif");
+}
+li.groups {
+  list-style-image: url("../../resources/groupIcon.gif");
+}
+li.user {
+  list-style-image: url("../../resources/userIcon.gif");
+}
+li.changeGroup {
+  list-style-image: url("../../resources/changeGroup.gif");
 }
 .calendarTree  li.trash {
-  list-style-image: url(../../resources/trashIcon.gif);
+  list-style-image: url("../../resources/trashIcon.gif");
 }
 .calendarTree  li.inbox {
-  list-style-image: url(../../resources/inboxIcon.gif);
+  list-style-image: url("../../resources/inboxIcon.gif");
 }
 .calendarTree  li.outbox {
-  list-style-image: url(../../resources/outboxIcon.gif);
+  list-style-image: url("../../resources/outboxIcon.gif");
 }
 .calendarTree  li.deleted {
-  list-style-image: url(../../resources/calIconDeleted-sm.gif);
+  list-style-image: url("../../resources/calIconDeleted-sm.gif");
 }
 .calendarTree  li.selected {
-  list-style-image: url(../../resources/glassFill-icon-view.gif);
+  list-style-image: url("../../resources/glassFill-icon-view.gif");
   font-weight: bold;
 }
 .calendarTree  li.alias {
-  list-style-image: url(../../resources/calIconAlias-sm.gif);
+  list-style-image: url("../../resources/calIconAlias-sm.gif");
   font-style: italic;
   margin-left: 0;
@@ -961,5 +985,5 @@
 }
 .calendarTree  li.aliasFolder {
-  list-style-image: url(../../resources/catIconAlias.gif);
+  list-style-image: url("../../resources/catIconAlias.gif");
   font-style: italic;
   margin-left: 0;
Index: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 2031)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 2032)
@@ -637,4 +637,7 @@
           </a>
         </td>
+        <!--
+          Category management is becomeing a  super-user and calsuite admin feature;
+          Categories underly much of the new single calendar and filtering model.
         <td>
           <a id="addCategoryLink" href="{$category-initAdd}">
@@ -642,5 +645,5 @@
             <br/>Add Category
           </a>
-        </td>
+        </td> -->
       </tr>
       <tr>
@@ -663,4 +666,7 @@
           </a>
         </td>
+        <!--
+          Category management is becomeing a super-user and calsuite admin feature;
+          Categories underly much of the new single calendar and filtering model.
         <td>
           <a href="{$category-initUpdate}">
@@ -668,73 +674,8 @@
             <br/>Manage Categories
           </a>
-        </td>
+        </td> -->
       </tr>
     </table>
 
-    <!--
-    <h2 class="menuTitle">Main Menu</h2>
-    <table id="mainMenuTable">
-      <tr>
-        <th>Events</th>
-        <td>
-          <a id="addEventLink" href="{$event-initAddEvent}">
-            Add
-          </a>
-        </td>
-        <td>
-          <a href="{$event-initUpdateEvent}">
-            Edit / Delete
-          </a>
-        </td>
-        <!- -
-        Disable direct selection by ID; we'll need to find another way
-        of quickly getting to events: search and grid views should be implemented. - - >
-        <!- -
-        <td>
-          Event ID:
-          <xsl:copy-of select="/bedework/formElements/*"/>
-        </td>- - >
-      </tr>
-      <tr>
-        <th>Contacts</th>
-        <td>
-          <a id="addContactLink" href="{$contact-initAdd}">
-            Add
-          </a>
-        </td>
-        <td>
-          <a href="{$contact-initUpdate}">
-            Edit / Delete
-          </a>
-        </td>
-      </tr>
-      <tr>
-        <th>Locations</th>
-        <td>
-          <a id="addLocationLink" href="{$location-initAdd}">
-            Add
-          </a>
-        </td>
-        <td>
-          <a href="{$location-initUpdate}">
-            Edit / Delete
-          </a>
-        </td>
-      </tr>
-      <tr>
-        <th>Categories</th>
-        <td>
-          <a id="addCategoryLink" href="{$category-initAdd}">
-            Add
-          </a>
-        </td>
-        <td>
-          <a href="{$category-initUpdate}">
-            Edit / Delete
-          </a>
-        </td>
-      </tr>
-    </table>
-    -->
     <div id="mainMenuEventSearch">
       <h4 class="menuTitle">Event search:</h4>
@@ -813,5 +754,5 @@
         </xsl:if-->
         <xsl:if test="/bedework/userInfo/adminGroupMaintOk='true'">
-          <li>
+          <li class="groups">
             <a href="{$admingroup-initUpdate}">
               Manage admin groups
@@ -819,5 +760,5 @@
           </li>
         </xsl:if>
-        <li>
+        <li class="changeGroup">
           <a href="{$admingroup-switch}">
             Change group...
@@ -825,5 +766,5 @@
         </li>
         <xsl:if test="/bedework/userInfo/userMaintOK='true'">
-          <li>
+          <li class="user">
             <form action="{$prefs-fetchForUpdate}" method="post">
               Edit user preferences (enter userid):<br/>
@@ -842,34 +783,32 @@
       <h2>Manage System</h2>
       <ul class="adminMenu strong">
-        <li>
+        <li class="calendar">
           <a href="{$calendar-fetch}">
             Manage calendars
           </a>
         </li>
-        <li>
+        <li class="categories">
+          <a href="{$category-initUpdate}">
+            Manage categories
+          </a>
+        </li>
+        <li class="calsuites">
           <a href="{$calsuite-fetch}">
             Manage calendar suites
           </a>
         </li>
-        <li>
+        <li class="upload">
           <a href="{$event-initUpload}">
-            Upload iCAL file
+            Upload ical file
           </a>
         </li>
       </ul>
       <ul class="adminMenu">
-        <li>
-          <a href="{$filter-showAddForm}">
-            Manage CalDAV filters
-          </a>
-        </li>
-      </ul>
-      <ul class="adminMenu">
-        <li>
+        <li class="prefs">
           <a href="{$system-fetch}">
             Manage system preferences
           </a>
         </li>
-        <li>
+        <li class="timezones">
           <a href="{$timezones-initUpload}">
             Manage system timezones
@@ -892,4 +831,11 @@
             </li>
           </ul>
+        </li>
+      </ul>
+      <ul class="adminMenu">
+        <li>
+          <a href="{$filter-showAddForm}">
+            Manage CalDAV filters
+          </a>
         </li>
       </ul>
@@ -1083,4 +1029,9 @@
           </td>
         </tr>
+        <!-- Disabling calendar selection is temporary - but we must determine if we're using
+             a single calendar model (e.g. excluding submissions calendar, etc). The following value should *not* be
+             hard coded, but we'll do this for the moment. -->
+        <input type="hidden" name="newCalPath" value="/public/cals/MainCal"/>
+        <!--
         <xsl:if test="not(starts-with(form/calendar/path,$submissionsRootUnencoded))">
           <tr>
@@ -1093,5 +1044,5 @@
             <td>
               <xsl:if test="form/calendar/preferred/select/option">
-                <!-- Display the preferred calendars by default if they exist -->
+                -  - Display the preferred calendars by default if they exist - -
                 <select name="bwPreferredCalendars" id="bwPreferredCalendars" onchange="this.form.newCalPath.value = this.value">
                   <option value="">
@@ -1115,5 +1066,5 @@
                 </select>
               </xsl:if>
-              <!-- hide the listing of all calendars if preferred calendars exist, otherwise show them -->
+               - - hide the listing of all calendars if preferred calendars exist, otherwise show them - -
               <select name="bwAllCalendars" id="bwAllCalendars" onchange="this.form.newCalPath.value = this.value;">
                 <xsl:if test="form/calendar/preferred/select/option">
@@ -1140,6 +1091,6 @@
               </select>
               <xsl:text> </xsl:text>
-              <!-- allow for toggling between the preferred and all calendars listings if preferred
-                   calendars exist -->
+               - - allow for toggling between the preferred and all calendars listings if preferred
+                   calendars exist - -
               <xsl:if test="form/calendar/preferred/select/option">
                 <input type="radio" name="toggleCalendarLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredCalendars','shown');changeClass('bwAllCalendars','invisible');this.form.newCalPath.value = this.form.bwPreferredCalendars.value;"/>
@@ -1154,5 +1105,5 @@
             </td>
           </tr>
-        </xsl:if>
+        </xsl:if> -->
 
         <tr>
@@ -2255,6 +2206,25 @@
         </tr>
 
+        <!-- Display in  -->
+        <!-- These are the subscriptions (aliases) where the events should show up.
+             By selecting one or more of these, appropriate categories will be set on the event -->
+        <tr>
+          <td class="fieldName">
+            Display in:
+          </td>
+          <td>
+            <xsl:for-each select="true">
+              <input type="checkbox" name="alias" value=""/>Test<br/>
+            </xsl:for-each>
+          </td>
+        </tr>
 
         <!--  Category  -->
+        <!--
+          categories will no longer be directly set by the user; they are set
+          by the back-end based on the subscriptions in the calendar suite.
+          A user, therefore, tells the system where they want the event to
+          show up, and the categories are set for them. -->
+        <!--
         <tr>
           <td class="fieldName">
@@ -2270,5 +2240,5 @@
                   <td>
                     <xsl:for-each select="form/categories/preferred/category[position() &lt;= ceiling($catCount div 2)]">
-                      <!-- <xsl:sort select="keyword" order="ascending"/> -->
+                      <xsl:sort select="keyword" order="ascending"/>
                       <input type="checkbox" name="categoryKey">
                         <xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute>
@@ -2282,5 +2252,5 @@
                   <td>
                     <xsl:for-each select="form/categories/preferred/category[position() &gt; ceiling($catCount div 2)]">
-                      <!-- <xsl:sort select="keyword" order="ascending"/> -->
+                      <xsl:sort select="keyword" order="ascending"/>
                       <input type="checkbox" name="categoryKey">
                         <xsl:attribute name="value"><xsl:value-of select="keyword"/></xsl:attribute>
@@ -2334,6 +2304,7 @@
             </table>
           </td>
-        </tr>
+        </tr> -->
         <!-- note -->
+        <!-- let's shut this off for now - needs rewriting if we keep it at all
         <tr>
           <td colspan="2" style="padding-top: 1em;">
@@ -2353,5 +2324,5 @@
             </span>
           </td>
-        </tr>
+        </tr> -->
 
         <xsl:if test="form/contact/name">