Changeset 1847

Show
Ignore:
Timestamp:
04/21/08 10:19:57
Author:
johnsa
Message:

web clients: finish off x-property client support; move application specific xprops from x-property class to eventForm.js for each client.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js

    r1842 r1847  
    339339  formObj["eventEndDate.month"].value = endDate.getMonth() + 1; 
    340340  formObj["eventEndDate.day"].value = endDate.getDate(); 
     341} 
     342function setBedeworkXProperties(formObj,submitter) { 
     343  // set up specific Bedework X-Properties on event form submission 
     344  // Depends on bedeworkXProperties.js 
     345  // Set application local x-properties here. 
     346 
     347  // X-BEDEWORK-IMAGE and its parameters: 
     348  if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') { 
     349    bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true); 
     350  } 
     351  // X-BEDEWORK-SUBMITTEDBY 
     352  bwXProps.update(bwXPropertySubmittedBy,[],submitter,true); 
     353 
     354  // commit all xproperties back to the form 
     355  bwXProps.generate(formObj); 
    341356} 
    342357function swapAllDayEvent(obj) { 

  • releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/resources/bedeworkXProperties.js

    r1846 r1847  
    3838var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY"; 
    3939var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT"; 
    40  
     40var bwXParamLocationAddress = "X-BEDEWORK-PARAM-LOCATION-ADDRESS"; 
     41var bwXParamLocationSubAddress = "X-BEDEWORK-PARAM-LOCATION-SUBADDRESS"; 
     42var bwXParamLocationURL = "X-BEDEWORK-PARAM-LOCATION-URL"; 
     43var bwXParamContactName = "X-BEDEWORK-PARAM-CONTACT-NAME"; 
     44var bwXParamContactPhone = "X-BEDEWORK-PARAM-CONTACT-PHONE"; 
     45var bwXParamContactURL = "X-BEDEWORK-PARAM-CONTACT-URL"; 
     46var bwXParamContactEmail = "X-BEDEWORK-PARAM-CONTACT-EMAIL"; 
     47var bwXParamCategories = "X-BEDEWORK-PARAM-CATEGORIES"; 
    4148 
    4249// ======================================================================== 
    …… 
    6269      for (var i = 0; i < this.params.length; i++) { 
    6370        if (this.params[i][1] != "") { 
    64           curXparams += ";" + this.params[i][0] + "=" + this.params[i][1]; 
     71          curXparams += ";" + this.params[i][0] + "=\"" + this.params[i][1] + "\""; 
    6572        } 
    6673      } 
    …… 
    7986 
    8087  this.update = function(name, params, value, isUnique) { 
     88    // strip out any double quotes in the parameter values: 
     89    if (params.length) { 
     90      for (var i = 0; i < params.length; i++) { 
     91        var strippedParamValue = ""; 
     92        for (var j = 0; j < params[i][1].length; j++) { 
     93          var c = params[i][1][j]; 
     94          if (c != '"') { 
     95            strippedParamValue += c; 
     96          } 
     97        } 
     98        params[i][1] = strippedParamValue; 
     99      } 
     100    } 
     101    // add or update the xproperty: 
    81102    var xprop = new BwXProperty(name, params, value); 
    82103    if (isUnique && this.contains(name)) { 
    …… 
    119140 
    120141} 
    121  
    122 function setBedeworkXProperties(formObj,submitter) { 
    123   // set up specific Bedework X-Properties on event form submission 
    124  
    125   // X-BEDEWORK-IMAGE and its parameters: 
    126   if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') { 
    127     bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true); 
    128   } 
    129   // X-BEDEWORK-SUBMITTEDBY 
    130   bwXProps.update(bwXPropertySubmittedBy,[],submitter,true); 
    131  
    132   // commit all xproperties back to the form 
    133   bwXProps.generate(formObj); 
    134 } 

  • releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl

    r1845 r1847  
    105105      </head> 
    106106      <body> 
    107         <xsl:if test="/bedework/page = 'editEvent' and 
    108                       normalize-space(/bedework/formElements/form/xproperties/xproperty[@name='X-BEDEWORK-SUBMIT-COMMENT']/value) != ''"> 
     107        <xsl:if test="/bedework/page = 'editEvent'"> 
    109108          <xsl:attribute name="onload">initRXDates();initXProperties();</xsl:attribute> 
    110109        </xsl:if> 

  • releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js

    r1845 r1847  
    267267  // as an xproperty.  Relies on bedeworkXProperties.js 
    268268 
     269 
     270} 
     271function setBedeworkXProperties(formObj,submitter) { 
     272  // set up specific Bedework X-Properties on event form submission 
     273  // Depends on bedeworkXProperties.js 
     274  // Set application x-properties here. 
     275 
     276  // X-BEDEWORK-SUBMIT-COMMENT and its parameters 
    269277  bwXProps.update(bwXPropertySubmitComment, 
    270278                  [[bwXParamLocationAddress,formObj["commentLocationAddress"].value], 
    …… 
    277285                   [bwXParamCategories,formObj["commentCategories"].value]], 
    278286                  formObj["commentNotes"].value,true); 
    279 } 
    280 function getComments(formId,comment) { 
    281   // get the submission comments (location, contact, and category suggestions) 
    282   // and load them into the form 
    283   var formObj = document.getElementById(formId); 
    284  
    285   var commentVals = comment.split("\t"); 
    286   formObj["commentLocationAddress"].value = (commentVals[0] == undefined) ? "" : commentVals[0]; 
    287   formObj["commentLocationSubaddress"].value = (commentVals[1] == undefined) ? "" : commentVals[1]; 
    288   formObj["commentLocationURL"].value = (commentVals[2] == undefined) ? "" : commentVals[2]; 
    289   formObj["commentContactName"].value = (commentVals[3] == undefined) ? "" : commentVals[3]; 
    290   formObj["commentContactPhone"].value = (commentVals[4] == undefined) ? "" : commentVals[4]; 
    291   formObj["commentContactURL"].value = (commentVals[5] == undefined) ? "" : commentVals[5]; 
    292   formObj["commentContactEmail"].value = (commentVals[6] == undefined) ? "" : commentVals[6]; 
    293   formObj["commentCategories"].value = (commentVals[7] == undefined) ? "" : commentVals[7]; 
    294   formObj["commentNotes"].value = (commentVals[8] == undefined) ? "" : commentVals[8]; 
     287 
     288  // X-BEDEWORK-IMAGE and its parameters: 
     289  if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') { 
     290    bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true); 
     291  } 
     292  // X-BEDEWORK-SUBMITTEDBY 
     293  bwXProps.update(bwXPropertySubmittedBy,[],submitter,true); 
     294 
     295  // commit all xproperties back to the form 
     296  bwXProps.generate(formObj); 
    295297} 
    296298// create table of form fields for review 

  • releases/bedework-3.4.1.1/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkXProperties.js

    r1845 r1847  
    6868    if (this.params.length) { 
    6969      for (var i = 0; i < this.params.length; i++) { 
    70         curXparams += ";" + this.params[i][0] + "=\"" + this.params[i][1] + "\""; 
     70        if (this.params[i][1] != "") { 
     71          curXparams += ";" + this.params[i][0] + "=\"" + this.params[i][1] + "\""; 
     72        } 
    7173      } 
    7274    } 
    …… 
    138140 
    139141} 
    140  
    141 function setBedeworkXProperties(formObj,submitter) { 
    142   // set up specific Bedework X-Properties on event form submission 
    143  
    144   // X-BEDEWORK-IMAGE and its parameters: 
    145   if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') { 
    146     bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true); 
    147   } 
    148   // X-BEDEWORK-SUBMITTEDBY 
    149   bwXProps.update(bwXPropertySubmittedBy,[],submitter,true); 
    150  
    151   // commit all xproperties back to the form 
    152   bwXProps.generate(formObj); 
    153 } 

  • releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js

    r1842 r1847  
    260260  formObj["eventEndDate.month"].value = endDate.getMonth() + 1; 
    261261  formObj["eventEndDate.day"].value = endDate.getDate(); 
     262} 
     263function setBedeworkXProperties(formObj,submitter) { 
     264  // Set up specific Bedework X-Properties on event form submission 
     265  // Depends on bedeworkXProperties.js 
     266  // Set application x-properties here. 
     267 
     268  // X-BEDEWORK-IMAGE and its parameters: 
     269  if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') { 
     270    bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true); 
     271  } 
     272  // X-BEDEWORK-SUBMITTEDBY 
     273  bwXProps.update(bwXPropertySubmittedBy,[],submitter,true); 
     274 
     275  // commit all xproperties back to the form 
     276  bwXProps.generate(formObj); 
    262277} 
    263278function swapAllDayEvent(obj) { 

  • releases/bedework-3.4.1.1/deployment/webuser/webapp/resources/demoskins/resources/bedeworkXProperties.js

    r1844 r1847  
    3838var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY"; 
    3939var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT"; 
    40  
     40var bwXParamLocationAddress = "X-BEDEWORK-PARAM-LOCATION-ADDRESS"; 
     41var bwXParamLocationSubAddress = "X-BEDEWORK-PARAM-LOCATION-SUBADDRESS"; 
     42var bwXParamLocationURL = "X-BEDEWORK-PARAM-LOCATION-URL"; 
     43var bwXParamContactName = "X-BEDEWORK-PARAM-CONTACT-NAME"; 
     44var bwXParamContactPhone = "X-BEDEWORK-PARAM-CONTACT-PHONE"; 
     45var bwXParamContactURL = "X-BEDEWORK-PARAM-CONTACT-URL"; 
     46var bwXParamContactEmail = "X-BEDEWORK-PARAM-CONTACT-EMAIL"; 
     47var bwXParamCategories = "X-BEDEWORK-PARAM-CATEGORIES"; 
    4148 
    4249// ======================================================================== 
    …… 
    6168    if (this.params.length) { 
    6269      for (var i = 0; i < this.params.length; i++) { 
    63         curXparams += ";" + this.params[i][0] + "=" + this.params[i][1]; 
     70        if (this.params[i][1] != "") { 
     71          curXparams += ";" + this.params[i][0] + "=\"" + this.params[i][1] + "\""; 
     72        } 
    6473      } 
    6574    } 
    …… 
    7786 
    7887  this.update = function(name, params, value, isUnique) { 
     88    // strip out any double quotes in the parameter values: 
     89    if (params.length) { 
     90      for (var i = 0; i < params.length; i++) { 
     91        var strippedParamValue = ""; 
     92        for (var j = 0; j < params[i][1].length; j++) { 
     93          var c = params[i][1][j]; 
     94          if (c != '"') { 
     95            strippedParamValue += c; 
     96          } 
     97        } 
     98        params[i][1] = strippedParamValue; 
     99      } 
     100    } 
     101    // add or update the xproperty: 
    79102    var xprop = new BwXProperty(name, params, value); 
    80103    if (isUnique && this.contains(name)) { 
    …… 
    117140 
    118141} 
    119  
    120 function setBedeworkXProperties(formObj,submitter) { 
    121   // set up specific Bedework X-Properties on event form submission 
    122  
    123   // X-BEDEWORK-IMAGE and its parameters: 
    124   if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') { 
    125     bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true); 
    126   } 
    127   // X-BEDEWORK-SUBMITTEDBY 
    128   bwXProps.update(bwXPropertySubmittedBy,[],submitter,true); 
    129  
    130   // commit all xproperties back to the form 
    131   bwXProps.generate(formObj); 
    132 }