Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/BasicContent.jsp,v
diff -u -r1.37 -r1.38
--- lams_tool_vote/web/authoring/BasicContent.jsp	18 Oct 2006 03:23:11 -0000	1.37
+++ lams_tool_vote/web/authoring/BasicContent.jsp	23 Oct 2006 00:47:12 -0000	1.38
@@ -22,8 +22,12 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
-<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
+<c:set scope="request" var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set scope="request" var="tool">
+	<lams:WebAppURL />
+</c:set>
 
 <script type="text/javascript">
 <!-- Common Javascript functions for LAMS -->
@@ -33,7 +37,7 @@
 	function showMessage(url) {
 		var area=document.getElementById("messageArea");
 		if(area != null){
-			area.style.width="670px";
+			area.style.width="640px";
 			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
@@ -70,95 +74,72 @@
 
 </script>
 
-			<html:hidden property="questionIndex"/>
-			
-			<table cellpadding="0">
+<html:hidden property="questionIndex" />
 
-						<tr>
-							<td colspan="2">
-								<div class="field-name">
-									<fmt:message key="label.authoring.title.col"></fmt:message>
-								</div>
-								<html:text property="title" style="width: 100%;"></html:text>
-							</td>
-						</tr>
-						
+<table cellpadding="0">
 
-						<tr>
-							<td colspan="2">
-								<div class="field-name">
-									<fmt:message key="label.authoring.instructions.col"></fmt:message>
-								</div>
-								<lams:FCKEditor id="instructions"
-									value="${voteGeneralAuthoringDTO.activityInstructions}"
-									contentFolderID="${voteGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
-							</td>
-						</tr>
-	
-				 		<tr>
-						<td colspan="2">
-							<div id="resourceListArea">
-						 		<c:if test="${voteGeneralAuthoringDTO.activeModule == 'authoring' || voteGeneralAuthoringDTO.activeModule == 'defineLater'}"> 		
-									<%@ include file="/authoring/itemlist.jsp"%>
-								</c:if> 							
-						 		<c:if test="${voteGeneralAuthoringDTO.activeModule != 'authoring' && voteGeneralAuthoringDTO.activeModule != 'defineLater'}"> 		
-									<%@ include file="/monitoring/itemlist.jsp"%>
-								</c:if> 							
-							</div>
-						</td>
-						</tr>
-						
+	<tr>
+		<td colspan="2">
+			<div class="field-name">
+				<fmt:message key="label.authoring.title.col"></fmt:message>
+			</div>
+			<html:text property="title" style="width: 100%;"></html:text>
+		</td>
+	</tr>
 
-			 		<c:if test="${voteGeneralAuthoringDTO.activeModule == 'authoring' || voteGeneralAuthoringDTO.activeModule == 'defineLater'}"> 								
-						<tr>
-							<td colspan="2">
-									<a href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&voteChangable=${voteGeneralAuthoringDTO.voteChangable}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
-										style="float:right;width:150px" class="button-add-item"> <fmt:message
-										key="label.add.new.nomination" /> </a>
-							</td>
-						</tr>
-					</c:if> 												
-			 		<c:if test="${voteGeneralAuthoringDTO.activeModule != 'authoring' && voteGeneralAuthoringDTO.activeModule != 'defineLater'}"> 							
-						<tr>
-							<td colspan="2">
-									<a href="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&voteChangable=${voteGeneralAuthoringDTO.voteChangable}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
-										style="float:right;width:150px" class="button-add-item"> <fmt:message
-										key="label.add.new.nomination" /> </a>
-							</td>
-						</tr>
-					</c:if> 																		 		
 
-					<tr>
-						<td colspan="2">
-							<iframe
-								onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
-								id="messageArea" name="messageArea"
-								style="width:0px;height:0px;border:0px;display:none"
-								frameborder="no" scrolling="no">
-							</iframe>
-						</td>
-					</tr>
+	<tr>
+		<td colspan="2">
+			<div class="field-name">
+				<fmt:message key="label.authoring.instructions.col"></fmt:message>
+			</div>
+			<lams:FCKEditor id="instructions"
+				value="${voteGeneralAuthoringDTO.activityInstructions}"
+				contentFolderID="${voteGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
+		</td>
+	</tr>
+</table>
 
-			 </table>			
+<div id="resourceListArea">
+	<c:if
+		test="${voteGeneralAuthoringDTO.activeModule == 'authoring' || voteGeneralAuthoringDTO.activeModule == 'defineLater'}">
+		<%@ include file="/authoring/itemlist.jsp"%>
+	</c:if>
+	<c:if
+		test="${voteGeneralAuthoringDTO.activeModule != 'authoring' && voteGeneralAuthoringDTO.activeModule != 'defineLater'}">
+		<%@ include file="/monitoring/itemlist.jsp"%>
+	</c:if>
+</div>
 
-				
-				<table cellpadding="0">
-					    <tr> <td> &nbsp </td> </tr>					    
-						<tr> 
-							<td>							
-						      	<c:if test="${voteGeneralAuthoringDTO.activeModule != 'authoring'}"> 					
-									<p align="right">
-									    <a href="javascript:submitMethod('submitAllContent')" class="button">
-								        	<fmt:message key="label.save"/></a>
-									</p>
-								</c:if> 					
-							</td> 
-					  	</tr>
-				 </table>
+<p>
+	<c:if
+		test="${voteGeneralAuthoringDTO.activeModule == 'authoring' || voteGeneralAuthoringDTO.activeModule == 'defineLater'}">
+		<a
+			href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&voteChangable=${voteGeneralAuthoringDTO.voteChangable}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
+			class="button-add-item"> <fmt:message
+				key="label.add.new.nomination" /> </a>
+	</c:if>
+	<c:if
+		test="${voteGeneralAuthoringDTO.activeModule != 'authoring' && voteGeneralAuthoringDTO.activeModule != 'defineLater'}">
+		<a
+			href="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&voteChangable=${voteGeneralAuthoringDTO.voteChangable}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
+			class="button-add-item"> <fmt:message
+				key="label.add.new.nomination" /> </a>
+	</c:if>
+</p>
 
-	                                     
+<p>
+	<iframe
+		onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
+		id="messageArea" name="messageArea"
+		style="width:0px;height:0px;border:0px;display:none" frameborder="no"
+		scrolling="no">
+	</iframe>
+</p>
 
-
-
-
-
+<c:if test="${voteGeneralAuthoringDTO.activeModule != 'authoring'}">
+	<p align="right">
+		<a href="javascript:submitMethod('submitAllContent')" class="button">
+			<fmt:message key="label.save" /> </a>
+	</p>
+</c:if>