Index: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css (revision 2072)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css (revision 2086)
@@ -50,5 +50,5 @@
   width: 100%;
   height: 26px;
-  background: #2c5f89 url(../../images/curDateRangeBlue.gif) repeat-x bottom;
+  background: #2B4795 url(../../images/glassFill-02.gif) repeat-x bottom;
   color : #eee;
   margin: 0em;
@@ -65,5 +65,5 @@
 }
 #curDateRangeTable td.sideBarOpenCloseIcon {
-  background: url(../../images/curDateRangeBlue-left.gif) no-repeat top left;
+  background: url(../../images/glassFill-02-leftBorder.gif) no-repeat top left;
   color: inherit;
   width: 200px;
@@ -75,5 +75,5 @@
 }
 #curDateRangeTable td.rssPrint {
-  background: url(../../images/curDateRangeBlue-right.gif) no-repeat top right;
+  background: url(../../images/glassFill-02-rightBorder.gif) no-repeat top right;
   color: inherit;
   width: 200px;
@@ -191,4 +191,46 @@
   display: inline;
 }
+#bwTabs {
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  background-color: #333;
+  color: #eee;
+}
+#bwTabs ul {
+  height: 20px;
+  margin: 0 2px;
+  padding: 4px 0 0 0;
+}
+#bwTabs li {
+  float: left;
+  width: 80px;
+  height: 20px;
+  text-align: center;
+  line-height: 23px;
+  letter-spacing: 1px;
+  font-weight: bold;
+  font-size: 12px;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  list-style-image: none;
+  color: black;
+  background: #eee url("../../images/std-tab-off-80x20.gif") no-repeat bottom;
+}
+#bwTabs li.selected {
+  color: black;
+  background: #eee url("../../images/std-tab-on-80x20.gif") no-repeat top;
+}
+#bwTabs a {
+  text-decoration: none;
+  color: black;
+  background-color: transparent;
+}
+#bwTabs a:hover {
+  color: #c00;
+  background-color: transparent;
+}
+/* tabsTable provides styles for the older version of Bedework's tabs */
 #tabsTable {
   margin: 0em;
@@ -210,4 +252,5 @@
 }
 #navigationBarTable {
+  clear: both;
   font-size: 0.8em;
   margin: 0em;
@@ -341,5 +384,5 @@
 }
 #searchTable .searchRelevance {
-  background-color: #2c5f89;
+  background-color: #2B4795;
   color: black;
 }
@@ -403,5 +446,5 @@
 #dayCalendarTable .dateRange {
   text-align: left;
-  background-color: #D3E4F0;
+  background-color: #e2decc;
   color: black;
   white-space: nowrap;
@@ -435,5 +478,5 @@
 #weekCalendarTable .dateRange {
   text-align: left;
-  background-color: #D3E4F0;
+  background-color: #e2decc;
   color: black;
   white-space: nowrap;
@@ -465,5 +508,5 @@
   text-align: center;
   vertical-align: middle;
-  background-color: #2c5f89;
+  background-color: #2B4795;
   color: #eee;
   border: 1px solid black;
@@ -510,5 +553,5 @@
   padding: 0.1em 0.2em 0.1em 0.2em;
   text-decoration: none;
-  background-color: #A3C8D9;
+  background-color: #CCD7F5;
   color: black;
 }
@@ -519,5 +562,5 @@
   padding: 0.1em 0.2em 0.1em 0.2em;
   text-decoration: none;
-  background-color: #DEECF2;
+  background-color: #EBF0FF;
   color: black;
 }
@@ -674,6 +717,6 @@
   font-weight: bold;
   text-align: center;
-  background-color: #EDF5F9;
-  color: black;
+  background-color: #2B4795;
+  color: #eee;
   white-space: nowrap;
   border-bottom: 1px solid #999;
@@ -700,6 +743,6 @@
   text-decoration: none;
   background-color: inherit;
+  color: #eee;
   padding: 1px;
-  color: black;
 }
 #yearCalendarTable  table.yearViewMonthTable td a:hover  {
@@ -740,5 +783,5 @@
   font-size: 0.9em;
   text-transform: lowercase;
-  background-color: #C0D4DD;
+  background-color: #D0D5E1;
   color: black;
   white-space: nowrap;
@@ -747,5 +790,5 @@
   font-size: 0.9em;
   text-transform: lowercase;
-  background-color: #F0F9FF;
+  background-color: #DFE7FB;
   color: black;
   white-space: nowrap;
@@ -754,5 +797,5 @@
   font-size: 0.9em;
   text-transform: lowercase;
-  background-color: #DEECF2;
+  background-color: #CCD7F5;
   color: black;
   white-space: nowrap;
@@ -761,5 +804,5 @@
   font-size: 0.9em;
   text-transform: lowercase;
-  background-color: #A3C8D9;
+  background-color: #B3C0E6;
   color: black;
   white-space: nowrap;
@@ -800,13 +843,13 @@
 #listTable td.dateRow {
   text-align: left;
-  background-color: #B1D4E3;
-  color: #333;
-  font-size: 0.8em;
+  background-color: #666;
+  /*background-color: #2B4795;*/
+  color: #eee;
+  font-size: 0.8em;
+  margin: 0;
   padding: 0.2em 0.5em 0.2em 0.5em;
-  margin: 0em;
 }
 #listTable td.dateRow a {
-  display: block;
-  color: #333;
+  color: #fff;
   background-color: transparent;
   font-weight: bold;
@@ -917,5 +960,5 @@
 /*   LINKS    */
 a:link, a:active, a:visited {
-  color: #2c5f89;
+  color: #2B4795;
   background-color: transparent;
 }
@@ -1043,5 +1086,5 @@
 html .dojoFloatingPaneTitleBar {
   color: white;
-  background: #2c5f89 url(../../images/curDateRangeBlue.gif) repeat-x bottom;
+  background: #2B4795 url(../../images/curDateRangeBlue.gif) repeat-x bottom;
 }
 html .dojoFloatingPaneTitleText {
Index: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (revision 2056)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (revision 2086)
@@ -301,5 +301,36 @@
 
   <xsl:template name="tabs">
-    <xsl:choose>
+    <div id="bwTabs">
+      <ul>
+        <li>
+          <xsl:if test="/bedework/page='eventscalendar' and /bedework/periodname='Day'">
+            <xsl:attribute name="class">selected</xsl:attribute>
+          </xsl:if>
+          <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}">DAY</a>
+        </li>
+        <li>
+          <xsl:if test="/bedework/page='eventscalendar' and /bedework/periodname='Week' or /bedework/periodname=''">
+            <xsl:attribute name="class">selected</xsl:attribute>
+          </xsl:if>
+          <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}">WEEK</a>
+        </li>
+        <li>
+          <xsl:if test="/bedework/page='eventscalendar' and /bedework/periodname='Month'">
+            <xsl:attribute name="class">selected</xsl:attribute>
+          </xsl:if><a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}">MONTH</a>
+        </li>
+        <li>
+          <xsl:if test="/bedework/page='eventscalendar' and /bedework/periodname='Year'">
+            <xsl:attribute name="class">selected</xsl:attribute>
+          </xsl:if><a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}">YEAR</a>
+        </li>
+        <li>
+          <xsl:if test="/bedework/page='eventList'">
+            <xsl:attribute name="class">selected</xsl:attribute>
+          </xsl:if><a href="{$listEvents}">LIST</a>
+        </li>
+      </ul>
+    </div>
+    <!-- xsl:choose>
       <xsl:when test="/bedework/page='eventscalendar'">
         <table border="0" cellpadding="0" cellspacing="0" id="tabsTable">
@@ -346,5 +377,5 @@
             </td>
             <td class="centerCell">
-              &#160;<!--<img src="{$resourcesRoot}/images/std-button-today.gif" width="46" height="17" border="0" alt="TODAY"/>-->
+              &#160;
             </td>
             <td class="rightCell">
@@ -370,5 +401,5 @@
             </td>
             <td class="centerCell">
-              &#160;<!--<img src="{$resourcesRoot}/images/std-button-today.gif" width="46" height="17" border="0" alt="TODAY"/>-->
+              &#160;
             </td>
             <td class="rightCell">
@@ -378,5 +409,5 @@
         </table>
       </xsl:otherwise>
-    </xsl:choose>
+    </xsl:choose-->
   </xsl:template>
 
@@ -859,4 +890,14 @@
         </tr>
       </xsl:if>
+      <xsl:if test="comments/comment">
+        <tr>
+          <td class="fieldname">Comments:</td>
+          <td class="fieldval comments">
+            <xsl:for-each select="comments/comment">
+              <p><xsl:value-of select="value"/></p>
+            </xsl:for-each>
+          </td>
+        </tr>
+      </xsl:if>
       <xsl:if test="xproperties/X-BEDEWORK-ALIAS">
         <tr>
@@ -875,15 +916,4 @@
         </tr>
       </xsl:if>
-      <xsl:if test="calendar/path!=''">
-        <tr>
-          <td class="fieldname">Calendar:</td>
-          <td class="fieldval">
-            <xsl:variable name="calUrl" select="calendar/encodedPath"/>
-            <a href="{$setSelection}&amp;calUrl={$calUrl}">
-              <xsl:value-of select="calendar/name"/>
-            </a>
-          </td>
-        </tr>
-      </xsl:if>
       <xsl:if test="categories/category">
         <tr>
@@ -896,11 +926,12 @@
         </tr>
       </xsl:if>
-      <xsl:if test="comments/comment">
+      <xsl:if test="calendar/path!=''">
         <tr>
-          <td class="fieldname">Comments:</td>
-          <td class="fieldval comments">
-            <xsl:for-each select="comments/comment">
-              <p><xsl:value-of select="value"/></p>
-            </xsl:for-each>
+          <td class="fieldname">Calendar:</td>
+          <td class="fieldval">
+            <xsl:variable name="calUrl" select="calendar/encodedPath"/>
+            <a href="{$setSelection}&amp;calUrl={$calUrl}">
+              <xsl:value-of select="calendar/name"/>
+            </a>
           </td>
         </tr>
Index: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/green.css
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/green.css (revision 2072)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/green.css (revision 2086)
@@ -197,4 +197,45 @@
   display: inline;
 }
+#bwTabs {
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  background-color: #333;
+  color: #eee;
+}
+#bwTabs ul {
+  height: 20px;
+  margin: 0 2px;
+  padding: 4px 0 0 0;
+}
+#bwTabs li {
+  float: left;
+  width: 80px;
+  height: 20px;
+  text-align: center;
+  line-height: 23px;
+  letter-spacing: 1px;
+  font-weight: bold;
+  font-size: 12px;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  list-style-image: none;
+  color: black;
+  background: #eee url("../../images/std-tab-off-80x20.gif") no-repeat bottom;
+}
+#bwTabs li.selected {
+  color: black;
+  background: #eee url("../../images/std-tab-on-80x20.gif") no-repeat top;
+}
+#bwTabs a {
+  text-decoration: none;
+  color: black;
+  background-color: transparent;
+}
+#bwTabs a:hover {
+  color: #c00;
+  background-color: transparent;
+}
 #tabsTable {
   margin: 0em;
Index: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/red.css
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/red.css (revision 2072)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/red.css (revision 2086)
@@ -197,4 +197,45 @@
   display: inline;
 }
+#bwTabs {
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  background-color: #333;
+  color: #eee;
+}
+#bwTabs ul {
+  height: 20px;
+  margin: 0 2px;
+  padding: 4px 0 0 0;
+}
+#bwTabs li {
+  float: left;
+  width: 80px;
+  height: 20px;
+  text-align: center;
+  line-height: 23px;
+  letter-spacing: 1px;
+  font-weight: bold;
+  font-size: 12px;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  list-style-image: none;
+  color: black;
+  background: #eee url("../../images/std-tab-off-80x20.gif") no-repeat bottom;
+}
+#bwTabs li.selected {
+  color: black;
+  background: #eee url("../../images/std-tab-on-80x20.gif") no-repeat top;
+}
+#bwTabs a {
+  text-decoration: none;
+  color: black;
+  background-color: transparent;
+}
+#bwTabs a:hover {
+  color: #c00;
+  background-color: transparent;
+}
 #tabsTable {
   margin: 0em;
Index: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (revision 2083)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (revision 2086)
@@ -402,4 +402,61 @@
   font-weight: normal;
   margin-top: 5px;
+}
+#bedework #bwTabs {
+  width: 100%;
+  min-width: 567px;
+  margin: 0;
+  padding: 0;
+  background-color: #333;
+  color: #eee;
+}
+#bedework #bwTabs ul {
+  height: 20px;
+  margin: 0;
+  padding: 4px 0 0 0;
+}
+#bedework #bwTabs li {
+  float: left;
+  width: 80px;
+  height: 20px;
+  text-align: center;
+  line-height: 23px;
+  letter-spacing: 1px;
+  font-weight: bold;
+  font-size: 12px;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  list-style-image: none;
+  color: black;
+  background: #eee url("../../resources/std-tab-off-80x20.gif") no-repeat bottom;
+}
+#bedework #bwTabs li.selected {
+  color: black;
+  background: #eee url("../../resources/std-tab-on-80x20.gif") no-repeat top;
+}
+#bedework #bwTabs a {
+  text-decoration: none;
+  color: black;
+  background-color: transparent;
+}
+#bedework #bwTabs a:hover {
+  color: #c00;
+  background-color: transparent;
+}
+#bedework #bwUserInfo {
+  float: right;
+  padding-right: 0.5em;
+  margin: 4px 0 0 0;
+  font-size: 0.8em;
+  vertical-align: bottom;
+}
+#bedework #bwUserInfo a {
+  background-color: inherit;
+  color: #ccc;
+}
+#bedework #bwUserInfo .logout {
+  padding-left: 0.5em;
+  font-size: 0.8em;
 }
 #bedework #tabsTable {
@@ -1325,6 +1382,6 @@
   text-decoration: none;
   background-color: inherit;
+  color: #eee;
   padding: 1px;
-  color: #eee;
 }
 #bedework #yearCalendarTable  table.yearViewMonthTable td a:hover  {
@@ -1355,5 +1412,5 @@
   font-size: 0.9em;
   text-transform: lowercase;
-  background-color: #ddd;
+  background-color: #eee;
   color: black;
   white-space: nowrap;
Index: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 2083)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 2086)
@@ -679,5 +679,43 @@
       </xsl:choose>
     </xsl:variable>
-    <table cellspacing="0" id="tabsTable">
+    <div id="bwTabs">
+      <div id="bwUserInfo">
+        logged in as
+        <xsl:text> </xsl:text>
+        <strong><xsl:value-of select="/bedework/userid"/></strong>
+        <xsl:text> </xsl:text>
+        <span class="logout"><a href="{$setup}&amp;logout=true">logout</a></span>
+      </div>
+      <ul>
+        <li>
+          <xsl:if test="/bedework/page='eventscalendar' and /bedework/periodname='Day'">
+            <xsl:attribute name="class">selected</xsl:attribute>
+          </xsl:if>
+          <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}">DAY</a>
+        </li>
+        <li>
+          <xsl:if test="/bedework/page='eventscalendar' and /bedework/periodname='Week' or /bedework/periodname=''">
+            <xsl:attribute name="class">selected</xsl:attribute>
+          </xsl:if>
+          <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}">WEEK</a>
+        </li>
+        <li>
+          <xsl:if test="/bedework/page='eventscalendar' and /bedework/periodname='Month'">
+            <xsl:attribute name="class">selected</xsl:attribute>
+          </xsl:if><a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}">MONTH</a>
+        </li>
+        <li>
+          <xsl:if test="/bedework/page='eventscalendar' and /bedework/periodname='Year'">
+            <xsl:attribute name="class">selected</xsl:attribute>
+          </xsl:if><a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}">YEAR</a>
+        </li>
+        <li>
+          <xsl:if test="/bedework/page='eventList'">
+            <xsl:attribute name="class">selected</xsl:attribute>
+          </xsl:if><a href="{$listEvents}">LIST</a>
+        </li>
+      </ul>
+    </div>
+    <!-- table cellspacing="0" id="tabsTable">
       <tr>
         <td>
@@ -713,5 +751,5 @@
         <td>
           <xsl:choose>
-            <!-- don't allow switching to year for free busy view, so only use setViewPeriod action -->
+            < ! - - don't allow switching to year for free busy view, so only use setViewPeriod action - - >
             <xsl:when test="/bedework/periodname='Year'">
               <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a>
@@ -737,5 +775,5 @@
         </td>
       </tr>
-    </table>
+    </table-->
   </xsl:template>