Changeset 2166
- Timestamp:
- 05/11/09 15:31:53
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/webadmin/webapp/resources/default/default/default.css
r2163 r2166 716 716 height: 20px; 717 717 } 718 #submitTable{718 .submitBox { 719 719 position: relative; /* allows for absolute positioning within the table, e.g. #pubishBox */ 720 width: 96%; /* less than 100% helps avoid IE weirdness */721 720 margin-top: 1em; 722 721 } … … 1145 1144 background-color: transparent; 1146 1145 color: black; 1146 } 1147 .right { 1148 float: right; 1147 1149 } 1148 1150 .padTop { trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
r2165 r2166 1080 1080 '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:call-template>', 1081 1081 '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-EMAIL']"/></xsl:call-template>', 1082 '<ul><xsl:for-each select="form/categories/current//keyword"><li><xsl:call-template name="escapeApos"><xsl:with-param name="str" select="."/></xsl:call-template></li></xsl:for-each></ul>', 1082 1083 '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:call-template>', 1083 1084 '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/></xsl:call-template>'); … … 1101 1102 <div id="bwSubmittedEventComment"> 1102 1103 <xsl:if test="/bedework/page = 'modEvent'"><xsl:attribute name="class">invisible</xsl:attribute></xsl:if> 1104 <xsl:text> </xsl:text> 1103 1105 </div> 1104 1106 </div> … … 2585 2587 <xsl:param name="eventTitle"/> 2586 2588 <xsl:param name="eventUrl"/> 2587 <table border="0" id="submitTable"> 2588 <tr> 2589 <xsl:choose> 2590 <xsl:when test="starts-with(form/calendar/event/path,$submissionsRootUnencoded)"> 2591 <td> 2592 <!-- no need for a publish box in the single calendar model unless we have more than one calendar; --> 2593 <xsl:choose> 2594 <xsl:when test="count(form/calendar/all/select/option) > 1"><!-- test for the presence of more than one publishing calendar --> 2595 <div id="publishBox" class="invisible"> 2596 <div id="publishBoxCloseButton"> 2597 <a href="javascript:resetPublishBox('calendarId')"> 2598 <img src="{$resourcesRoot}/resources/closeIcon.gif" width="20" height="20" alt="close" border="0"/> 2599 </a> 2600 </div> 2601 <strong>Select a calendar in which to publish this event:</strong><br/> 2602 <select name="calendarId" id="calendarId"> 2603 <option> 2604 <xsl:attribute name="value"><xsl:value-of select="form/calendar/path"/></xsl:attribute> 2605 Select: 2606 </option> 2607 <xsl:for-each select="form/calendar/all/select/option"> 2608 <xsl:sort select="." order="ascending"/> 2609 <option> 2610 <xsl:attribute name="value"><xsl:value-of select="@value"/></xsl:attribute> 2611 <xsl:if test="@selected"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 2612 <xsl:choose> 2613 <xsl:when test="starts-with(node(),/bedework/submissionsRoot/unencoded)"> 2614 submitted events 2615 </xsl:when> 2616 <xsl:otherwise> 2617 <xsl:value-of select="substring-after(node(),'/public/')"/> 2618 </xsl:otherwise> 2619 </xsl:choose> 2620 </option> 2621 </xsl:for-each> 2622 </select> 2623 <input type="submit" name="publishEvent" value="Publish" onclick="changeClass('publishBox','invisible')"/> 2624 <xsl:if test="$portalFriendly = 'false'"> 2625 <br/> 2626 <span id="calDescriptionsLink"> 2627 <a href="javascript:launchSimpleWindow('{$calendar-fetchDescriptions}')">calendar descriptions</a> 2628 </span> 2629 </xsl:if> 2630 </div> 2631 <input type="submit" name="updateSubmitEvent" value="Update Event"/> 2632 <input type="button" name="publishEvent" value="Publish Event" onclick="changeClass('publishBox','visible')"/> 2633 <input type="submit" name="cancel" value="Cancel"/> 2634 </xsl:when> 2635 <xsl:otherwise> 2636 <!-- we are using the single calendar model for public events --> 2637 <input type="submit" name="updateSubmitEvent" value="Update Event"/> 2638 <input type="submit" name="publishEvent" value="Publish Event"> 2639 <xsl:attribute name="onclick">doPublishEvent('<xsl:value-of select="form/calendar/all/select/option/@value"/>','<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrl"/>');</xsl:attribute> 2640 </input> 2641 <input type="submit" name="cancel" value="Cancel"/> 2642 </xsl:otherwise> 2643 </xsl:choose> 2644 </td> 2645 <td align="right"> 2646 <input type="submit" name="delete" value="Delete Event"/> 2647 </td> 2648 </xsl:when> 2649 <xsl:otherwise> 2650 <xsl:choose> 2651 <xsl:when test="/bedework/creating='true'"> 2652 <td> 2653 <input type="submit" name="addEvent" value="Add Event"/> 2654 <input type="submit" name="cancelled" value="Cancel"/> 2655 </td> 2656 </xsl:when> 2657 <xsl:otherwise> 2658 <td> 2659 <input type="submit" name="updateEvent" value="Update Event"/> 2660 <input type="submit" name="cancelled" value="Cancel"/> 2661 <xsl:if test="form/recurringEntity != 'true' and recurrenceId = ''"> 2662 <!-- cannot duplicate recurring events for now --> 2663 <input type="submit" name="copy" value="Copy Event"/> 2664 </xsl:if> 2665 </td> 2666 <td align="right"> 2667 <input type="submit" name="delete" value="Delete Event"/> 2668 </td> 2669 </xsl:otherwise> 2670 </xsl:choose> 2671 </xsl:otherwise> 2672 </xsl:choose> 2673 </tr> 2674 </table> 2589 <div class="submitBox"> 2590 <xsl:choose> 2591 <xsl:when test="starts-with(form/calendar/event/path,$submissionsRootUnencoded)"> 2592 <div class="right"> 2593 <input type="submit" name="delete" value="Delete Event"/> 2594 </div> 2595 <!-- no need for a publish box in the single calendar model unless we have more than one calendar; --> 2596 <xsl:choose> 2597 <xsl:when test="count(form/calendar/all/select/option) > 1"><!-- test for the presence of more than one publishing calendar --> 2598 <div id="publishBox" class="invisible"> 2599 <div id="publishBoxCloseButton"> 2600 <a href="javascript:resetPublishBox('calendarId')"> 2601 <img src="{$resourcesRoot}/resources/closeIcon.gif" width="20" height="20" alt="close" border="0"/> 2602 </a> 2603 </div> 2604 <strong>Select a calendar in which to publish this event:</strong><br/> 2605 <select name="calendarId" id="calendarId"> 2606 <option> 2607 <xsl:attribute name="value"><xsl:value-of select="form/calendar/path"/></xsl:attribute> 2608 Select: 2609 </option> 2610 <xsl:for-each select="form/calendar/all/select/option"> 2611 <xsl:sort select="." order="ascending"/> 2612 <option> 2613 <xsl:attribute name="value"><xsl:value-of select="@value"/></xsl:attribute> 2614 <xsl:if test="@selected"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 2615 <xsl:choose> 2616 <xsl:when test="starts-with(node(),/bedework/submissionsRoot/unencoded)"> 2617 submitted events 2618 </xsl:when> 2619 <xsl:otherwise> 2620 <xsl:value-of select="substring-after(node(),'/public/')"/> 2621 </xsl:otherwise> 2622 </xsl:choose> 2623 </option> 2624 </xsl:for-each> 2625 </select> 2626 <input type="submit" name="publishEvent" value="Publish" onclick="changeClass('publishBox','invisible')"/> 2627 <xsl:if test="$portalFriendly = 'false'"> 2628 <br/> 2629 <span id="calDescriptionsLink"> 2630 <a href="javascript:launchSimpleWindow('{$calendar-fetchDescriptions}')">calendar descriptions</a> 2631 </span> 2632 </xsl:if> 2633 </div> 2634 <input type="submit" name="updateSubmitEvent" value="Update Event"/> 2635 <input type="button" name="publishEvent" value="Publish Event" onclick="changeClass('publishBox','visible')"/> 2636 <input type="submit" name="cancel" value="Cancel"/> 2637 </xsl:when> 2638 <xsl:otherwise> 2639 <!-- we are using the single calendar model for public events --> 2640 <input type="submit" name="updateSubmitEvent" value="Update Event"/> 2641 <input type="submit" name="publishEvent" value="Publish Event"> 2642 <xsl:attribute name="onclick">doPublishEvent('<xsl:value-of select="form/calendar/all/select/option/@value"/>','<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrl"/>');</xsl:attribute> 2643 </input> 2644 <input type="submit" name="cancel" value="Cancel"/> 2645 </xsl:otherwise> 2646 </xsl:choose> 2647 </xsl:when> 2648 <xsl:otherwise> 2649 <xsl:choose> 2650 <xsl:when test="/bedework/creating='true'"> 2651 <input type="submit" name="addEvent" value="Add Event"/> 2652 <input type="submit" name="cancelled" value="Cancel"/> 2653 </xsl:when> 2654 <xsl:otherwise> 2655 <div class="right"> 2656 <input type="submit" name="delete" value="Delete Event"/> 2657 </div> 2658 <input type="submit" name="updateEvent" value="Update Event"/> 2659 <input type="submit" name="cancelled" value="Cancel"/> 2660 <xsl:if test="form/recurringEntity != 'true' and recurrenceId = ''"> 2661 <!-- cannot duplicate recurring events for now --> 2662 <input type="submit" name="copy" value="Copy Event"/> 2663 </xsl:if> 2664 </xsl:otherwise> 2665 </xsl:choose> 2666 </xsl:otherwise> 2667 </xsl:choose> 2668 </div> 2675 2669 </xsl:template> 2676 2670 … … 3113 3107 </table> 3114 3108 3115 <table border="0" id="submitTable"> 3116 <tr> 3117 <xsl:choose> 3118 <xsl:when test="/bedework/creating='true'"> 3119 <td> 3120 <input type="submit" name="addContact" value="Add Contact"/> 3121 <input type="submit" name="cancelled" value="Cancel"/> 3122 </td> 3123 </xsl:when> 3124 <xsl:otherwise> 3125 <td> 3126 <input type="submit" name="updateContact" value="Update Contact"/> 3127 <input type="submit" name="cancelled" value="Cancel"/> 3128 </td> 3129 <td align="right"> 3130 <input type="submit" name="delete" value="Delete Contact"/> 3131 </td> 3132 </xsl:otherwise> 3133 </xsl:choose> 3134 </tr> 3135 </table> 3136 3109 <div class="submitBox"> 3110 <xsl:choose> 3111 <xsl:when test="/bedework/creating='true'"> 3112 <input type="submit" name="addContact" value="Add Contact"/> 3113 <input type="submit" name="cancelled" value="Cancel"/> 3114 </xsl:when> 3115 <xsl:otherwise> 3116 <input type="submit" name="updateContact" value="Update Contact"/> 3117 <input type="submit" name="cancelled" value="Cancel"/> 3118 <div class="right"> 3119 <input type="submit" name="delete" value="Delete Contact"/> 3120 </div> 3121 </xsl:otherwise> 3122 </xsl:choose> 3123 </div> 3137 3124 </form> 3138 3125 </xsl:template> … … 3246 3233 </table> 3247 3234 3248 <table border="0" id="submitTable"> 3249 <tr> 3250 <xsl:choose> 3251 <xsl:when test="/bedework/creating='true'"> 3252 <td> 3253 <input type="submit" name="addLocation" value="Add Location"/> 3254 <input type="submit" name="cancelled" value="Cancel"/> 3255 </td> 3256 </xsl:when> 3257 <xsl:otherwise> 3258 <td> 3259 <input type="submit" name="updateLocation" value="Update Location"/> 3260 <input type="submit" name="cancelled" value="Cancel"/> 3261 </td> 3262 <td align="right"> 3263 <input type="submit" name="delete" value="Delete Location"/> 3264 </td> 3265 </xsl:otherwise> 3266 </xsl:choose> 3267 </tr> 3268 </table> 3235 <div class="submitBox"> 3236 <xsl:choose> 3237 <xsl:when test="/bedework/creating='true'"> 3238 <input type="submit" name="addLocation" value="Add Location"/> 3239 <input type="submit" name="cancelled" value="Cancel"/> 3240 </xsl:when> 3241 <xsl:otherwise> 3242 <input type="submit" name="updateLocation" value="Update Location"/> 3243 <input type="submit" name="cancelled" value="Cancel"/> 3244 <div class="right"> 3245 <input type="submit" name="delete" value="Delete Location"/> 3246 </div> 3247 </xsl:otherwise> 3248 </xsl:choose> 3249 </div> 3269 3250 </form> 3270 3251 </xsl:template> … … 3362 3343 </tr> 3363 3344 </table> 3364 <table border="0" id="submitTable"> 3365 <tr> 3366 <td> 3367 <input type="submit" name="addCategory" value="Add Category"/> 3368 <input type="submit" name="cancelled" value="Cancel"/> 3369 </td> 3370 </tr> 3371 </table> 3345 <div class="submitBox"> 3346 <input type="submit" name="addCategory" value="Add Category"/> 3347 <input type="submit" name="cancelled" value="Cancel"/> 3348 </div> 3372 3349 </form> 3373 3350 </xsl:when> … … 3398 3375 </table> 3399 3376 3400 <table border="0" id="submitTable"> 3401 <tr> 3402 <td> 3403 <input type="submit" name="updateCategory" value="Update Category"/> 3404 <input type="submit" name="cancelled" value="Cancel"/> 3405 </td> 3406 <td align="right"> 3407 <input type="submit" name="delete" value="Delete Category"/> 3408 </td> 3409 </tr> 3410 </table> 3377 <div class="submitBox"> 3378 <div class="right"> 3379 <input type="submit" name="delete" value="Delete Category"/> 3380 </div> 3381 <input type="submit" name="updateCategory" value="Update Category"/> 3382 <input type="submit" name="cancelled" value="Cancel"/> 3383 </div> 3411 3384 </form> 3412 3385 </xsl:otherwise> … … 4040 4013 </div> 4041 4014 4042 <table border="0" id="submitTable"> 4043 <tr> 4044 <td> 4045 <xsl:choose> 4046 <xsl:when test="isSubscription='true'"> 4047 <input type="submit" name="updateCalendar" value="Update Subscription"/> 4048 </xsl:when> 4049 <xsl:when test="calType = '0'"> 4050 <input type="submit" name="updateCalendar" value="Update Folder"/> 4051 </xsl:when> 4052 <xsl:otherwise> 4053 <input type="submit" name="updateCalendar" value="Update Calendar"/> 4054 </xsl:otherwise> 4055 </xsl:choose> 4056 <input type="submit" name="cancelled" value="cancel"/> 4057 </td> 4058 <td align="right"> 4059 <xsl:choose> 4060 <xsl:when test="isSubscription='true'"> 4061 <input type="submit" name="delete" value="Remove Subscription"/> 4062 </xsl:when> 4063 <xsl:when test="calType = '0'"> 4064 <input type="submit" name="delete" value="Delete Folder"/> 4065 </xsl:when> 4066 <xsl:otherwise> 4067 <input type="submit" name="delete" value="Delete Calendar"/> 4068 </xsl:otherwise> 4069 </xsl:choose> 4070 </td> 4071 </tr> 4072 </table> 4015 <div class="submitBox"> 4016 <div class="right"> 4017 <xsl:choose> 4018 <xsl:when test="isSubscription='true'"> 4019 <input type="submit" name="delete" value="Remove Subscription"/> 4020 </xsl:when> 4021 <xsl:when test="calType = '0'"> 4022 <input type="submit" name="delete" value="Delete Folder"/> 4023 </xsl:when> 4024 <xsl:otherwise> 4025 <input type="submit" name="delete" value="Delete Calendar"/> 4026 </xsl:otherwise> 4027 </xsl:choose> 4028 </div> 4029 <xsl:choose> 4030 <xsl:when test="isSubscription='true'"> 4031 <input type="submit" name="updateCalendar" value="Update Subscription"/> 4032 </xsl:when> 4033 <xsl:when test="calType = '0'"> 4034 <input type="submit" name="updateCalendar" value="Update Folder"/> 4035 </xsl:when> 4036 <xsl:otherwise> 4037 <input type="submit" name="updateCalendar" value="Update Calendar"/> 4038 </xsl:otherwise> 4039 </xsl:choose> 4040 <input type="submit" name="cancelled" value="cancel"/> 4041 </div> 4073 4042 </form> 4074 4043 <!-- div id="sharingBox"> … … 4204 4173 </table> 4205 4174 4206 <table border="0" id="submitTable"> 4207 <tr> 4208 <td> 4209 <input type="submit" name="cancelled" value="Cancel"/> 4210 </td> 4211 <td align="right"> 4212 <xsl:choose> 4213 <xsl:when test="isSubscription = 'true'"> 4214 <input type="submit" name="delete" value="Yes: Remove Subscription!"/> 4215 </xsl:when> 4216 <xsl:when test="calType = '0'"> 4217 <input type="submit" name="delete" value="Yes: Delete Folder!"/> 4218 </xsl:when> 4219 <xsl:otherwise> 4220 <input type="submit" name="delete" value="Yes: Delete Calendar!"/> 4221 </xsl:otherwise> 4222 </xsl:choose> 4223 </td> 4224 </tr> 4225 </table> 4175 <div class="submitBox"> 4176 <div class="right"> 4177 <xsl:choose> 4178 <xsl:when test="isSubscription = 'true'"> 4179 <input type="submit" name="delete" value="Yes: Remove Subscription!"/> 4180 </xsl:when> 4181 <xsl:when test="calType = '0'"> 4182 <input type="submit" name="delete" value="Yes: Delete Folder!"/> 4183 </xsl:when> 4184 <xsl:otherwise> 4185 <input type="submit" name="delete" value="Yes: Delete Calendar!"/> 4186 </xsl:otherwise> 4187 </xsl:choose> 4188 </div> 4189 <input type="submit" name="cancelled" value="Cancel"/> 4190 </div> 4226 4191 </form> 4227 4192 </xsl:template> … … 4873 4838 </table> 4874 4839 4875 <table border="0" id="submitTable"> 4876 <tr> 4877 <td> 4878 <input type="submit" name="cancelled" value="Cancel"/> 4879 </td> 4880 <td align="right"> 4881 <xsl:choose> 4882 <xsl:when test="isSubscription = 'true'"> 4883 <input type="submit" name="delete" value="Yes: Remove Subscription!"/> 4884 </xsl:when> 4885 <xsl:when test="calType = '0'"> 4886 <input type="submit" name="delete" value="Yes: Delete Folder!"/> 4887 </xsl:when> 4888 <xsl:otherwise> 4889 <input type="submit" name="delete" value="Yes: Delete Calendar!"/> 4890 </xsl:otherwise> 4891 </xsl:choose> 4892 </td> 4893 </tr> 4894 </table> 4840 <div class="submitBox"> 4841 <div class="right"> 4842 <xsl:choose> 4843 <xsl:when test="isSubscription = 'true'"> 4844 <input type="submit" name="delete" value="Yes: Remove Subscription!"/> 4845 </xsl:when> 4846 <xsl:when test="calType = '0'"> 4847 <input type="submit" name="delete" value="Yes: Delete Folder!"/> 4848 </xsl:when> 4849 <xsl:otherwise> 4850 <input type="submit" name="delete" value="Yes: Delete Calendar!"/> 4851 </xsl:otherwise> 4852 </xsl:choose> 4853 </div> 4854 <input type="submit" name="cancelled" value="Cancel"/> 4855 </div> 4895 4856 </form> 4896 4857 </xsl:template> … … 5011 4972 </table> 5012 4973 5013 <table border="0" id="submitTable"> 5014 <tr> 5015 <td> 5016 <input type="button" name="return" value="Return to Views Listing" onclick="javascript:location.replace('{$view-fetch}')"/> 5017 </td> 5018 <td align="right"> 5019 <form name="deleteViewForm" action="{$view-fetchForUpdate}" method="post"> 5020 <input type="submit" name="deleteButton" value="Delete View"/> 5021 <input type="hidden" name="name" value="{$viewName}"/> 5022 <input type="hidden" name="delete" value="yes"/> 5023 </form> 5024 </td> 5025 </tr> 5026 </table> 4974 <div class="submitBox"> 4975 <div class="right"> 4976 <form name="deleteViewForm" action="{$view-fetchForUpdate}" method="post"> 4977 <input type="submit" name="deleteButton" value="Delete View"/> 4978 <input type="hidden" name="name" value="{$viewName}"/> 4979 <input type="hidden" name="delete" value="yes"/> 4980 </form> 4981 </div> 4982 <input type="button" name="return" value="Return to Views Listing" onclick="javascript:location.replace('{$view-fetch}')"/> 4983 </div> 5027 4984 </xsl:template> 5028 4985 … … 5103 5060 </tr> 5104 5061 </table> 5105 <table border="0" id="submitTable"> 5106 <tr> 5107 <td> 5108 <input name="submit" type="submit" value="Continue"/> 5109 <input name="cancelled" type="submit" value="Cancel"/> 5110 </td> 5111 </tr> 5112 </table> 5062 <div class="submitBox"> 5063 <input name="submit" type="submit" value="Continue"/> 5064 <input name="cancelled" type="submit" value="Cancel"/> 5065 </div> 5113 5066 </form> 5114 5067 </xsl:template> … … 5440 5393 </tr> 5441 5394 </table> 5442 <table border="0" id="submitTable"> 5443 <tr> 5444 <td> 5445 <input type="submit" name="updateSystemParams" value="Update"/> 5446 <input type="submit" name="cancelled" value="Cancel"/> 5447 </td> 5448 </tr> 5449 </table> 5395 <div class="submitBox"> 5396 <input type="submit" name="updateSystemParams" value="Update"/> 5397 <input type="submit" name="cancelled" value="Cancel"/> 5398 </div> 5450 5399 </form> 5451 5400 </xsl:template> … … 5506 5455 </tr> 5507 5456 </table> 5508 <table border="0" id="submitTable"> 5509 <tr> 5510 <td> 5511 <input type="submit" name="updateCalSuite" value="Add"/> 5512 <input type="submit" name="cancelled" value="Cancel"/> 5513 </td> 5514 </tr> 5515 </table> 5457 <div class="submitBox"> 5458 <input type="submit" name="updateCalSuite" value="Add"/> 5459 <input type="submit" name="cancelled" value="Cancel"/> 5460 </div> 5516 5461 </form> 5517 5462 </xsl:template> … … 5557 5502 </div> 5558 5503 5559 <table border="0" id="submitTable"> 5560 <tr> 5561 <td> 5562 <input type="submit" name="updateCalSuite" value="Update"/> 5563 <input type="submit" name="cancelled" value="Cancel"/> 5564 </td> 5565 <td align="right"> 5566 <input type="submit" name="delete" value="Delete Calendar Suite"/> 5567 </td> 5568 </tr> 5569 </table> 5504 <div class="submitBox"> 5505 <div class="right"> 5506 <input type="submit" name="delete" value="Delete Calendar Suite"/> 5507 </div> 5508 <input type="submit" name="updateCalSuite" value="Update"/> 5509 <input type="submit" name="cancelled" value="Cancel"/> 5510 </div> 5570 5511 </form> 5571 5512 … … 6178 6119 </tr> 6179 6120 </table> 6180 <table border="0" id="submitTable"> 6181 <tr> 6182 <td> 6183 <xsl:choose> 6184 <xsl:when test="/bedework/creating = 'true'"> 6185 <input type="submit" name="updateAdminGroup" value="Add Admin Group"/> 6186 <input type="submit" name="cancelled" value="Cancel"/> 6187 </xsl:when> 6188 <xsl:otherwise> 6189 <input type="submit" name="updateAdminGroup" value="Update Admin Group"/> 6190 <input type="submit" name="cancelled" value="Cancel"/> 6191 </xsl:otherwise> 6192 </xsl:choose> 6193 </td> 6194 <td align="right"> 6195 <xsl:if test="/bedework/creating = 'false'"> 6196 <input type="submit" name="delete" value="Delete"/> 6197 </xsl:if> 6198 </td> 6199 </tr> 6200 </table> 6121 <div class="submitBox"> 6122 <div class="right"> 6123 <xsl:if test="/bedework/creating = 'false'"> 6124 <input type="submit" name="delete" value="Delete"/> 6125 </xsl:if> 6126 </div> 6127 <xsl:choose> 6128 <xsl:when test="/bedework/creating = 'true'"> 6129 <input type="submit" name="updateAdminGroup" value="Add Admin Group"/> 6130 <input type="submit" name="cancelled" value="Cancel"/> 6131 </xsl:when> 6132 <xsl:otherwise> 6133 <input type="submit" name="updateAdminGroup" value="Update Admin Group"/> 6134 <input type="submit" name="cancelled" value="Cancel"/> 6135 </xsl:otherwise> 6136 </xsl:choose> 6137 </div> 6201 6138 </form> 6202 6139 </xsl:template> trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js
r2163 r2166 243 243 * contactUrl: value of contact's parameter X-BEDEWORK-PARAM-URL 244 244 * contactEmail: value of contact's parameter X-BEDEWORK-PARAM-EMAIL 245 * category: value of x-property X-BEDEWORK-CATEGORIES 245 * categories: list of categories derived from submitted topical areas 246 * category: value of x-property X-BEDEWORK-CATEGORIES - a freeform user suggestion 246 247 * notes: value of the x-property X-BEDEWORK-SUBMIT-COMMENT 247 248 */ 248 function bwSubmitComment(locationAddress,locationSubaddress,locationUrl,contactName,contactPhone,contactUrl,contactEmail,categor y,notes) {249 function bwSubmitComment(locationAddress,locationSubaddress,locationUrl,contactName,contactPhone,contactUrl,contactEmail,categories,category,notes) { 249 250 this.locationAddress = locationAddress; 250 251 this.locationSubaddress = locationSubaddress; … … 254 255 this.contactUrl = contactUrl; 255 256 this.contactEmail = contactEmail; 257 this.categories = categories; 256 258 this.category = category; 257 259 this.notes = notes; … … 276 278 output += '</table>'; 277 279 } 280 if (this.categories != "") { 281 output += '<table>'; 282 output += '<tr><th>Suggested Categories:</th></tr>'; 283 output += '<tr><td>' + this.categories + '</td></tr>'; 284 output += '</table>'; 285 } 278 286 if (this.category != "") { 279 output += '<p><strong> Suggested Type of Event:</strong><br/>';287 output += '<p><strong>Type of Event:</strong> (if categories weren\'t sufficient)<br/>'; 280 288 output += this.category; 281 289 output += '</p>';
