Changeset 2160

Show
Ignore:
Timestamp:
05/08/09 10:55:56
Author:
johnsa
Message:

submissions client: add submitter's email address as xproperty in event
admin client: use email address for mailto

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webadmin/webapp/resources/default/default/default.css

    r2154 r2160  
    311311  float: right; 
    312312} 
     313#bwSubmittedBy a { 
     314  font-weight: bold; 
     315} 
    313316#bwSubmittedEventCommentBlock h4 { 
    314317  display: inline; 

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r2158 r2160  
    10831083 
    10841084      <div id="bwSubmittedEventCommentBlock"> 
    1085         <div id="bwSubmittedBy">Submitted by <xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']/values/text"/></div> 
     1085        <div id="bwSubmittedBy"> 
     1086          Submitted by 
     1087          <xsl:variable name="submitterEmail" select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTER-EMAIL']/values/text"/> 
     1088          <xsl:variable name="eventTitle" select="form/title/input/@value"/> 
     1089          <a href="mailto:{$submitterEmail}?subject=[Event%20Submission] {$eventTitle}" title="Email {$submitterEmail}"> 
     1090            <xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']/values/text"/> 
     1091          </a> 
     1092        </div> 
    10861093        <h4>Comments from Submitter</h4> 
    10871094        <a href="javascript:toggleVisibility('bwSubmittedEventComment','visible');" class="toggle">show/hide</a> 

  • trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.css

    r2088 r2160  
    760760  color: black; 
    761761  background: #ff0 url(../../resources/glassFill-message.gif) repeat-x top; 
     762  /*background-color: #ff0;*/ 
    762763  border: 1px solid #333; 
    763764} 

  • trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl

    r2159 r2160  
    186186      </xsl:choose> 
    187187      <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js">&#160;</script> 
    188       <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js">&#160;</script> 
     188      <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkXProperties.js">&#160;</script> 
     189      <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkUtil.js">&#160;</script> 
    189190    </xsl:if> 
    190191    <script type="text/javascript"> 
    …… 
    327328      </xsl:choose> 
    328329    </xsl:variable> 
    329     <form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}');"> 
     330    <form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="return setEventFields(this,{$portalFriendly},'{$submitter}');"> 
    330331      <xsl:apply-templates select="." mode="eventForm"/> 
    331332    </form> 
    …… 
    340341      </xsl:choose> 
    341342    </xsl:variable> 
    342     <form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}');"> 
     343    <form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="return setEventFields(this,{$portalFriendly},'{$submitter}');"> 
    343344      <xsl:apply-templates select="." mode="eventForm"/> 
    344345    </form> 
    …… 
    11381139 
    11391140        <div id="bwCommentNotes"> 
    1140           <div id="bwEmailHolderNotice" class="invisible">You must include your email address.</div> <!-- a holder for validation notes --> 
     1141          <!-- holders for validation notes --> 
     1142          <div id="xBwEmailHolderNotice" class="invisible">You must include your email address.</div> 
     1143          <div id="xBwEmailHolderInvalidNotice" class="invisible">This does not appear to be a valid email address.  Please correct.</div> 
    11411144          <p> 
    1142             <label for="emailHolder">Enter your email address: </label><br/> 
    1143             <input type="text" name="emailHolder" size="80"> 
     1145            <label for="xBwEmailHolder">Enter your email address: </label><br/> 
     1146            <input type="text" name="xBwEmailHolder" id="xBwEmailHolder" size="80"> 
    11441147              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTER-EMAIL']/values/text"/></xsl:attribute> 
    11451148            </input> 

  • trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js

    r2130 r2160  
    236236 
    237237function setEventFields(formObj,portalFriendly,submitter) { 
    238   if (!portalFriendly) { 
    239     setDates(formObj); 
    240   } 
    241   setComments(formObj); 
    242   //if(formObj.freq){ 
    243   //  setRecurrence(formObj); 
    244   //} else we are editing an instance of a recurrence 
    245   setBedeworkXProperties(formObj,submitter); 
    246   //setAccessHow(formObj,1); 
    247   //setAccessAcl(formObj); 
     238  if (validateStep4()) { 
     239    if (!portalFriendly) { 
     240      setDates(formObj); 
     241    } 
     242    //setComments(formObj); 
     243    //if(formObj.freq){ 
     244    //  setRecurrence(formObj); 
     245    //} else we are editing an instance of a recurrence 
     246    setBedeworkXProperties(formObj, submitter); 
     247    return true; 
     248  } else { 
     249    return false; 
     250  } 
    248251} 
    249252/* Set dates based on jQuery widgets */ 
    …… 
    262265} 
    263266function setComments(formObj) { 
     267  // DEPRECATED: see setBedeworkXProperties() 
    264268  // set the submission comments (location, contact, and category suggestions) 
    265269  // as an xproperty.  Relies on bedeworkXProperties.js 
    …… 
    301305                   [bwXParamHeight,'']], 
    302306                   formObj["xBwImageHolder"].value,true); 
     307  } 
     308 
     309  // X-BEDEWORK-SUBMITTER-EMAIL 
     310  if (formObj["xBwEmailHolder"] && formObj["xBwEmailHolder"].value != '') { 
     311    bwXProps.update(bwXPropertySubmitterEmail, [], formObj["xBwEmailHolder"].value, true); 
    303312  } 
    304313 
    …… 
    712721} 
    713722 
    714  
    715  
     723function validateStep4(){ 
     724  var validity = true; 
     725  var email = document.getElementById("xBwEmailHolder").value; 
     726  if (email == '') { 
     727    changeClass("xBwEmailHolder", "highlight"); 
     728    changeClass("xBwEmailHolderNotice", "notice"); 
     729    changeClass("xBwEmailHolderInvalidNotice", "invisible"); 
     730    validity = false; 
     731  } else if (!echeck(email)) { 
     732    changeClass("xBwEmailHolder", "highlight"); 
     733    changeClass("xBwEmailHolderInvalidNotice", "notice"); 
     734    changeClass("xBwEmailHolderNotice","invisible"); 
     735    validity = false; 
     736  } else { 
     737    // none of these class changes are needed, but are 
     738    // here for completeness 
     739    changeClass("xBwEmailHolder","none"); 
     740    changeClass("xBwEmailHolderNotice","invisible"); 
     741    changeClass("xBwEmailHolderInvalidNotice", "invisible"); 
     742  } 
     743  return validity; 
     744} 
     745 
     746 
     747 

  • trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkXProperties.js

    r2130 r2160  
    3838var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT"; 
    3939var bwXPropertySubmitStatus = "X-BEDEWORK-SUBMIT-STATUS"; 
     40var bwXPropertySubmitterEmail = "X-BEDEWORK-SUBMITTER-EMAIL"; 
    4041 
    4142var bwXParamDescription = "X-BEDEWORK-PARAM-DESCRIPTION"; 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r2156 r2160  
    515515      <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/> 
    516516      <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js">&#160;</script> 
    517       <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js">&#160;</script> 
     517      <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkXProperties.js">&#160;</script> 
    518518      <link rel="stylesheet" href="/bedework-common/default/default/bedeworkAccess.css"/> 
    519519      <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkAccess.js">&#160;</script> 

  • trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkXProperties.js

    r2130 r2160  
    3838var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT"; 
    3939var bwXPropertySubmitStatus = "X-BEDEWORK-SUBMIT-STATUS"; 
     40var bwXPropertySubmitterEmail = "X-BEDEWORK-SUBMITTER-EMAIL"; 
    4041 
    4142var bwXParamDescription = "X-BEDEWORK-PARAM-DESCRIPTION";