Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 1673

Timestamp:

12/13/07 17:34:01

Author:

johnsa

Message:

web submit: closing in on finishing first version of public events submission. Added an input field for gathering comments from user. Working through UI.

Files:

trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (2 diffs)
trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (modified) (1 diff)
trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.css (modified) (1 diff)
trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl (modified) (7 diffs)
trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js (modified) (1 diff)

Legend:

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

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

r1672	r1673
524	524	<xsl:attribute name="class">selected</xsl:attribute>
525	525	</xsl:if>
526		<a href="{$initPendingTab}&~~ignoreCreator=yes&~~calPath={$submissionsRootEncoded}&listAllEvents=true">Pending Events</a>
	526	<a href="{$initPendingTab}&calPath={$submissionsRootEncoded}&listAllEvents=true">Pending Events</a>
527	527	</li>
528	528	<xsl:if test="/bedework/currentCalSuite/currentAccess/current-user-privilege-set/privilege/write or /bedework/userInfo/superUser='true'">
…	…
2189	2189	<input type="submit" name="updateSubmitEvent" value="Update Event"/>
2190	2190	<input type="submit" name="publishEvent" value="Publish Event"/>
2191		<input type="submit" name="cancel~~led~~" value="Cancel"/>
	2191	<input type="submit" name="cancel" value="Cancel"/>
2192	2192	</td>
2193	2193	<td align="right">

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

r1670	r1673
284	284	commentWindow.document.writeln("</body></html>");
285	285	commentWindow.document.close();
	286	commentWindow.focus();
286	287	}
287	288	}

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

r1665	r1673
38	38	float: right;
39	39	font-size: 0.8em;
	40	}
	41	#bedework #bwCommentNotes {
	42	clear: both;
	43	margin: 1em 0.5em;
40	44	}
41	45	#bedework div.eventSubmitButtons {

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

r1667	r1673
287	287	<xsl:variable name="guid" select="guid"/>
288	288	<xsl:variable name="recurrenceId" select="recurrenceId"/>
289		~~<!-- DEPRECATED: <input type="hidden" name="endType" value="date"/> -->~~
290	289	<!-- comment field to hold the user's suggestions: -->
291	290	<input type="hidden" name="xbwsubmitcomment" id="bwEventComment" value=""/>
…	…
440	439	height="13"
441	440	border="0"/>
	441	previous</a> \|
	442	<a href="javascript:show('bwHelp-Review','bwEventTab-Review','bwBottomNav-Review'); hide('bwHelp-Categories','bwEventTab-Categories','bwBottomNav-Categories'); ">
	443	next
	444	<img alt="previous"
	445	src="{$resourcesRoot}/resources/arrowRight.gif"
	446	width="13"
	447	height="13"
	448	border="0"/>
	449	</a>
	450	</div>
	451	<strong>Step 4:</strong> Select Categories. <em>Optional.</em>
	452	</div>
	453	<div id="bwHelp-Review" class="invisible">
	454	<div class="navButtons">
	455	<a href="javascript:show('bwHelp-Categories','bwEventTab-Categories','bwBottomNav-Categories'); hide('bwHelp-Review','bwEventTab-Review','bwBottomNav-Review'); ">
	456	<img alt="previous"
	457	src="{$resourcesRoot}/resources/arrowLeft.gif"
	458	width="13"
	459	height="13"
	460	border="0"/>
442	461	previous</a>
443	462	<span class="hidden">
	463	<!-- this is here just to take up the appropriate space -->
444	464	<xsl:text> </xsl:text>\| next
445	465	<img alt="previous"
…	…
449	469	border="0"/>
450	470	</span>
451		<div class="eventSubmitButtons">
452		<input name="submit" class="submit" type="submit" value="submit for approval"/>
453		<input name="cancelled" type="submit" value="cancel"/>
454		</div>
455		</div>
456		<strong>Step 4:</strong> Select Categories. <em>Optional.</em>
	471	</div>
	472	<strong>Step 5:</strong> Add Comments. <em>Optional.</em>
457	473	</div>
458	474	</div>
…	…
847	863	</tr>
848	864
849
850	865	<!-- Description -->
851	866	<tr>
…	…
1011	1026	</div>
1012	1027	</div>
	1028
	1029	<!-- Review tab -->
	1030	<!-- ============== -->
	1031	<div id="bwEventTab-Review" class="invisible">
	1032	<!-- <table id="bwEventSubmitReview" class="common">
	1033	<tr>
	1034	<th colspan="2">Event Details</th>
	1035	</tr>-->
	1036	<!-- the form elements will be inserted here -->
	1037	<!-- </table>-->
	1038	<div id="bwCommentNotes">
	1039	Please supply any final notes or instructions regarding your event:<br/>
	1040	<textarea name="commentNotes" cols="60" rows="4"> </textarea>
	1041	</div>
	1042	<div class="eventSubmitButtons">
	1043	<input name="submit" class="submit" type="submit" value="submit for approval"/>
	1044	<input name="cancelled" type="submit" value="cancel"/>
	1045	</div>
	1046	</div>
1013	1047	</div>
1014	1048
…	…
1072	1106	height="13"
1073	1107	border="0"/>
	1108	previous</a> \|
	1109	<a href="javascript:show('bwHelp-Review','bwEventTab-Review','bwBottomNav-Review'); hide('bwHelp-Categories','bwEventTab-Categories','bwBottomNav-Categories');">
	1110	<!-- displayReview('standardForm','bwEventSubmitReview',1) -->
	1111	next
	1112	<img alt="previous"
	1113	src="{$resourcesRoot}/resources/arrowRight.gif"
	1114	width="13"
	1115	height="13"
	1116	border="0"/>
	1117	</a>
	1118	</div>
	1119	</div>
	1120	<div id="bwBottomNav-Review" class="invisible">
	1121	<div class="navButtons">
	1122	<a href="javascript:show('bwHelp-Categories','bwEventTab-Categories','bwBottomNav-Categories'); hide('bwHelp-Review','bwEventTab-Review','bwBottomNav-Review'); ">
	1123	<img alt="previous"
	1124	src="{$resourcesRoot}/resources/arrowLeft.gif"
	1125	width="13"
	1126	height="13"
	1127	border="0"/>
1074	1128	previous</a>
1075	1129	<span class="hidden">
…	…
1081	1135	border="0"/>
1082	1136	</span>
1083		~~<div class="eventSubmitButtons">~~
1084		~~<input name="submit" class="submit" type="submit" value="submit for approval"/>~~
1085		~~<input name="cancelled" type="submit" value="cancel"/>~~
1086		~~</div>~~
1087	1137	</div>
1088	1138	</div>

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

r1669	r1673
272	272	comment += formObj["commentContactURL"].value + "\t";
273	273	comment += formObj["commentContactEmail"].value + "\t";
274		comment += formObj["commentCategories"].value;
	274	comment += formObj["commentCategories"].value + "\t";
	275	comment += formObj["commentNotes"].value;
275	276
276	277	formObj["xbwsubmitcomment"].value = comment;
	278	}
	279	// create table of form fields for review
	280	function displayReview(formId,tableId,numHeaderRows) {
	281	try {
	282	// get the form
	283	var formObj = document.getElementById(formId);
	284
	285	// get the table body
	286	var reviewTableBody = document.getElementById(tableId).tBodies[0];
	287
	288	// remove existing rows
	289	for (i = reviewTableBody.rows.length - 1; i >= numHeaderRows; i--) {
	290	reviewTableBody.deleteRow(i);
	291	}
	292
	293	// recreate the table rows
	294	var tr = reviewTableBody.insertRow(0 + numHeaderRows);
	295	tr.insertCell(0).innerHTML = "Title";
	296	tr.insertCell(1).appendChild(document.createTextNode(formObj.summary.value));
	297
	298	tr = reviewTableBody.insertRow(1 + numHeaderRows);
	299	tr.insertCell(0).innerHTML = "Description";
	300	tr.insertCell(1).appendChild(document.createTextNode(formObj.description.value));
	301
	302	} catch (e) {
	303	alert(e);
	304	}
277	305	}
278	306	function swapAllDayEvent(obj) {