Index: lams_tool_larsrc/web/WEB-INF/tags/SetEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/Attic/SetEditor.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/web/WEB-INF/tags/SetEditor.tag	27 Jun 2006 08:06:03 -0000	1.3
+++ lams_tool_larsrc/web/WEB-INF/tags/SetEditor.tag	28 Jun 2006 07:09:28 -0000	1.4
@@ -34,6 +34,8 @@
 <%@ attribute name="text" required="true" rtexprvalue="true"%>
 <%@ attribute name="small" required="false" rtexprvalue="true"%>
 <%@ attribute name="key" required="false" rtexprvalue="true"%>
+<%@ attribute name="alt" required="false" rtexprvalue="true"%> <!--  default true -->
+
 <%@ taglib uri="tags-function" prefix="fn"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
@@ -56,27 +58,33 @@
 	<c:set var="txtClassName" value="smallTextareaPanel" />
 </c:if>
 
+<c:set var="fieldName" value="field-name" />
+<c:if test="${alt}">
+<c:set var="fieldName" value="field-name-alternative-color" />
+</c:if>
+
 <div id="preview${id}" style="visibility: hidden; display: none;">
 	<div>
-		<c:if test="${key != null}">
-			<fmt:message key="${key}"/>
-		</c:if>
-		<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)">
-			<img src="${lams}images/html.gif" border="0" alt="Open HTML Editor">
-		</a>
+		<p class="button">
+			<c:if test="${key != null}">
+				<span class="${fieldName}"><fmt:message key="${key}" /></span>
+			</c:if>
+			<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)" class="button-html-editor">HTML Editor</a>
+		</p>
 	</div>
 	<div class="${previewClassName}" id="preview${id}.text"></div>
+</div>
 
 
-</div>
 <div id="tx${id}">
 	<div>
-		<c:if test="${key != null}">
-			<fmt:message key="${key}"/>
-		</c:if>		
-		<a href="javascript:doTextToHTML('${id}');doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)">
-			<img src="${lams}images/html.gif" border="0" alt="Open HTML Editor">
-		</a>
+
+		<p class="button">
+			<c:if test="${key != null}">
+				<span class="${fieldName}"><fmt:message key="${key}" /></span>
+			</c:if>
+			<a href="javascript:doTextToHTML('${id}');doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)" class="button-html-editor">HTML Editor</a>
+		</p>
 	</div>
 	<textarea class="${txtClassName}" name="${fn:toLowerCase(id_a)}${id_b}" id="tx${id}.textarea"><c:out value="${text}" escapeXml="false" /></textarea>
 </div>
Index: lams_tool_larsrc/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/common/header.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_larsrc/web/common/header.jsp	28 Jun 2006 02:37:42 -0000	1.6
+++ lams_tool_larsrc/web/common/header.jsp	28 Jun 2006 07:09:28 -0000	1.7
@@ -14,15 +14,15 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
 
  	<!-- ********************  CSS ********************** -->
+	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
+	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
 	<lams:css />
 	<!--[if IE]>
 	<style type="text/css">
 	@import url(${lams}/css/ie-styles.css);
 	</style>
 	<![endif]-->
 
-	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
-	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
 
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/authoring.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	28 Jun 2006 04:42:52 -0000	1.15
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	28 Jun 2006 07:09:28 -0000	1.16
@@ -101,27 +101,26 @@
 </head>
 <body onLoad="init()">
 <div id="page">
-	<html:form action="authoring/update" method="post" styleId="authoringForm" focus="resource.title" enctype="multipart/form-data">
-		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<html:hidden property="toolContentID" />
-		<html:hidden property="currentTab" styleId="currentTab" />
-<div id="header">
 		<h1>
 			<fmt:message key="label.authoring.heading" />
 		</h1>
+<div id="header">
 		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
 </div>
 		<!-- start tabs -->
 <div id="content">
 		<!-- end tab buttons -->
-		<div class="tabbody">
 			<table align=center>
 				<tr>
 					<td NOWRAP>
 						<%@ include file="/common/messages.jsp"%>
 					</td>
 				</tr>
 			</table>
+	<html:form action="authoring/update" method="post" styleId="authoringForm" focus="resource.title" enctype="multipart/form-data">
+		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+		<html:hidden property="toolContentID" />
+		<html:hidden property="currentTab" styleId="currentTab" />
 
 			<!-- tab content 1 (Basic) -->
 			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
@@ -144,11 +143,10 @@
 				accessMode="author"
 			--%>
 			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ResourceConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" />
+	</html:form>
 
-		</div>
 </div>
 
-	</html:form>
 <div id="footer"></div>
 <lams:HTMLEditor />
 <!-- end page div -->
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addfile.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	28 Jun 2006 05:09:43 -0000	1.3
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	28 Jun 2006 07:09:27 -0000	1.4
@@ -1,6 +1,3 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-
 <%@ include file="/common/taglibs.jsp"%>
 <html>
 	<head>
@@ -54,19 +51,17 @@
 							<tr>
 								<td valign="top">
 									<fmt:message key="label.authoring.basic.resource.title.input" /><BR>
-									<html:text property="title" size="40" tabindex="1" />
+									<html:text property="title" size="40" tabindex="1" /><BR><BR>
+									<fmt:message key="label.authoring.basic.resource.file.input" /><BR>
+									<input type="file" name="file" size="25"/> 
 								</td>
 								<td valign="top">
 									<fmt:message key="label.learning.comment.or.instruction" /><BR>
 									<lams:STRUTS-textarea rows="5" cols="30" tabindex="2" property="description" />
 								</td>
 							</tr>
 							<tr>
-								<td>
-									<fmt:message key="label.authoring.basic.resource.file.input" />
-									<input type="file" name="file" size="25"  /> 
-								</td>
-								<td  align="center" valign="bottom">
+								<td  colspan="2" align="center" valign="bottom">
 									<a href="#" onclick="document.getElementById('resourceItemForm').submit()" class="button">
 										<fmt:message key="button.upload"/>
 									</a>
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addurl.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	28 Jun 2006 05:09:43 -0000	1.4
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	28 Jun 2006 07:09:27 -0000	1.5
@@ -51,20 +51,19 @@
 							<tr>
 								<td valign="top">
 									<fmt:message key="label.authoring.basic.resource.title.input" /><BR>
-									<html:text property="title" size="40" tabindex="1" />
+									<html:text property="title" size="40" tabindex="1" /><BR><BR>
+									<fmt:message key="label.authoring.basic.resource.url.input" /><BR>
+									<input type="url" name="url" size="40"  /> <BR>
+									<html:checkbox property="openUrlNewWindow"><fmt:message key="open.in.new.window"/></html:checkbox>									
+									
 								</td>
 								<td valign="top">
 									<fmt:message key="label.learning.comment.or.instruction" /><BR>
 									<lams:STRUTS-textarea rows="5" cols="30" tabindex="2" property="description" />
 								</td>
 							</tr>
 							<tr>
-								<td>
-									<fmt:message key="label.authoring.basic.resource.url.input" />
-									<input type="url" name="url" size="40"  /> 
-									<html:checkbox property="openUrlNewWindow"><fmt:message key="open.in.new.window"/></html:checkbox>									
-								</td>
-								<td align="center" valign="bottom">
+								<td colspan="2" align="center" valign="bottom">
 									<a href="#" onclick="document.getElementById('resourceItemForm').submit()" class="button">
 										<fmt:message key="button.add"/>
 									</a>
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.17 -r1.18
--- lams_tool_larsrc/web/pages/learning/learning.jsp	28 Jun 2006 05:09:43 -0000	1.17
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	28 Jun 2006 07:09:27 -0000	1.18
@@ -50,8 +50,7 @@
 </head>
 <body>
 <div id="page">
-	<div id="header">
-	<table border="0" align="center" class="forms" width="95%">
+	<table border="0" align="center" width="95%">
 		<tr>
 			<td>
 				<h1>
@@ -63,27 +62,28 @@
 			</td>
 		</tr>
 	</table>
-	</div>
+	<br>
 	<div id="content">
+	<BR>
 	<%@ include file="/common/messages.jsp"%>
-	<table border="0" align="center" class="forms" width="95%">
+	<table border="0" align="center" width="95%">
 		<tr>
-			<th width="400px">
+			<th width="400px" align="center">
 				<fmt:message key="label.resoruce.to.review" />
 			</th>
-			<th scope="col" width="50px">
+			<th width="50px">
 				<fmt:message key="label.completed" />
 			</th>
-			<th scope="col" align="center">
-				<a href="#" class="button" onclick="return checkNew()"><fmt:message key="label.check.for.new" /></a>
+			<th align="center">
+			
 			</th>
 		</tr>
 		<c:forEach var="item" items="${resourceList}">
 			<tr>
-				<td>${item.title}
-				<c:if test="${!item.createByAuthor}">
-					[${item.createBy.loginName}]
-				</c:if>
+				<td  align="center">${item.title}
+					<c:if test="${!item.createByAuthor}">
+						[${item.createBy.loginName}]
+					</c:if>
 				</td>
 				<td align="center">
 					<c:if test="${item.complete}">
@@ -100,6 +100,8 @@
 		</c:forEach>
 		<tr>
 			<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>
Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	28 Jun 2006 04:42:52 -0000	1.8
+++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	28 Jun 2006 07:09:28 -0000	1.9
@@ -10,11 +10,8 @@
 	    
 	    	var imgRoot="${lams}images/";
 		    var themeName="aqua";
-	        
 	        function init(){
-	        
 	            initTabSize(4);
-	            
                 selectTab(1); //select the default tab;
 	        }     
 	        
@@ -31,6 +28,9 @@
 	</head>
 	<body onLoad="init()">
 	<div id="page">
+		<h1>
+			<fmt:message key="label.authoring.heading" />
+		</h1>
 	<div id="header">
 		<lams:Tabs>
 			<lams:Tab id="1" key="monitoring.tab.summary" />
@@ -41,15 +41,13 @@
 	</div>
 	<div id="content">
 
-		<div class="tabbody">
 			<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
 			<lams:TabBody id="2" titleKey="monitoring.tab.instructions" page="instructions.jsp"/>
 			<lams:TabBody id="3" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
 			<lams:TabBody id="4" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
-		</div>
-		</div>
-		<div id="footer"></div>
-		
 	</div>
+	<div id="footer"></div>
+	
+	</div>
 	</body>
 </html>