Changeset 380
- Timestamp:
- 04/18/06 12:01:51
- Files:
-
- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (9 diffs)
- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/messages.xsl (modified) (1 diff)
- trunk/calendar3/webclient/war/docs/calendar/modCalendar.jsp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
r379 r380 506 506 </form> 507 507 </td> 508 <!--509 <td class="rightCell">510 <form method="post" action="{$setSelection}">511 <select name="calId" onChange="submit()" >512 <option>select a calendar</option>513 <xsl:for-each select="/bedework/calendars/calendar">514 <xsl:variable name="id" select="id"/>515 <xsl:choose>516 <xsl:when test="title=/bedework/title">517 <option value="{$id}" selected="selected"><xsl:value-of select="title"/></option>518 </xsl:when>519 <xsl:otherwise>520 <option value="{$id}"><xsl:value-of select="title"/></option>521 </xsl:otherwise>522 </xsl:choose>523 </xsl:for-each>524 </select>525 </form>526 <span class="calLinks"><a href="{$setSelection}?calId=">show all</a> | <a href="{$fetchPublicCalendars}">calendar list</a></span>527 </td> -->528 508 </tr> 529 509 </table> … … 1886 1866 <!--+++++++++++++++ Calendars ++++++++++++++++++++--> 1887 1867 <xsl:template match="calendars"> 1868 <h2>Manage Calendars</h2> 1888 1869 <table id="calendarTable"> 1889 1870 <tr> 1890 1871 <td class="cals"> 1891 <h3> Public calendars</h3>1892 <ul id="calendarTree">1872 <h3>Calendars</h3> 1873 <ul class="calendarTree"> 1893 1874 <xsl:choose> 1894 1875 <xsl:when test="/bedework/page='calendarDescriptions' or … … 1930 1911 1931 1912 <xsl:template match="calendar" mode="listForUpdate"> 1932 <xsl:variable name="id" select="id"/> 1933 <xsl:variable name="itemClass"> 1934 <xsl:choose> 1935 <xsl:when test="calendarCollection='false'">folder</xsl:when> 1936 <xsl:otherwise>calendar</xsl:otherwise> 1937 </xsl:choose> 1938 </xsl:variable> 1939 <li class="{$itemClass}"> 1940 <a href="{$calendar-fetchForUpdate}&calId={$id}" title="update"> 1941 <xsl:value-of select="name"/> 1942 </a> 1943 <xsl:if test="calendarCollection='false'"> 1944 <xsl:text> </xsl:text> 1945 <a href="{$calendar-initAdd}&calId={$id}" title="add a calendar or folder"> 1946 <img src="{$resourcesRoot}/resources/calAddIcon.gif" width="13" height="13" alt="add a calendar or folder" border="0"/> 1913 <xsl:if test="(name != 'Inbox') and (name != 'Outbox')"> 1914 <xsl:variable name="id" select="id"/> 1915 <xsl:variable name="itemClass"> 1916 <xsl:choose> 1917 <xsl:when test="calendarCollection='false'">folder</xsl:when> 1918 <xsl:otherwise>calendar</xsl:otherwise> 1919 </xsl:choose> 1920 </xsl:variable> 1921 <li class="{$itemClass}"> 1922 <a href="{$calendar-fetchForUpdate}&calId={$id}" title="update"> 1923 <xsl:value-of select="name"/> 1947 1924 </a> 1948 </xsl:if> 1949 <xsl:if test="calendar"> 1950 <ul> 1951 <xsl:apply-templates select="calendar" mode="listForUpdate"> 1952 <!--<xsl:sort select="title" order="ascending" case-order="upper-first"/>--> 1953 </xsl:apply-templates> 1954 </ul> 1955 </xsl:if> 1956 </li> 1925 <xsl:if test="calendarCollection='false'"> 1926 <xsl:text> </xsl:text> 1927 <a href="{$calendar-initAdd}&calId={$id}" title="add a calendar or folder"> 1928 <img src="{$resourcesRoot}/resources/calAddIcon.gif" width="13" height="13" alt="add a calendar or folder" border="0"/> 1929 </a> 1930 </xsl:if> 1931 <xsl:if test="calendar"> 1932 <ul> 1933 <xsl:apply-templates select="calendar" mode="listForUpdate"> 1934 <!--<xsl:sort select="title" order="ascending" case-order="upper-first"/>--> 1935 </xsl:apply-templates> 1936 </ul> 1937 </xsl:if> 1938 </li> 1939 </xsl:if> 1957 1940 </xsl:template> 1958 1941 1959 1942 <xsl:template match="calendar" mode="listForDisplay"> 1960 <xsl:variable name="id" select="id"/> 1961 <xsl:variable name="itemClass"> 1962 <xsl:choose> 1963 <xsl:when test="calendarCollection='false'">folder</xsl:when> 1964 <xsl:otherwise>calendar</xsl:otherwise> 1965 </xsl:choose> 1966 </xsl:variable> 1967 <li class="{$itemClass}"> 1968 <a href="{$calendar-fetchForDisplay}&calId={$id}" title="display"> 1969 <xsl:value-of select="name"/> 1970 </a> 1971 <xsl:if test="calendar"> 1972 <ul> 1973 <xsl:apply-templates select="calendar" mode="listForDisplay"> 1974 <!--<xsl:sort select="title" order="ascending" case-order="upper-first"/>--> 1975 </xsl:apply-templates> 1976 </ul> 1977 </xsl:if> 1978 </li> 1943 <xsl:if test="(name != 'Inbox') and (name != 'Outbox')"> 1944 <xsl:variable name="id" select="id"/> 1945 <xsl:variable name="itemClass"> 1946 <xsl:choose> 1947 <xsl:when test="calendarCollection='false'">folder</xsl:when> 1948 <xsl:otherwise>calendar</xsl:otherwise> 1949 </xsl:choose> 1950 </xsl:variable> 1951 <li class="{$itemClass}"> 1952 <a href="{$calendar-fetchForDisplay}&calId={$id}" title="display"> 1953 <xsl:value-of select="name"/> 1954 </a> 1955 <xsl:if test="calendar"> 1956 <ul> 1957 <xsl:apply-templates select="calendar" mode="listForDisplay"> 1958 <!--<xsl:sort select="title" order="ascending" case-order="upper-first"/>--> 1959 </xsl:apply-templates> 1960 </ul> 1961 </xsl:if> 1962 </li> 1963 </xsl:if> 1979 1964 </xsl:template> 1980 1965 … … 1982 1967 <h3>Add Calendar / Folder</h3> 1983 1968 <form name="addCalForm" action="{$calendar-update}"> 1984 <table class="eventFormTable">1969 <table id="commonTable"> 1985 1970 <tr> 1986 1971 <th>Name:</th> … … 2044 2029 </xsl:choose> 2045 2030 <form name="modCalForm" action="{$calendar-update}"> 2046 <table class="eventFormTable">2031 <table id="commonTable"> 2047 2032 <tr> 2048 2033 <th>Path:</th> … … 2125 2110 2126 2111 <xsl:template name="calendarList"> 2127 <h3>Manag eCalendars</h3>2112 <h3>Managing Calendars</h3> 2128 2113 <ul> 2129 2114 <li>Select an item from the calendar list on the left to modify … … 2160 2145 </tr> 2161 2146 <xsl:for-each select="//calendar"> 2162 <xsl:variable name="descClass"> 2163 <xsl:choose> 2164 <xsl:when test="position() mod 2 = 0">even</xsl:when> 2165 <xsl:otherwise>odd</xsl:otherwise> 2166 </xsl:choose> 2167 </xsl:variable> 2168 <tr class="{$descClass}"> 2169 <td> 2170 <xsl:value-of select="name"/> 2171 </td> 2172 <td> 2173 <xsl:value-of select="desc"/> 2174 </td> 2175 </tr> 2147 <xsl:if test="(name != 'Inbox') and (name != 'Outbox')"> 2148 <xsl:variable name="descClass"> 2149 <xsl:choose> 2150 <xsl:when test="position() mod 2 = 0">even</xsl:when> 2151 <xsl:otherwise>odd</xsl:otherwise> 2152 </xsl:choose> 2153 </xsl:variable> 2154 <tr class="{$descClass}"> 2155 <td> 2156 <xsl:value-of select="name"/> 2157 </td> 2158 <td> 2159 <xsl:value-of select="desc"/> 2160 </td> 2161 </tr> 2162 </xsl:if> 2176 2163 </xsl:for-each> 2177 2164 </table> … … 2180 2167 <xsl:template match="currentCalendar" mode="displayCalendar"> 2181 2168 <h2>Calendar Information</h2> 2182 <table class="eventFormTable">2169 <table id="commonTable"> 2183 2170 <tr> 2184 2171 <th>Name:</th> … … 2226 2213 2227 2214 <form name="delCalForm" action="{$calendar-delete}"> 2228 <table class="eventFormTable">2215 <table id="commonTable"> 2229 2216 <tr> 2230 2217 <th>Path:</th> trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/messages.xsl
r354 r380 35 35 </xsl:otherwise> 36 36 </xsl:choose> 37 </xsl:when> 38 <xsl:when test="id='org.bedework.client.message.calendar.added'"> 39 <p>Calendar added.</p> 40 </xsl:when> 41 <xsl:when test="id='org.bedework.client.message.calendar.updated'"> 42 <p>Calendar updated.</p> 43 </xsl:when> 44 <xsl:when test="id='org.bedework.client.message.calendar.deleted'"> 45 <p>Calendar deleted.</p> 37 46 </xsl:when> 38 47 <xsl:when test="id='org.bedework.client.message.added.subscriptions'"> trunk/calendar3/webclient/war/docs/calendar/modCalendar.jsp
r319 r380 5 5 6 6 <page>modCalendar</page> 7 < %--<creating><bean:write name="calForm" property="addingCalendar"/></creating>--%>7 <creating><bean:write name="calForm" property="addingCalendar"/></creating> 8 8 9 9 <%@include file="/docs/calendar/displayCalendarCommon.jsp"%>
