Index: lams_tool_lamc/build.xml
===================================================================
diff -u -r9143e89a9c23c613879042751449004326a50bf6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/build.xml	(.../build.xml)	(revision 9143e89a9c23c613879042751449004326a50bf6)
+++ lams_tool_lamc/build.xml	(.../build.xml)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -455,5 +455,16 @@
 			<native2ascii encoding="UTF-8" src="${conf.language.dir}" dest="${conf.language.dir}"
 			   includes="*.txt" ext=".properties"/>
 	    </target>
+	
+	   <!-- ================================= 
+	          target: synchronize-jsp              
+	         ================================= -->
+	    <target name="synchronize-deploy" description="copy non-java file into deploy folder">
+	        <copy verbose="yes" todir="${jboss.deploy}/${product}.war">
+	        	<fileset dir="${conf.web.dir}">
+	        		<include name="**/*.*"/>
+	        	</fileset>
+	        </copy>
+	    </target>
 
 </project>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/fckeditor/tlds/FCKeditor.tld
===================================================================
diff -u -r653f0f0eff40af5e6891c22ef2b8efe9bf2f75af -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 653f0f0eff40af5e6891c22ef2b8efe9bf2f75af)
+++ lams_tool_lamc/web/WEB-INF/fckeditor/tlds/FCKeditor.tld	(.../FCKeditor.tld)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -14,6 +14,7 @@
 		<attribute>
 			<name>id</name>
 			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
   		</attribute>
 		<attribute>
 			<name>basePath</name>
Index: lams_tool_lamc/web/WEB-INF/lams.tld
===================================================================
diff -u -r9143e89a9c23c613879042751449004326a50bf6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9143e89a9c23c613879042751449004326a50bf6)
+++ lams_tool_lamc/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -13,6 +13,26 @@
 
    <tag>
 
+      <description>Converts role name into form usable as message resources key</description>
+      <display-name>Converts role name into form usable as message resources key</display-name>
+      <icon>    
+      </icon>
+      <name>role</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Converts role name into form usable as message resources key</description>
+         <name>role</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output the Server URL as defined in the lams.xml configuration file.</description>
       <display-name>LAMS URL</display-name>
       <icon>    
@@ -64,6 +84,34 @@
    </tag>
    <tag>
 
+      <description>Help tag</description>
+      <display-name>Help tag</display-name>
+      <icon>    
+      </icon>
+      <name>help</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Help tag</description>
+         <name>module</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <description>Help tag</description>
+         <name>toolSignature</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
       <display-name>generate unique ID</display-name>
       <icon>    
@@ -131,7 +179,15 @@
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>Output stylesheet based on the user preferences.</description>
+         <name>style</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
 
   	<tag>
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -46,7 +46,7 @@
 
 	<%@ include file="/common/header.jsp"%>
 	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
-	<script type="text/javascript" src="${tool}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 
 	
  	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
@@ -75,7 +75,7 @@
 		    	if(tag.value != "")
 		    		selectTab(tag.value);
 	            else
-	                selectTab(1); //select the default tab;
+	              selectTab(1); //select the default tab;
 	            
 			}
 			else
@@ -108,7 +108,7 @@
 </head>
 
 
-<body onLoad="init();">
+<body onLoad="init();" class="stripes">
 
 <div id="page">
 	<h1>  <bean:message key="label.authoring.mc"/> </h1>
@@ -137,8 +137,8 @@
 		<html:hidden property="contentFolderID"/>												
 		
 		<%@ include file="/common/messages.jsp"%>
+		   
 		
-		
 		<c:if test="${mcGeneralAuthoringDTO.activeModule != 'defineLater' }"> 			
 			<!-- tab content 1 (Basic) -->
 			<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -100,7 +100,7 @@
 							<fmt:message key="label.edit.question"></fmt:message>
 						</div>
 						
-						<lams:FCKEditor id="newQuestion"
+  					<lams:FCKEditor id="newQuestion"
 							value="${mcGeneralAuthoringDTO.editableQuestionText}"
 							contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
 					</td>
Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -79,9 +79,9 @@
 						<div class="field-name" style="text-align: left;">
 							<fmt:message key="label.add.new.question"></fmt:message>
 						</div>
-						<lams:FCKEditor id="newQuestion"
+ 						<lams:FCKEditor id="newQuestion"
 							value="${mcGeneralAuthoringDTO.editableQuestionText}"
-							contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor>
+							contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"></lams:FCKEditor> 
 					</td>
 				</tr>
 
Index: lams_tool_lamc/web/common/header.jsp
===================================================================
diff -u -r9143e89a9c23c613879042751449004326a50bf6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/common/header.jsp	(.../header.jsp)	(revision 9143e89a9c23c613879042751449004326a50bf6)
+++ lams_tool_lamc/web/common/header.jsp	(.../header.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -20,10 +20,10 @@
 <!-- ********************  CSS ********************** -->
 <c:choose>
 	<c:when test="${not empty localLinkPath}">
-		<lams:css localLinkPath="${localLinkPath}"/>
+		<lams:css localLinkPath="${localLinkPath}"  style="tabbed"/>
 	</c:when>
 	<c:otherwise>
-		<lams:css />
+		<lams:css style="tabbed"/>
 	</c:otherwise>
 </c:choose>
 
Index: lams_tool_lamc/web/common/learnerheader.jsp
===================================================================
diff -u
--- lams_tool_lamc/web/common/learnerheader.jsp	(revision 0)
+++ lams_tool_lamc/web/common/learnerheader.jsp	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -0,0 +1,32 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
+
+
+<!-- HTTP 1.1 -->
+<meta http-equiv="Cache-Control" content="no-store" />
+<!-- HTTP 1.0 -->
+<meta http-equiv="Pragma" content="no-cache" />
+<!-- Prevents caching at the Proxy Server -->
+<meta http-equiv="Expires" content="0" />
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+<!-- ********************  CSS ********************** -->
+<c:choose>
+	<c:when test="${not empty localLinkPath}">
+		<lams:css localLinkPath="${localLinkPath}"/>
+	</c:when>
+	<c:otherwise>
+		<lams:css/>
+	</c:otherwise>
+</c:choose>
+
+<!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+
Index: lams_tool_lamc/web/export/exportportfolio.jsp
===================================================================
diff -u -r9143e89a9c23c613879042751449004326a50bf6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 9143e89a9c23c613879042751449004326a50bf6)
+++ lams_tool_lamc/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -28,29 +28,25 @@
 	<html:html locale="true">
 	<head>
 	<title> <bean:message key="label.exportPortfolio"/> </title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<lams:css localLinkPath="../"/>
 	</head>
 
-	<body>
+	<body class="stripes">
 	
 	    <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
 		<html:hidden property="method"/>
 		<html:hidden property="toolContentID"/>
 	
-		<div id="page-learner"><!--main box 'page'-->
-	
-			<h1 class="no-tabs-below">
+			<div id="content">
+		
+			<h1>
 			<c:if test="${(userExceptionNoToolSessions != 'true') }"> 	
 				<c:if test="${(portfolioExportMode == 'learner')}"><bean:message key="label.export.learner"/></c:if>			
 				<c:if test="${(portfolioExportMode != 'learner')}"><bean:message key="label.export.teacher"/> </h1></c:if>			
 			</c:if>
 	        </h1>
-			<div id="header-no-tabs-learner">
-		
-			</div><!--closes header-->
-		
-			<div id="content-learner">
-		
+
 				<c:if test="${(userExceptionNoToolSessions == 'true')}"> 	
 						<h2> <bean:message key="error.noLearnerActivity"/> </h2>
 				</c:if>			
@@ -321,11 +317,9 @@
 			</div>  <!--closes content-->
 		
 		
-			<div id="footer-learner">
+			<div id="footer">
 			</div><!--closes footer-->
 		
-		</div><!--closes page-->
-		
 		</html:form>	
 
 	</body>
Fisheye: Tag 82475bcf94096557635a347e2927c9995c8a03ee refers to a dead (removed) revision in file `lams_tool_lamc/web/includes/javascript/common.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/includes/layout.jsp
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/includes/layout.jsp	(.../layout.jsp)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/web/includes/layout.jsp	(.../layout.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -9,7 +9,7 @@
 		<title><bean:message key="activity.title" /></title>
 		<%@ include file="/common/header.jsp"%>
 	</head>
-	<body>
+	<body class="stripes">
 		<div id="page">
 			<tiles:useAttribute name="pageTitleKey" scope="request" />
 			<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
Index: lams_tool_lamc/web/includes/learnerLayout.jsp
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/web/includes/learnerLayout.jsp	(.../learnerLayout.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -12,7 +12,7 @@
 <html>
 	<head>
 		<title><bean:message key="activity.title" /></title>
-		<%@ include file="/common/header.jsp"%>
+		<%@ include file="/common/learnerheader.jsp"%>
 		<script type="text/javascript">
 			var removeItemAttachmentUrl = "<html:rewrite page="/learning/deleteAttachment.do" />";
 		</script>		
@@ -25,9 +25,7 @@
 		</script>		
 		
 	</head>
-	<body>
-		<div id="page-learner">
-			<tiles:insert attribute="body" />
-		</div>
+	<body  class="stripes">
+		<tiles:insert attribute="body" />
 	</body>
 </html>
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -r9143e89a9c23c613879042751449004326a50bf6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 9143e89a9c23c613879042751449004326a50bf6)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -32,9 +32,10 @@
 </c:set>
 
 <html:html>
-<head>
+<head class="stripes">
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 	
 		<script language="JavaScript" type="text/JavaScript">
@@ -47,16 +48,9 @@
 		</script>
 </head>
 
-<body>
-	<div id="page-learner">
-	
-	<h1 class="no-tabs-below">
-		<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
-	</h1>
+<body class="stripes">
 
-<div id="header-no-tabs-learner"></div>
-
-<div id="content-learner">
+<div id="content">
 	<html:form  action="/learning?method=displayMc&validate=false" enctype="multipart/form-data" method="POST" target="_self">
 		<html:hidden property="toolContentID"/>						
 		<html:hidden property="toolSessionID"/>						
@@ -68,6 +62,10 @@
 		<html:hidden property="learnerProgressUserId"/>										
 		<html:hidden property="questionListingMode"/>					
 		
+		<h1>
+			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+		</h1>
+		
 		<c:choose> 
 		  <c:when test="${mcGeneralLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}" > 
 				<jsp:include page="/learning/SingleQuestionAnswersContent.jsp" /> 
@@ -79,9 +77,8 @@
 	</html:form>
 </div>
 
-<div id="footer-learner"></div>
+<div id="footer"></div>
 
-</div>
 </body>
 </html:html>
 
Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r9143e89a9c23c613879042751449004326a50bf6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 9143e89a9c23c613879042751449004326a50bf6)
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -33,21 +33,19 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 </head>
 
-<body>
-	<div id="page-learner">
-	
-	<h1 class="no-tabs-below">
+<body class="stripes">
+
+<div id="content">
+
+	<h1>
 		<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
 	</h1>
 
-<div id="header-no-tabs-learner"></div>
-
-<div id="content-learner">
-
 		<html:form  action="/learning?method=displayMc&validate=false" method="POST" target="_self">
 			<html:hidden property="toolContentID"/>						
 			<html:hidden property="toolSessionID"/>								
@@ -231,9 +229,8 @@
 
 </div>
 
-<div id="footer-learner"></div>
+<div id="footer"></div>
 
-</div>
 </body>
 </html:html>
 
Index: lams_tool_lamc/web/learning/Notebook.jsp
===================================================================
diff -u -r9143e89a9c23c613879042751449004326a50bf6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 9143e89a9c23c613879042751449004326a50bf6)
+++ lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -34,28 +34,26 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 </head>
 
-<body>
-	<div id="page-learner">
+<body class="stripes">
 	
-	<h1 class="no-tabs-below">
-		<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false"/> 		
-	</h1>
-	
-	
-	<div id="header-no-tabs-learner"></div>
-	
 	<html:form  action="/learning?method=displayMc&validate=false" enctype="multipart/form-data" method="POST" target="_self">
 		<html:hidden property="toolContentID"/>						
 		<html:hidden property="toolSessionID"/>						
 		<html:hidden property="httpSessionID"/>			
 		<html:hidden property="userID"/>								
 		
-		<div id="content-learner">
+		<div id="content">
+			
+		<h1>
+			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false"/> 		
+		</h1>
 		
+
 		<table>
 			<tr>
 				<td>
@@ -65,7 +63,7 @@
 
 			<tr>
 				<td>
-					<html:textarea cols="66" rows="8" property="entryText"></html:textarea>
+					<html:textarea cols="60" rows="8" property="entryText"></html:textarea>
 				</td>
 			</tr>
 
@@ -82,10 +80,8 @@
 		</div>
 	</html:form>	
 	
-	<div id="footer-learner"></div>
+	<div id="footer"></div>
 
-
-</div>
 </body>
 </html:html>
 
Index: lams_tool_lamc/web/learning/RedoQuestions.jsp
===================================================================
diff -u -r9143e89a9c23c613879042751449004326a50bf6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/learning/RedoQuestions.jsp	(.../RedoQuestions.jsp)	(revision 9143e89a9c23c613879042751449004326a50bf6)
+++ lams_tool_lamc/web/learning/RedoQuestions.jsp	(.../RedoQuestions.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -34,20 +34,13 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 </head>
 
-<body>
-	<div id="page-learner">
+<body class="stripes">
 	
-	<h1 class="no-tabs-below">
-		<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />		
-	</h1>
-	
-	
-	<div id="header-no-tabs-learner"></div>
-	
 		<html:form  action="/learning?method=displayMc&validate=false" method="POST" target="_self">
 			<html:hidden property="toolContentID"/>						
 			<html:hidden property="toolSessionID"/>								
@@ -59,7 +52,11 @@
 			<html:hidden property="learnerProgressUserId"/>										
 			<html:hidden property="questionListingMode"/>													
 
-			<div id="content-learner">		
+			<div id="content">		
+				<h1>
+					<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />		
+				</h1>
+	
 				<table class="forms">
 					  <tr>
 					  	<th scope="col" valign=top colspan=2> 
@@ -126,10 +123,8 @@
 	
 		</html:form>	
 	
-	<div id="footer-learner"></div>
+	<div id="footer"></div>
 
-
-</div>
 </body>
 </html:html>
 
Index: lams_tool_lamc/web/learning/ResultsSummary.jsp
===================================================================
diff -u -r9143e89a9c23c613879042751449004326a50bf6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/learning/ResultsSummary.jsp	(.../ResultsSummary.jsp)	(revision 9143e89a9c23c613879042751449004326a50bf6)
+++ lams_tool_lamc/web/learning/ResultsSummary.jsp	(.../ResultsSummary.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -34,20 +34,14 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 </head>
 
-<body>
-	<div id="page-learner">
+<body class="stripes">
 	
-	<h1 class="no-tabs-below">
-		<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
-	</h1>
-
-<div id="header-no-tabs-learner"></div>
-
-<div id="content-learner">
+<div id="content">
 	<html:form  action="/learning?method=displayMc&validate=false" method="POST" target="_self">
 		<html:hidden property="toolContentID"/>						
 		<html:hidden property="toolSessionID"/>								
@@ -59,6 +53,11 @@
 		<html:hidden property="learnerProgressUserId"/>										
 		<html:hidden property="questionListingMode"/>												
 	
+		<h1>
+			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+		</h1>
+
+	
 				<table class="forms">
 				  <tr>
 				  	<th scope="col" valign=top colspan=2> 
@@ -153,9 +152,8 @@
 </html:form>
 </div>
 
-<div id="footer-learner"></div>
+<div id="footer"></div>
 
-</div>
 </body>
 </html:html>
 
Index: lams_tool_lamc/web/learning/RunOffline.jsp
===================================================================
diff -u -r9143e89a9c23c613879042751449004326a50bf6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 9143e89a9c23c613879042751449004326a50bf6)
+++ lams_tool_lamc/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -34,25 +34,21 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 </head>
 
-<body>
-	<div id="page-learner">
+<body class="stripes">
 	
-	<h1 class="no-tabs-below">&nbsp;</h1>
-	
-	<div id="header-no-tabs-learner"></div>
-	
 	<html:form  action="/learning?method=displayMc&validate=false" method="POST" target="_self">
 		<html:hidden property="toolContentID"/>						
 		<html:hidden property="toolSessionID"/>						
 		<html:hidden property="httpSessionID"/>			
 		<html:hidden property="userID"/>								
 
 	
-		<div id="content-learner">
+		<div id="content">
 			&nbsp&nbsp&nbsp&nbsp&nbsp <bean:message key="label.learning.forceOfflineMessage" />
 			
 			<table>	
@@ -79,10 +75,9 @@
 		</div>
 	</html:form>	
 	
-	<div id="footer-learner"></div>
+	<div id="footer"></div>
 
 
-</div>
 </body>
 </html:html>
 
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -r9143e89a9c23c613879042751449004326a50bf6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 9143e89a9c23c613879042751449004326a50bf6)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -34,21 +34,18 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 </head>
 
-<body>
-	<div id="page-learner">
-	
-	<h1 class="no-tabs-below">
+<body class="stripes">
+
+<div id="content">
+	<h1>
 		<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
 	</h1>
 
-<div id="header-no-tabs-learner"></div>
-
-
-<div id="content-learner">
 		<html:form  action="/learning?method=displayMc&validate=false" method="POST" target="_self">
 			<html:hidden property="toolContentID"/>						
 			<html:hidden property="toolSessionID"/>								
@@ -240,9 +237,8 @@
 
 </div>
 
-<div id="footer-learner"></div>
+<div id="footer"></div>
 
-</div>
 </body>
 </html:html>
 
Index: lams_tool_lamc/web/monitoring/LearnerNotebook.jsp
===================================================================
diff -u -r9143e89a9c23c613879042751449004326a50bf6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision 9143e89a9c23c613879042751449004326a50bf6)
+++ lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -34,25 +34,23 @@
 <html:html>
 <head>
 	<html:base />
-	<lams:headItems />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
 	<title><bean:message key="activity.title" /></title>
 	
 </head>
 
-<body>
-	<div id="page-learner">
+<body class="stripes">
 	
-	<h1 class="no-tabs-below">
-		<bean:message key="label.view.reflection"/>
-	</h1>
-	
-	
-	<div id="header-no-tabs-learner"></div>
-	
 	<html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
 	
-		<div id="content-learner">
+		<div id="content">
 		
+		<h1>
+			<bean:message key="label.view.reflection"/>
+		</h1>
+	
+
 			<table>
 				<tr>
 					<td>
@@ -81,7 +79,7 @@
 		</div>
 	</html:form>	
 	
-	<div id="footer-learner"></div>
+	<div id="footer"></div>
 
 
 </div>
Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r9143e89a9c23c613879042751449004326a50bf6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 9143e89a9c23c613879042751449004326a50bf6)
+++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -44,7 +44,7 @@
 
 	<%@ include file="/common/header.jsp"%>
 	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
-	<script type="text/javascript" src="${tool}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 
 	<script type="text/javascript">
 	
@@ -143,7 +143,7 @@
 	</script>
 	
 </head>
-<body onLoad="init();">
+<body onLoad="init();" class="stripes">
 
 
 	<div id="page">
Index: lams_tool_lamc/web/monitoring/Reflections.jsp
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -50,7 +50,7 @@
 											<c:param name="contentFolderID" value="${McMonitoringForm.contentFolderID}" />																								
 										</c:url>
 		
-										<html:link href="${fn:escapeXml(openNotebook)}" target="_blank">
+										<html:link href="javascript:launchPopup('${fn:escapeXml(openNotebook)}');" styleClass="button">
 											<bean:message key="label.view" />
 										</html:link>
 	
Index: lams_tool_lamc/web/monitoring/editQuestionBox.jsp
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/monitoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/web/monitoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -24,7 +24,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <html>
 	<head>
-		<%@ include file="/common/header.jsp"%>
+		<%@ include file="/common/learnerheader.jsp"%>
 		
 		<script language="JavaScript" type="text/JavaScript">
 
@@ -56,6 +56,7 @@
 	</head>
 	
 	<body>
+	
 		<table cellpadding="0">
 
 			<html:form  action="/monitoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">			
@@ -165,6 +166,5 @@
 			</html:form>
 			
 		</table>
-
 	</body>
 </html>
Index: lams_tool_lamc/web/monitoring/newQuestionBox.jsp
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r82475bcf94096557635a347e2927c9995c8a03ee
--- lams_tool_lamc/web/monitoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/web/monitoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 82475bcf94096557635a347e2927c9995c8a03ee)
@@ -24,7 +24,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <html>
 	<head>
-		<%@ include file="/common/header.jsp"%>
+		<%@ include file="/common/learnerheader.jsp"%>
 		
 		<script language="JavaScript" type="text/JavaScript">