Changeset 1852

Show
Ignore:
Timestamp:
04/21/08 17:05:44
Author:
johnsa
Message:

web clients: more x-property client support; break xprops into logical units; fix up admin client submissions comment display

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1781 r1852  
    316316  color: black; 
    317317} 
     318#bwSubmittedBy { 
     319  float: right; 
     320} 
    318321#bwSubmittedEventCommentBlock h4 { 
    319322  display: inline; 

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

    r1849 r1852  
    1010     omit-xml-declaration="yes"/> 
    1111 <xsl:strip-space elements="*"/> 
     12 
    1213  <!-- ======================================== --> 
    1314  <!--      BEDEWORK ADMIN CLIENT STYLESHEET     --> 
    …… 
    10401041 
    10411042    <!-- if a submitted event has comments, display them --> 
    1042     <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']"> 
     1043    <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-LOCATION' or name()='X-BEDEWORK-CONTACT' or name()='X-BEDEWORK-CATEGORIES' or name()='X-BEDEWORK-SUBMIT-COMMENT']"> 
    10431044      <script type="text/javascript"> 
    10441045        bwSubmitComment = new bwSubmitComment( 
    1045           '<xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-LOCATION-ADDRESS']"/>', 
    1046           '<xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-LOCATION-SUBADDRESS']"/>', 
    1047           '<xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-LOCATION-URL']"/>', 
    1048           '<xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-CONTACT-NAME']"/>', 
    1049           '<xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-CONTACT-PHONE']"/>', 
    1050           '<xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-CONTACT-URL']"/>', 
    1051           '<xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-CONTACT-EMAIL']"/>', 
    1052           '<xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-CATEGORIES']"/>', 
    1053           '<xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/>'); 
     1046          '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/values/text"/></xsl:call-template>', 
     1047          '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-SUBADDRESS']"/></xsl:call-template>', 
     1048          '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:call-template>', 
     1049          '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/values/text"/></xsl:call-template>', 
     1050          '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-PHONE']"/></xsl:call-template>', 
     1051          '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:call-template>', 
     1052          '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-EMAIL']"/></xsl:call-template>', 
     1053          '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:call-template>', 
     1054          '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/></xsl:call-template>'); 
    10541055      </script> 
    10551056 
    10561057      <div id="bwSubmittedEventCommentBlock"> 
     1058        <div id="bwSubmittedBy">Submitted by <xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']/values/text"/></div> 
    10571059        <h4>Comments from Submitter</h4> 
    10581060        <a href="javascript:toggleVisibility('bwSubmittedEventComment','visible');" class="toggle">show/hide</a> 
    …… 
    10661068    </xsl:if> 
    10671069 
    1068     <xsl:variable name="submitter" select="/bedework/userInfo/group"/> 
     1070    <xsl:variable name="submitter"> 
     1071      <xsl:choose> 
     1072        <xsl:when test="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']/values/text"/></xsl:when> 
     1073        <xsl:otherwise><xsl:value-of select="/bedework/userInfo/user"/></xsl:otherwise> 
     1074      </xsl:choose> 
     1075    </xsl:variable> 
    10691076    <form name="eventForm" method="post" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')"> 
    10701077      <xsl:choose> 
    …… 
    64256432    </div> 
    64266433  </xsl:template> 
     6434 
     6435  <!--==== Utility Templates ====--> 
     6436  <xsl:template name="escapeApos"> 
     6437    <xsl:param name="str"/> 
     6438    <xsl:variable name="apos" select='"&apos;"'/> 
     6439    <xsl:choose> 
     6440      <xsl:when test="contains($str, $apos)"> 
     6441         <xsl:value-of select="substring-before($str, $apos)" /> 
     6442         <xsl:text>\'</xsl:text> 
     6443         <xsl:call-template name="escapeApos"> 
     6444            <xsl:with-param name="str" select="substring-after($str, $apos)" /> 
     6445         </xsl:call-template> 
     6446      </xsl:when> 
     6447      <xsl:otherwise> 
     6448         <xsl:value-of select="$str" /> 
     6449      </xsl:otherwise> 
     6450    </xsl:choose> 
     6451  </xsl:template> 
     6452 
    64276453</xsl:stylesheet> 

  • trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js

    r1849 r1852  
    240240 
    241241/* A comment accompanying a submitted event. 
    242  * These values come from the x-property X-BEDEWORK-SUBMIT-COMMENT 
    243  * locationAddress: value of parameter X-BEDEWORK-PARAM-LOCATION-ADDRESS 
    244  * locationSubaddress: value of parameter X-BEDEWORK-PARAM-LOCATION-SUBADDRESS 
    245  * locationUrl: value of parameter X-BEDEWORK-PARAM-LOCATION-URL 
    246  * contactName: value of parameter X-BEDEWORK-PARAM-CONTACT-NAME 
    247  * contactPhone: value of parameter X-BEDEWORK-PARAM-CONTACT-PHONE 
    248  * contactUrl: value of parameter X-BEDEWORK-PARAM-CONTACT-URL 
    249  * contactEmail: value of parameter X-BEDEWORK-PARAM-CONTACT-EMAIL 
    250  * category: value of parameter X-BEDEWORK-PARAM-CATEGORIES 
    251  * notes: value of the x-property 
     242 * These values come from sumbitted x-properties 
     243 * locationAddress: value of property X-BEDEWORK-LOCATION 
     244 * locationSubaddress: value of location's parameter X-BEDEWORK-SUBADDRESS 
     245 * locationUrl: value of location's parameter X-BEDEWORK-PARAM-URL 
     246 * contactName: value of x-property X-BEDEWORK-CONTACT 
     247 * contactPhone: value of contact's parameter X-BEDEWORK-PARAM-PHONE 
     248 * contactUrl: value of contact's parameter X-BEDEWORK-PARAM-URL 
     249 * contactEmail: value of contact's parameter X-BEDEWORK-PARAM-EMAIL 
     250 * category: value of x-property X-BEDEWORK-CATEGORIES 
     251 * notes: value of the x-property X-BEDEWORK-SUBMIT-COMMENT 
    252252 */ 
    253253function bwSubmitComment(locationAddress,locationSubaddress,locationUrl,contactName,contactPhone,contactUrl,contactEmail,category,notes) { 
    …… 
    355355  // X-BEDEWORK-IMAGE and its parameters: 
    356356  if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') { 
    357     bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true); 
     357    bwXProps.update(bwXPropertyImage, 
     358                  [[bwXParamDescription,''], 
     359                   [bwXParamWidth,''], 
     360                   [bwXParamHeight,'']], 
     361                   formObj["xBwImageHolder"].value,true); 
    358362  } 
    359363  // X-BEDEWORK-SUBMITTEDBY 

  • trunk/deployment/webadmin/webapp/resources/resources/bedeworkXProperties.js

    r1849 r1852  
    3232 
    3333var bwXPropertyImage = "X-BEDEWORK-IMAGE"; 
     34var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY"; 
     35var bwXPropertyLocation = "X-BEDEWORK-LOCATION"; 
     36var bwXPropertyContact = "X-BEDEWORK-CONTACT"; 
     37var bwXPropertyCategories = "X-BEDEWORK-CATEGORIES"; 
     38var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT"; 
     39 
    3440var bwXParamDescription = "X-BEDEWORK-PARAM-DESCRIPTION"; 
    3541var bwXParamWidth = "X-BEDEWORK-PARAM-WIDTH"; 
    3642var bwXParamHeight = "X-BEDEWORK-PARAM-HEIGHT"; 
    37  
    38 var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY"; 
    39 var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT"; 
    40 var bwXParamLocationAddress = "X-BEDEWORK-PARAM-LOCATION-ADDRESS"; 
    41 var bwXParamLocationSubAddress = "X-BEDEWORK-PARAM-LOCATION-SUBADDRESS"; 
    42 var bwXParamLocationURL = "X-BEDEWORK-PARAM-LOCATION-URL"; 
    43 var bwXParamContactName = "X-BEDEWORK-PARAM-CONTACT-NAME"; 
    44 var bwXParamContactPhone = "X-BEDEWORK-PARAM-CONTACT-PHONE"; 
    45 var bwXParamContactURL = "X-BEDEWORK-PARAM-CONTACT-URL"; 
    46 var bwXParamContactEmail = "X-BEDEWORK-PARAM-CONTACT-EMAIL"; 
    47 var bwXParamCategories = "X-BEDEWORK-PARAM-CATEGORIES"; 
     43var bwXParamSubAddress = "X-BEDEWORK-PARAM-SUBADDRESS"; 
     44var bwXParamURL = "X-BEDEWORK-PARAM-URL"; 
     45var bwXParamPhone = "X-BEDEWORK-PARAM-PHONE"; 
     46var bwXParamEmail = "X-BEDEWORK-PARAM-EMAIL"; 
    4847 
    4948// ======================================================================== 

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

    r1848 r1852  
    294294  <!--==== ADD EVENT ====--> 
    295295  <xsl:template match="formElements" mode="addEvent"> 
    296     <xsl:variable name="submitter" select="/bedework/userid"/> 
     296    <xsl:variable name="submitter"> 
     297      <xsl:choose> 
     298        <xsl:when test="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']/values/text"/></xsl:when> 
     299        <xsl:otherwise><xsl:value-of select="/bedework/userid"/></xsl:otherwise> 
     300      </xsl:choose> 
     301    </xsl:variable> 
    297302    <form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}');"> 
    298303      <xsl:apply-templates select="." mode="eventForm"/> 
    …… 
    302307  <!--==== EDIT EVENT ====--> 
    303308  <xsl:template match="formElements" mode="editEvent"> 
    304     <xsl:variable name="submitter" select="/bedework/userid"/> 
     309    <xsl:variable name="submitter"> 
     310      <xsl:choose> 
     311        <xsl:when test="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']/values/text"/></xsl:when> 
     312        <xsl:otherwise><xsl:value-of select="/bedework/userid"/></xsl:otherwise> 
     313      </xsl:choose> 
     314    </xsl:variable> 
    305315    <form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}');"> 
    306316      <xsl:apply-templates select="." mode="eventForm"/> 
    …… 
    906916            <label for="commentLocationAddress">Address: </label> 
    907917            <input type="text" name="commentLocationAddress" id="bwCommentLocationAddress"> 
    908               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-LOCATION-ADDRESS']"/></xsl:attribute> 
     918              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/values/text"/></xsl:attribute> 
    909919            </input> 
    910920          </p> 
    …… 
    912922            <label for="commentLocationSubaddress"><em>Sub-address:</em> </label> 
    913923            <input type="text" name="commentLocationSubaddress" id="commentLocationSubaddress"> 
    914               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-LOCATION-SUBADDRESS']"/></xsl:attribute> 
     924              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-SUBADDRESS']"/></xsl:attribute> 
    915925            </input> 
    916926            <span class="note"> optional</span> 
    …… 
    919929            <label for="commentLocationURL"><em>URL:</em> </label> 
    920930            <input type="text" name="commentLocationURL" id="commentLocationURL"> 
    921               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-LOCATION-URL']"/></xsl:attribute> 
     931              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:attribute> 
    922932            </input> 
    923933            <span class="note"> optional</span> 
    …… 
    945955            <label for="commentContactName">Organization Name: </label> 
    946956            <input type="text" name="commentContactName" id="bwCommentContactName" size="40"> 
    947               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-CONTACT-NAME']"/></xsl:attribute> 
     957              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/values/text"/></xsl:attribute> 
    948958            </input> 
    949959            <span class="note"> Please limit contacts to organizations, not individuals.</span> 
    …… 
    952962            <label for="commentContactPhone"><em>Phone:</em> </label> 
    953963            <input type="text" name="commentContactPhone"> 
    954               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-CONTACT-PHONE']"/></xsl:attribute> 
     964              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-PHONE']"/></xsl:attribute> 
    955965            </input> 
    956966            <span class="note"> optional</span> 
    …… 
    959969            <label for="commentContactURL"><em>URL:</em> </label> 
    960970            <input type="text" name="commentContactURL"> 
    961               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-CONTACT-URL']"/></xsl:attribute> 
     971              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:attribute> 
    962972            </input> 
    963973            <span class="note"> optional</span> 
    …… 
    966976            <label for="commentContactEmail"><em>Email:</em> </label> 
    967977            <input type="text" name="commentContactEmail"> 
    968               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-CONTACT-EMAIL']"/></xsl:attribute> 
     978              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-EMAIL']"/></xsl:attribute> 
    969979            </input> 
    970980            <span class="note"> optional</span> 
    …… 
    10131023            <label for="commentCategories">Category suggestion: </label> 
    10141024            <input type="text" name="commentCategories" size="30"> 
    1015               <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/parameters/node()[name()='X-BEDEWORK-PARAM-CATEGORIES']"/></xsl:attribute> 
     1025              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:attribute> 
    10161026            </input> 
    10171027          </p> 

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

    r1848 r1852  
    274274  // Set application x-properties here. 
    275275 
    276   // X-BEDEWORK-SUBMIT-COMMENT and its parameters 
    277   bwXProps.update(bwXPropertySubmitComment, 
    278                   [[bwXParamLocationAddress,formObj["commentLocationAddress"].value], 
    279                    [bwXParamLocationSubAddress,formObj["commentLocationSubaddress"].value], 
    280                    [bwXParamLocationURL,formObj["commentLocationURL"].value], 
    281                    [bwXParamContactName,formObj["commentContactName"].value], 
    282                    [bwXParamContactPhone,formObj["commentContactPhone"].value], 
    283                    [bwXParamContactURL,formObj["commentContactURL"].value], 
    284                    [bwXParamContactEmail,formObj["commentContactEmail"].value], 
    285                    [bwXParamCategories,formObj["commentCategories"].value]], 
    286                   formObj["commentNotes"].value,true); 
     276  // Sumbission comments as x-properties 
     277  bwXProps.update(bwXPropertyLocation, 
     278                  [[bwXParamSubAddress,formObj["commentLocationSubaddress"].value], 
     279                   [bwXParamURL,formObj["commentLocationURL"].value]], 
     280                   formObj["commentLocationAddress"].value,true); 
     281  bwXProps.update(bwXPropertyContact, 
     282                  [[bwXParamPhone,formObj["commentContactPhone"].value], 
     283                   [bwXParamURL,formObj["commentContactURL"].value], 
     284                   [bwXParamEmail,formObj["commentContactEmail"].value]], 
     285                   formObj["commentContactName"].value,true); 
     286  bwXProps.update(bwXPropertyCategories,[],formObj["commentCategories"].value,true); 
     287  bwXProps.update(bwXPropertySubmitComment,[],formObj["commentNotes"].value,true); 
    287288 
    288289  // X-BEDEWORK-IMAGE and its parameters: 
    289290  if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') { 
    290     bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true); 
     291    bwXProps.update(bwXPropertyImage, 
     292                  [[bwXParamDescription,''], 
     293                   [bwXParamWidth,''], 
     294                   [bwXParamHeight,'']], 
     295                   formObj["xBwImageHolder"].value,true); 
    291296  } 
    292297  // X-BEDEWORK-SUBMITTEDBY 

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

    r1849 r1852  
    3232 
    3333var bwXPropertyImage = "X-BEDEWORK-IMAGE"; 
     34var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY"; 
     35var bwXPropertyLocation = "X-BEDEWORK-LOCATION"; 
     36var bwXPropertyContact = "X-BEDEWORK-CONTACT"; 
     37var bwXPropertyCategories = "X-BEDEWORK-CATEGORIES"; 
     38var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT"; 
     39 
    3440var bwXParamDescription = "X-BEDEWORK-PARAM-DESCRIPTION"; 
    3541var bwXParamWidth = "X-BEDEWORK-PARAM-WIDTH"; 
    3642var bwXParamHeight = "X-BEDEWORK-PARAM-HEIGHT"; 
     43var bwXParamSubAddress = "X-BEDEWORK-PARAM-SUBADDRESS"; 
     44var bwXParamURL = "X-BEDEWORK-PARAM-URL"; 
     45var bwXParamPhone = "X-BEDEWORK-PARAM-PHONE"; 
     46var bwXParamEmail = "X-BEDEWORK-PARAM-EMAIL"; 
    3747 
    38 var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY"; 
    39 var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT"; 
    40 var bwXParamLocationAddress = "X-BEDEWORK-PARAM-LOCATION-ADDRESS"; 
    41 var bwXParamLocationSubAddress = "X-BEDEWORK-PARAM-LOCATION-SUBADDRESS"; 
    42 var bwXParamLocationURL = "X-BEDEWORK-PARAM-LOCATION-URL"; 
    43 var bwXParamContactName = "X-BEDEWORK-PARAM-CONTACT-NAME"; 
    44 var bwXParamContactPhone = "X-BEDEWORK-PARAM-CONTACT-PHONE"; 
    45 var bwXParamContactURL = "X-BEDEWORK-PARAM-CONTACT-URL"; 
    46 var bwXParamContactEmail = "X-BEDEWORK-PARAM-CONTACT-EMAIL"; 
    47 var bwXParamCategories = "X-BEDEWORK-PARAM-CATEGORIES"; 
    4848 
    4949// ======================================================================== 

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

    r1841 r1852  
    19951995  <!-- The name "eventForm" is referenced by several javascript functions. Do not 
    19961996    change it without modifying bedework.js --> 
    1997     <xsl:variable name="submitter" select="/bedework/userid"/> 
     1997    <xsl:variable name="submitter"> 
     1998      <xsl:choose> 
     1999        <xsl:when test="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']/values/text"/></xsl:when> 
     2000        <xsl:otherwise><xsl:value-of select="/bedework/userid"/></xsl:otherwise> 
     2001      </xsl:choose> 
     2002    </xsl:variable> 
    19982003    <form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')"> 
    19992004      <h2> 
    …… 
    20162021    <!-- The name "eventForm" is referenced by several javascript functions. Do not 
    20172022    change it without modifying bedework.js --> 
    2018     <xsl:variable name="submitter" select="/bedework/userid"/> 
     2023    <xsl:variable name="submitter"> 
     2024      <xsl:choose> 
     2025        <xsl:when test="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']/values/text"/></xsl:when> 
     2026        <xsl:otherwise><xsl:value-of select="/bedework/userid"/></xsl:otherwise> 
     2027      </xsl:choose> 
     2028    </xsl:variable> 
    20192029    <form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')"> 
    20202030      <h2> 

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

    r1848 r1852  
    268268  // X-BEDEWORK-IMAGE and its parameters: 
    269269  if (formObj["xBwImageHolder"] && formObj["xBwImageHolder"].value != '') { 
    270     bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true); 
     270    bwXProps.update(bwXPropertyImage, 
     271                  [[bwXParamDescription,''], 
     272                   [bwXParamWidth,''], 
     273                   [bwXParamHeight,'']], 
     274                   formObj["xBwImageHolder"].value,true); 
    271275  } 
    272276  // X-BEDEWORK-SUBMITTEDBY 

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

    r1849 r1852  
    3232 
    3333var bwXPropertyImage = "X-BEDEWORK-IMAGE"; 
     34var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY"; 
     35var bwXPropertyLocation = "X-BEDEWORK-LOCATION"; 
     36var bwXPropertyContact = "X-BEDEWORK-CONTACT"; 
     37var bwXPropertyCategories = "X-BEDEWORK-CATEGORIES"; 
     38var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT"; 
     39 
    3440var bwXParamDescription = "X-BEDEWORK-PARAM-DESCRIPTION"; 
    3541var bwXParamWidth = "X-BEDEWORK-PARAM-WIDTH"; 
    3642var bwXParamHeight = "X-BEDEWORK-PARAM-HEIGHT"; 
    37  
    38 var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY"; 
    39 var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT"; 
    40 var bwXParamLocationAddress = "X-BEDEWORK-PARAM-LOCATION-ADDRESS"; 
    41 var bwXParamLocationSubAddress = "X-BEDEWORK-PARAM-LOCATION-SUBADDRESS"; 
    42 var bwXParamLocationURL = "X-BEDEWORK-PARAM-LOCATION-URL"; 
    43 var bwXParamContactName = "X-BEDEWORK-PARAM-CONTACT-NAME"; 
    44 var bwXParamContactPhone = "X-BEDEWORK-PARAM-CONTACT-PHONE"; 
    45 var bwXParamContactURL = "X-BEDEWORK-PARAM-CONTACT-URL"; 
    46 var bwXParamContactEmail = "X-BEDEWORK-PARAM-CONTACT-EMAIL"; 
    47 var bwXParamCategories = "X-BEDEWORK-PARAM-CATEGORIES"; 
     43var bwXParamSubAddress = "X-BEDEWORK-PARAM-SUBADDRESS"; 
     44var bwXParamURL = "X-BEDEWORK-PARAM-URL"; 
     45var bwXParamPhone = "X-BEDEWORK-PARAM-PHONE"; 
     46var bwXParamEmail = "X-BEDEWORK-PARAM-EMAIL"; 
    4847 
    4948// ========================================================================