Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 1842

Timestamp:

04/18/08 17:45:58

Author:

johnsa

Message:

web clients: adding/updating xproperty support to all clients; added X-BEDEWORK-SUBMITTEDBY property.

Files:

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

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

r1836	r1842
247	247	<xsl:for-each select="form/xproperties/node()">
248	248	bwXprops.init('<xsl:value-of select="name()"/>',[<xsl:for-each select="parameters/node()">['<xsl:value-of select="name()"/>','<xsl:value-of select="node()"/>']</xsl:for-each>],"<xsl:value-of select="values/text"/>");
249		<!-- <xsl:variable name="xprop"><xsl:value-of select="name()"/><xsl:for-each select="parameters/node()">;<xsl:value-of select="name()"/>=<xsl:value-of select="node()"/></xsl:for-each>:<xsl:value-of select="values/text"/></xsl:variable>
250		~~<input type="hidden" name="xproperty" value="{$xprop}" id="name()"/> -->~~
251	249	</xsl:for-each>
252	250	}
…	…
1059	1057	</xsl:if>
1060	1058
1061		<form name="eventForm" method="post" onsubmit="setEventFields(this,{$portalFriendly})">
	1059	<xsl:variable name="submitter" select="/bedework/userInfo/group"/>
	1060	<form name="eventForm" method="post" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')">
1062	1061	<xsl:choose>
1063	1062	<xsl:when test="/bedework/page = 'modEventPending'">

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

r1836	r1842
317	317	// ========================================================================
318	318
319		function setEventFields(formObj,portalFriendly) {
	319	function setEventFields(formObj,portalFriendly,submitter) {
320	320	if (!portalFriendly) {
321	321	setDates(formObj);
322	322	}
323	323	setRecurrence(formObj);
324		setBedeworkXProperties(formObj);
	324	setBedeworkXProperties(formObj,submitter);
325	325
326	326	//setAccessHow(formObj,1);

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

r1838	r1842
1		// Bedework ~~event form~~ functions
	1	// Bedework x-property functions
2	2
3	3	/* **********************************************************************
…	…
36	36	var bwXParamHeight = "X-BEDEWORK-PARAM-HEIGHT";
37	37
	38	var bwXPropertySubmittedBy = "X-BEDEWORK-SUBMITTEDBY";
38	39	var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT";
39	40
…	…
47	48	/* An xproperty
48	49	* name: String - name of x-property, e.g. "X-BEDEWORK-IMAGE"
49		* params: 2-D Array of parameter ~~key~~/value pairs,
	50	* params: 2-D Array of parameter name/value pairs,
50	51	* e.g. params[0] = ["X-BEDEWORK-PARAM-DESCRIPTION","a lovely image"]
51	52	* value: String - value of x-property
…	…
58	59	this.format = function() {
59	60	var curXparams = "";
60		for (var i = 0; i < this.params.length; i++) {
61		curXparams += ";" + this.params[i][0] + "=" + this.params[i][1];
	61	if (this.params.length) {
	62	for (var i = 0; i < this.params.length; i++) {
	63	curXparams += ";" + this.params[i][0] + "=" + this.params[i][1];
	64	}
62	65	}
63	66	return this.name + curXparams + ":" + this.value;
…	…
75	78	this.update = function(name, params, value, isUnique) {
76	79	var xprop = new BwXProperty(name, params, value);
77		if (isUnique && this.contains(~~xprop~~)) {
	80	if (isUnique && this.contains(name)) {
78	81	index = this.getIndex(name);
79	82	xproperties.splice(index,1,xprop);
…	…
83	86	}
84	87
85		this.contains = function(~~xprop~~) {
	88	this.contains = function(name) {
86	89	for (var i = 0; i < xproperties.length; i++) {
87	90	var curXprop = xproperties[i];
88		if (curXprop~~[0].equals(xprop[0])~~) {
	91	if (curXprop.name == name) {
89	92	return true;
90	93	}
…	…
93	96	}
94	97
95		this.getIndex = function(~~xpropN~~ame) {
	98	this.getIndex = function(name) {
96	99	for (var i = 0; i < xproperties.length; i++) {
97	100	var curXprop = xproperties[i];
98		if (curXprop~~[0].equals(xpropName)~~) {
	101	if (curXprop.name == name) {
99	102	return i;
100	103	}
…	…
109	112	xpropField.name = "xproperty";
110	113	xpropField.value = xproperties[i].format();
	114	// alert(xproperties[i].format());
111	115	}
112	116	}
…	…
114	118	}
115	119
116		function setBedeworkXProperties(formObj) {
	120	function setBedeworkXProperties(formObj,submitter) {
117	121	// set up specific Bedework X-Properties on event form submission
118	122
…	…
121	125	bwXProps.update(bwXPropertyImage,[[bwXParamDescription,''],[bwXParamWidth,''],[bwXParamHeight,'']],formObj["xBwImageHolder"].value,true);
122	126	}
	127	// X-BEDEWORK-SUBMITTEDBY
	128	bwXProps.update(bwXPropertySubmittedBy,[],submitter,true);
123	129
124	130	// commit all xproperties back to the form

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

r1817	r1842
107	107	<xsl:if test="/bedework/page = 'editEvent' and
108	108	normalize-space(/bedework/formElements/form/xproperties/xproperty[@name='X-BEDEWORK-SUBMIT-COMMENT']/value) != ''">
109		<xsl:attribute name="onload">getComments('standardForm','<xsl:value-of select="/bedework/formElements/form/xproperties/xproperty[@name='X-BEDEWORK-SUBMIT-COMMENT']/value"/>');</xsl:attribute>
	109	<xsl:attribute name="onload">initRXDates();initXProperties();getComments('standardForm','<xsl:value-of select="/bedework/formElements/form/xproperties/xproperty[@name='X-BEDEWORK-SUBMIT-COMMENT']/value"/>');</xsl:attribute>
110	110	</xsl:if>
111	111	<div id="bedework"><!-- main wrapper div -->
…	…
155	155	<script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"> </script>
156	156	<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js"> </script>
	157	<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js"> </script>
157	158	</xsl:if>
158	159	<!-- <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkAccess.js"> </script> -->
…	…
163	164	<script type="text/javascript">
164	165	<xsl:comment>
165		~~<![CDATA[~~
166	166	function focusElement(id) {
167	167	// focuses element by id
168	168	document.getElementById(id).focus();
169	169	}
170		]]>
	170	function initRXDates() {
	171	// return string values to be loaded into javascript for rdates
	172	<xsl:for-each select="/bedework/formElements/form/rdates/rdate">
	173	bwRdates.update('<xsl:value-of select="date"/>','<xsl:value-of select="time"/>',false,false,false,'<xsl:value-of select="tzid"/>');
	174	</xsl:for-each>
	175	// return string values to be loaded into javascript for exdates
	176	<xsl:for-each select="/bedework/formElements/form/exdates/rdate">
	177	bwExdates.update('<xsl:value-of select="date"/>','<xsl:value-of select="time"/>',false,false,false,'<xsl:value-of select="tzid"/>');
	178	</xsl:for-each>
	179	}
	180	function initXProperties() {
	181	<xsl:for-each select="form/xproperties/node()">
	182	bwXprops.init('<xsl:value-of select="name()"/>',[<xsl:for-each select="parameters/node()">['<xsl:value-of select="name()"/>','<xsl:value-of select="node()"/>']</xsl:for-each>],"<xsl:value-of select="values/text"/>");
	183	</xsl:for-each>
	184	}
171	185	</xsl:comment>
172	186	</script>
…	…
281	295	<!--==== ADD EVENT ====-->
282	296	<xsl:template match="formElements" mode="addEvent">
283		<form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="setEventFields(this);">
	297	<xsl:variable name="submitter" select="/bedework/userid"/>
	298	<form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}');">
284	299	<xsl:apply-templates select="." mode="eventForm"/>
285	300	</form>
…	…
288	303	<!--==== EDIT EVENT ====-->
289	304	<xsl:template match="formElements" mode="editEvent">
290		<form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="setEventFields(this);">
	305	<xsl:variable name="submitter" select="/bedework/userid"/>
	306	<form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}');">
291	307	<xsl:apply-templates select="." mode="eventForm"/>
292	308	</form>

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

r1817	r1842
240	240	// ========================================================================
241	241
242		function setEventFields(formObj) {
243		setDates(formObj);
	242	function setEventFields(formObj,portalFriendly,submitter) {
	243	if (!portalFriendly) {
	244	setDates(formObj);
	245	}
244	246	setComments(formObj);
245	247	setRecurrence(formObj);
	248	setBedeworkXProperties(formObj,submitter);
246	249	setAccessHow(formObj,1);
247	250	//setAccessAcl(formObj);

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

r1810	r1842
189	189	</xsl:when>
190	190	<xsl:when test="/bedework/page = 'editEvent'">
191		<xsl:attribute name="onload">initRXDates();</xsl:attribute>
	191	<xsl:attribute name="onload">initRXDates();initXProperties();focusElement('bwEventTitle');</xsl:attribute>
192	192	</xsl:when>
193	193	<xsl:when test="/bedework/page = 'attendees'">
…	…
379	379	<script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"> </script>
380	380	<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js"> </script>
	381	<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js"> </script>
381	382	<script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkAccess.js"> </script>
382	383	<xsl:if test="$portalFriendly = 'true'">
…	…
401	402	<xsl:for-each select="/bedework/formElements/form/exdates/rdate">
402	403	bwExdates.update('<xsl:value-of select="date"/>','<xsl:value-of select="time"/>',false,false,false,'<xsl:value-of select="tzid"/>');
	404	</xsl:for-each>
	405	}
	406	function initXProperties() {
	407	<xsl:for-each select="form/xproperties/node()">
	408	bwXprops.init('<xsl:value-of select="name()"/>',[<xsl:for-each select="parameters/node()">['<xsl:value-of select="name()"/>','<xsl:value-of select="node()"/>']</xsl:for-each>],"<xsl:value-of select="values/text"/>");
403	409	</xsl:for-each>
404	410	}
…	…
1989	1995	<!-- The name "eventForm" is referenced by several javascript functions. Do not
1990	1996	change it without modifying bedework.js -->
1991		<form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly})">
	1997	<xsl:variable name="submitter" select="/bedework/userid"/>
	1998	<form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')">
1992	1999	<h2>
1993	2000	<span class="formButtons">
…	…
2009	2016	<!-- The name "eventForm" is referenced by several javascript functions. Do not
2010	2017	change it without modifying bedework.js -->
2011		<form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly})">
	2018	<xsl:variable name="submitter" select="/bedework/userid"/>
	2019	<form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')">
2012	2020	<h2>
2013	2021	<span class="formButtons">

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

r1729	r1842
239	239	// ========================================================================
240	240
241		function setEventFields(formObj,portalFriendly) {
	241	function setEventFields(formObj,portalFriendly,submitter) {
242	242	if (!portalFriendly) {
243	243	setDates(formObj);
244	244	}
245	245	setRecurrence(formObj);
	246	setBedeworkXProperties(formObj,submitter);
246	247	setAccessHow(formObj,1);
247	248	//setAccessAcl(formObj);

Download in other formats: