Changeset 1641

Timestamp:

11/30/07 08:02:41

Author:

kllin

Message:

beginning to breakup webpublic.

Files:

• branches/xslt-rewrite/deployment/resources/xsl/default/default/navigation.xsl (modified) (1 diff)
• branches/xslt-rewrite/deployment/resources/xsl/default/default/search.xsl (modified) (1 diff)
• branches/xslt-rewrite/deployment/resources/xsl/default/default/variables.xsl (added)
• branches/xslt-rewrite/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css (modified) (11 diffs)
• branches/xslt-rewrite/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (modified) (8 diffs)
• branches/xslt-rewrite/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (1 diff)

branches/xslt-rewrite/deployment/resources/xsl/default/default/navigation.xsl

@@ -268 +268 @@
-          </xsl:choose>
-        </td>
+        <td class="centerCell">
+          &#160;
+        </td>
-        <td class="rightCell">
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        </td>
-      </tr>

branches/xslt-rewrite/deployment/resources/xsl/default/default/search.xsl

@@ -686 +686 @@
-    </xsl:if>
-  </xsl:template>
+
+
+  <xsl:template name="searchBar">
+    <table width="100%" border="0" cellpadding="0" cellspacing="0" id="searchBarTable">
+       <tr>
+         <td class="leftCell">
+           <xsl:choose>
+             <xsl:when test="/bedework/selectionState/selectionType = 'calendar'">
+               Calendar: <xsl:value-of select="/bedework/selectionState/subscriptions/subscription/calendar/name"/>
+               <span class="link">[<a href="{$setSelection}">default view</a>]</span>
+             </xsl:when>
+             <xsl:when test="/bedework/selectionState/selectionType = 'search'">
+               Current search: <xsl:value-of select="/bedework/search"/>
+               <span class="link">[<a href="{$setSelection}">default view</a>]</span>
+             </xsl:when>
+             <xsl:when test="/bedework/selectionState/selectionType = 'subscription'">
+               Subscription: (not implemented yet)
+               <span class="link">[<a href="{$setSelection}">default view</a>]</span>
+             </xsl:when>
+             <xsl:when test="/bedework/selectionState/selectionType = 'filter'">
+               Filter: (not implemented yet)
+               <span class="link">[<a href="{$setSelection}">default view</a>]</span>
+             </xsl:when>
+             <xsl:otherwise><!-- view -->
+               View:
+               <form name="selectViewForm" method="post" action="{$setSelection}">
+                <select name="viewName" onchange="submit()" >
+                  <xsl:for-each select="/bedework/views/view">
+                    <xsl:variable name="name" select="name"/>
+                    <xsl:choose>
+                      <xsl:when test="name=/bedework/selectionState/view/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="link"><a href="{$setSelection}">default view</a> | <a href="{$fetchPublicCalendars}">available calendars</a></span>
+             </xsl:otherwise>
+           </xsl:choose>
+         </td>
+         <td class="rightCell">
+            <xsl:if test="/bedework/page!='searchResult'">
+              <form name="searchForm" id="searchForm" method="post" action="{$search}">
+                Search:
+                <input type="text" name="query" size="15">
+                  <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute>
+                </input>
+                <input type="submit" name="submit" value="go"/>
+              </form>
+              <xsl:text> </xsl:text>
+            </xsl:if>
+            <xsl:choose>
+              <xsl:when test="/bedework/periodname='Day'">
+                <img src="{$resourcesRoot}/resources/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}/resources/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}&amp;setappvar=monthViewMode(cal)" title="toggle list/calendar view">
+                      <img src="{$resourcesRoot}/resources/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
+                    </a>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <a href="{$setup}&amp;setappvar=monthViewMode(list)" title="toggle list/calendar view">
+                      <img src="{$resourcesRoot}/resources/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}&amp;setappvar=weekViewMode(cal)" title="toggle list/calendar view">
+                      <img src="{$resourcesRoot}/resources/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
+                    </a>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <a href="{$setup}&amp;setappvar=weekViewMode(list)" title="toggle list/calendar view">
+                      <img src="{$resourcesRoot}/resources/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
+                               not(/bedework/appvar[key='monthViewMode']))) or
+                              (/bedework/periodname='Week' and
+                              (/bedework/appvar[key='weekViewMode']/value='cal' or
+                               not(/bedework/appvar[key='weekViewMode'])))">
+                <xsl:choose>
+                  <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
+                    <img src="{$resourcesRoot}/resources/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}/resources/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}&amp;setappvar=summaryMode(summary)" title="toggle summary/detailed view">
+                      <img src="{$resourcesRoot}/resources/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
+                    </a>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <a href="{$setup}&amp;setappvar=summaryMode(details)" title="toggle summary/detailed view">
+                      <img src="{$resourcesRoot}/resources/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}"><img src="{$resourcesRoot}/resources/std-button-refresh.gif" width="70" height="21" border="0" alt="refresh view"/></a>
+          </td>
+       </tr>
+    </table>
+  </xsl:template>
-</xsl:stylesheet>

branches/xslt-rewrite/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css

@@ -50 +50 @@
-  width: 100%;
-  height: 26px;
-imag
+resourc
-  color : #eee;
-  margin: 0em;
@@ -65 +65 @@
-}
-#curDateRangeTable td.sideBarOpenCloseIcon {
-imag
+resourc
-  color: inherit;
-  width: 200px;
@@ -75 +75 @@
-}
-#curDateRangeTable td.rssPrint {
-imag
+resourc
-  color: inherit;
-  width: 200px;
@@ -206 +206 @@
-}
-#tabsTable .rightCell {
-imag
+resourc
-  padding-right: 0.5em;
-}
@@ -539 +539 @@
-  border-bottom: 1px solid #ccc;
-  border-top: 1px solid #ccc;
-imag
+resourc
-  color: black;
-}
@@ -617 +617 @@
-  display: block;
-  color: black;
-imag
+resourc
-  padding: 2px;
-  margin-bottom: 6px;
@@ -778 +778 @@
-}
-#listTable td.bwStatusTentative {
-imag
+resourc
-  color: black;
-}
@@ -827 +827 @@
-}
-#calPageTable ul.calendarTree li.folder {
-imag
+resourc
-  padding-top: 0.25em;
-  padding-bottom: 0.25em;
-}
-#calPageTable ul.calendarTree li.calendar {
-imag
+resourc
-}
-#calPageTable .exportCalLink {
@@ -953 +953 @@
-}
-h2.bwStatusTentative {
-imag
+resourc
-  color: black;
-}
@@ -966 +966 @@
-#tabsTable .centerCell {
-  text-align: left;
-imag
+resourc
-  font-size: 0.8em;
-  white-space: nowrap;
@@ -1011 +1011 @@
-html .dojoFloatingPaneTitleBar {
-  color: white;
-imag
+resourc
-}
-html .dojoFloatingPaneTitleText {

branches/xslt-rewrite/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

@@ -54 +54 @@
-  <!-- ================================= -->
-
-imag
+resourc
-  <xsl:variable name="resourceCommons">../../../bedework-common</xsl:variable>
-
-  <!-- DEFINE INCLUDES -->
-  <!-- cannot use the resourceCommons variable in xsl:include paths -->
-  <xsl:include href="../../../bedework-common/default/default/errors.xsl"/>
-  <xsl:include href="../../../bedework-common/default/default/messages.xsl"/>
-  <xsl:include href="../../../bedework-common/default/default/variables.xsl"/>
+  <xsl:include href="../../../bedework-common/default/default/navigation.xsl"/>
+  <xsl:include href="../../../bedework-common/default/default/search.xsl"/>
-
-  <!-- MAIN TEMPLATE -->
@@ -89 +89 @@
-        </xsl:if>
-        <!-- address bar icon -->
-imag
+resourc
-      </head>
-      <body>
@@ -156 +156 @@
-      </body>
-    </html>
-  </xsl:template>
-
-  <!--==== HEADER TEMPLATES and NAVIGATION  ====-->
-  <!-- these templates are separated out for convenience and to simplify the default template -->
-
-  <xsl:template name="headBar">
-    <table width="100%" border="0" cellpadding="0" cellspacing="0" id="logoTable">
-      <tr>
-        <td colspan="3" id="logoCell"><a href="/bedework/"><img src="{$resourcesRoot}/images/bedeworkLogo.gif" width="292" height="75" border="0" alt="Bedework"/></a></td>
-        <td colspan="2" id="schoolLinksCell">
-          <h2>Public Calendar</h2>
-          <a href="{$privateCal}">Personal Calendar</a> |
-          <a href="http://www.yourschoolhere.edu">School Home</a> |
-          <a href="http://www.bedework.org/">Other Link</a> |
-          <a href="http://helpdesk.rpi.edu/update.do?catcenterkey=51">
-            Example Calendar Help
-          </a>
-        </td>
-      </tr>
-    </table>
-    <table id="curDateRangeTable"  cellspacing="0">
-      <tr>
-        <td class="sideBarOpenCloseIcon">
-          &#160;
-          <!--
-          we may choose to implement calendar selection in the public calendar
-          using a sidebar; leave this comment here for now.
-          <xsl:choose>
-            <xsl:when test="/bedework/appvar[key='sidebar']/value='closed'">
-              <a href="?setappvar=sidebar(opened)">
-                <img alt="open sidebar" src="{$resourcesRoot}/resources/sideBarArrowOpen.gif" width="21" height="16" border="0" align="left"/>
-              </a>
-            </xsl:when>
-            <xsl:otherwise>
-              <a href="?setappvar=sidebar(closed)">
-                <img alt="close sidebar" src="{$resourcesRoot}/resources/sideBarArrowClose.gif" width="21" height="16" border="0" align="left"/>
-              </a>
-            </xsl:otherwise>
-          </xsl:choose>-->
-        </td>
-        <td class="date">
-          <xsl:choose>
-            <xsl:when test="/bedework/page='event'">
-              Event Information
-            </xsl:when>
-            <xsl:when test="/bedework/page='showSysStats' or
-                            /bedework/page='calendars'">
-              &#160;
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="/bedework/firstday/longdate"/>
-              <xsl:if test="/bedework/periodname!='Day'">
-                -
-                <xsl:value-of select="/bedework/lastday/longdate"/>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </td>
-        <td class="rssPrint">
-          <a href="javascript:window.print()" title="print this view">
-            <img alt="print this view" src="{$resourcesRoot}/images/std-print-icon.gif" width="20" height="14" border="0"/> print
-          </a>
-          <a class="rss" href="{$setup}&amp;setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
-        </td>
-      </tr>
-    </table>
-  </xsl:template>
-
-  <xsl:template name="messagesAndErrors">
-    <xsl:if test="/bedework/message">
-      <ul id="messages">
-        <xsl:for-each select="/bedework/message">
-          <li><xsl:apply-templates select="."/></li>
-        </xsl:for-each>
-      </ul>
-    </xsl:if>
-    <xsl:if test="/bedework/error">
-      <ul id="errors">
-        <xsl:for-each select="/bedework/error">
-          <li><xsl:apply-templates select="."/></li>
-        </xsl:for-each>
-      </ul>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="tabs">
-    <xsl:variable name="navAction">
-      <xsl:choose>
-        <xsl:when test="/bedework/page='attendees'"><xsl:value-of select="$event-attendeesForEvent"/></xsl:when>
-        <xsl:when test="/bedework/page='freeBusy'"><xsl:value-of select="$freeBusy-fetch"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="$setViewPeriod"/></xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <table cellspacing="0" id="tabsTable">
-      <tr>
-        <td>
-          <xsl:choose>
-            <xsl:when test="/bedework/periodname='Day'">
-              <a href="{$navAction}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-day-on.gif" width="90" height="20" border="0" alt="DAY"/></a>
-            </xsl:when>
-            <xsl:otherwise>
-              <a href="{$navAction}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-day-off.gif" width="90" height="20" border="0" alt="DAY"/></a>
-            </xsl:otherwise>
-          </xsl:choose>
-        </td>
-        <td>
-          <xsl:choose>
-            <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''">
-              <a href="{$navAction}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a>
-             </xsl:when>
-            <xsl:otherwise>
-              <a href="{$navAction}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
-             </xsl:otherwise>
-          </xsl:choose>
-        </td>
-        <td>
-          <xsl:choose>
-            <xsl:when test="/bedework/periodname='Month'">
-              <a href="{$navAction}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a>
-            </xsl:when>
-            <xsl:otherwise>
-              <a href="{$navAction}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
-            </xsl:otherwise>
-          </xsl:choose>
-        </td>
-        <td>
-          <xsl:choose>
-            <!-- 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>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:choose>
-                <xsl:when test="/bedework/page='attendees' or /bedework/page='freeBusy'">
-                  <img src="{$resourcesRoot}/resources/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:otherwise>
-          </xsl:choose>
-        </td>
-        <td class="rightCell">
-          <xsl:if test="/bedework/userid">
-            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>
-          </xsl:if>
-        </td>
-      </tr>
-    </table>
-  </xsl:template>
-
-  <xsl:template name="navigation">
-    <table border="0" cellpadding="0" cellspacing="0" id="navigationBarTable">
-      <tr>
-        <td class="leftCell">
-          <a id="prevViewPeriod" href="{$setViewPeriod}&amp;date={$prevdate}"><img src="{$resourcesRoot}/images/std-arrow-left.gif" alt="previous" width="13" height="16" class="prevImg" border="0"/></a>
-          <a id="nextViewPeriod" href="{$setViewPeriod}&amp;date={$nextdate}"><img src="{$resourcesRoot}/images/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a>
-          <xsl:choose>
-            <xsl:when test="/bedework/periodname='Year'">
-              <xsl:value-of select="substring(/bedework/firstday/date,1,4)"/>
-            </xsl:when>
-            <xsl:when test="/bedework/periodname='Month'">
-              <xsl:value-of select="/bedework/firstday/monthname"/>, <xsl:value-of select="substring(/bedework/firstday/date,1,4)"/>
-            </xsl:when>
-            <xsl:when test="/bedework/periodname='Week'">
-              Week of <xsl:value-of select="substring-after(/bedework/firstday/longdate,', ')"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="/bedework/firstday/longdate"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </td>
-        <td class="todayButton">
-          <a href="{$setViewPeriod}&amp;viewType=todayView&amp;date={$curdate}">
-            <img src="{$resourcesRoot}/images/std-button-today-off.gif" width="54" height="22" border="0" alt="Go to Today" align="left"/>
-          </a>
-        </td>
-        <td align="right" class="gotoForm">
-          <form name="calForm" method="post" action="{$setViewPeriod}">
-             <table border="0" cellpadding="0" cellspacing="0">
-              <tr>
-                <xsl:if test="/bedework/periodname!='Year'">
-                  <td>
-                    <select name="viewStartDate.month">
-                      <xsl:for-each select="/bedework/monthvalues/val">
-                        <xsl:variable name="temp" select="."/>
-                        <xsl:variable name="pos" select="position()"/>
-                        <xsl:choose>
-                          <xsl:when test="/bedework/monthvalues[start=$temp]">
-                            <option value="{$temp}" selected="selected">
-                              <xsl:value-of select="/bedework/monthlabels/val[position()=$pos]"/>
-                            </option>
-                          </xsl:when>
-                          <xsl:otherwise>
-                            <option value="{$temp}">
-                              <xsl:value-of select="/bedework/monthlabels/val[position()=$pos]"/>
-                            </option>
-                          </xsl:otherwise>
-                        </xsl:choose>
-                      </xsl:for-each>
-                    </select>
-                  </td>
-                  <xsl:if test="/bedework/periodname!='Month'">
-                    <td>
-                      <select name="viewStartDate.day">
-                        <xsl:for-each select="/bedework/dayvalues/val">
-                          <xsl:variable name="temp" select="."/>
-                          <xsl:variable name="pos" select="position()"/>
-                          <xsl:choose>
-                            <xsl:when test="/bedework/dayvalues[start=$temp]">
-                              <option value="{$temp}" selected="selected">
-                                <xsl:value-of select="/bedework/daylabels/val[position()=$pos]"/>
-                              </option>
-                            </xsl:when>
-                            <xsl:otherwise>
-                              <option value="{$temp}">
-                                <xsl:value-of select="/bedework/daylabels/val[position()=$pos]"/>
-                              </option>
-                            </xsl:otherwise>
-                          </xsl:choose>
-                        </xsl:for-each>
-                      </select>
-                    </td>
-                  </xsl:if>
-                </xsl:if>
-                <td>
-                  <xsl:variable name="temp" select="/bedework/yearvalues/start"/>
-                  <input type="text" name="viewStartDate.year" maxlength="4" size="4" value="{$temp}"/>
-                </td>
-                <td>
-                  <input name="submit" type="submit" value="go"/>
-                </td>
-              </tr>
-            </table>
-          </form>
-        </td>
-        <td class="rightCell">
-        </td>
-      </tr>
-    </table>
-  </xsl:template>
-
-  <xsl:template name="searchBar">
-    <table width="100%" border="0" cellpadding="0" cellspacing="0" id="searchBarTable">
-       <tr>
-         <td class="leftCell">
-           <xsl:choose>
-             <xsl:when test="/bedework/selectionState/selectionType = 'calendar'">
-               Calendar: <xsl:value-of select="/bedework/selectionState/subscriptions/subscription/calendar/name"/>
-               <span class="link">[<a href="{$setSelection}">default view</a>]</span>
-             </xsl:when>
-             <xsl:when test="/bedework/selectionState/selectionType = 'search'">
-               Current search: <xsl:value-of select="/bedework/search"/>
-               <span class="link">[<a href="{$setSelection}">default view</a>]</span>
-             </xsl:when>
-             <xsl:when test="/bedework/selectionState/selectionType = 'subscription'">
-               Subscription: (not implemented yet)
-               <span class="link">[<a href="{$setSelection}">default view</a>]</span>
-             </xsl:when>
-             <xsl:when test="/bedework/selectionState/selectionType = 'filter'">
-               Filter: (not implemented yet)
-               <span class="link">[<a href="{$setSelection}">default view</a>]</span>
-             </xsl:when>
-             <xsl:otherwise><!-- view -->
-               View:
-               <form name="selectViewForm" method="post" action="{$setSelection}">
-                <select name="viewName" onchange="submit()" >
-                  <xsl:for-each select="/bedework/views/view">
-                    <xsl:variable name="name" select="name"/>
-                    <xsl:choose>
-                      <xsl:when test="name=/bedework/selectionState/view/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="link"><a href="{$setSelection}">default view</a> | <a href="{$fetchPublicCalendars}">available calendars</a></span>
-             </xsl:otherwise>
-           </xsl:choose>
-         </td>
-         <td class="rightCell">
-            <xsl:if test="/bedework/page!='searchResult'">
-              <form name="searchForm" id="searchForm" method="post" action="{$search}">
-                Search:
-                <input type="text" name="query" size="15">
-                  <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute>
-                </input>
-                <input type="submit" name="submit" value="go"/>
-              </form>
-              <xsl:text> </xsl:text>
-            </xsl:if>
-            <xsl:choose>
-              <xsl:when test="/bedework/periodname='Day'">
-                <img src="{$resourcesRoot}/images/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/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}&amp;setappvar=monthViewMode(cal)" title="toggle list/calendar view">
-                      <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
-                    </a>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <a href="{$setup}&amp;setappvar=monthViewMode(list)" title="toggle list/calendar view">
-                      <img src="{$resourcesRoot}/images/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}&amp;setappvar=weekViewMode(cal)" title="toggle list/calendar view">
-                      <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
-                    </a>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <a href="{$setup}&amp;setappvar=weekViewMode(list)" title="toggle list/calendar view">
-                      <img src="{$resourcesRoot}/images/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
-                               not(/bedework/appvar[key='monthViewMode']))) or
-                              (/bedework/periodname='Week' and
-                              (/bedework/appvar[key='weekViewMode']/value='cal' or
-                               not(/bedework/appvar[key='weekViewMode'])))">
-                <xsl:choose>
-                  <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-                    <img src="{$resourcesRoot}/images/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/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}&amp;setappvar=summaryMode(summary)" title="toggle summary/detailed view">
-                      <img src="{$resourcesRoot}/images/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
-                    </a>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <a href="{$setup}&amp;setappvar=summaryMode(details)" title="toggle summary/detailed view">
-                      <img src="{$resourcesRoot}/images/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}"><img src="{$resourcesRoot}/images/std-button-refresh.gif" width="70" height="21" border="0" alt="refresh view"/></a>
-          </td>
-       </tr>
-    </table>
-  </xsl:template>
-
@@ -690 +318 @@
-              <!-- hide this for a 3.3.1 bug: can't add a reference to a recurring event at this time -->
-              <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar">
-imag
+resourc
-              add to my calendar</a>
-            </xsl:if>
-            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-            <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
-imag
+resourc
-             download</a>
-          </div>
@@ -973 +601 @@
-                    <!-- hide this for a 3.3.1 bug: can't add a reference to a recurring event at this time -->
-                    <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar">
-imag
+resourc
-                    </a>
-                  </xsl:if>
-                  <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
-                  <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
-imag
+resourc
-                  </a>
-                </td>
@@ -1302 +930 @@
-          <xsl:variable name="idForCal" select="translate(translate(path,'/','S'),' ','s')"/>
-          <a href="javascript:launchExportWidget('exportCalendarForm','{$export}','{$name}','{$calPath}')" id="{$idForCal}" title="export calendar as iCal">
-imag
+resourc
-          </a> -->
-          <a href="{$calendar-fetchForExport}&amp;calPath={$calPath}" title="export calendar as iCal">
-imag
+resourc
-          </a>
-        </span>
@@ -1362 +990 @@
-  </xsl:template>
-
-  <!--==== SEARCH RESULT ====-->
-  <xsl:template name="searchResult">
-    <h2 class="bwStatusConfirmed">
-      <div id="searchFilter">
-        <form name="searchForm" method="post" action="{$search}">
-          Search:
-          <input type="text" name="query" size="15">
-            <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute>
-          </input>
-          <input type="submit" name="submit" value="go"/>
-          Limit:
-          <xsl:choose>
-            <xsl:when test="/bedework/searchResults/searchLimits = 'beforeToday'">
-              <input type="radio" name="searchLimits" value="fromToday"/>today forward
-              <input type="radio" name="searchLimits" value="beforeToday" checked="checked"/>past dates
-              <input type="radio" name="searchLimits" value="none"/>all dates
-            </xsl:when>
-            <xsl:when test="/bedework/searchResults/searchLimits = 'none'">
-              <input type="radio" name="searchLimits" value="fromToday"/>today forward
-              <input type="radio" name="searchLimits" value="beforeToday"/>past dates
-              <input type="radio" name="searchLimits" value="none" checked="checked"/>all dates
-            </xsl:when>
-            <xsl:otherwise>
-              <input type="radio" name="searchLimits" value="fromToday" checked="checked"/>today forward
-              <input type="radio" name="searchLimits" value="beforeToday"/>past dates
-              <input type="radio" name="searchLimits" value="none"/>all dates
-            </xsl:otherwise>
-          </xsl:choose>
-        </form>
-      </div>
-      Search Result
-    </h2>
-    <table id="searchTable" cellpadding="0" cellspacing="0">
-      <tr>
-        <th colspan="5">
-          <xsl:if test="/bedework/searchResults/numPages &gt; 1">
-            <xsl:variable name="curPage" select="/bedework/searchResults/curPage"/>
-            <div id="searchPageForm">
-              page:
-              <xsl:if test="/bedework/searchResults/curPage != 1">
-                <xsl:variable name="prevPage" select="number($curPage) - 1"/>
-                &lt;<a href="{$search-next}&amp;pageNum={$prevPage}">prev</a>
-              </xsl:if>
-              <xsl:text> </xsl:text>
-
-              <xsl:call-template name="searchResultPageNav">
-                <xsl:with-param name="page">
-                  <xsl:choose>
-                    <xsl:when test="number($curPage) - 10 &lt; 1">1</xsl:when>
-                    <xsl:otherwise><xsl:value-of select="number($curPage) - 6"/></xsl:otherwise>
-                  </xsl:choose>
-                </xsl:with-param>
-              </xsl:call-template>
-
-              <xsl:text> </xsl:text>
-              <xsl:choose>
-                <xsl:when test="$curPage != /bedework/searchResults/numPages">
-                  <xsl:variable name="nextPage" select="number($curPage) + 1"/>
-                  <a href="{$search-next}&amp;pageNum={$nextPage}">next</a>&gt;
-                </xsl:when>
-                <xsl:otherwise>
-                  <span class="hidden">next&gt;</span><!-- occupy the space to keep the navigation from moving around -->
-                </xsl:otherwise>
-              </xsl:choose>
-            </div>
-          </xsl:if>
-          <xsl:value-of select="/bedework/searchResults/resultSize"/>
-          result<xsl:if test="/bedework/searchResults/resultSize != 1">s</xsl:if> returned
-          for <em><xsl:value-of select="/bedework/searchResults/query"/></em>
-        </th>
-      </tr>
-      <xsl:if test="/bedework/searchResults/searchResult">
-        <tr class="fieldNames">
-          <td>
-            relevance
-          </td>
-          <td>
-            summary
-          </td>
-          <td>
-            date &amp; time
-          </td>
-          <td>
-            calendar
-          </td>
-          <td>
-            location
-          </td>
-        </tr>
-      </xsl:if>
-      <xsl:for-each select="/bedework/searchResults/searchResult">
-        <xsl:variable name="subscriptionId" select="event/subscription/id"/>
-        <xsl:variable name="calPath" select="event/calendar/encodedPath"/>
-        <xsl:variable name="guid" select="event/guid"/>
-        <xsl:variable name="recurrenceId" select="event/recurrenceId"/>
-        <tr>
-          <td class="relevance">
-            <xsl:value-of select="ceiling(number(score)*100)"/>%
-            <img src="{$resourcesRoot}/images/spacer.gif" height="4" class="searchRelevance">
-              <xsl:attribute name="width"><xsl:value-of select="ceiling((number(score)*100) div 1.5)"/></xsl:attribute>
-            </img>
-          </td>
-          <td>
-            <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
-              <xsl:value-of select="event/summary"/>
-            </a>
-          </td>
-          <td>
-            <xsl:value-of select="event/start/longdate"/>
-            <xsl:text> </xsl:text>
-            <xsl:value-of select="event/start/time"/>
-            <xsl:choose>
-              <xsl:when test="event/start/longdate != event/end/longdate">
-                - <xsl:value-of select="event/start/longdate"/>
-                <xsl:text> </xsl:text>
-                <xsl:value-of select="event/end/time"/>
-              </xsl:when>
-              <xsl:when test="event/start/time != event/end/time">
-                - <xsl:value-of select="event/end/time"/>
-              </xsl:when>
-            </xsl:choose>
-          </td>
-          <td>
-            <xsl:variable name="calUrl" select="event/calendar/encodedPath"/>
-            <a href="{$setSelection}&amp;calUrl={$calUrl}">
-              <xsl:value-of select="event/calendar/name"/>
-            </a>
-          </td>
-          <td>
-            <xsl:value-of select="event/location/address"/>
-          </td>
-        </tr>
-      </xsl:for-each>
-    </table>
-  </xsl:template>
-
-  <xsl:template name="searchResultPageNav">
-    <xsl:param name="page">1</xsl:param>
-    <xsl:variable name="curPage" select="/bedework/searchResults/curPage"/>
-    <xsl:variable name="numPages" select="/bedework/searchResults/numPages"/>
-    <xsl:variable name="endPage">
-      <xsl:choose>
-        <xsl:when test="number($curPage) + 6 &gt; number($numPages)"><xsl:value-of select="$numPages"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="number($curPage) + 6"/></xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$page = $curPage">
-        <xsl:value-of select="$page"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <a href="{$search-next}&amp;pageNum={$page}">
-          <xsl:value-of select="$page"/>
-        </a>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text> </xsl:text>
-    <xsl:if test="$page &lt; $endPage">
-       <xsl:call-template name="searchResultPageNav">
-         <xsl:with-param name="page" select="number($page)+1"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-
-  <!--+++++++++++++++ System Stats ++++++++++++++++++++-->
-  <xsl:template name="stats">
@@ -1591 +1055 @@
-    </xsl:choose>
-  </xsl:template>
-
-  <!--==== FOOTER ====-->
-
-  <xsl:template name="footer">
-    <div id="footer">
-      Demonstration calendar; place footer information here.
-    </div>
-    <table id="skinSelectorTable" border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <td class="leftCell">
-          Based on the <a href="http://www.bedework.org/">Bedework Website</a> |
-          <a href="?noxslt=yes">show XML</a> |
-          <a href="?refreshXslt=yes">refresh XSLT</a>
-        </td>
-        <td class="rightCell">
-          <form name="styleSelectForm" method="post" action="{$setup}">
-            <select name="setappvar" onchange="submit()">
-              <option value="">example styles:</option>
-              <option value="style(green)">green</option>
-              <option value="style(red)">red</option>
-              <option value="style(blue)">blue</option>
-            </select>
-          </form>
-          <form name="skinSelectForm" method="post" action="{$setup}">
-            <input type="hidden" name="setappvar" value="summaryMode(details)"/>
-            <select name="skinPicker" onchange="window.location = this.value">
-              <option value="{$setup}&amp;skinNameSticky=default">example skins:</option>
-              <option value="{$setViewPeriod}&amp;viewType=weekView&amp;skinName=rss&amp;setappvar=summaryMode(details)">rss feed</option>
-              <option value="{$setViewPeriod}&amp;viewType=todayView&amp;skinName=jsToday&amp;contentType=text/javascript&amp;contentName=bedework.js">javascript feed</option>
-              <option value="{$setViewPeriod}&amp;viewType=todayView&amp;skinName=videocal">video feed</option>
-              <option value="{$setup}&amp;skinNameSticky=default">reset to calendar default</option>
-            </select>
-          </form>
-          <form name="skinSelectForm" method="post" action="">
-            <select name="sitePicker" onchange="window.location = this.value">
-              <option>production examples:</option>
-              <option value="http://events.dal.ca/">Dalhousie</option>
-              <option value="http://events.rpi.edu">Rensselaer</option>
-              <option value="http://myuw.washington.edu/cal/">Washington</option>
-            </select>
-          </form>
-        </td>
-      </tr>
-    </table>
-  </xsl:template>
-</xsl:stylesheet>

branches/xslt-rewrite/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

@@ -55 +55 @@
-  <xsl:include href="../../../bedework-common/default/default/prefs.xsl"/>
-  <xsl:include href="../../../bedework-common/default/default/attendees.xsl"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
- <!-- BEGIN MAIN TEMPLATE -->