Changeset 1680
- Timestamp:
- 12/18/07 15:34:53
- Files:
-
- trunk/deployment/resources/xsl/default/default/errors.xsl (modified) (1 diff)
- trunk/deployment/webadmin/webapp/resources/default/default/default.css (modified) (1 diff)
- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (13 diffs)
- trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (modified) (1 diff)
- trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.css (modified) (1 diff)
- trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/resources/xsl/default/default/errors.xsl
r1597 r1680 244 244 Error: you cannot change scheduling method 245 245 </xsl:when> 246 <xsl:when test="id='org.bedework.validation.error.insubmissionscalendar'"> 247 Error: to publish this event, please select a public calendar 248 </xsl:when> 246 249 247 250 <!-- Scheduling error codes are defined in CalfacadeException --> trunk/deployment/webadmin/webapp/resources/default/default/default.css
r1674 r1680 356 356 background-color: #eee; 357 357 } 358 #commonListTable td.date, 359 #commonListTable td.calcat { 360 white-space: nowrap; 361 } 358 362 .recurrenceEditLinks { 359 363 font-style: italic; trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
r1674 r1680 87 87 <xsl:variable name="event-initUpdateEvent" select="/bedework/urlPrefixes/event/initUpdateEvent/a/@href"/> 88 88 <xsl:variable name="event-delete" select="/bedework/urlPrefixes/event/delete/a/@href"/> 89 <xsl:variable name="event-deletePending" select="/bedework/urlPrefixes/event/deletePending/a/@href"/> 89 90 <xsl:variable name="event-fetchForDisplay" select="/bedework/urlPrefixes/event/fetchForDisplay/a/@href"/> 90 91 <xsl:variable name="event-fetchForUpdate" select="/bedework/urlPrefixes/event/fetchForUpdate/a/@href"/> 92 <xsl:variable name="event-fetchForUpdatePending" select="/bedework/urlPrefixes/event/fetchForUpdatePending/a/@href"/> 91 93 <xsl:variable name="event-update" select="/bedework/urlPrefixes/event/update/a/@href"/> 94 <xsl:variable name="event-updatePending" select="/bedework/urlPrefixes/event/updatePending/a/@href"/> 92 95 <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent/a/@href"/> 93 96 <xsl:variable name="event-initUpload" select="/bedework/urlPrefixes/event/initUpload/a/@href"/> … … 213 216 <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/> 214 217 <link rel="stylesheet" href="{$resourcesRoot}/default/default/subColors.css"/> 215 <xsl:if test="/bedework/page='modEvent' ">218 <xsl:if test="/bedework/page='modEvent' or /bedework/page='modEventPending'"> 216 219 <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js"> </script> 217 220 <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"> </script> … … 272 275 <xsl:call-template name="eventList"/> 273 276 </xsl:when> 274 <xsl:when test="/bedework/page='modEvent'"> 277 <xsl:when test="/bedework/page='modEvent' or 278 /bedework/page='modEventPending'"> 275 279 <xsl:apply-templates select="/bedework/formElements" mode="modEvent"/> 276 280 </xsl:when> 277 <xsl:when test="/bedework/page='displayEvent' or /bedework/page='deleteEventConfirm'"> 281 <xsl:when test="/bedework/page='displayEvent' or 282 /bedework/page='deleteEventConfirm' or 283 /bedework/page='deleteEventConfirmPending'"> 278 284 <xsl:apply-templates select="/bedework/event" mode="displayEvent"/> 279 285 </xsl:when> … … 284 290 <xsl:call-template name="modContact"/> 285 291 </xsl:when> 286 <xsl:when test="/bedework/page='deleteContactConfirm' or /bedework/page='contactReferenced'"> 292 <xsl:when test="/bedework/page='deleteContactConfirm' or 293 /bedework/page='contactReferenced'"> 287 294 <xsl:call-template name="deleteContactConfirm"/> 288 295 </xsl:when> … … 305 312 <xsl:call-template name="deleteCategoryConfirm"/> 306 313 </xsl:when> 307 <xsl:when test="/bedework/page='calendarList' or /bedework/page='calendarDescriptions' or /bedework/page='displayCalendar' or /bedework/page='modCalendar' or /bedework/page='deleteCalendarConfirm' or /bedework/page='calendarReferenced'"> 314 <xsl:when test="/bedework/page='calendarList' or 315 /bedework/page='calendarDescriptions' or 316 /bedework/page='displayCalendar' or 317 /bedework/page='modCalendar' or 318 /bedework/page='deleteCalendarConfirm' or 319 /bedework/page='calendarReferenced'"> 308 320 <xsl:apply-templates select="/bedework/calendars" mode="calendarCommon"/> 309 321 </xsl:when> … … 311 323 <xsl:call-template name="calendarMove"/> 312 324 </xsl:when> 313 <xsl:when test="/bedework/page='subscriptions' or /bedework/page='modSubscription'"> 325 <xsl:when test="/bedework/page='subscriptions' or 326 /bedework/page='modSubscription'"> 314 327 <xsl:apply-templates select="/bedework/subscriptions"/> 315 328 </xsl:when> … … 721 734 <h2>Pending Events</h2> 722 735 <p>The following events were submitted to the calendar:</p> 723 <xsl:call-template name="eventListCommon"/> 736 <xsl:call-template name="eventListCommon"> 737 <xsl:with-param name="pending">true</xsl:with-param> 738 </xsl:call-template> 724 739 </xsl:template> 725 740 … … 874 889 875 890 <xsl:template name="eventListCommon"> 891 <xsl:param name="pending">false</xsl:param> 876 892 <table id="commonListTable"> 877 893 <tr> … … 879 895 <th>Start Date</th> 880 896 <th>End Date</th> 881 <th>Calendar</th> 897 <xsl:choose> 898 <xsl:when test="$pending = 'true'"> 899 <th>Categories</th> 900 </xsl:when> 901 <xsl:otherwise> 902 <th>Calendar</th> 903 </xsl:otherwise> 904 </xsl:choose> 882 905 <th>Description</th> 883 906 </tr> … … 890 913 <tr> 891 914 <td> 892 <a href="{$event-fetchForUpdate}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}"> 893 <xsl:choose> 894 <xsl:when test="summary != ''"> 895 <xsl:value-of select="summary"/> 896 </xsl:when> 897 <xsl:otherwise> 898 <em>no title</em> 899 </xsl:otherwise> 900 </xsl:choose> 901 </a> 915 <xsl:choose> 916 <xsl:when test="$pending = 'true'"> 917 <a href="{$event-fetchForUpdatePending}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}"> 918 <xsl:choose> 919 <xsl:when test="summary != ''"> 920 <xsl:value-of select="summary"/> 921 </xsl:when> 922 <xsl:otherwise> 923 <em>no title</em> 924 </xsl:otherwise> 925 </xsl:choose> 926 </a> 927 </xsl:when> 928 <xsl:otherwise> 929 <a href="{$event-fetchForUpdate}&subid={$subscriptionId}&calPath={$calPath}&guid={$guid}&recurrenceId={$recurrenceId}"> 930 <xsl:choose> 931 <xsl:when test="summary != ''"> 932 <xsl:value-of select="summary"/> 933 </xsl:when> 934 <xsl:otherwise> 935 <em>no title</em> 936 </xsl:otherwise> 937 </xsl:choose> 938 </a> 939 </xsl:otherwise> 940 </xsl:choose> 902 941 </td> 903 942 <td class="date"> 904 <xsl:value-of select="start/longdate"/>, 943 <xsl:value-of select="start/shortdate"/> 944 <xsl:text> </xsl:text> 905 945 <xsl:value-of select="start/time"/> 906 946 </td> 907 947 <td class="date"> 908 <xsl:value-of select="end/longdate"/>, 948 <xsl:value-of select="end/shortdate"/> 949 <xsl:text> </xsl:text> 909 950 <xsl:value-of select="end/time"/> 910 951 </td> 911 <td> 912 <xsl:value-of select="calendar/name"/> 952 <td class="calcat"> 953 <xsl:choose> 954 <xsl:when test="$pending = 'true'"> 955 <xsl:for-each select="categories/category"> 956 <xsl:value-of select="word"/><br/> 957 </xsl:for-each> 958 </xsl:when> 959 <xsl:otherwise> 960 <xsl:value-of select="calendar/name"/> 961 </xsl:otherwise> 962 </xsl:choose> 913 963 </td> 914 964 <td> … … 959 1009 </xsl:if> 960 1010 961 <xsl:variable name="modEventAction" select="form/@action"/> 962 <form name="eventForm" method="post" action="{$modEventAction}" onsubmit="setEventFields(this)"> 1011 <form name="eventForm" method="post" onsubmit="setEventFields(this)"> 1012 <xsl:choose> 1013 <xsl:when test="/bedework/page = 'modEventPending'"> 1014 <xsl:attribute name="action"><xsl:value-of select="$event-updatePending"/></xsl:attribute> 1015 </xsl:when> 1016 <xsl:otherwise> 1017 <xsl:attribute name="action"><xsl:value-of select="$event-update"/></xsl:attribute> 1018 </xsl:otherwise> 1019 </xsl:choose> 963 1020 964 1021 <xsl:call-template name="submitEventButtons"/> … … 2404 2461 2405 2462 <xsl:choose> 2406 <xsl:when test="/bedework/page='deleteEventConfirm' ">2463 <xsl:when test="/bedework/page='deleteEventConfirm' or /bedework/page='deleteEventConfirmPending'"> 2407 2464 <h2>Ok to delete this event?</h2> 2408 2465 <p style="width: 400px;">Note: we do not encourage deletion of old but correct events; we prefer to keep … … 2410 2467 that are truly erroneous.</p> 2411 2468 <p id="confirmButtons"> 2412 <form action="{$event-delete}" method="post"> 2469 <form method="post"> 2470 <xsl:choose> 2471 <xsl:when test="/bedework/page = 'deleteEventConfirmPending'"> 2472 <xsl:attribute name="action"><xsl:value-of select="$event-deletePending"/></xsl:attribute> 2473 </xsl:when> 2474 <xsl:otherwise> 2475 <xsl:attribute name="action"><xsl:value-of select="$event-delete"/></xsl:attribute> 2476 </xsl:otherwise> 2477 </xsl:choose> 2413 2478 <input type="submit" name="cancelled" value="Cancel"/> 2414 2479 <input type="submit" name="delete" value="Delete"/> trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js
r1676 r1680 273 273 output += '</table>'; 274 274 } 275 if (this.category != "") { 276 output += '<table>'; 277 output += '<tr><th colspan="2">Suggested Category:</th></tr>'; 278 output += '<tr><td>Category:</td><td>' + this.category + '</td></tr>'; 279 output += '</table>'; 280 } 281 output += '<p>'; 275 282 if (this.notes != "") { 276 output += '<p><strong>Notes:</strong><br/>'; 277 output += this.notes + '</p>'; 278 } 283 output += '<strong>Notes:</strong><br/>'; 284 output += this.notes; 285 } 286 output += '</p>'; 279 287 280 288 return output; trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.css
r1673 r1680 747 747 font-style: italic; 748 748 } 749 #bedework #commonListTable { 750 margin-bottom: 2em; 751 } 752 #bedework #commonListTable th { 753 padding: 0.2em 1em 0.2em 0.5em; 754 background-color : #ccc; 755 color: black; 756 white-space: nowrap; 757 text-align: left; 758 } 759 #bedework #commonListTable td { 760 vertical-align: top; 761 font-size: 0.9em; 762 padding: 0.2em 1em 0.2em 0.5em; 763 color: black; 764 background-color: #eee; 765 } trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
r1676 r1680 218 218 <li class="selected">Overview</li> 219 219 <li><a href="{$initEvent}">Add Event</a></li> 220 <li><a href="{$initPendingEvents}&calPath={$submissionsRootEncoded} ">My Pending Events</a></li>220 <li><a href="{$initPendingEvents}&calPath={$submissionsRootEncoded}&listAllEvents=true">My Pending Events</a></li> 221 221 </xsl:when> 222 222 <xsl:when test="/bedework/page='eventList'"> … … 228 228 <li><a href="{$setup}">Overview</a></li> 229 229 <li class="selected">Add Event</li> 230 <li><a href="{$initPendingEvents}&calPath={$submissionsRootEncoded} ">My Pending Events</a></li>230 <li><a href="{$initPendingEvents}&calPath={$submissionsRootEncoded}&listAllEvents=true">My Pending Events</a></li> 231 231 </xsl:otherwise> 232 232 </xsl:choose> … … 1323 1323 <!--++++++++++++++++++ Events ++++++++++++++++++++--> 1324 1324 <xsl:template name="eventList"> 1325 <h 2>Pending Events</h2>1325 <h1>Pending Events</h1> 1326 1326 <xsl:call-template name="eventListCommon"/> 1327 1327 </xsl:template> … … 1331 1331 <tr> 1332 1332 <th>Title</th> 1333 <!-- <th>Submitted</th> --> 1333 1334 <th>Start Date</th> 1334 1335 <th>End Date</th> 1335 <th>Ca lendar</th>1336 <th>Categories</th> 1336 1337 <th>Description</th> 1337 1338 </tr> … … 1355 1356 </a> 1356 1357 </td> 1358 <!-- need to output created date 1357 1359 <td class="date"> 1358 <xsl:value-of select="start/longdate"/>, 1360 <xsl:value-of select="end/longdate"/> 1361 </td> --> 1362 <td class="date"> 1363 <xsl:value-of select="start/shortdate"/> 1364 <xsl:text> </xsl:text> 1359 1365 <xsl:value-of select="start/time"/> 1360 1366 </td> 1361 1367 <td class="date"> 1362 <xsl:value-of select="end/longdate"/>, 1368 <xsl:value-of select="end/shortdate"/> 1369 <xsl:text> </xsl:text> 1363 1370 <xsl:value-of select="end/time"/> 1364 1371 </td> 1365 1372 <td> 1366 <xsl:value-of select="calendar/name"/> 1373 <xsl:for-each select="categories/category"> 1374 <xsl:value-of select="word"/><br/> 1375 </xsl:for-each> 1367 1376 </td> 1368 1377 <td>
