Index: trunk/deployment/resources/javascript/bedework/bedeworkXProperties.js =================================================================== --- trunk/deployment/resources/javascript/bedework/bedeworkXProperties.js (revision 3487) +++ trunk/deployment/resources/javascript/bedework/bedeworkXProperties.js (revision 3568) @@ -36,4 +36,10 @@ var bwXPropertySubmitterEmail = "X-BEDEWORK-SUBMITTER-EMAIL"; var bwXPropertySubmissionClaimant = "X-BEDEWORK-SUBMISSION-CLAIMANT"; +var bwXPropertyMaxTickets = "X-BEDEWORK-MAX-TICKETS"; +var bwXPropertyMaxTicketsPerUser = "X-BEDEWORK-MAX-TICKETS-PER-USER"; +var bwXPropertyRegistrationStart = "X-BEDEWORK-REGISTRATION-START"; +var bwXPropertyRegistrationEnd = "X-BEDEWORK-REGISTRATION-END"; +var bwXPropertyInstanceOnly = "X-BEDEWORK-INSTANCE-ONLY"; + var bwXParamDisplayName = "X-BEDEWORK-PARAM-DISPLAYNAME"; Index: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl =================================================================== --- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 3563) +++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 3568) @@ -2885,23 +2885,23 @@ invisible - Registration: - - + + + checked - + Index: trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl =================================================================== --- trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl (revision 3558) +++ trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl (revision 3568) @@ -270,5 +270,5 @@ (optional: for information about the location) Contact: - Creator + Creator Topical area: Contact (name): @@ -276,4 +276,14 @@ Contact's URL: Contact Email Address: + Registration: + Users may register for this event + Max tickets: + (maximum number of tickets allowed for the event) + Tickets allowed: + (maximum number of tickets per user) + Registration opens: + (date/time registration becomes available) + Registration closes: + (date/time of registration cut off) (optional) Index: trunk/deployment/webadmin/webapp/resources/es_ES/default/default.css =================================================================== --- trunk/deployment/webadmin/webapp/resources/es_ES/default/default.css (revision 3515) +++ trunk/deployment/webadmin/webapp/resources/es_ES/default/default.css (revision 3568) @@ -521,4 +521,7 @@ width: 160px; } +#bwRegistrationFields { + margin: 1em; +} .shown { display: inline; Index: trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl =================================================================== --- trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (revision 3558) +++ trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (revision 3568) @@ -364,4 +364,57 @@ pmLabel: "" }); + + // registration open dates + $("#xBwRegistrationOpensDate").datepicker({ + + + defaultDate: new Date(, , ) + + + defaultDate: new Date(, , ) + + + }).attr("readonly", "readonly"); + $("#xBwRegistrationOpensDate").val(''); + + // registration open time + $("#xBwRegistrationOpensClock").bwTimePicker({ + hour24: , + attachToId: "xBwRegistrationOpensTimeFields", + hourIds: ["xBwRegistrationOpensHour"], + minuteIds: ["xBwRegistrationOpensMinute"], + ampmIds: ["xBwRegistrationOpensAmpm"], + hourLabel: "", + minuteLabel: "", + amLabel: "", + pmLabel: "" + }); + + // registration close dates + $("#xBwRegistrationClosesDate").datepicker({ + + + defaultDate: new Date(, , ) + + + defaultDate: new Date(, , ) + + + }).attr("readonly", "readonly"); + $("#xBwRegistrationClosesDate").val(''); + + // registration close time + $("#xBwRegistrationClosesClock").bwTimePicker({ + hour24: , + attachToId: "xBwRegistrationClosesTimeFields", + hourIds: ["xBwRegistrationClosesHour"], + minuteIds: ["xBwRegistrationClosesMinute"], + ampmIds: ["xBwRegistrationClosesAmpm"], + hourLabel: "", + minuteLabel: "", + amLabel: "", + pmLabel: "" + }); + } @@ -2830,4 +2883,96 @@ + + + invisible + + + + checked + + + + + + + @@ -3048,5 +3193,5 @@ /user/ - + @@ -3054,4 +3199,5 @@ + Index: trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl =================================================================== --- trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl (revision 3558) +++ trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl (revision 3568) @@ -276,4 +276,14 @@ URL de contacto: Dirección de Email de contacto: + Registration: + Users may register for this event + Max tickets: + (maximum number of tickets allowed for the event) + Tickets allowed: + (maximum number of tickets per user) + Registration opens: + (date/time registration becomes available) + Registration closes: + (date/time of registration cut off) (opcional) Index: trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js =================================================================== --- trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (revision 3563) +++ trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (revision 3568) @@ -358,7 +358,20 @@ } - //X-BEDEWORK-THUMB-IMAGE: + // X-BEDEWORK-THUMB-IMAGE: if (formObj["xBwImageThumbHolder"] && formObj["xBwImageThumbHolder"].value != '') { bwXProps.update(bwXPropertyThumbImage,[],formObj["xBwImageThumbHolder"].value,true); + } + + // Event registration x-properties: + if (formObj["bwIsRegisterableEvent"].checked) { + bwXProps.update(bwXPropertyMaxTickets,[],formObj["xBwMaxTicketsHolder"].value,true); + bwXProps.update(bwXPropertyMaxTicketsPerUser,[],formObj["xBwMaxTicketsPerUserHolder"].value,true); + + var bwRegDateString = "" + bwRegDateString = formObj["xBwRegistrationOpensDate"].value.replace(/-/g,"") + "T" + padTimeUnit(formObj["xBwRegistrationOpens.hour"].value) + padTimeUnit(formObj["xBwRegistrationOpens.minute"].value) + "00"; + bwXProps.update(bwXPropertyRegistrationStart,[["TZID",formObj["xBwRegistrationOpensTzid"].value]],bwRegDateString,true); + + bwRegDateString = formObj["xBwRegistrationClosesDate"].value.replace(/-/g,"") + "T" + padTimeUnit(formObj["xBwRegistrationCloses.hour"].value) + padTimeUnit(formObj["xBwRegistrationCloses.minute"].value) + "00"; + bwXProps.update(bwXPropertyRegistrationEnd,[["TZID",formObj["xBwRegistrationClosesTzid"].value]],bwRegDateString,true); } @@ -368,4 +381,12 @@ // commit all xproperties back to the form bwXProps.generate(formObj); +} +function padTimeUnit(val) { + timeUnit = parseInt(val,10); + if (timeUnit < 10) { + return "0" + timeUnit; + } else { + return String(timeUnit); + } } function removeEventImage(imgField,thumbField) {