Changeset 3149
- Timestamp:
- 01/21/11 16:51:06
- Files:
-
- releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl (modified) (3 diffs)
- releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js (modified) (1 diff)
- releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/calendars.xsl (modified) (17 diffs)
- releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bedeworkTheme.css (modified) (1 diff)
- releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/event.xsl (modified) (1 diff)
- releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl (modified) (2 diffs)
- trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl (modified) (3 diffs)
- trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js (modified) (1 diff)
- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/calendars.xsl (modified) (17 diffs)
- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bedeworkTheme.css (modified) (1 diff)
- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/event.xsl (modified) (1 diff)
- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
r2841 r3149 1278 1278 <!-- we've hit an unresolvable alias; stop descending --> 1279 1279 <input type="checkbox" name="forDiplayOnly" disabled="disabled"/> 1280 <em><xsl:value-of select=" name"/>?</em>1280 <em><xsl:value-of select="summary"/>?</em> 1281 1281 </xsl:when> 1282 1282 <xsl:when test="calType = '0'"> … … 1284 1284 underlying calendar aliases --> 1285 1285 <img src="{$resourcesRoot}/resources/catIcon.gif" width="13" height="13" alt="folder" class="folderForAliasTree" border="0"/> 1286 <xsl:value-of select=" name"/>1286 <xsl:value-of select="summary"/> 1287 1287 </xsl:when> 1288 1288 <xsl:otherwise> 1289 1289 <xsl:variable name="virtualPath">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:variable> 1290 <input type="checkbox" name="alias" onclick="toggleBedeworkXProperty('X-BEDEWORK-SUBMIT-ALIAS','{$virtualPath}',this.checked)"> 1290 <xsl:variable name="displayName" select="summary"/> 1291 <input type="checkbox" name="alias" onclick="toggleBedeworkXProperty('X-BEDEWORK-SUBMIT-ALIAS','{$displayName}','{$virtualPath}',this.checked)"> 1291 1292 <xsl:attribute name="value"><xsl:value-of select="$virtualPath"/></xsl:attribute> 1292 1293 <xsl:if test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> … … 1294 1295 <xsl:choose> 1295 1296 <xsl:when test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"> 1296 <strong><xsl:value-of select=" name"/></strong>1297 <strong><xsl:value-of select="summary"/></strong> 1297 1298 </xsl:when> 1298 1299 <xsl:otherwise> 1299 <xsl:value-of select=" name"/>1300 <xsl:value-of select="summary"/> 1300 1301 </xsl:otherwise> 1301 1302 </xsl:choose> releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js
r2850 r3149 312 312 bwXProps.generate(formObj); 313 313 } 314 function toggleBedeworkXProperty(xprop, value,checked) {314 function toggleBedeworkXProperty(xprop,displayName,value,checked) { 315 315 if (!checked) { 316 316 bwXProps.removeByValue(xprop, value); 317 317 } else { 318 bwXProps.update(bwXPropertySubmitAlias,[ ],value,false);318 bwXProps.update(bwXPropertySubmitAlias,[[bwXParamDisplayName,displayName]],value,false); 319 319 } 320 320 } releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/calendars.xsl
r3138 r3149 153 153 </xsl:attribute> 154 154 </xsl:if> 155 <xsl:value-of select=" name"/>155 <xsl:value-of select="summary"/> 156 156 </a> 157 157 <xsl:if test="color != '' and color != 'null'"> … … 163 163 <ul> 164 164 <xsl:apply-templates select="calendar[canAlias = 'true']" mode="myCalendars"> 165 <xsl:sort select=" name" order="ascending" case-order="upper-first"/>165 <xsl:sort select="summary" order="ascending" case-order="upper-first"/> 166 166 </xsl:apply-templates> 167 167 </ul> … … 189 189 <xsl:when test="calType='5'"> 190 190 <a href="{$showInbox}" title="{$bwStr-Cals-IncomingSchedulingRequests}"> 191 <xsl:value-of select=" name"/>191 <xsl:value-of select="summary"/> 192 192 </a> 193 193 <xsl:text> </xsl:text> … … 198 198 <xsl:when test="calType='6'"> 199 199 <a href="{$showOutbox}" title="{$bwStr-Cals-OutgoingSchedulingRequests}"> 200 <xsl:value-of select=" name"/>200 <xsl:value-of select="summary"/> 201 201 </a> 202 202 <xsl:text> </xsl:text> … … 214 214 </xsl:choose> 215 215 </xsl:attribute> 216 <xsl:value-of select=" name"/>216 <xsl:value-of select="summary"/> 217 217 </a> 218 218 </xsl:otherwise> … … 248 248 </xsl:attribute> 249 249 <a href="{$calendar-fetchForUpdate}&calPath={$calPath}" title="{$bwStr-Cals-Update}"> 250 <xsl:value-of select=" name"/>250 <xsl:value-of select="summary"/> 251 251 </a> 252 252 <xsl:if test="calType = '0' and isSubscription = 'false'"> … … 259 259 <ul> 260 260 <xsl:apply-templates select="calendar" mode="listForUpdate"> 261 <xsl:sort select=" name" order="ascending" case-order="upper-first"/>261 <xsl:sort select="summary" order="ascending" case-order="upper-first"/> 262 262 </xsl:apply-templates> 263 263 </ul> … … 278 278 </xsl:attribute> 279 279 <a href="{$calendar-fetchForDisplay}&calPath={$calPath}" title="{$bwStr-Cals-Display}"> 280 <xsl:value-of select=" name"/>280 <xsl:value-of select="summary"/> 281 281 </a> 282 282 <xsl:if test="calendar"> 283 283 <ul> 284 284 <xsl:apply-templates select="calendar[number(calType) < 2 or number(calType) = 4 or number(calType) > 6]" mode="listForDisplay"> 285 <xsl:sort select=" name" order="ascending" case-order="upper-first"/>285 <xsl:sort select="summary" order="ascending" case-order="upper-first"/> 286 286 </xsl:apply-templates> 287 287 </ul> … … 313 313 <xsl:when test="/bedework/formElements/form/calendars/select/option"> 314 314 <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar" mode="selectCalForEventCalTree"> 315 <xsl:sort select=" name" order="ascending" case-order="upper-first"/>315 <xsl:sort select="summary" order="ascending" case-order="upper-first"/> 316 316 </xsl:apply-templates> 317 317 </xsl:when> … … 338 338 </xsl:attribute> 339 339 <xsl:variable name="calPath" select="path"/> 340 <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable> 341 <xsl:variable name="calDisplay"> 342 <xsl:choose> 343 <xsl:when test="contains(path,$userPath)"> 344 <xsl:value-of select="substring-after(path,$userPath)"/> 345 </xsl:when> 346 <xsl:otherwise> 347 <xsl:value-of select="path"/> 348 </xsl:otherwise> 349 </xsl:choose> 350 </xsl:variable> 340 <xsl:variable name="calDisplay" select="summary"/> 351 341 <xsl:choose> 352 342 <xsl:when test="path = /bedework/formElements/form/calendars/select//option/@value and (calType != '0')"> 353 343 <a href="javascript:updateEventFormCalendar('{$calPath}','{$calDisplay}')"> 354 <strong><xsl:value-of select=" name"/></strong>344 <strong><xsl:value-of select="summary"/></strong> 355 345 </a> 356 346 </xsl:when> 357 347 <xsl:otherwise> 358 <xsl:value-of select=" name"/>348 <xsl:value-of select="summary"/> 359 349 </xsl:otherwise> 360 350 </xsl:choose> … … 362 352 <ul> 363 353 <xsl:apply-templates select="calendar[calType < 2]" mode="selectCalForEventCalTree"> 364 <xsl:sort select=" name" order="ascending" case-order="upper-first"/>354 <xsl:sort select="summary" order="ascending" case-order="upper-first"/> 365 355 </xsl:apply-templates> 366 356 </ul> … … 417 407 <xsl:when test="canAlias = 'true'"> 418 408 <a href="javascript:updatePublicCalendarAlias('{$calPath}','{$calDisplay}','{$calendarCollection}')"> 419 <xsl:value-of select=" name"/>409 <xsl:value-of select="summary"/> 420 410 </a> 421 411 </xsl:when> 422 412 <xsl:otherwise> 423 <xsl:value-of select=" name"/>413 <xsl:value-of select="summary"/> 424 414 </xsl:otherwise> 425 415 </xsl:choose> … … 899 889 <tr class="{$descClass}"> 900 890 <td> 901 <xsl:value-of select=" name"/>891 <xsl:value-of select="summary"/> 902 892 </td> 903 893 <td> … … 1053 1043 <xsl:variable name="name" select="name"/> 1054 1044 <a href="javascript:exportCalendar('exportCalendarForm','{$name}','{$calPath}')"> 1055 <xsl:value-of select=" name"/>1045 <xsl:value-of select="summary"/> 1056 1046 </a> 1057 1047 </li> … … 1065 1055 <xsl:variable name="name" select="name"/> 1066 1056 <a href="javascript:exportCalendar('exportCalendarForm','{$name}','{$calPath}')"> 1067 <xsl:value-of select=" name"/>1057 <xsl:value-of select="summary"/> 1068 1058 </a> 1069 1059 </li> … … 1085 1075 <xsl:when test="calType = '0'"> 1086 1076 <li class="folder"> 1087 <xsl:value-of select=" name"/>1077 <xsl:value-of select="summary"/> 1088 1078 <xsl:if test="calendar"> 1089 1079 <ul> … … 1098 1088 <xsl:variable name="name" select="name"/> 1099 1089 <a href="javascript:exportCalendar('exportCalendarForm','{$name}','{$calPath}')"> 1100 <xsl:value-of select=" name"/>1090 <xsl:value-of select="summary"/> 1101 1091 </a> 1102 1092 </li> releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bedeworkTheme.css
r3130 r3149 680 680 #bedework #calSelectWidget { 681 681 position: absolute; 682 z-index: 10; 682 683 margin: 0; 683 684 padding: 0 2em 1em 0; releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/event.xsl
r2981 r3149 594 594 <td class="fieldname"><xsl:copy-of select="$bwStr-SgEv-Calendar"/><xsl:text> </xsl:text></td> 595 595 <td class="fieldval"> 596 <!-- 597 <xsl:variable name="virtualPath"><xsl:call-template name="url-encode"><xsl:with-param name="str">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:with-param></xsl:call-template></xsl:variable> 598 <xsl:variable name="calUrl" select="calendar/encodedPath"/> --> 599 <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable> 600 <!-- a href="{$setSelection}&virtualPath={$virtualPath}&calUrl={$calUrl}"--> 601 <xsl:choose> 602 <xsl:when test="contains(calendar/path,$userPath)"> 603 <xsl:value-of select="substring-after(calendar/path,$userPath)"/> 604 </xsl:when> 605 <xsl:otherwise> 606 <xsl:value-of select="calendar/path"/> 607 </xsl:otherwise> 608 </xsl:choose> 609 <!-- /a--> 596 <xsl:value-of select="calendar/summary"/> 610 597 </td> 611 598 </tr> releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl
r3134 r3149 232 232 233 233 <input type="hidden" name="newCalPath" value="{$newCalPath}"/> 234 235 <xsl:variable name="userFullPath"><xsl:value-of select="$userPath"/>/</xsl:variable>236 234 <span id="bwEventCalDisplay"> 237 <xsl:choose> 238 <xsl:when test="contains($newCalPath,$userFullPath)"> 239 <xsl:value-of select="substring-after($newCalPath,$userFullPath)"/> 240 </xsl:when> 241 <xsl:otherwise> 242 <xsl:value-of select="$newCalPath"/> 243 </xsl:otherwise> 244 </xsl:choose> 235 <xsl:value-of select="form/calendar/summary"/> 236 <xsl:text> </xsl:text> 245 237 </span> 246 238 </xsl:when> … … 249 241 <xsl:attribute name="value"><xsl:value-of select="form/calendar/path"/></xsl:attribute> 250 242 </input> 251 252 <xsl:variable name="userFullPath"><xsl:value-of select="$userPath"/>/</xsl:variable>253 243 <span id="bwEventCalDisplay"> 254 <xsl:choose> 255 <xsl:when test="contains(form/calendar/path,$userFullPath)"> 256 <xsl:value-of select="substring-after(form/calendar/path,$userFullPath)"/> 257 </xsl:when> 258 <xsl:otherwise> 259 <xsl:value-of select="form/calendar/path"/> 260 </xsl:otherwise> 261 </xsl:choose> 244 <xsl:value-of select="form/calendar/summary"/> 262 245 <xsl:text> </xsl:text> 263 <!-- this final text element is required to avoid an empty264 span element which is improperly rendered in the browser -->265 246 </span> 266 267 247 <xsl:call-template name="selectCalForEvent"/> 268 269 248 </xsl:otherwise> 270 249 </xsl:choose> trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
r2841 r3149 1278 1278 <!-- we've hit an unresolvable alias; stop descending --> 1279 1279 <input type="checkbox" name="forDiplayOnly" disabled="disabled"/> 1280 <em><xsl:value-of select=" name"/>?</em>1280 <em><xsl:value-of select="summary"/>?</em> 1281 1281 </xsl:when> 1282 1282 <xsl:when test="calType = '0'"> … … 1284 1284 underlying calendar aliases --> 1285 1285 <img src="{$resourcesRoot}/resources/catIcon.gif" width="13" height="13" alt="folder" class="folderForAliasTree" border="0"/> 1286 <xsl:value-of select=" name"/>1286 <xsl:value-of select="summary"/> 1287 1287 </xsl:when> 1288 1288 <xsl:otherwise> 1289 1289 <xsl:variable name="virtualPath">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:variable> 1290 <input type="checkbox" name="alias" onclick="toggleBedeworkXProperty('X-BEDEWORK-SUBMIT-ALIAS','{$virtualPath}',this.checked)"> 1290 <xsl:variable name="displayName" select="summary"/> 1291 <input type="checkbox" name="alias" onclick="toggleBedeworkXProperty('X-BEDEWORK-SUBMIT-ALIAS','{$displayName}','{$virtualPath}',this.checked)"> 1291 1292 <xsl:attribute name="value"><xsl:value-of select="$virtualPath"/></xsl:attribute> 1292 1293 <xsl:if test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> … … 1294 1295 <xsl:choose> 1295 1296 <xsl:when test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"> 1296 <strong><xsl:value-of select=" name"/></strong>1297 <strong><xsl:value-of select="summary"/></strong> 1297 1298 </xsl:when> 1298 1299 <xsl:otherwise> 1299 <xsl:value-of select=" name"/>1300 <xsl:value-of select="summary"/> 1300 1301 </xsl:otherwise> 1301 1302 </xsl:choose> trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js
r2850 r3149 312 312 bwXProps.generate(formObj); 313 313 } 314 function toggleBedeworkXProperty(xprop, value,checked) {314 function toggleBedeworkXProperty(xprop,displayName,value,checked) { 315 315 if (!checked) { 316 316 bwXProps.removeByValue(xprop, value); 317 317 } else { 318 bwXProps.update(bwXPropertySubmitAlias,[ ],value,false);318 bwXProps.update(bwXPropertySubmitAlias,[[bwXParamDisplayName,displayName]],value,false); 319 319 } 320 320 } trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/calendars.xsl
r3138 r3149 153 153 </xsl:attribute> 154 154 </xsl:if> 155 <xsl:value-of select=" name"/>155 <xsl:value-of select="summary"/> 156 156 </a> 157 157 <xsl:if test="color != '' and color != 'null'"> … … 163 163 <ul> 164 164 <xsl:apply-templates select="calendar[canAlias = 'true']" mode="myCalendars"> 165 <xsl:sort select=" name" order="ascending" case-order="upper-first"/>165 <xsl:sort select="summary" order="ascending" case-order="upper-first"/> 166 166 </xsl:apply-templates> 167 167 </ul> … … 189 189 <xsl:when test="calType='5'"> 190 190 <a href="{$showInbox}" title="{$bwStr-Cals-IncomingSchedulingRequests}"> 191 <xsl:value-of select=" name"/>191 <xsl:value-of select="summary"/> 192 192 </a> 193 193 <xsl:text> </xsl:text> … … 198 198 <xsl:when test="calType='6'"> 199 199 <a href="{$showOutbox}" title="{$bwStr-Cals-OutgoingSchedulingRequests}"> 200 <xsl:value-of select=" name"/>200 <xsl:value-of select="summary"/> 201 201 </a> 202 202 <xsl:text> </xsl:text> … … 214 214 </xsl:choose> 215 215 </xsl:attribute> 216 <xsl:value-of select=" name"/>216 <xsl:value-of select="summary"/> 217 217 </a> 218 218 </xsl:otherwise> … … 248 248 </xsl:attribute> 249 249 <a href="{$calendar-fetchForUpdate}&calPath={$calPath}" title="{$bwStr-Cals-Update}"> 250 <xsl:value-of select=" name"/>250 <xsl:value-of select="summary"/> 251 251 </a> 252 252 <xsl:if test="calType = '0' and isSubscription = 'false'"> … … 259 259 <ul> 260 260 <xsl:apply-templates select="calendar" mode="listForUpdate"> 261 <xsl:sort select=" name" order="ascending" case-order="upper-first"/>261 <xsl:sort select="summary" order="ascending" case-order="upper-first"/> 262 262 </xsl:apply-templates> 263 263 </ul> … … 278 278 </xsl:attribute> 279 279 <a href="{$calendar-fetchForDisplay}&calPath={$calPath}" title="{$bwStr-Cals-Display}"> 280 <xsl:value-of select=" name"/>280 <xsl:value-of select="summary"/> 281 281 </a> 282 282 <xsl:if test="calendar"> 283 283 <ul> 284 284 <xsl:apply-templates select="calendar[number(calType) < 2 or number(calType) = 4 or number(calType) > 6]" mode="listForDisplay"> 285 <xsl:sort select=" name" order="ascending" case-order="upper-first"/>285 <xsl:sort select="summary" order="ascending" case-order="upper-first"/> 286 286 </xsl:apply-templates> 287 287 </ul> … … 313 313 <xsl:when test="/bedework/formElements/form/calendars/select/option"> 314 314 <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar" mode="selectCalForEventCalTree"> 315 <xsl:sort select=" name" order="ascending" case-order="upper-first"/>315 <xsl:sort select="summary" order="ascending" case-order="upper-first"/> 316 316 </xsl:apply-templates> 317 317 </xsl:when> … … 338 338 </xsl:attribute> 339 339 <xsl:variable name="calPath" select="path"/> 340 <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable> 341 <xsl:variable name="calDisplay"> 342 <xsl:choose> 343 <xsl:when test="contains(path,$userPath)"> 344 <xsl:value-of select="substring-after(path,$userPath)"/> 345 </xsl:when> 346 <xsl:otherwise> 347 <xsl:value-of select="path"/> 348 </xsl:otherwise> 349 </xsl:choose> 350 </xsl:variable> 340 <xsl:variable name="calDisplay" select="summary"/> 351 341 <xsl:choose> 352 342 <xsl:when test="path = /bedework/formElements/form/calendars/select//option/@value and (calType != '0')"> 353 343 <a href="javascript:updateEventFormCalendar('{$calPath}','{$calDisplay}')"> 354 <strong><xsl:value-of select=" name"/></strong>344 <strong><xsl:value-of select="summary"/></strong> 355 345 </a> 356 346 </xsl:when> 357 347 <xsl:otherwise> 358 <xsl:value-of select=" name"/>348 <xsl:value-of select="summary"/> 359 349 </xsl:otherwise> 360 350 </xsl:choose> … … 362 352 <ul> 363 353 <xsl:apply-templates select="calendar[calType < 2]" mode="selectCalForEventCalTree"> 364 <xsl:sort select=" name" order="ascending" case-order="upper-first"/>354 <xsl:sort select="summary" order="ascending" case-order="upper-first"/> 365 355 </xsl:apply-templates> 366 356 </ul> … … 417 407 <xsl:when test="canAlias = 'true'"> 418 408 <a href="javascript:updatePublicCalendarAlias('{$calPath}','{$calDisplay}','{$calendarCollection}')"> 419 <xsl:value-of select=" name"/>409 <xsl:value-of select="summary"/> 420 410 </a> 421 411 </xsl:when> 422 412 <xsl:otherwise> 423 <xsl:value-of select=" name"/>413 <xsl:value-of select="summary"/> 424 414 </xsl:otherwise> 425 415 </xsl:choose> … … 899 889 <tr class="{$descClass}"> 900 890 <td> 901 <xsl:value-of select=" name"/>891 <xsl:value-of select="summary"/> 902 892 </td> 903 893 <td> … … 1053 1043 <xsl:variable name="name" select="name"/> 1054 1044 <a href="javascript:exportCalendar('exportCalendarForm','{$name}','{$calPath}')"> 1055 <xsl:value-of select=" name"/>1045 <xsl:value-of select="summary"/> 1056 1046 </a> 1057 1047 </li> … … 1065 1055 <xsl:variable name="name" select="name"/> 1066 1056 <a href="javascript:exportCalendar('exportCalendarForm','{$name}','{$calPath}')"> 1067 <xsl:value-of select=" name"/>1057 <xsl:value-of select="summary"/> 1068 1058 </a> 1069 1059 </li> … … 1085 1075 <xsl:when test="calType = '0'"> 1086 1076 <li class="folder"> 1087 <xsl:value-of select=" name"/>1077 <xsl:value-of select="summary"/> 1088 1078 <xsl:if test="calendar"> 1089 1079 <ul> … … 1098 1088 <xsl:variable name="name" select="name"/> 1099 1089 <a href="javascript:exportCalendar('exportCalendarForm','{$name}','{$calPath}')"> 1100 <xsl:value-of select=" name"/>1090 <xsl:value-of select="summary"/> 1101 1091 </a> 1102 1092 </li> trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bedeworkTheme.css
r3129 r3149 680 680 #bedework #calSelectWidget { 681 681 position: absolute; 682 z-index: 10; 682 683 margin: 0; 683 684 padding: 0 2em 1em 0; trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/event.xsl
r2981 r3149 594 594 <td class="fieldname"><xsl:copy-of select="$bwStr-SgEv-Calendar"/><xsl:text> </xsl:text></td> 595 595 <td class="fieldval"> 596 <!-- 597 <xsl:variable name="virtualPath"><xsl:call-template name="url-encode"><xsl:with-param name="str">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:with-param></xsl:call-template></xsl:variable> 598 <xsl:variable name="calUrl" select="calendar/encodedPath"/> --> 599 <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable> 600 <!-- a href="{$setSelection}&virtualPath={$virtualPath}&calUrl={$calUrl}"--> 601 <xsl:choose> 602 <xsl:when test="contains(calendar/path,$userPath)"> 603 <xsl:value-of select="substring-after(calendar/path,$userPath)"/> 604 </xsl:when> 605 <xsl:otherwise> 606 <xsl:value-of select="calendar/path"/> 607 </xsl:otherwise> 608 </xsl:choose> 609 <!-- /a--> 596 <xsl:value-of select="calendar/summary"/> 610 597 </td> 611 598 </tr> trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl
r3133 r3149 232 232 233 233 <input type="hidden" name="newCalPath" value="{$newCalPath}"/> 234 235 <xsl:variable name="userFullPath"><xsl:value-of select="$userPath"/>/</xsl:variable>236 234 <span id="bwEventCalDisplay"> 237 <xsl:choose> 238 <xsl:when test="contains($newCalPath,$userFullPath)"> 239 <xsl:value-of select="substring-after($newCalPath,$userFullPath)"/> 240 </xsl:when> 241 <xsl:otherwise> 242 <xsl:value-of select="$newCalPath"/> 243 </xsl:otherwise> 244 </xsl:choose> 235 <xsl:value-of select="form/calendar/summary"/> 236 <xsl:text> </xsl:text> 245 237 </span> 246 238 </xsl:when> … … 249 241 <xsl:attribute name="value"><xsl:value-of select="form/calendar/path"/></xsl:attribute> 250 242 </input> 251 252 <xsl:variable name="userFullPath"><xsl:value-of select="$userPath"/>/</xsl:variable>253 243 <span id="bwEventCalDisplay"> 254 <xsl:choose> 255 <xsl:when test="contains(form/calendar/path,$userFullPath)"> 256 <xsl:value-of select="substring-after(form/calendar/path,$userFullPath)"/> 257 </xsl:when> 258 <xsl:otherwise> 259 <xsl:value-of select="form/calendar/path"/> 260 </xsl:otherwise> 261 </xsl:choose> 244 <xsl:value-of select="form/calendar/summary"/> 262 245 <xsl:text> </xsl:text> 263 <!-- this final text element is required to avoid an empty264 span element which is improperly rendered in the browser -->265 246 </span> 266 267 247 <xsl:call-template name="selectCalForEvent"/> 268 269 248 </xsl:otherwise> 270 249 </xsl:choose>
