[Bedework-commit] bedework r1847 - in
releases/bedework-3.4.1.1/deployment:
webadmin/webapp/resources/resources
websubmit/webapp/resources/demoskins/default/default
websubmit/webapp/resources/demoskins/resources
webuser/webapp/resources/demoskins/resources
svnadmin at bedework.org
svnadmin at bedework.org
Mon Apr 21 10:19:58 EDT 2008
Author: johnsa
Date: 2008-04-21 10:19:57 -0400 (Mon, 21 Apr 2008)
New Revision: 1847
Modified:
releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js
releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkXProperties.js
releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js
releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkXProperties.js
releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js
releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkXProperties.js
Log:
web clients: finish off x-property client support; move application specific xprops from x-property class to eventForm.js for each client.
Modified: releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js
===================================================================
--- releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js 2008-04-21 03:26:57 UTC (rev 1846)
+++ releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js 2008-04-21 14:19:57 UTC (rev 1847)
@@ -339,6 +339,21 @@
formObj["eventEndDate.month"].value = endDate.getMonth() + 1;
formObj["eventEndDate.day"].value = endDate.getDate();
}
+function setBedeworkXProperties(formObj,submitter) {
+ // set up specific Bedework X-Properties on event form submission
+ // Depends on bedeworkXProperties.js
+ // Set application local x-properties here.
+
+ // X-BEDEWORK-IMAGE and its parameters:
+ if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') {
+ bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true);
+ }
+ // X-BEDEWORK-SUBMITTEDBY
+ bwXProps.update(bwXPropertySubmittedBy,[],submitter,true);
+
+ // commit all xproperties back to the form
+ bwXProps.generate(formObj);
+}
function swapAllDayEvent(obj) {
allDayStartDateField = document.getElementById("allDayStartDateField");
allDayEndDateField = document.getElementById("allDayEndDateField");
Modified: releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkXProperties.js
===================================================================
--- releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkXProperties.js 2008-04-21 03:26:57 UTC (rev 1846)
+++ releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkXProperties.js 2008-04-21 14:19:57 UTC (rev 1847)
@@ -37,8 +37,15 @@
var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY";
var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT";
+var bwXParamLocationAddress = "X-BEDEWORK-PARAM-LOCATION-ADDRESS";
+var bwXParamLocationSubAddress = "X-BEDEWORK-PARAM-LOCATION-SUBADDRESS";
+var bwXParamLocationURL = "X-BEDEWORK-PARAM-LOCATION-URL";
+var bwXParamContactName = "X-BEDEWORK-PARAM-CONTACT-NAME";
+var bwXParamContactPhone = "X-BEDEWORK-PARAM-CONTACT-PHONE";
+var bwXParamContactURL = "X-BEDEWORK-PARAM-CONTACT-URL";
+var bwXParamContactEmail = "X-BEDEWORK-PARAM-CONTACT-EMAIL";
+var bwXParamCategories = "X-BEDEWORK-PARAM-CATEGORIES";
-
// ========================================================================
// x-property functions
// ========================================================================
@@ -61,7 +68,7 @@
if (this.params.length) {
for (var i = 0; i < this.params.length; i++) {
if (this.params[i][1] != "") {
- curXparams += ";" + this.params[i][0] + "=" + this.params[i][1];
+ curXparams += ";" + this.params[i][0] + "=\"" + this.params[i][1] + "\"";
}
}
}
@@ -78,6 +85,20 @@
}
this.update = function(name, params, value, isUnique) {
+ // strip out any double quotes in the parameter values:
+ if (params.length) {
+ for (var i = 0; i < params.length; i++) {
+ var strippedParamValue = "";
+ for (var j = 0; j < params[i][1].length; j++) {
+ var c = params[i][1][j];
+ if (c != '"') {
+ strippedParamValue += c;
+ }
+ }
+ params[i][1] = strippedParamValue;
+ }
+ }
+ // add or update the xproperty:
var xprop = new BwXProperty(name, params, value);
if (isUnique && this.contains(name)) {
index = this.getIndex(name);
@@ -118,17 +139,3 @@
}
}
-
-function setBedeworkXProperties(formObj,submitter) {
- // set up specific Bedework X-Properties on event form submission
-
- // X-BEDEWORK-IMAGE and its parameters:
- if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') {
- bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true);
- }
- // X-BEDEWORK-SUBMITTEDBY
- bwXProps.update(bwXPropertySubmittedBy,[],submitter,true);
-
- // commit all xproperties back to the form
- bwXProps.generate(formObj);
-}
Modified: releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl 2008-04-21 03:26:57 UTC (rev 1846)
+++ releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl 2008-04-21 14:19:57 UTC (rev 1847)
@@ -104,8 +104,7 @@
<xsl:call-template name="headSection"/>
</head>
<body>
- <xsl:if test="/bedework/page = 'editEvent' and
- normalize-space(/bedework/formElements/form/xproperties/xproperty[@name='X-BEDEWORK-SUBMIT-COMMENT']/value) != ''">
+ <xsl:if test="/bedework/page = 'editEvent'">
<xsl:attribute name="onload">initRXDates();initXProperties();</xsl:attribute>
</xsl:if>
<div id="bedework"><!-- main wrapper div -->
Modified: releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js
===================================================================
--- releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js 2008-04-21 03:26:57 UTC (rev 1846)
+++ releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js 2008-04-21 14:19:57 UTC (rev 1847)
@@ -266,6 +266,14 @@
// set the submission comments (location, contact, and category suggestions)
// as an xproperty. Relies on bedeworkXProperties.js
+
+}
+function setBedeworkXProperties(formObj,submitter) {
+ // set up specific Bedework X-Properties on event form submission
+ // Depends on bedeworkXProperties.js
+ // Set application x-properties here.
+
+ // X-BEDEWORK-SUBMIT-COMMENT and its parameters
bwXProps.update(bwXPropertySubmitComment,
[[bwXParamLocationAddress,formObj["commentLocationAddress"].value],
[bwXParamLocationSubAddress,formObj["commentLocationSubaddress"].value],
@@ -276,22 +284,16 @@
[bwXParamContactEmail,formObj["commentContactEmail"].value],
[bwXParamCategories,formObj["commentCategories"].value]],
formObj["commentNotes"].value,true);
-}
-function getComments(formId,comment) {
- // get the submission comments (location, contact, and category suggestions)
- // and load them into the form
- var formObj = document.getElementById(formId);
- var commentVals = comment.split("\t");
- formObj["commentLocationAddress"].value = (commentVals[0] == undefined) ? "" : commentVals[0];
- formObj["commentLocationSubaddress"].value = (commentVals[1] == undefined) ? "" : commentVals[1];
- formObj["commentLocationURL"].value = (commentVals[2] == undefined) ? "" : commentVals[2];
- formObj["commentContactName"].value = (commentVals[3] == undefined) ? "" : commentVals[3];
- formObj["commentContactPhone"].value = (commentVals[4] == undefined) ? "" : commentVals[4];
- formObj["commentContactURL"].value = (commentVals[5] == undefined) ? "" : commentVals[5];
- formObj["commentContactEmail"].value = (commentVals[6] == undefined) ? "" : commentVals[6];
- formObj["commentCategories"].value = (commentVals[7] == undefined) ? "" : commentVals[7];
- formObj["commentNotes"].value = (commentVals[8] == undefined) ? "" : commentVals[8];
+ // X-BEDEWORK-IMAGE and its parameters:
+ if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') {
+ bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true);
+ }
+ // X-BEDEWORK-SUBMITTEDBY
+ bwXProps.update(bwXPropertySubmittedBy,[],submitter,true);
+
+ // commit all xproperties back to the form
+ bwXProps.generate(formObj);
}
// create table of form fields for review
function displayReview(formId,tableId,numHeaderRows) {
Modified: releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkXProperties.js
===================================================================
--- releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkXProperties.js 2008-04-21 03:26:57 UTC (rev 1846)
+++ releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkXProperties.js 2008-04-21 14:19:57 UTC (rev 1847)
@@ -67,7 +67,9 @@
var curXparams = "";
if (this.params.length) {
for (var i = 0; i < this.params.length; i++) {
- curXparams += ";" + this.params[i][0] + "=\"" + this.params[i][1] + "\"";
+ if (this.params[i][1] != "") {
+ curXparams += ";" + this.params[i][0] + "=\"" + this.params[i][1] + "\"";
+ }
}
}
return this.name + curXparams + ":" + this.value;
@@ -137,17 +139,3 @@
}
}
-
-function setBedeworkXProperties(formObj,submitter) {
- // set up specific Bedework X-Properties on event form submission
-
- // X-BEDEWORK-IMAGE and its parameters:
- if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') {
- bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true);
- }
- // X-BEDEWORK-SUBMITTEDBY
- bwXProps.update(bwXPropertySubmittedBy,[],submitter,true);
-
- // commit all xproperties back to the form
- bwXProps.generate(formObj);
-}
Modified: releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js
===================================================================
--- releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js 2008-04-21 03:26:57 UTC (rev 1846)
+++ releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js 2008-04-21 14:19:57 UTC (rev 1847)
@@ -260,6 +260,21 @@
formObj["eventEndDate.month"].value = endDate.getMonth() + 1;
formObj["eventEndDate.day"].value = endDate.getDate();
}
+function setBedeworkXProperties(formObj,submitter) {
+ // Set up specific Bedework X-Properties on event form submission
+ // Depends on bedeworkXProperties.js
+ // Set application x-properties here.
+
+ // X-BEDEWORK-IMAGE and its parameters:
+ if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') {
+ bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true);
+ }
+ // X-BEDEWORK-SUBMITTEDBY
+ bwXProps.update(bwXPropertySubmittedBy,[],submitter,true);
+
+ // commit all xproperties back to the form
+ bwXProps.generate(formObj);
+}
function swapAllDayEvent(obj) {
allDayStartDateField = document.getElementById("allDayStartDateField");
allDayEndDateField = document.getElementById("allDayEndDateField");
Modified: releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkXProperties.js
===================================================================
--- releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkXProperties.js 2008-04-21 03:26:57 UTC (rev 1846)
+++ releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkXProperties.js 2008-04-21 14:19:57 UTC (rev 1847)
@@ -37,8 +37,15 @@
var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY";
var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT";
+var bwXParamLocationAddress = "X-BEDEWORK-PARAM-LOCATION-ADDRESS";
+var bwXParamLocationSubAddress = "X-BEDEWORK-PARAM-LOCATION-SUBADDRESS";
+var bwXParamLocationURL = "X-BEDEWORK-PARAM-LOCATION-URL";
+var bwXParamContactName = "X-BEDEWORK-PARAM-CONTACT-NAME";
+var bwXParamContactPhone = "X-BEDEWORK-PARAM-CONTACT-PHONE";
+var bwXParamContactURL = "X-BEDEWORK-PARAM-CONTACT-URL";
+var bwXParamContactEmail = "X-BEDEWORK-PARAM-CONTACT-EMAIL";
+var bwXParamCategories = "X-BEDEWORK-PARAM-CATEGORIES";
-
// ========================================================================
// x-property functions
// ========================================================================
@@ -60,7 +67,9 @@
var curXparams = "";
if (this.params.length) {
for (var i = 0; i < this.params.length; i++) {
- curXparams += ";" + this.params[i][0] + "=" + this.params[i][1];
+ if (this.params[i][1] != "") {
+ curXparams += ";" + this.params[i][0] + "=\"" + this.params[i][1] + "\"";
+ }
}
}
return this.name + curXparams + ":" + this.value;
@@ -76,6 +85,20 @@
}
this.update = function(name, params, value, isUnique) {
+ // strip out any double quotes in the parameter values:
+ if (params.length) {
+ for (var i = 0; i < params.length; i++) {
+ var strippedParamValue = "";
+ for (var j = 0; j < params[i][1].length; j++) {
+ var c = params[i][1][j];
+ if (c != '"') {
+ strippedParamValue += c;
+ }
+ }
+ params[i][1] = strippedParamValue;
+ }
+ }
+ // add or update the xproperty:
var xprop = new BwXProperty(name, params, value);
if (isUnique && this.contains(name)) {
index = this.getIndex(name);
@@ -116,17 +139,3 @@
}
}
-
-function setBedeworkXProperties(formObj,submitter) {
- // set up specific Bedework X-Properties on event form submission
-
- // X-BEDEWORK-IMAGE and its parameters:
- if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') {
- bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true);
- }
- // X-BEDEWORK-SUBMITTEDBY
- bwXProps.update(bwXPropertySubmittedBy,[],submitter,true);
-
- // commit all xproperties back to the form
- bwXProps.generate(formObj);
-}
More information about the Bedework-commit
mailing list