Changeset 2167
- Timestamp:
- 05/11/09 15:55:10
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/deployment/webadmin/webapp/resources/default/default/default.css
r2166 r2167 332 332 } 333 333 #bwSubmittedEventCommentBlock p { 334 margin: 0; 335 padding: 1em 0 0 0; 334 336 clear: both; 335 337 } trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
r2166 r2167 1080 1080 '<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>', 1081 1081 '<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>', 1082 '< ul><xsl:for-each select="form/categories/current//keyword"><li><xsl:call-template name="escapeApos"><xsl:with-param name="str" select="."/></xsl:call-template></li></xsl:for-each></ul>',1082 '<xsl:for-each select="form/xproperties/node()[name()='X-BEDEWORK-ALIAS']/values/text"><xsl:call-template name="escapeApos"><xsl:with-param name="str"><xsl:call-template name="substring-afterLastInstanceOf"><xsl:with-param name="string" select="."/><xsl:with-param name="char">/</xsl:with-param></xsl:call-template></xsl:with-param></xsl:call-template><br/></xsl:for-each>', 1083 1083 '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:call-template>', 1084 1084 '<xsl:call-template name="escapeApos"><xsl:with-param name="str" select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/></xsl:call-template>'); … … 1091 1091 <a href="mailto:{$submitterEmail}?subject=[Event%20Submission] {$eventTitle}" title="Email {$submitterEmail}" class="submitter"> 1092 1092 <xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']/values/text"/> 1093 </a>< br/>1094 <a href="mailto:{$submitterEmail}?subject=[Event%20Submission] {$eventTitle}" title="Email {$submitterEmail}">1093 </a><xsl:text> </xsl:text> 1094 (<a href="mailto:{$submitterEmail}?subject=[Event%20Submission] {$eventTitle}" title="Email {$submitterEmail}"> 1095 1095 <img src="{$resourcesRoot}/resources/email.gif" border="0"/> 1096 1096 send message 1097 </a> 1097 </a>) 1098 1098 </div> 1099 1099 <h4>Comments from Submitter</h4> trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js
r2166 r2167 243 243 * contactUrl: value of contact's parameter X-BEDEWORK-PARAM-URL 244 244 * contactEmail: value of contact's parameter X-BEDEWORK-PARAM-EMAIL 245 * categories: list of categories derived from submitted topical areas245 * topicalAreas: list of submitted topical areas (may not match the event admin's view 246 246 * category: value of x-property X-BEDEWORK-CATEGORIES - a freeform user suggestion 247 247 * notes: value of the x-property X-BEDEWORK-SUBMIT-COMMENT 248 248 */ 249 function bwSubmitComment(locationAddress,locationSubaddress,locationUrl,contactName,contactPhone,contactUrl,contactEmail, categories,category,notes) {249 function bwSubmitComment(locationAddress,locationSubaddress,locationUrl,contactName,contactPhone,contactUrl,contactEmail,topicalAreas,category,notes) { 250 250 this.locationAddress = locationAddress; 251 251 this.locationSubaddress = locationSubaddress; … … 255 255 this.contactUrl = contactUrl; 256 256 this.contactEmail = contactEmail; 257 this. categories = categories;257 this.topicalAreas = topicalAreas; 258 258 this.category = category; 259 259 this.notes = notes; … … 278 278 output += '</table>'; 279 279 } 280 if (this. categories != "") {280 if (this.topicalAreas != "") { 281 281 output += '<table>'; 282 output += '<tr><th>Suggested Categories:</th></tr>';283 output += '<tr><td>' + this. categories + '</td></tr>';282 output += '<tr><th>Suggested Topical Areas:</th></tr>'; 283 output += '<tr><td>' + this.topicalAreas + '</td></tr>'; 284 284 output += '</table>'; 285 285 } 286 286 if (this.category != "") { 287 output += '<p><strong>Type of Event:</strong> (if categories weren\'t sufficient)<br/>';287 output += '<p><strong>Type of Event:</strong> (if Topical Areas weren\'t sufficient)<br/>'; 288 288 output += this.category; 289 289 output += '</p>';
