Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v
diff -u -r1.29 -r1.30
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	30 Jun 2006 02:16:53 -0000	1.29
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	30 Jun 2006 04:09:54 -0000	1.30
@@ -95,7 +95,12 @@
 		String param = mapping.getParameter();
 		//-----------------------Resource Author function ---------------------------
 		if(param.equals("start")){
-			request.setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.AUTHOR.toString());
+			ToolAccessMode mode = getAccessMode(request);
+			//teacher mode "check for new" button enter.
+			if(mode != null)
+				request.setAttribute(AttributeNames.ATTR_MODE,mode.toString());
+			else
+				request.setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.AUTHOR.toString());
 			return start(mapping, form, request, response);
 		}
 		if (param.equals("definelater")) {
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/learning.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_larsrc/web/pages/learning/learning.jsp	30 Jun 2006 02:24:23 -0000	1.20
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	30 Jun 2006 04:09:54 -0000	1.21
@@ -23,11 +23,11 @@
 		}
 		function checkNew(){
  		    var reqIDVar = new Date();
-			document.location.href = "<c:url value="/learning/start.do"/>?toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();
+			document.location.href = "<c:url value="/learning/start.do"/>?mode=${param.mode}&toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();
  		    return false;
 		}
 		function viewItem(itemUid){
-			var myUrl = "<c:url value="/reviewItem.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&itemUid=" + itemUid;
+			var myUrl = "<c:url value="/reviewItem.do"/>?mode=${param.mode}&toolSessionID=${toolSessionID}&itemUid=" + itemUid;
 			launchPopup(myUrl,"LearnerView");
 		}
 		function completeItem(itemUid){
@@ -94,7 +94,9 @@
 				</td>
 				
 				<td>
-					<a href="#" class="button" onclick="return completeItem(${item.uid})"><fmt:message key="label.completed" /></a>
+					<c:if test="${param.mode != 'teacher'}">
+						<a href="#" class="button" onclick="return completeItem(${item.uid})"><fmt:message key="label.completed" /></a>
+					</c:if>	
 					<a href="javascript:;" class="button" onclick="viewItem(${item.uid})" ><fmt:message key="label.view" /></a>
 				</td>
 			</tr>
@@ -103,9 +105,11 @@
 			<td colspan="3" align="right">
 				<a href="#" class="button" onclick="return checkNew()"><fmt:message key="label.check.for.new" /></a>
 				&nbsp;
-				<a href="#" class="button" onclick="return finishSession()">
-					<fmt:message key="label.finished" />
-				</a>
+				<c:if test="${param.mode != 'teacher'}">
+					<a href="#" class="button" onclick="return finishSession()">
+						<fmt:message key="label.finished" />
+					</a>
+				</c:if>
 			</td>
 		</tr>
 		<c:if test="${resource.miniViewResourceNumber > 0}">
@@ -116,57 +120,60 @@
 			</tr>
 		</c:if>
 	</table>
-	<c:if test="${resource.allowAddFiles || resource.allowAddUrls}">
-		<table border="0" align="center" width="100%">
-			<tr>
-				<td style="align:left" >
-					<fmt:message key="label.suggest.new"/> 
-					<c:choose>
-						<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
-							<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()"><fmt:message key="label.authoring.basic.resource.url.input"/> |
-							<input type="radio" name="suggest" value="file"  onclick="gotoFile()"><fmt:message key="label.authoring.basic.resource.file.input"/> 
-						</c:when>
-						<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
-							<input type="radio" name="suggest" value="file"  checked="true" onclick="gotoFile()"><fmt:message key="label.authoring.basic.resource.file.input"/> 
-						</c:when>
-						<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
-							<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()"><fmt:message key="label.authoring.basic.resource.url.input"/>
-						</c:when>
-					</c:choose>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<iframe onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'" 
-						id="reourceInputArea" name="reourceInputArea" style="width:0px;height:0px;border:0px;display:none" frameborder="no" scrolling="no">
-					</iframe>
-				</td>
-			</tr>			
-		</table>
+	<c:if test="${param.mode != 'teacher'}">
+		<c:if test="${resource.allowAddFiles || resource.allowAddUrls}">
+			<table border="0" align="center" width="100%">
+				<tr>
+					<td style="align:left" >
+						<fmt:message key="label.suggest.new"/> 
+						<c:choose>
+							<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
+								<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()"><fmt:message key="label.authoring.basic.resource.url.input"/> |
+								<input type="radio" name="suggest" value="file"  onclick="gotoFile()"><fmt:message key="label.authoring.basic.resource.file.input"/> 
+							</c:when>
+							<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
+								<input type="radio" name="suggest" value="file"  checked="true" onclick="gotoFile()"><fmt:message key="label.authoring.basic.resource.file.input"/> 
+							</c:when>
+							<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
+								<input type="radio" name="suggest" value="url" checked="true" onclick="gotoURL()"><fmt:message key="label.authoring.basic.resource.url.input"/>
+							</c:when>
+						</c:choose>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<iframe onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'" 
+							id="reourceInputArea" name="reourceInputArea" style="width:0px;height:0px;border:0px;display:none" frameborder="no" scrolling="no">
+						</iframe>
+					</td>
+				</tr>			
+			</table>
+		</c:if>
+		<c:choose>
+			<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
+				<script type="text/javascript">
+					<!--
+						showMessage("<c:url value='/pages/learning/addurl.jsp'/>");
+					-->
+				</script>
+			</c:when>
+			<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
+				<script type="text/javascript">
+					<!--
+						showMessage("<c:url value='/pages/learning/addfile.jsp'/>");
+					-->
+				</script>
+			</c:when>
+			<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
+				<script type="text/javascript">
+					<!--
+						showMessage("<c:url value='/pages/learning/addurl.jsp'/>");
+					-->
+				</script>
+			</c:when>
+		</c:choose>		
+	<%-- end mode != teacher --%>
 	</c:if>
-	<c:choose>
-		<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
-			<script type="text/javascript">
-				<!--
-					showMessage("<c:url value='/pages/learning/addurl.jsp'/>");
-				-->
-			</script>
-		</c:when>
-		<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
-			<script type="text/javascript">
-				<!--
-					showMessage("<c:url value='/pages/learning/addfile.jsp'/>");
-				-->
-			</script>
-		</c:when>
-		<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
-			<script type="text/javascript">
-				<!--
-					showMessage("<c:url value='/pages/learning/addurl.jsp'/>");
-				-->
-			</script>
-		</c:when>
-	</c:choose>		
 	</div>
 	<div id="footer"></div>
 </div>
Index: lams_tool_larsrc/web/pages/learning/start.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/start.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_larsrc/web/pages/learning/start.jsp	30 Jun 2006 02:16:53 -0000	1.5
+++ lams_tool_larsrc/web/pages/learning/start.jsp	30 Jun 2006 04:09:54 -0000	1.6
@@ -10,7 +10,7 @@
 			</c:when>
 			<c:otherwise>
 				<script type="text/javascript">
-					document.location = "<c:url value="/pages/learning/learning.jsp"/>"
+					document.location = "<c:url value="/pages/learning/learning.jsp?mode=${mode}"/>"
 				</script>
 			</c:otherwise>
 		</c:choose>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java,v
diff -u -r1.28 -r1.29
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	13 Jun 2006 07:27:25 -0000	1.28
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	30 Jun 2006 04:10:31 -0000	1.29
@@ -97,9 +97,11 @@
         request.getSession().setAttribute(AttributeNames.ATTR_MODE, mode);
                 
         if(mode.equals(ToolAccessMode.LEARNER) || mode.equals(ToolAccessMode.AUTHOR) ){
+        	request.setAttribute(AttributeNames.ATTR_MODE,mode);
             return listFiles(mapping, form, request, response);
         }
         else if(mode.equals(ToolAccessMode.TEACHER)){
+        	request.setAttribute(AttributeNames.ATTR_MODE,mode);
         	return listFiles(mapping, form, request, response);
         }
         logger.error("Requested mode + '" + mode.toString() + "' not supported");
Index: lams_tool_sbmt/web/learner/sbmtLearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/Attic/sbmtLearner.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_sbmt/web/learner/sbmtLearner.jsp	29 Jun 2006 08:48:36 -0000	1.10
+++ lams_tool_sbmt/web/learner/sbmtLearner.jsp	30 Jun 2006 04:10:31 -0000	1.11
@@ -82,7 +82,7 @@
 							<tr>
 								<!--Second Row displaying the description of the File -->
 								<td class="field-name">
-									<b><fmt:message key="label.learner.fileDescription" /></b>
+									<fmt:message key="label.learner.fileDescription" />
 								</td>
 								<td>
 									<c:out value="${file.fileDescription}" escapeXml="false" />
@@ -136,44 +136,46 @@
 
 			</table>
 
-			<html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data" focus="filePath" onsubmit="return validateForm(this);">
-				<p>
-					<html:errors />
-				</p>
-				<table>
-					<!-- Hidden fields -->
-					<html:hidden property="toolSessionID" value="${learner.toolSessionID}" />
-
-					<!--File path row -->
-					<tr>
-						<td class="field-name">
-							<fmt:message key="label.learner.filePath" />
-						</td>
-						<td>
-							<html:file property="filePath" disabled="${learner.locked}" size="40" tabindex="1" />
-						</td>
-					</tr>
-					<!--File Description row -->
-					<tr>
-						<td class="field-name">
-							<fmt:message key="label.learner.fileDescription" />
-						</td>
-						<td>
-							<lams:STRUTS-textarea rows="5" cols="40" tabindex="2" property="fileDescription" disabled="${learner.locked}" />
-						</td>
-					</tr>
-					<tr>
-						<td colspan="2" align="center">
-							<html:submit disabled="${learner.locked}" styleClass="buttonStyle">
-								<fmt:message key="label.learner.upload" />
-							</html:submit>
-							<html:button property="finished" onclick="finish()" disabled="${learner.locked}" styleClass="buttonStyle">
-								<fmt:message key="label.learner.finished" />
-							</html:button>
-						</td>
-					</tr>
-				</table>
-			</html:form>
+			<c:if test="${mode != 'teacher'}">
+				<html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data" focus="filePath" onsubmit="return validateForm(this);">
+					<p>
+						<html:errors />
+					</p>
+					<table>
+						<!-- Hidden fields -->
+						<html:hidden property="toolSessionID" value="${learner.toolSessionID}" />
+	
+						<!--File path row -->
+						<tr>
+							<td class="field-name">
+								<fmt:message key="label.learner.filePath" />
+							</td>
+							<td>
+								<html:file property="filePath" disabled="${learner.locked}" size="40" tabindex="1" />
+							</td>
+						</tr>
+						<!--File Description row -->
+						<tr>
+							<td class="field-name">
+								<fmt:message key="label.learner.fileDescription" />
+							</td>
+							<td>
+								<lams:STRUTS-textarea rows="5" cols="40" tabindex="2" property="fileDescription" disabled="${learner.locked}" />
+							</td>
+						</tr>
+						<tr>
+							<td colspan="2" align="center">
+								<html:submit disabled="${learner.locked}" styleClass="buttonStyle">
+									<fmt:message key="label.learner.upload" />
+								</html:submit>
+								<html:button property="finished" onclick="finish()" disabled="${learner.locked}" styleClass="buttonStyle">
+									<fmt:message key="label.learner.finished" />
+								</html:button>
+							</td>
+						</tr>
+					</table>
+				</html:form>
+			</c:if>
 		</div>
 		<div id="footer"></div>
 	</div>