Changeset 3587
- Timestamp:
- 07/20/12 13:32:29
- Files:
-
- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (3 diffs)
- trunk/deployment/webadmin/webapp/resources/default/default/localeSettings.xsl (modified) (1 diff)
- trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (modified) (7 diffs)
- trunk/deployment/webadmin/webapp/resources/es_ES/default/localeSettings.xsl (modified) (1 diff)
- trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
r3586 r3587 1429 1429 </xsl:choose> 1430 1430 </xsl:variable> 1431 <form name="eventForm" method="post" enctype="multipart/form-data" onsubmit=" setEventFields(this,{$portalFriendly},'{$submitter}')">1431 <form name="eventForm" method="post" enctype="multipart/form-data" onsubmit="return validateEventForm(this);setEventFields(this,{$portalFriendly},'{$submitter}')"> 1432 1432 <xsl:choose> 1433 1433 <xsl:when test="/bedework/page = 'modEventPending'"> … … 2874 2874 <td> 2875 2875 <input type="checkbox" id="bwIsRegisterableEvent" name="bwIsRegisterableEvent" onclick="showRegistrationFields(this);"> 2876 <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-MAX-TICKETS']"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 2876 <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-MAX-TICKETS']"> 2877 <xsl:attribute name="checked">checked</xsl:attribute> 2878 <xsl:attribute name="disabled">disabled</xsl:attribute> 2879 </xsl:if> 2877 2880 </input> 2878 2881 <label for="bwIsRegisterableEvent"><xsl:copy-of select="$bwStr-AEEF-UsersMayRegister"/></label> … … 2882 2885 2883 2886 <label for="xBwMaxTicketsHolder" class="interiorLabel"><xsl:copy-of select="$bwStr-AEEF-MaxTickets"/></label> 2884 <input type="text" 2887 <input type="text" name="xBwMaxTicketsHolder" id="xBwMaxTicketsHolder" size="3"> 2885 2888 <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-MAX-TICKETS']"> 2886 2889 <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-MAX-TICKETS']/values/text"/></xsl:attribute> trunk/deployment/webadmin/webapp/resources/default/default/localeSettings.xsl
r3571 r3587 60 60 var bwRecurChangeWarning = "WARNING: changing your recurrence rules\nwill destroy all existing recurrence overrides\nand exceptions when you save the event.\n\nContinue?"; 61 61 // registration strings 62 var maxTicketsWarning = " You must set the maximum number of tickets allowed for this event.";63 var maxTicketsPerUserWarning = " You must set the maximum number of tickets each user may aquire.";62 var maxTicketsWarning = "Event Registration Settings:\nYou must set the maximum number of tickets allowed for this event."; 63 var maxTicketsPerUserWarning = "Event Registration Settings:\nYou must set the maximum number of tickets each user may aquire."; 64 64 </script> 65 65 </xsl:template> trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
r3582 r3587 77 77 <!-- Use the regisration module? --> 78 78 <xsl:variable name="bwUseRegistrationSystem">true</xsl:variable> 79 <xsl:variable name="bwRegistrationRoot">/eventreg</xsl:variable> 79 80 80 81 <!-- Properly encoded prefixes to the application actions; use these to build … … 298 299 // startdate 299 300 $("#bwEventWidgetStartDate").datepicker({ 301 <xsl:if test="translate(/bedework/formElements/form/start/rfc3339DateTime,'-:','') = /bedework/formElements/form/xproperties/X-BEDEWORK-REGISTRATION-END/values/text">altField: "#xBwRegistrationClosesDate",</xsl:if> 300 302 defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/start/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/start/day/select/option[@selected = 'selected']/@value"/>) 301 303 }).attr("readonly", "readonly"); … … 370 372 371 373 // registration open dates 372 $("#xBwRegistrationOpensDate").datepicker({ 373 <xsl:choose> 374 <xsl:when test="false"><!-- add a test for the existence of a regOpen xprop and use it --> 375 defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/start/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/start/day/select/option[@selected = 'selected']/@value"/>) 376 </xsl:when> 377 <xsl:otherwise> 378 defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/start/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/start/day/select/option[@selected = 'selected']/@value"/>) 379 </xsl:otherwise> 380 </xsl:choose> 381 }).attr("readonly", "readonly"); 374 $("#xBwRegistrationOpensDate").datepicker().attr("readonly", "readonly"); 382 375 $("#xBwRegistrationOpensDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 383 376 … … 396 389 397 390 // registration close dates 398 $("#xBwRegistrationClosesDate").datepicker({ 399 <xsl:choose> 400 <xsl:when test="false"><!-- add a test for the existence of a regOpen xprop and use it --> 401 defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/start/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/start/day/select/option[@selected = 'selected']/@value"/>) 402 </xsl:when> 403 <xsl:otherwise> 404 defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/start/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/start/day/select/option[@selected = 'selected']/@value"/>) 405 </xsl:otherwise> 406 </xsl:choose> 407 }).attr("readonly", "readonly"); 391 $("#xBwRegistrationClosesDate").datepicker().attr("readonly", "readonly"); 408 392 $("#xBwRegistrationClosesDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 409 393 … … 1446 1430 </xsl:choose> 1447 1431 </xsl:variable> 1448 <form name="eventForm" method="post" enctype="multipart/form-data" onsubmit=" setEventFields(this,{$portalFriendly},'{$submitter}')">1432 <form name="eventForm" method="post" enctype="multipart/form-data" onsubmit="return validateEventForm(this);setEventFields(this,{$portalFriendly},'{$submitter}')"> 1449 1433 <xsl:choose> 1450 1434 <xsl:when test="/bedework/page = 'modEventPending'"> … … 2891 2875 <td> 2892 2876 <input type="checkbox" id="bwIsRegisterableEvent" name="bwIsRegisterableEvent" onclick="showRegistrationFields(this);"> 2893 <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-MAX-TICKETS']"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 2877 <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-MAX-TICKETS']"> 2878 <xsl:attribute name="checked">checked</xsl:attribute> 2879 <xsl:attribute name="disabled">disabled</xsl:attribute> 2880 </xsl:if> 2894 2881 </input> 2895 2882 <label for="bwIsRegisterableEvent"><xsl:copy-of select="$bwStr-AEEF-UsersMayRegister"/></label> … … 3021 3008 </script> 3022 3009 </xsl:if> 3023 <xsl:if test="form/eventregAdminToken"> 3024 <p><a href=""><xsl:copy-of select="$bwStr-AEEF-ViewRegistrations"/></a></p> 3010 <xsl:if test="eventregAdminToken"> 3011 <p> 3012 <xsl:variable name="registrationsHref"><xsl:value-of select="$bwRegistrationRoot"/>/admin/adminAgenda.do?href=<xsl:value-of select="form/calendar/event/encodedPath"/>/<xsl:value-of select="name"/>&atkn=<xsl:value-of select="eventregAdminToken"/></xsl:variable> 3013 <xsl:variable name="registrationsDownloadHref"><xsl:value-of select="$bwRegistrationRoot"/>/admin/download.do?href=<xsl:value-of select="form/calendar/event/encodedPath"/>/<xsl:value-of select="name"/>&atkn=<xsl:value-of select="eventregAdminToken"/></xsl:variable> 3014 <button onclick="launchSizedWindow('{$registrationsHref}', '1000', '600');return false;"><xsl:copy-of select="$bwStr-AEEF-ViewRegistrations"/></button> 3015 <xsl:text> </xsl:text> 3016 <!--<button onclick="location.href='{$registrationsDownloadHref}';return false;"><xsl:copy-of select="$bwStr-AEEF-DownloadRegistrations"/></button>--> 3017 </p> 3025 3018 </xsl:if> 3026 3019 </div> trunk/deployment/webadmin/webapp/resources/es_ES/default/localeSettings.xsl
r3571 r3587 56 56 var bwRecurChangeWarning = "WARNING: changing your recurrence rules\nwill destroy all existing recurrence overrides\nand exceptions when you save the event.\n\nContinue?"; 57 57 // registration strings 58 var maxTicketsWarning = " You must set the maximum number of tickets allowed for this event.";59 var maxTicketsPerUserWarning = " You must set the maximum number of tickets each user may aquire.";58 var maxTicketsWarning = "Event Registration Settings:\nYou must set the maximum number of tickets allowed for this event."; 59 var maxTicketsPerUserWarning = "Event Registration Settings:\nYou must set the maximum number of tickets each user may aquire."; 60 60 </script> 61 61 </xsl:template> trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js
r3571 r3587 333 333 function validateEventForm(formObj) { 334 334 if(formObj["bwIsRegisterableEvent"].checked) { 335 if(formObj["xBwMaxTicketsHolder"].value = "") {335 if(formObj["xBwMaxTicketsHolder"].value == "") { 336 336 alert(maxTicketsWarning); 337 337 formObj["xBwMaxTicketsHolder"].focus(); 338 338 return false; 339 339 } 340 if(formObj["xBwMaxTicketsPerUserHolder"].value = "") {340 if(formObj["xBwMaxTicketsPerUserHolder"].value == "") { 341 341 alert(maxTicketsPerUserWarning); 342 342 formObj["xBwMaxTicketsPerUserHolder"].focus();
