Index: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/blue.css
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/blue.css (revision 91)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/blue.css (revision 97)
@@ -95,5 +95,5 @@
   padding: 0em;
   border-left: 3px solid #aaa;
-  padding: 0.1em 0em 0em 1em;
+  padding: 0.1em 0 0 0.5em;
   white-space: nowrap;
 }
@@ -117,4 +117,5 @@
 }
 #searchBarTable form {
+  display: inline;
   margin: 0px 0px 1px 0px;
   padding: 0em;
@@ -200,5 +201,5 @@
   width: 10em;
 }
-#navigationBarTable .calLinks {
+#searchBarTable .calLinks {
   white-space: nowrap;
 }
Index: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl (revision 95)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl (revision 97)
@@ -1016,21 +1016,4 @@
         </td>
         <td class="rightCell">
-          <form name="selectViewForm" method="get" action="{$selectView}">
-            <select name="viewName" onChange="submit()" >
-              <option>select a view</option>
-              <xsl:for-each select="/ucalendar/views/view">
-                <xsl:variable name="name" select="name"/>
-                <xsl:choose>
-                  <xsl:when test="name=/ucalendar/name">
-                    <option value="{$name}" selected="selected"><xsl:value-of select="name"/></option>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <option value="{$name}"><xsl:value-of select="name"/></option>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:for-each>
-            </select>
-          </form>
-          <span class="calLinks"><a href="{$selectView}">show all</a> | <a href="{$fetchPublicCalendars}">calendar list</a></span>
         </td>
       </tr>
@@ -1043,15 +1026,27 @@
          <td class="leftCell">
            <xsl:choose>
-             <xsl:when test="/ucalendar/title!=''">
-               Calendar: <xsl:value-of select="/ucalendar/title"/>
-               <span class="link">[<a href="{$selectView}?calId=">clear</a>]</span>
+             <xsl:when test="/ucalendar/name!=''">
+               View:
+               <form name="selectViewForm" method="get" action="{$selectView}">
+                <select name="viewName" onChange="submit()" >
+                  <xsl:for-each select="/ucalendar/views/view">
+                    <xsl:variable name="name" select="name"/>
+                    <xsl:choose>
+                      <xsl:when test="name=/ucalendar/name">
+                        <option value="{$name}" selected="selected"><xsl:value-of select="name"/></option>
+                      </xsl:when>
+                      <xsl:otherwise>
+                        <option value="{$name}"><xsl:value-of select="name"/></option>
+                      </xsl:otherwise>
+                    </xsl:choose>
+                  </xsl:for-each>
+                </select>
+              </form>
+              <span class="calLinks"><a href="{$fetchPublicCalendars}">calendar list</a></span>
              </xsl:when>
              <xsl:when test="/ucalendar/search!=''">
                Current search: <xsl:value-of select="/ucalendar/search"/>
-               <span class="link">[<a href="{$selectView}?calId=">clear</a>]</span>
+               <span class="link">[<a href="{$selectView}">default view</a>]</span>
              </xsl:when>
-             <xsl:otherwise>
-               Current calendar: All
-             </xsl:otherwise>
            </xsl:choose>
          </td>
Index: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/green.css
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/en_US/default/green.css (revision 43)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/green.css (revision 97)
@@ -95,5 +95,5 @@
   padding: 0em;
   border-left: 3px solid #333;
-  padding: 0.1em 0em 0em 1em;
+  padding: 0.1em 0 0 0.5em;
   white-space: nowrap;
 }
@@ -117,4 +117,5 @@
 }
 #searchBarTable form {
+  display: inline;
   margin: 0px 0px 1px 0px;
   padding: 0em;
@@ -200,5 +201,5 @@
   width: 10em;
 }
-#navigationBarTable .calLinks {
+#searchBarTable .calLinks {
   white-space: nowrap;
 }
Index: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/red.css
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/en_US/default/red.css (revision 43)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/red.css (revision 97)
@@ -95,5 +95,5 @@
   padding: 0em;
   border-left: 3px solid #333;
-  padding: 0.1em 0em 0em 1em;
+  padding: 0.1em 0 0 0.5em;
   white-space: nowrap;
 }
@@ -117,4 +117,5 @@
 }
 #searchBarTable form {
+  display: inline;
   margin: 0px 0px 1px 0px;
   padding: 0em;
@@ -200,5 +201,5 @@
   width: 10em;
 }
-#navigationBarTable .calLinks {
+#searchBarTable .calLinks {
   white-space: nowrap;
 }