Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 1851

Timestamp:

04/21/08 17:05:19

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

releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.css

r1780	r1851
316	316	color: black;
317	317	}
	318	#bwSubmittedBy {
	319	float: right;
	320	}
318	321	#bwSubmittedEventCommentBlock h4 {
319	322	display: inline;

releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl

r1850	r1851
10	10	omit-xml-declaration="yes"/>
11	11	<xsl:strip-space elements="*"/>
	12
12	13	<!-- ======================================== -->
13	14	<!-- BEDEWORK ADMIN CLIENT STYLESHEET -->
…	…
1040	1041
1041	1042	<!-- 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']">
1043	1044	<script type="text/javascript">
1044	1045	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>');
1054	1055	</script>
1055	1056
1056	1057	<div id="bwSubmittedEventCommentBlock">
	1058	<div id="bwSubmittedBy">Submitted by <xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']/values/text"/></div>
1057	1059	<h4>Comments from Submitter</h4>
1058	1060	<a href="javascript:toggleVisibility('bwSubmittedEventComment','visible');" class="toggle">show/hide</a>
…	…
1066	1068	</xsl:if>
1067	1069
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>
1069	1076	<form name="eventForm" method="post" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')">
1070	1077	<xsl:choose>
…	…
6425	6432	</div>
6426	6433	</xsl:template>
	6434
	6435	<!--==== Utility Templates ====-->
	6436	<xsl:template name="escapeApos">
	6437	<xsl:param name="str"/>
	6438	<xsl:variable name="apos" select='"'"'/>
	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
6427	6453	</xsl:stylesheet>

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

r1850	r1851
240	240
241	241	/* A comment accompanying a submitted event.
242		* These values come from ~~the x-property X-BEDEWORK-SUBMIT-COMMENT~~
243		* locationAddress: value of p~~arameter 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
252	252	*/
253	253	function bwSubmitComment(locationAddress,locationSubaddress,locationUrl,contactName,contactPhone,contactUrl,contactEmail,category,notes) {
…	…
355	355	// X-BEDEWORK-IMAGE and its parameters:
356	356	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);
358	362	}
359	363	// X-BEDEWORK-SUBMITTEDBY

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

r1850	r1851
32	32
33	33	var bwXPropertyImage = "X-BEDEWORK-IMAGE";
	34	var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY";
	35	var bwXPropertyLocation = "X-BEDEWORK-LOCATION";
	36	var bwXPropertyContact = "X-BEDEWORK-CONTACT";
	37	var bwXPropertyCategories = "X-BEDEWORK-CATEGORIES";
	38	var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT";
	39
34	40	var bwXParamDescription = "X-BEDEWORK-PARAM-DESCRIPTION";
35	41	var bwXParamWidth = "X-BEDEWORK-PARAM-WIDTH";
36	42	var 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";
	43	var bwXParamSubAddress = "X-BEDEWORK-PARAM-SUBADDRESS";
	44	var bwXParamURL = "X-BEDEWORK-PARAM-URL";
	45	var bwXParamPhone = "X-BEDEWORK-PARAM-PHONE";
	46	var bwXParamEmail = "X-BEDEWORK-PARAM-EMAIL";
48	47
49	48	// ========================================================================

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

r1847	r1851
294	294	<!--==== ADD EVENT ====-->
295	295	<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>
297	302	<form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}');">
298	303	<xsl:apply-templates select="." mode="eventForm"/>
…	…
302	307	<!--==== EDIT EVENT ====-->
303	308	<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>
305	315	<form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}');">
306	316	<xsl:apply-templates select="." mode="eventForm"/>
…	…
906	916	<label for="commentLocationAddress">Address: </label>
907	917	<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>
909	919	</input>
910	920	</p>
…	…
912	922	<label for="commentLocationSubaddress"><em>Sub-address:</em> </label>
913	923	<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>
915	925	</input>
916	926	<span class="note"> optional</span>
…	…
919	929	<label for="commentLocationURL"><em>URL:</em> </label>
920	930	<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>
922	932	</input>
923	933	<span class="note"> optional</span>
…	…
945	955	<label for="commentContactName">Organization Name: </label>
946	956	<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>
948	958	</input>
949	959	<span class="note"> Please limit contacts to organizations, not individuals.</span>
…	…
952	962	<label for="commentContactPhone"><em>Phone:</em> </label>
953	963	<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>
955	965	</input>
956	966	<span class="note"> optional</span>
…	…
959	969	<label for="commentContactURL"><em>URL:</em> </label>
960	970	<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>
962	972	</input>
963	973	<span class="note"> optional</span>
…	…
966	976	<label for="commentContactEmail"><em>Email:</em> </label>
967	977	<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>
969	979	</input>
970	980	<span class="note"> optional</span>
…	…
1013	1023	<label for="commentCategories">Category suggestion: </label>
1014	1024	<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>
1016	1026	</input>
1017	1027	</p>

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

r1847	r1851
274	274	// Set application x-properties here.
275	275
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);
287	288
288	289	// X-BEDEWORK-IMAGE and its parameters:
289	290	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);
291	296	}
292	297	// X-BEDEWORK-SUBMITTEDBY

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

r1850	r1851
32	32
33	33	var bwXPropertyImage = "X-BEDEWORK-IMAGE";
	34	var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY";
	35	var bwXPropertyLocation = "X-BEDEWORK-LOCATION";
	36	var bwXPropertyContact = "X-BEDEWORK-CONTACT";
	37	var bwXPropertyCategories = "X-BEDEWORK-CATEGORIES";
	38	var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT";
	39
34	40	var bwXParamDescription = "X-BEDEWORK-PARAM-DESCRIPTION";
35	41	var bwXParamWidth = "X-BEDEWORK-PARAM-WIDTH";
36	42	var bwXParamHeight = "X-BEDEWORK-PARAM-HEIGHT";
	43	var bwXParamSubAddress = "X-BEDEWORK-PARAM-SUBADDRESS";
	44	var bwXParamURL = "X-BEDEWORK-PARAM-URL";
	45	var bwXParamPhone = "X-BEDEWORK-PARAM-PHONE";
	46	var bwXParamEmail = "X-BEDEWORK-PARAM-EMAIL";
37	47
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";~~
48	48
49	49	// ========================================================================

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

r1842	r1851
1995	1995	<!-- The name "eventForm" is referenced by several javascript functions. Do not
1996	1996	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>
1998	2003	<form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')">
1999	2004	<h2>
…	…
2016	2021	<!-- The name "eventForm" is referenced by several javascript functions. Do not
2017	2022	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>
2019	2029	<form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')">
2020	2030	<h2>

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

r1847	r1851
268	268	// X-BEDEWORK-IMAGE and its parameters:
269	269	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);
271	275	}
272	276	// X-BEDEWORK-SUBMITTEDBY

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

r1850	r1851
32	32
33	33	var bwXPropertyImage = "X-BEDEWORK-IMAGE";
	34	var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY";
	35	var bwXPropertyLocation = "X-BEDEWORK-LOCATION";
	36	var bwXPropertyContact = "X-BEDEWORK-CONTACT";
	37	var bwXPropertyCategories = "X-BEDEWORK-CATEGORIES";
	38	var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT";
	39
34	40	var bwXParamDescription = "X-BEDEWORK-PARAM-DESCRIPTION";
35	41	var bwXParamWidth = "X-BEDEWORK-PARAM-WIDTH";
36	42	var 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";
	43	var bwXParamSubAddress = "X-BEDEWORK-PARAM-SUBADDRESS";
	44	var bwXParamURL = "X-BEDEWORK-PARAM-URL";
	45	var bwXParamPhone = "X-BEDEWORK-PARAM-PHONE";
	46	var bwXParamEmail = "X-BEDEWORK-PARAM-EMAIL";
48	47
49	48	// ========================================================================

Download in other formats: