Changeset 341
- Timestamp:
- 04/06/06 17:06:24
- Files:
-
- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css (modified) (8 diffs)
- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (8 diffs)
- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/errors.xsl (modified) (1 diff)
- trunk/calendar3/webclient/war/docs/event/emitEvent.jsp (modified) (1 diff)
- trunk/calendar3/webclient/war/docs/header.jsp (modified) (1 diff)
- trunk/calendar3/webclient/war/docs/subs/subscriptions.jsp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css
r339 r341 74 74 #curDateRangeTable { 75 75 width: 100%; 76 background-color: # 663;76 background-color: #339; 77 77 color : #eee; 78 margin: 0em; 79 font-weight : bold; 80 text-align : center; 81 vertical-align: middle; 82 white-space: nowrap; 83 } 84 #curDateRangeTable td { 78 85 padding-top: 3px; 79 86 padding-bottom: 1px; 80 87 padding-left: 0.5em; 81 88 padding-right: 0.5em; 82 margin: 0em; 83 line-height: 1.5em; 89 } 90 #curDateRangeTable td.sideBarOpenCloseIcon { 91 width: 200px; 92 } 93 #curDateRangeTable td.date { 84 94 font-weight : bold; 85 95 text-align : center; 86 vertical-align: middle;87 white-space: nowrap;88 }89 #curDateRangeTable td.date {90 width: 100%;91 font-weight : bold;92 text-align : center;93 96 white-space: nowrap; 94 97 } 95 98 #curDateRangeTable td.rssPrint { 99 width: 200px; 96 100 font-weight : bold; 97 101 text-align : right; … … 150 154 #bodyBlock td#sideBar { 151 155 width: 200px; 156 font-size: 0.8em; 152 157 border-left: 2px solid #333; 153 158 border-right: 3px groove #ddd; … … 156 161 vertical-align: top; 157 162 padding: 0; 163 } 164 #bodyBlock td#sideBar h3 { 165 color: #eee; 166 background-color: #333; 167 font-weight: normal; 168 margin: 0; 169 padding: 2px 4px; 158 170 } 159 171 #bodyBlock td#sideBarClosed { … … 170 182 margin: 3px 0; 171 183 vertical-align: middle; 172 /*position: absolute; 173 left: 32px; 174 padding-top: 3px;*/ 175 }/* 176 #bodyBlock td#sideBar #sideBarTabs { 177 width: 200px; 178 height: 24px; 179 margin: 0; 180 padding: 0; 181 color: black; 182 background-color: #ddd; 183 } 184 #bodyBlock td#sideBar #sideBarTabs td { 185 font-size: 12px; 186 padding: 0 0.5em; 187 margin: 0; 188 vertical-align: middle; 189 text-align: center; 190 border-top: 1px solid #333; 191 border-bottom: 1px solid #333; 192 border-left: 1px solid #333; 193 } 194 #bodyBlock td#sideBar #sideBarTabs td.first { 195 border-left: none; 196 } 197 #bodyBlock td#sideBar #sideBarTabs td.selected { 198 color: black; 199 background-color: white; 200 border-bottom: none; 201 padding-bottom: 1px; 202 }*/ 184 } 203 185 #bodyBlock td#sideBar #sideBarMenu li { 204 font-size: 0.9em;205 186 padding-bottom: 0.5em; 206 187 } … … 235 216 background-color: transparent; 236 217 } 237 #utilBarTable .logout {238 font-size: 0.8em;239 }240 218 #utilBarTable .rightCell { 241 219 margin: 0; … … 260 238 white-space: nowrap; 261 239 } 262 #tabsTable .centerCell {240 /* #tabsTable .centerCell { 263 241 text-align: left; 264 242 background : url(../../resources/std-tab-space.gif); 265 width: 100%;266 243 padding-left: 0.5em; 267 } 244 }*/ 268 245 #tabsTable a { 269 246 background-color: inherit; … … 271 248 } 272 249 #tabsTable .rightCell { 250 width: 100%; 273 251 background : url(../../resources/std-tab-space.gif); 274 252 padding: 0 0.5em; 253 text-align: right; 254 } 255 #tabsTable .logout { 256 padding-left: 0.5em; 257 font-size: 0.8em; 275 258 } 276 259 #navigationBarTable { … … 881 864 width: 200px; 882 865 } 883 #calendarTree ul {866 .calendarTree ul { 884 867 padding-left: 10px; 885 868 margin-left: 10px; 886 869 } 887 #calendarTree li {870 .calendarTree li { 888 871 padding-top: 0.25em; 889 872 /*font-weight: bold;*/ 890 873 } 891 #calendarTree li.folder {874 .calendarTree li.folder { 892 875 list-style-image: url(../../resources/catIcon.gif); 893 876 } 894 #calendarTree li.calendar {877 .calendarTree li.calendar { 895 878 list-style-image: url(../../resources/calIcon-sm.gif); 896 879 } 897 #calendarTree a:link,898 #calendarTree a:active,899 #calendarTree a:visited {900 text-decoration: none; 901 } 902 #calendarTree a:hover {880 .calendarTree a:link, 881 .calendarTree a:active, 882 .calendarTree a:visited { 883 text-decoration: none; 884 } 885 .calendarTree a:hover { 903 886 color: black; 904 887 background-color: #ff3; trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
r339 r341 232 232 </table> 233 233 <table id="curDateRangeTable" cellspacing="0"> 234 <td >234 <td class="sideBarOpenCloseIcon"> 235 235 <xsl:choose> 236 236 <xsl:when test="/bedework/appvar[key='sidebar']/value='closed'"> … … 263 263 264 264 <xsl:template name="sideBar"> 265 <h3>views</h3> 266 <ul id="myViews"> 267 <li><a href="{$setSelection}">default view</a></li> 268 </ul> 269 270 <h3>calendars</h3> 271 <ul class="calendarTree"> 272 <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar" mode="myCalendars"/> 273 </ul> 274 275 <h3>subscriptions</h3> 276 <ul class="calendarTree"> 277 <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/></xsl:variable> 278 <xsl:choose> 279 <xsl:when test="/bedework/mySubscriptions/subscription[not(contains(uri,$userPath))]"> 280 <xsl:apply-templates select="/bedework/mySubscriptions/subscription[not(contains(uri,$userPath))]" mode="mySubscriptions"/> 281 </xsl:when> 282 <xsl:otherwise> 283 <li class="none">no subscriptions</li> 284 </xsl:otherwise> 285 </xsl:choose> 286 </ul> 287 288 <h3>options</h3> 265 289 <ul id="sideBarMenu"> 266 290 <li><a href="{$initEvent}">Add Event</a></li> … … 317 341 </xsl:choose> 318 342 </td> 319 <td class="centerCell">320  321 </td>322 343 <td class="rightCell"> 323 Welcome344 welcome 324 345 <xsl:text> </xsl:text> 325 346 <strong><xsl:value-of select="/bedework/userid"/></strong> … … 345 366 <a href="{$setViewPeriod}?viewType=yearView&date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a> 346 367 </td> 347 <td class="centerCell">348  <!--<a href="http://www.rpi.edu/dept/cct/apps/pubeventsxml/calendarfeatures.html">login</a>-->349 </td>350 368 <td class="rightCell"> 351 Welcome369 welcome 352 370 <xsl:text> </xsl:text> 353 371 <strong><xsl:value-of select="/bedework/userid"/></strong> … … 941 959 </td> 942 960 </xsl:template> 943 944 <!--==== CALENDAR LISTING / MANAGE SUBSCRIPTIONS ====-->945 <!-- DEPRECATED946 <xsl:template match="calendars">947 <xsl:variable name="publicCalCount" select="count(calendar[name='public']/calendar)"/>948 <table id="calPageTable" border="0" cellpadding="0" cellspacing="0">949 <tr>950 <th colspan="2">951 Calendar Subscriptions952 </th>953 </tr>954 <tr>955 <td colspan="2" class="infoCell">956 Add and remove subscriptions to public calendars957 </td>958 </tr>959 <tr>960 <td class="leftCell">961 <ul class="calendarTree">962 <xsl:apply-templates select="calendar[name='public']/calendar[position() <= ceiling($publicCalCount div 2)]" mode="calTree"/>963 </ul>964 </td>965 <td>966 <ul class="calendarTree">967 <xsl:apply-templates select="calendar[name='public']/calendar[position() > ceiling($publicCalCount div 2)]" mode="calTree"/>968 </ul>969 </td>970 </tr>971 </table>972 </xsl:template>973 974 <xsl:template match="calendar" mode="calTree">975 <xsl:variable name="itemClass">976 <xsl:choose>977 <xsl:when test="calendarCollection='false'">folder</xsl:when>978 <xsl:otherwise>calendar</xsl:otherwise>979 </xsl:choose>980 </xsl:variable>981 <xsl:variable name="id" select="id"/>982 <xsl:variable name="name" select="name"/>983 <li class="{$itemClass}">984 <a href="{$subscribe}?calid={$id}&name={$name}"><xsl:value-of select="name"/></a>985 <xsl:if test="calendar">986 <ul>987 <xsl:apply-templates select="calendar" mode="calTree"/>988 </ul>989 </xsl:if>990 </li>991 </xsl:template> -->992 961 993 962 <!--==== SINGLE EVENT ====--> … … 1811 1780 subscribe to an external calendar</a>.--> 1812 1781 </p> 1813 <ul id="calendarTree">1782 <ul class="calendarTree"> 1814 1783 <xsl:apply-templates select="/bedework/subscriptions/subscribe/calendars/calendar" mode="subscribe"/> 1815 1784 </ul> … … 1854 1823 </xsl:template> 1855 1824 1825 <xsl:template match="calendar" mode="myCalendars"> 1826 <!-- supress Inbox and Outbox for the moment --> 1827 <xsl:if test="(name != 'Inbox') and (name != 'Outbox')"> 1828 <xsl:variable name="id" select="id"/> 1829 <xsl:variable name="itemClass"> 1830 <xsl:choose> 1831 <xsl:when test="calendarCollection='false'">folder</xsl:when> 1832 <xsl:otherwise>calendar</xsl:otherwise> 1833 </xsl:choose> 1834 </xsl:variable> 1835 <li class="{$itemClass}"> 1836 <!--<a href="{$subscriptions-initAdd}&calId={$id}">--> 1837 <xsl:value-of select="name"/> 1838 <!--</a>--> 1839 <xsl:if test="calendar"> 1840 <ul> 1841 <xsl:apply-templates select="calendar" mode="myCalendars"/> 1842 </ul> 1843 </xsl:if> 1844 </li> 1845 </xsl:if> 1846 </xsl:template> 1847 1856 1848 <xsl:template match="subscription" mode="addSubscription"> 1857 1849 <h3>Add New Subscription</h3> … … 2044 2036 </table> 2045 2037 <!--<h4><a href="{$subscriptions-initAdd}&calUri=please enter a calendar uri">Subscribe to a remote calendar</a> (by URI)</h4>--> 2038 </xsl:template> 2039 2040 <xsl:template match="subscription" mode="mySubscriptions"> 2041 <li class="calendar"> 2042 <!--<xsl:variable name="subname" select="name"/> 2043 <a href="{$subscriptions-fetchForUpdate}&subname={$subname}">--> 2044 <xsl:value-of select="name"/> 2045 <!--</a>--> 2046 </li> 2046 2047 </xsl:template> 2047 2048 trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/errors.xsl
r332 r341 42 42 <p>A subscription by that name already exists.</p> 43 43 </xsl:when> 44 <xsl:when test="id='org.bedework.client.error.nodefaultview'"> 45 No default view defined 46 </xsl:when> 44 47 <xsl:otherwise> 45 48 <p><xsl:value-of select="id"/> = <xsl:value-of select="param"/></p> trunk/calendar3/webclient/war/docs/event/emitEvent.jsp
r340 r341 94 94 </logic:present> 95 95 96 97 <%-- **************************************************************** 98 the following code should not be produced in the public client 99 **************************************************************** --%> 96 100 <bw:emitCurrentPrivs name="eventInfo" property="currentAccess" /> 97 101 </event> trunk/calendar3/webclient/war/docs/header.jsp
r319 r341 222 222 </selectionState> 223 223 224 <%-- **************************************************************** 225 the following code should not be produced in the public client 226 **************************************************************** --%> 227 <myViews> 228 </myViews> 229 230 <myCalendars> 231 <jsp:include page="/docs/calendar/emitCalendars.jsp"/> 232 </myCalendars> 233 234 <mySubscriptions> 235 <jsp:include page="/docs/subs/emitSubscriptions.jsp"/> 236 </mySubscriptions> 237 238 <myPreferences> 239 </myPreferences> 240 224 241 <% 225 242 } catch (Throwable t) { trunk/calendar3/webclient/war/docs/subs/subscriptions.jsp
r320 r341 12 12 13 13 <subscriptions> 14 <logic:iterate name="calForm" property="subscriptions" id="subscription"> 15 <subscription> 16 <bw:emitText name="subscription" property="name" /> 17 <bw:emitText name="subscription" property="uri" /> 18 <affectsFreeBusy><bean:write name="subscription" property="affectsFreeBusy" /></affectsFreeBusy> 19 <display><bean:write name="subscription" property="display" /></display> 20 <bw:emitText name="subscription" property="style" /> 21 <internal><bean:write name="subscription" property="internalSubscription" /></internal> 22 <emailNotifications><bean:write name="subscription" property="emailNotifications" /></emailNotifications> 23 <calendarDeleted><bean:write name="subscription" property="calendarDeleted" /></calendarDeleted> 24 <unremoveable><bean:write name="subscription" property="unremoveable" /></unremoveable> 25 </subscription> 26 </logic:iterate> 14 <%-- this is now permanently in header.jsp so the code is being duplicated; 15 we should consolidate the subscriptions code by removing it here -- 16 just produce the "subscribe" list below. --%> 17 <%@include file="/docs/subs/emitSubscriptions.jsp"%> 27 18 28 19 <subscribe>
