Changeset 1115
- Timestamp:
- 12/01/06 15:35:46
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
r1114 r1115 1170 1170 <td align="right"> 1171 1171 <input type="submit" name="delete" value="Delete Event"/> 1172 <input type="hidden" name="public" value="true"/>1173 1172 </td> 1174 1173 </xsl:otherwise> … … 1249 1248 1250 1249 <xsl:template match="event" mode="displayEvent"> 1250 <xsl:variable name="calPath" select="calendar/path"/> 1251 <xsl:variable name="guid" select="guid"/> 1252 <xsl:variable name="recurrenceId" select="recurrenceId"/> 1253 1251 1254 <xsl:choose> 1252 1255 <xsl:when test="/bedeworkadmin/page='deleteEventConfirm'"> 1256 1253 1257 <h2>Ok to delete this event?</h2> 1254 1258 <p style="width: 400px;">Note: we do not encourage deletion of old but correct events; we prefer to keep … … 1256 1260 that are truly erroneous.</p> 1257 1261 <p id="confirmButtons"> 1258 <xsl:copy-of select="/bedeworkadmin/formElements/*"/> 1262 <form action="{$event-delete}" method="post"> 1263 <input type="submit" name="cancelled" value="Cancel"/> 1264 <input type="submit" name="delete" value="Delete"/> 1265 <input type="hidden" name="calPath" value="{$calPath}"/> 1266 <input type="hidden" name="guid" value="{$guid}"/> 1267 <input type="hidden" name="recurrenceId" value="{$recurrenceId}"/> 1268 </form> 1259 1269 </p> 1260 1270 </xsl:when> … … 1265 1275 1266 1276 <table class="eventFormTable"> 1267 <tr>1268 <th>1269 ID:1270 </th>1271 <td>1272 <xsl:value-of select="id"/>1273 </td>1274 </tr>1275 1277 1276 1278 <tr> … … 1279 1281 </th> 1280 1282 <td> 1281 <xsl:value-of select="title"/> 1283 <strong><xsl:value-of select="summary"/></strong> 1284 </td> 1285 </tr> 1286 1287 <tr> 1288 <th> 1289 When: 1290 </th> 1291 <td> 1292 <xsl:value-of select="start/dayname"/>, <xsl:value-of select="start/longdate"/><xsl:text> </xsl:text> 1293 <xsl:if test="start/allday = 'false'"> 1294 <span class="time"><xsl:value-of select="start/time"/></span> 1295 </xsl:if> 1296 <xsl:if test="(end/longdate != start/longdate) or 1297 ((end/longdate = start/longdate) and (end/time != start/time))"> - </xsl:if> 1298 <xsl:if test="end/longdate != start/longdate"> 1299 <xsl:value-of select="substring(end/dayname,1,3)"/>, <xsl:value-of select="end/longdate"/><xsl:text> </xsl:text> 1300 </xsl:if> 1301 <xsl:choose> 1302 <xsl:when test="start/allday = 'true'"> 1303 <span class="time"><em>(all day)</em></span> 1304 </xsl:when> 1305 <xsl:when test="end/longdate != start/longdate"> 1306 <span class="time"><xsl:value-of select="end/time"/></span> 1307 </xsl:when> 1308 <xsl:when test="end/time != start/time"> 1309 <span class="time"><xsl:value-of select="end/time"/></span> 1310 </xsl:when> 1311 </xsl:choose> 1282 1312 </td> 1283 1313 </tr> … … 1288 1318 </th> 1289 1319 <td> 1290 <xsl:value-of select="calendar"/> 1291 </td> 1292 </tr> 1293 1294 <tr> 1295 <th> 1296 Start: 1297 </th> 1298 <td> 1299 <xsl:value-of select="start/year"/>-<xsl:value-of select="start/month"/>-<xsl:value-of select="start/day"/> 1300 <xsl:text> </xsl:text> 1301 <xsl:choose> 1302 <xsl:when test="start/allDay='true'"> 1303 <strong>all day event</strong> 1304 </xsl:when> 1305 <xsl:otherwise> 1306 <xsl:value-of select="start/hour"/>:<xsl:value-of select="start/minute"/> 1307 <xsl:if test="start/ampm"> 1308 <xsl:value-of select="start/ampm"/> 1309 </xsl:if> 1310 </xsl:otherwise> 1311 </xsl:choose> 1312 </td> 1313 </tr> 1314 <tr> 1315 <th> 1316 End: 1317 </th> 1318 <td> 1319 <xsl:choose> 1320 <xsl:when test="end/endtype = 'none'"> 1321 <div class="dateFields" id="noDuration"> 1322 This event has no duration / end date 1323 </div> 1324 </xsl:when> 1325 <xsl:when test="end/endtype = 'duration'"> 1326 <div class="dateFields"> 1327 <div class="invisible" id="endDuration"> 1328 <div class="durationBox"> 1329 <input type="text" name="eventDuration.daysStr" size="2" value="0" onChange="window.document.peForm.durationType[0].checked = true;"/>days 1330 <input type="text" name="eventDuration.hoursStr" size="2" value="1" onChange="window.document.peForm.durationType[0].checked = true;"/>hours 1331 <input type="text" name="eventDuration.minutesStr" size="2" value="0" onChange="window.document.peForm.durationType[0].checked = true;"/>minutes 1332 </div> 1333 <span class="durationSpacerText">or</span> 1334 <div class="durationBox"> 1335 <input type="text" name="eventDuration.weeksStr" size="2" value="0" onChange="window.document.peForm.durationType[1].checked = true;"/>weeks 1336 </div> 1337 </div> 1338 </div> 1339 </xsl:when> 1340 <xsl:otherwise> 1341 <xsl:value-of select="end/dateTime/year"/>-<xsl:value-of select="end/dateTime/month"/>-<xsl:value-of select="end/dateTime/day"/> 1342 <xsl:text> </xsl:text> 1343 <xsl:value-of select="end/dateTime/hour"/>:<xsl:value-of select="end/dateTime/minute"/> 1344 <xsl:text> </xsl:text> 1345 <xsl:if test="end/dateTime/ampm"> 1346 <xsl:value-of select="end/dateTime/ampm"/> 1347 </xsl:if> 1348 </xsl:otherwise> 1349 </xsl:choose> 1350 </td> 1351 </tr> 1352 1353 <!-- Category --> 1354 <tr> 1355 <th> 1356 Category: 1357 </th> 1358 <td> 1359 <xsl:value-of select="category"/> 1320 <xsl:value-of select="calendar/path"/> 1360 1321 </td> 1361 1322 </tr> … … 1367 1328 </th> 1368 1329 <td> 1369 <xsl:value-of select="desc "/>1330 <xsl:value-of select="description"/> 1370 1331 </td> 1371 1332 </tr> … … 1391 1352 </td> 1392 1353 </tr> 1354 1393 1355 <!-- Location --> 1394 1356 <tr> … … 1397 1359 </th> 1398 1360 <td> 1399 <xsl:value-of select="location"/> 1361 <xsl:value-of select="location/address"/><br/> 1362 <xsl:value-of select="location/subaddress"/> 1400 1363 </td> 1401 1364 </tr> … … 1407 1370 </th> 1408 1371 <td> 1409 <xsl:value-of select="contact"/> 1372 <xsl:value-of select="contact/name"/><br/> 1373 <xsl:value-of select="contact/phone"/><br/> 1374 <xsl:variable name="mailto" select="email"/> 1375 <a href="mailto:{$mailto}"><xsl:value-of select="email"/></a> 1376 <xsl:variable name="link" select="link"/> 1377 <a href="mailto:{$link}"><xsl:value-of select="link"/></a> 1410 1378 </td> 1411 1379 </tr> … … 1421 1389 </tr> 1422 1390 1391 <!-- Categories --> 1392 <tr> 1393 <th> 1394 Categories: 1395 </th> 1396 <td> 1397 <xsl:for-each select="categories/category"> 1398 <xsl:value-of select="word"/><br/> 1399 </xsl:for-each> 1400 </td> 1401 </tr> 1402 1423 1403 </table> 1424 1404 1425 1405 <p> 1426 1406 <xsl:if test="/bedeworkadmin/canEdit = 'true' or /bedeworkadmin/userInfo/superUser = 'true'"> 1427 <xsl:variable name="calPath" select="calendar/encodedPath"/>1428 <xsl:variable name="guid" select="guid"/>1429 <xsl:variable name="recurrenceId" select="recurrenceId"/>1430 1407 <input type="button" name="return" value="Edit event" onclick="javascript:location.replace('{$event-fetchForUpdate}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}')"/> 1431 1408 </xsl:if> 1432 1409 1433 <input type="button" name="return" value="Back to search results" onclick="javascript:history.back()"/>1410 <input type="button" name="return" value="Back" onclick="javascript:history.back()"/> 1434 1411 </p> 1435 1412 </xsl:template> trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
r1114 r1115 142 142 143 143 <!-- Other generally useful global variables --> 144 <xsl:variable name="confId" select="/bedework/confirmationid"/>145 144 <xsl:variable name="prevdate" select="/bedework/previousdate"/> 146 145 <xsl:variable name="nextdate" select="/bedework/nextdate"/> … … 978 977 <xsl:when test="recurring=true"> 979 978 Remove: 980 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid} &confirmationid={$confId}">979 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}"> 981 980 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 982 981 all 983 982 </a> | 984 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId} &confirmationid={$confId}">983 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}"> 985 984 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 986 985 this instance … … 988 987 </xsl:when> 989 988 <xsl:otherwise> 990 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId} &confirmationid={$confId}">Remove</a>989 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}">Remove</a> 991 990 </xsl:otherwise> 992 991 </xsl:choose> … … 997 996 Edit: <a href="{$editEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}">master</a> | 998 997 <a href="{$editEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}">instance</a> | 999 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId} &confirmationid={$confId}">Delete All</a>998 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}">Delete All</a> 1000 999 </xsl:when> 1001 1000 <xsl:otherwise> 1002 1001 <a href="{$editEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}">Edit</a> | 1003 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId} &confirmationid={$confId}">Delete</a>1002 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}">Delete</a> 1004 1003 </xsl:otherwise> 1005 1004 </xsl:choose> … … 1302 1301 <xsl:when test="recurring=true"> 1303 1302 Remove: 1304 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid} &confirmationid={$confId}">1303 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}"> 1305 1304 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 1306 1305 all 1307 1306 </a> | 1308 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId} &confirmationid={$confId}">1307 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}"> 1309 1308 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 1310 1309 this instance … … 1312 1311 </xsl:when> 1313 1312 <xsl:otherwise> 1314 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId} &confirmationid={$confId}">1313 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}"> 1315 1314 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 1316 1315 Remove … … 1323 1322 <xsl:when test="recurring=true"> 1324 1323 Edit: 1325 <a href="{$editEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid} &confirmationid={$confId}">1324 <a href="{$editEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}"> 1326 1325 <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit"/> 1327 1326 master event 1328 1327 </a> | 1329 <a href="{$editEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId} &confirmationid={$confId}">1328 <a href="{$editEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}"> 1330 1329 <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit"/> 1331 1330 this instance … … 1333 1332 </xsl:when> 1334 1333 <xsl:otherwise> 1335 <a href="{$editEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid} &confirmationid={$confId}">1334 <a href="{$editEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}"> 1336 1335 <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit"/> 1337 1336 Edit … … 1351 1350 <xsl:choose> 1352 1351 <xsl:when test="recurring=true"> 1353 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid} &confirmationid={$confId}">1352 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}"> 1354 1353 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 1355 1354 Delete All (recurring) … … 1357 1356 </xsl:when> 1358 1357 <xsl:otherwise> 1359 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId} &confirmationid={$confId}">1358 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}"> 1360 1359 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 1361 1360 Delete … … 1660 1659 change it without modifying includes.js --> 1661 1660 <form name="eventForm" method="post" action="{$addEvent}" id="standardForm"> 1662 <input type="hidden" name="confirmationid" value="{$confId}"/>1663 1661 <input type="hidden" name="endType" value="date"/> 1664 1662 <h2>Add Event</h2> … … 2256 2254 change it without modifying includes.js --> 2257 2255 <form name="eventForm" method="post" action="{$updateEvent}" id="standardForm"> 2258 <input type="hidden" name="confirmationid" value="{$confId}"/>2259 2256 <input type="hidden" name="endType" value="date"/> 2260 2257 <h2>Edit Event</h2> … … 2263 2260 <th colspan="2" class="commonHeader"> 2264 2261 <div id="eventActions"> 2265 <a href="{$eventView}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId} &confirmationid={$confId}">2262 <a href="{$eventView}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}"> 2266 2263 <img src="{$resourcesRoot}/resources/glassFill-icon-viewGray.gif" width="13" height="13" border="0" alt="view"/> 2267 2264 View … … 2269 2266 <xsl:if test="currentAccess/current-user-privilege-set/privilege/unbind"> 2270 2267 | 2271 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPathEncoded}&guid={$guid}&recurrenceId={$recurrenceId} &confirmationid={$confId}">2268 <a href="{$delEvent}&subid={$subscriptionId}&calPath={$calPathEncoded}&guid={$guid}&recurrenceId={$recurrenceId}"> 2272 2269 <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 2273 2270 Delete … … 2614 2611 <input name="submit" type="submit" value="Submit Event"/>  2615 2612 <input name="cancelled" type="submit" value="Cancel"/> 2616 <input type="button" value="return to view" onclick="location.replace('{$eventView}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId} &confirmationid={$confId}')"/>2613 <input type="button" value="return to view" onclick="location.replace('{$eventView}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}')"/> 2617 2614 </td> 2618 2615 </tr> … … 4375 4372 <xsl:when test="/bedework/creating = 'true'"> 4376 4373 <form name="addLocationForm" method="post" action="{$location-update}" id="standardForm"> 4377 <input type="hidden" name="confirmationid" value="{$confId}"/>4378 4374 <h2>Manage Locations</h2> 4379 4375 <table class="common" cellspacing="0"> … … 4419 4415 <form name="editLocationForm" method="post" action="{$location-update}" id="standardForm"> 4420 4416 <input type="hidden" name="updateLocation" value="true"/> 4421 <input type="hidden" name="confirmationid" value="{$confId}"/>4422 4417 <h2>Manage Locations</h2> 4423 4418 <table class="common" cellspacing="0"> … … 4596 4591 <form name="eventForm" method="post" action="{$schedule-attendeeRespond}" id="standardForm"> 4597 4592 <input type="hidden" name="updateEvent" value="true"/> 4598 <input type="hidden" name="confirmationid" value="{$confId}"/>4599 4593 <input type="hidden" name="endType" value="date"/> 4600 4594 <h2>Meeting Request</h2>
