Changeset 4
- Timestamp:
- 01/20/06 16:56:12
- Files:
-
- trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.xsl (modified) (6 diffs)
- trunk/calendar3/resources/log4j.xml (modified) (1 diff)
- trunk/calendar3/webadmin/war/WEB-INF/struts-config.xml (modified) (2 diffs)
- trunk/calendar3/webadmin/war/docs/calendar/deleteConfirm.jsp (modified) (1 diff)
- trunk/calendar3/webadmin/war/docs/calendar/displayCalendarCommon.jsp (modified) (1 diff)
- trunk/calendar3/webadmin/war/docs/calendar/emitCalendar.jsp (modified) (1 diff)
- trunk/calendar3/webadmin/war/docs/calendar/modCalendar.jsp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.xsl
r3 r4 163 163 <xsl:call-template name="deleteLocationConfirm"/> 164 164 </xsl:when> 165 <xsl:when test="/bedeworkadmin/page='calendarList' or /bedeworkadmin/page='modCalendar' ">165 <xsl:when test="/bedeworkadmin/page='calendarList' or /bedeworkadmin/page='modCalendar' or /bedeworkadmin/page='deleteCalendarConfirm'"> 166 166 <xsl:apply-templates select="/bedeworkadmin/calendars"/> 167 167 </xsl:when> … … 1229 1229 <xsl:call-template name="calendarList"/> 1230 1230 </xsl:when> 1231 <xsl:when test="/bedeworkadmin/page='deleteCalendarConfirm'"> 1232 <xsl:apply-templates select="/bedeworkadmin/currentCalendar" mode="deleteCalendarConfirm"/> 1233 </xsl:when> 1231 1234 <xsl:when test="/bedeworkadmin/creating='true'"> 1232 1235 <xsl:apply-templates select="/bedeworkadmin/currentCalendar" mode="addCalendar"/> … … 1315 1318 <tr> 1316 1319 <td> 1317 <input type="submit" name="addCalendar" value="Add Calendar " class="padRight"/>1320 <input type="submit" name="addCalendar" value="Add Calendar/Folder" class="padRight"/> 1318 1321 <input type="submit" name="cancelled" value="Cancel" class="padRight"/> 1319 1322 <input type="reset" value="Clear" class="padRight"/> 1320 </td>1321 <td align="right">1322 <input type="submit" name="delete" value="Delete Calendar"/>1323 1323 </td> 1324 1324 </tr> … … 1351 1351 </tr> 1352 1352 <tr> 1353 <th>Mailing List ID:</th> 1354 <td> 1355 <xsl:value-of select="mailListId"/> 1356 </td> 1357 </tr> 1358 <tr> 1353 1359 <th>Summary:</th> 1354 1360 <td> … … 1385 1391 <tr> 1386 1392 <td> 1387 <input type="submit" name="updateCalendar" value="Update Calendar" class="padRight"/> 1393 <xsl:choose> 1394 <xsl:when test="calendarCollection='true'"> 1395 <input type="submit" name="updateCalendar" value="Update Calendar" class="padRight"/> 1396 </xsl:when> 1397 <xsl:otherwise> 1398 <input type="submit" name="updateCalendar" value="Update Folder" class="padRight"/> 1399 </xsl:otherwise> 1400 </xsl:choose> 1388 1401 <input type="submit" name="cancelled" value="Cancel" class="padRight"/> 1389 1402 <input type="reset" value="Reset" class="padRight"/> 1390 1403 </td> 1391 1404 <td align="right"> 1392 <input type="submit" name="delete" value="Delete Calendar"/> 1405 <xsl:choose> 1406 <xsl:when test="calendarCollection='true'"> 1407 <input type="submit" name="delete" value="Delete Calendar"/> 1408 </xsl:when> 1409 <xsl:otherwise> 1410 <input type="submit" name="delete" value="Delete Folder"/> 1411 </xsl:otherwise> 1412 </xsl:choose> 1393 1413 </td> 1394 1414 </tr> … … 1416 1436 </li> 1417 1437 </ul> 1438 </xsl:template> 1439 1440 <xsl:template match="currentCalendar" mode="deleteCalendarConfirm"> 1441 <xsl:choose> 1442 <xsl:when test="calendarCollection='true'"> 1443 <h3>Delete Calendar</h3> 1444 <p> 1445 The following calendar will be deleted. Continue? 1446 </p> 1447 </xsl:when> 1448 <xsl:otherwise> 1449 <h3>Delete Folder</h3> 1450 <p> 1451 The following folder <em>and all its contents</em> will be deleted. 1452 Continue? 1453 </p> 1454 </xsl:otherwise> 1455 </xsl:choose> 1456 1457 <form name="delCalForm" action="{$calendar-delete}"> 1458 <table class="eventFormTable"> 1459 <tr> 1460 <th>Path:</th> 1461 <td> 1462 <xsl:value-of select="path"/> 1463 </td> 1464 </tr> 1465 <tr> 1466 <th>Name:</th> 1467 <td> 1468 <xsl:value-of select="name"/> 1469 </td> 1470 </tr> 1471 <tr> 1472 <th>Summary:</th> 1473 <td> 1474 <xsl:value-of select="summary"/> 1475 </td> 1476 </tr> 1477 <tr> 1478 <th>Description:</th> 1479 <td> 1480 <xsl:value-of select="desc"/> 1481 </td> 1482 </tr> 1483 </table> 1484 1485 <table border="0" width="100%" id="submitTable"> 1486 <tr> 1487 <td> 1488 <input type="submit" name="cancelled" value="Cancel" class="padRight"/> 1489 </td> 1490 <td align="right"> 1491 <xsl:choose> 1492 <xsl:when test="calendarCollection='true'"> 1493 <input type="submit" name="delete" value="Yes: Delete Calendar!"/> 1494 </xsl:when> 1495 <xsl:otherwise> 1496 <input type="submit" name="delete" value="Yes: Delete Folder!"/> 1497 </xsl:otherwise> 1498 </xsl:choose> 1499 </td> 1500 </tr> 1501 </table> 1502 </form> 1503 1418 1504 </xsl:template> 1419 1505 trunk/calendar3/resources/log4j.xml
r2 r4 193 193 </category> 194 194 195 <!-- hibernate is noisy too --> 196 <category name="org.hibernate"> 197 <priority value="INFO"/> 198 </category> 199 195 200 <!-- Set rpi categories --> 196 201 <!-- trunk/calendar3/webadmin/war/WEB-INF/struts-config.xml
r2 r4 251 251 <forward name="inUse" path="/calendar/showReferenced.rdo" redirect="true" /> 252 252 <forward name="notFound" path="/calendar/showUpdateList.rdo" redirect="true" /> 253 <forward name="cancelled" path="/calendar/showUpdateList.rdo" redirect="true" /> 253 254 <forward name="continue" path="/calendar/showUpdateList.rdo" redirect="true" /> 254 255 </action> … … 278 279 validate="false"> 279 280 <forward name="continue" path="/calendar/showUpdateList.rdo" redirect="true" /> 281 <forward name="cancelled" path="/calendar/showUpdateList.rdo" redirect="true" /> 280 282 <forward name="retry" path="/calendar/showModForm.rdo" redirect="true" /> 281 283 <forward name="delete" path="/calendar/showDeleteConfirm.rdo" redirect="true" /> trunk/calendar3/webadmin/war/docs/calendar/deleteConfirm.jsp
r2 r4 1 1 <%@ taglib uri='struts-bean' prefix='bean' %> 2 2 <%@ taglib uri='struts-logic' prefix='logic' %> 3 <%@ taglib uri='struts-html' prefix='html' %>4 <%@ taglib uri='struts-genurl' prefix='genurl' %>5 3 6 <jsp:include page="/docs/header.jsp"> 7 <jsp:param name="title" value="org.bedework.title.delete.calendar.confirm"/> 8 </jsp:include> 4 <%@include file="/docs/header.jsp"%> 9 5 10 < h2><bean:message key="org.bedework.text.delete.calendar.ok" /></h2>6 <page>deleteCalendarConfirm</page> 11 7 12 <genurl:form action="calendar/delete.do" > 13 <html:submit property="cancelled" value="Cancel"/> 14 <html:submit property="deleteCalendarOK" value="Delete"/> 8 <%@include file="/docs/calendar/displayCalendarCommon.jsp"%> 15 9 16 17 <jsp:include page="displayCalendarCommon.jsp" /> 18 19 20 <html:submit property="cancelled" value="Cancel"/> 21 <html:submit property="deleteCalendarOK" value="Delete"/> 22 </genurl:form> 10 <%@include file="/docs/calendar/emitCalendars.jsp"%> 23 11 24 12 <%@include file="/docs/footer.jsp"%> 25 trunk/calendar3/webadmin/war/docs/calendar/displayCalendarCommon.jsp
r2 r4 3 3 <%@ taglib uri='struts-html' prefix='html' %> 4 4 5 <h2>Calendar Information</h2> 6 7 <table id="eventFormTable"> 8 <tr> 9 <td class="fieldName"> 10 Calendar: 11 </td> 12 <td> 13 <bean:write name="peForm" property="calendar.name" /> 14 </td> 15 </tr> 16 <tr> 17 <td class="fieldName"> 18 Path: 19 </td> 20 <td> 21 <bean:write name="peForm" property="calendar.path" />- 22 </td> 23 </tr> 24 <tr> 25 <td class="fieldName"> 26 Public: 27 </td> 28 <td> 29 <bean:write name="peForm" property="calendar.publick" />- 30 </td> 31 </tr> 32 <tr> 33 <td class="fieldName"> 34 Access: 35 </td> 36 <td> 37 <bean:write name="peForm" property="calendar.access" />- 38 </td> 39 </tr> 40 <tr> 41 <td class="fieldName"> 42 Title: 43 </td> 44 <td> 45 <bean:write name="peForm" property="calendar.title" />- 46 </td> 47 </tr> 48 <tr> 49 <td class="fieldName"> 50 Description: 51 </td> 52 <td> 53 <bean:write name="peForm" property="calendar.description" />- 54 </td> 55 </tr> 56 <tr> 57 <td class="fieldName"> 58 Show Children: 59 </td> 60 <td> 61 <bean:write name="peForm" property="calendar.showChildren" />- 62 </td> 63 </tr> 64 <tr> 65 <td class="fieldName"> 66 Calendar Collection: 67 </td> 68 <td> 69 <bean:write name="peForm" property="calendar.calendarCollection" />- 70 </td> 71 </tr> 72 </table> 5 <bean:define id="curcal" name="peForm" property="calendar"/> 6 <currentCalendar> 7 <id><bean:write name="curcal" property="id" /></id> 8 <name><bean:write name="curcal" property="name" /></name> 9 <summary><bean:write name="curcal" property="summary" /></summary> 10 <desc><bean:write name="curcal" property="description" /></desc> 11 <path><bean:write name="curcal" property="path" /></path> 12 <calendarCollection><bean:write name="curcal" property="calendarCollection" /></calendarCollection> 13 <mailListId><bean:write name="calendar" property="mailListId" /></mailListId> 14 </currentCalendar> trunk/calendar3/webadmin/war/docs/calendar/emitCalendar.jsp
r2 r4 7 7 <path><bean:write name="calendar" property="path" /></path> 8 8 <calendarCollection><bean:write name="calendar" property="calendarCollection" /></calendarCollection> 9 <mailListId><bean:write name="calendar" property="mailListId" /></mailListId> 9 10 10 11 <logic:iterate name="calendar" property="children" id="cal"> trunk/calendar3/webadmin/war/docs/calendar/modCalendar.jsp
r2 r4 1 1 <%@ taglib uri='struts-bean' prefix='bean' %> 2 2 <%@ taglib uri='struts-logic' prefix='logic' %> 3 <%@ taglib uri='struts-html' prefix='html' %>4 <%@ taglib uri='struts-genurl' prefix='genurl' %>5 3 6 4 <%@include file="/docs/header.jsp"%> … … 9 7 <creating><bean:write name="peForm" property="addingCalendar"/></creating> 10 8 11 <bean:define id="curcal" name="peForm" property="calendar"/> 12 <currentCalendar> 13 <id><bean:write name="curcal" property="id" /></id> 14 <name><bean:write name="curcal" property="name" /></name> 15 <summary><bean:write name="curcal" property="summary" /></summary> 16 <desc><bean:write name="curcal" property="description" /></desc> 17 <path><bean:write name="curcal" property="path" /></path> 18 <calendarCollection><bean:write name="curcal" property="calendarCollection" /></calendarCollection> 19 </currentCalendar> 9 <%@include file="/docs/calendar/displayCalendarCommon.jsp"%> 20 10 21 11 <%@include file="/docs/calendar/emitCalendars.jsp"%>
