Index: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/en_US/default/default.css (revision 2)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css (revision 202)
@@ -109,4 +109,47 @@
   background-color: #fff;
 }
+#bodyBlock {
+  width: 100%;
+  margin: 0;
+  padding: 0;
+}
+#bodyBlock td {
+  margin: 0;
+  padding: 0;
+}
+#bodyBlock td#leftMenus {
+  width: 200px;  
+  border-left: 2px solid #333;
+  border-right: 3px groove #ddd;
+  border-bottom: 2px solid #aaa;
+  vertical-align: top;
+  padding: 0;
+}
+#bodyBlock td#leftMenus #leftTabs {
+  width: 200px;
+  height: 24px; 
+  margin: 0;
+  padding: 0;
+  color: black;
+  background-color: #ddd;
+}
+#bodyBlock td#leftMenus #leftTabs td {
+  font-size: 12px;
+  padding: 0 0.5em;
+  margin: 0;
+  vertical-align: middle;
+  border-top: 1px solid #333;
+  border-bottom: 1px solid #333;
+  border-left: 1px solid #333;
+}
+#bodyBlock td#leftMenus #leftTabs td.first {  
+  border-left: none;
+}
+#bodyBlock td#leftMenus #leftTabs td.selected {  
+  color: black;
+  background-color: white;
+  border-bottom: none;
+  padding-bottom: 1px;
+}
 #userBarTable {
   margin: 0;
@@ -119,5 +162,5 @@
   margin: 0;
   padding: 0;
-  border-left: 2px solid #333;
+  border-left: 1px solid #333;
   padding: 0.2em 0 0.2em 1em;
   white-space: nowrap;
@@ -151,4 +194,5 @@
   padding: 4px 0px 0px 0px;
   text-align: center;
+  vertical-align: bottom;
   background-color: #333;
   color: #eee;
@@ -174,5 +218,5 @@
   padding: 0em;
   vertical-align: top;
-  border-left : 2px solid #333;
+  border-left : 1px solid #333;
   border-right : 2px solid #333;
   border-bottom: 1px solid Gray;
@@ -200,5 +244,5 @@
 }
 #navigationBarTable td.leftCell {
-    text-align: left;
+  text-align: left;
   white-space: nowrap;
   padding-left: 0.5em;
@@ -270,5 +314,5 @@
   padding: 0px;
   border-bottom: 2px solid #aaa;
-  border-left: 2px solid #333;
+  border-left: 1px solid #333;
   border-right: 2px solid #333;
 }
@@ -330,5 +374,5 @@
   padding: 0;
   border-bottom: 2px solid #aaa;
-  border-left: 2px solid #333;
+  border-left: 1px solid #333;
   border-right: 2px solid #333;
 }
@@ -370,5 +414,5 @@
   border-top: 1px solid #666;
   border-bottom: 2px solid #aaa;
-  border-left: 2px solid #333;
+  border-left: 1px solid #333;
   border-right: 2px solid #333;
 }
@@ -402,5 +446,5 @@
   border-top: 1px solid #666;
   border-bottom: 2px solid #aaa;
-  border-left: 2px solid #333;
+  border-left: 1px solid #333;
   border-right: 2px solid #333;
 }
@@ -434,5 +478,5 @@
   border-top: 1px solid #666;
   border-bottom: 2px solid #aaa;
-  border-left: 2px solid #333;
+  border-left: 1px solid #333;
   border-right: 2px solid #333;
 }
@@ -575,5 +619,5 @@
   border-top: 1px solid #666;
   border-bottom: 2px solid #aaa;
-  border-left: 2px solid #333;
+  border-left: 1px solid #333;
   border-right: 2px solid #333;
 }
@@ -644,5 +688,5 @@
   border-top: 1px solid #666;
   border-bottom: 2px solid #aaa;
-  border-left: 2px solid #333;
+  border-left: 1px solid #333;
   border-right: 2px solid #333;
 }
Index: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 201)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 202)
@@ -90,81 +90,82 @@
           </div>
         </xsl:if>
-        <!-- <xsl:call-template name="alerts"/> -->
-        <xsl:call-template name="tabs"/>
-        <div id="bodyBlock">
-          <div id="leftMenus">
-            test
-          </div>
-          <div id="bodyContent">
-            <xsl:choose>
-              <xsl:when test="/bedework/page='event'">
-                <!-- show an event -->
-                <xsl:apply-templates select="/bedework/event"/>
-              </xsl:when>
-              <xsl:when test="/bedework/page='addEvent'">
-                <xsl:call-template name="addEvent"/>
-              </xsl:when>
-              <xsl:when test="/bedework/page='editEvent'">
-                <!-- edit an event -->
-                <xsl:apply-templates select="/bedework/eventform"/>
-              </xsl:when>
-              <xsl:when test="/bedework/page='alarmOptions'">
-                <xsl:call-template name="alarmOptions" />
-              </xsl:when>
-              <xsl:when test="/bedework/page='upload'">
-                <xsl:call-template name="upload" />
-              </xsl:when>
-              <xsl:when test="/bedework/page='manageLocations'">
-                <xsl:call-template name="manageLocations" />
-              </xsl:when>
-              <xsl:when test="/bedework/page='editLocation'">
-                <!-- edit an event -->
-                <xsl:apply-templates select="/bedework/locationform"/>
-              </xsl:when>
-              <xsl:when test="/bedework/page='calendars'">
-                <!-- show a list of all calendars and manage subscriptions -->
-                <xsl:apply-templates select="/bedework/calendars"/>
-              </xsl:when>
-              <xsl:when test="/bedework/page='other'">
-                <!-- show an arbitrary page -->
-                <xsl:call-template name="selectPage"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <!-- otherwise, show the eventsCalendar -->
-                <xsl:call-template name="navigation"/>
-                <xsl:call-template name="userBar"/>
-                <!-- main eventCalendar content -->
-                <xsl:choose>
-                  <xsl:when test="/bedework/periodname='Day'">
-                    <xsl:call-template name="listView"/>
-                  </xsl:when>
-                  <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''">
-                    <xsl:choose>
-                      <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'">
-                        <xsl:call-template name="listView"/>
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:call-template name="weekView"/>
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </xsl:when>
-                  <xsl:when test="/bedework/periodname='Month'">
-                    <xsl:choose>
-                      <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'">
-                        <xsl:call-template name="listView"/>
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:call-template name="monthView"/>
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:call-template name="yearView"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:otherwise>
-            </xsl:choose>
-          </div>
-        </div>
+        <table id="bodyBlock" cellspacing="0">
+          <tr>
+            <td id="leftMenus">
+              <xsl:call-template name="leftMenus"/>
+            </td>
+            <td id="bodyContent">
+              <xsl:call-template name="tabs"/>
+              <xsl:choose>
+                <xsl:when test="/bedework/page='event'">
+                  <!-- show an event -->
+                  <xsl:apply-templates select="/bedework/event"/>
+                </xsl:when>
+                <xsl:when test="/bedework/page='addEvent'">
+                  <xsl:call-template name="addEvent"/>
+                </xsl:when>
+                <xsl:when test="/bedework/page='editEvent'">
+                  <!-- edit an event -->
+                  <xsl:apply-templates select="/bedework/eventform"/>
+                </xsl:when>
+                <xsl:when test="/bedework/page='alarmOptions'">
+                  <xsl:call-template name="alarmOptions" />
+                </xsl:when>
+                <xsl:when test="/bedework/page='upload'">
+                  <xsl:call-template name="upload" />
+                </xsl:when>
+                <xsl:when test="/bedework/page='manageLocations'">
+                  <xsl:call-template name="manageLocations" />
+                </xsl:when>
+                <xsl:when test="/bedework/page='editLocation'">
+                  <!-- edit an event -->
+                  <xsl:apply-templates select="/bedework/locationform"/>
+                </xsl:when>
+                <xsl:when test="/bedework/page='calendars'">
+                  <!-- show a list of all calendars and manage subscriptions -->
+                  <xsl:apply-templates select="/bedework/calendars"/>
+                </xsl:when>
+                <xsl:when test="/bedework/page='other'">
+                  <!-- show an arbitrary page -->
+                  <xsl:call-template name="selectPage"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <!-- otherwise, show the eventsCalendar -->
+                  <xsl:call-template name="navigation"/>
+                  <xsl:call-template name="userBar"/>
+                  <!-- main eventCalendar content -->
+                  <xsl:choose>
+                    <xsl:when test="/bedework/periodname='Day'">
+                      <xsl:call-template name="listView"/>
+                    </xsl:when>
+                    <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''">
+                      <xsl:choose>
+                        <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'">
+                          <xsl:call-template name="listView"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:call-template name="weekView"/>
+                        </xsl:otherwise>
+                      </xsl:choose>
+                    </xsl:when>
+                    <xsl:when test="/bedework/periodname='Month'">
+                      <xsl:choose>
+                        <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'">
+                          <xsl:call-template name="listView"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:call-template name="monthView"/>
+                        </xsl:otherwise>
+                      </xsl:choose>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <xsl:call-template name="yearView"/>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </xsl:otherwise>
+              </xsl:choose>
+            </td>
+          </tr>
+        </table>
         <!-- footer -->
         <xsl:call-template name="footer"/>
@@ -227,4 +228,14 @@
   </xsl:template>
 
+  <xsl:template name="leftMenus">
+    <table id="leftTabs" cellspacing="0">
+      <tr>    
+        <td class="selected first">Main</td>  
+        <td>Calendars</td>
+        <td>Subscriptions</td>
+      </tr>
+    </table>
+  </xsl:template>
+  
   <xsl:template name="tabs">
     <xsl:choose>
@@ -273,8 +284,4 @@
             </td>
             <td class="centerCell">
-                <a href="setup.do">refresh view</a><!-- <a href="http://www.rpi.edu/dept/cct/apps/pubeventsxml/calendarfeatures.html">login</a> -->
-                <!-- <span id="featureHighlight">switch view &#8594;</span> -->
-            </td>
-            <td class="centerCell">
                 <a href="{$initUpload}">upload</a><!-- <a href="http://www.rpi.edu/dept/cct/apps/pubeventsxml/calendarfeatures.html">login</a> -->
                 <!-- <span id="featureHighlight">switch view &#8594;</span> -->
@@ -286,75 +293,7 @@
               <a class="rss" href="{$setSelection}?calId=&amp;setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
             </td>
-            <td>
-              <xsl:choose>
-                <xsl:when test="/bedework/periodname='Day'">
-                  <img src="{$resourcesRoot}/images/demo/std-button-listview-off.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/>
-                </xsl:when>
-                <xsl:when test="/bedework/periodname='Year'">
-                  <img src="{$resourcesRoot}/images/demo/std-button-calview-off.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/>
-                </xsl:when>
-                <xsl:when test="/bedework/periodname='Month'">
-                  <xsl:choose>
-                    <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'">
-                      <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view">
-                        <img src="{$resourcesRoot}/images/demo/std-button-calview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/>
-                      </a>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view">
-                        <img src="{$resourcesRoot}/images/demo/std-button-listview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/>
-                      </a>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:choose>
-                    <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'">
-                      <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view">
-                        <img src="{$resourcesRoot}/images/demo/std-button-calview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/>
-                      </a>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view">
-                        <img src="{$resourcesRoot}/images/demo/std-button-listview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/>
-                      </a>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:otherwise>
-              </xsl:choose>
-            </td>
+            
             <td class="rightCell">
-              <xsl:choose>
-                <xsl:when test="/bedework/periodname='Year' or
-                                (/bedework/periodname='Month' and
-                                (/bedework/appvar[key='monthViewMode']/value='cal' or
-                                 count(/bedework/appvar[key='monthViewMode'])=0)) or
-                                (/bedework/periodname='Week' and
-                                (/bedework/appvar[key='weekViewMode']/value='cal' or
-                                 count(/bedework/appvar[key='weekViewMode'])=0))">
-                  <xsl:choose>
-                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-                      <img src="{$resourcesRoot}/images/demo/std-button-summary-off.gif" width="67" height="20" border="0" alt="only summaries of events supported in this view"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <img src="{$resourcesRoot}/images/demo/std-button-details-off.gif" width="67" height="20" border="0" alt="only summaries of events supported in this view"/>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:choose>
-                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-                      <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view">
-                        <img src="{$resourcesRoot}/images/demo/std-button-summary.gif" width="67" height="20" border="0" alt="toggle summary/detailed view"/>
-                      </a>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view">
-                        <img src="{$resourcesRoot}/images/demo/std-button-details.gif" width="67" height="20" border="0" alt="toggle summary/detailed view"/>
-                      </a>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:otherwise>
-              </xsl:choose>
+              &#160;
             </td>
           </tr>
@@ -386,14 +325,4 @@
       </xsl:otherwise>
     </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="alerts">
-    <table id="alertsTable">
-      <tr>
-        <td>
-          I'm an alert
-        </td>
-      </tr>
-    </table>
   </xsl:template>
 
@@ -531,7 +460,76 @@
          </td>
          <td class="rightCell">
-           <a href="{$initEvent}">Add Event</a> |
+           <xsl:choose>
+            <xsl:when test="/bedework/periodname='Day'">
+              <img src="{$resourcesRoot}/images/demo/std-button-listview-off.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
+            </xsl:when>
+            <xsl:when test="/bedework/periodname='Year'">
+              <img src="{$resourcesRoot}/images/demo/std-button-calview-off.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
+            </xsl:when>
+            <xsl:when test="/bedework/periodname='Month'">
+              <xsl:choose>
+                <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'">
+                  <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view">
+                    <img src="{$resourcesRoot}/images/demo/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
+                  </a>
+                </xsl:when>
+                <xsl:otherwise>
+                  <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view">
+                    <img src="{$resourcesRoot}/images/demo/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
+                  </a>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:choose>
+                <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'">
+                  <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view">
+                    <img src="{$resourcesRoot}/images/demo/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
+                  </a>
+                </xsl:when>
+                <xsl:otherwise>
+                  <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view">
+                    <img src="{$resourcesRoot}/images/demo/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
+                  </a>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:otherwise>
+          </xsl:choose>
+           <xsl:choose>
+              <xsl:when test="/bedework/periodname='Year' or
+                              (/bedework/periodname='Month' and
+                              (/bedework/appvar[key='monthViewMode']/value='cal' or
+                               count(/bedework/appvar[key='monthViewMode'])=0)) or
+                              (/bedework/periodname='Week' and
+                              (/bedework/appvar[key='weekViewMode']/value='cal' or
+                               count(/bedework/appvar[key='weekViewMode'])=0))">
+                <xsl:choose>
+                  <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
+                    <img src="{$resourcesRoot}/images/demo/std-button-summary-off.gif" width="62" height="21" border="0" alt="only summaries of events supported in this view"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <img src="{$resourcesRoot}/images/demo/std-button-details-off.gif" width="62" height="21" border="0" alt="only summaries of events supported in this view"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:choose>
+                  <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
+                    <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view">
+                      <img src="{$resourcesRoot}/images/demo/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
+                    </a>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view">
+                      <img src="{$resourcesRoot}/images/demo/std-button-details.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
+                    </a>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:otherwise>
+            </xsl:choose>
+            <a href="setup.do"><img src="{$resourcesRoot}/images/demo/std-button-refresh.gif" width="70" height="21" border="0" alt="refresh view"/></a>
+           <!--<a href="{$initEvent}">Add Event</a> |
            <a href="{$manageLocations}">Manage Locations</a> |
-           <a href="{$fetchPublicCalendars}">Manage Subscriptions</a>
+           <a href="{$fetchPublicCalendars}">Manage Subscriptions</a>-->
            <!-- <form name="calForm" method="get" action="{$setSelection}">Search: <input type="text" name="searchString" size="30" value=""/><input type="submit" value="go"/></form> -->
          </td>