Index: lams_admin/web/adminHeader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/Attic/adminHeader.jsp,v
diff -u -r1.5 -r1.6
--- lams_admin/web/adminHeader.jsp	23 Feb 2006 00:23:25 -0000	1.5
+++ lams_admin/web/adminHeader.jsp	6 Jun 2006 07:12:54 -0000	1.6
@@ -1 +1,9 @@
+<%@ page contentType="text/html; charset=utf-8" language="java" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_admin/web/cache.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/joblist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/joblist.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_admin/web/joblist.jsp	6 Jun 2006 07:12:53 -0000	1.1
@@ -0,0 +1,31 @@
+<div align="center" id="jobList">
+	<div id="datatablecontainer">
+	<table width="100%" align="CENTER" 	class="form">
+		<tr>
+			<td valign="MIDDLE"><b><fmt:message key="title.job.list"/></b></td>
+			<td colspan="2" />
+		</tr>
+		<tr>
+			<th scope="col" width="25%"><fmt:message key="lable.job.name"/></th>
+			<th scope="col" width="25%"><fmt:message key="lable.job.start.date"/></th>
+			<th scope="col" width="50%"><fmt:message key="lable.job.description"/></th>
+		</tr>
+		<c:forEach items="${jobList}" var="job" varStatus="status">
+			<tr>
+				<td>
+					<c:out value="${job.name}"/>
+				</td>
+				<td>
+					<fmt:formatDate value="${job.startDate}"/>
+				</td>
+				<td>
+					<c:out value="${job.description}"/>
+				</td>
+			</tr>
+		</c:forEach>
+		<tr>
+			<td colspan="3" >Total jobs: ${fn:length(jobList)}</td>
+		</tr>
+	</table>
+	</div>
+</div>
Index: lams_admin/web/organisation.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/Attic/organisation.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_admin/web/organisation.jsp	6 Jun 2006 07:12:53 -0000	1.1
@@ -0,0 +1,51 @@
+<html:form action="/admin/organisation" method="post">
+<html:hidden property="organisationId" />
+<html:hidden name="parentOrganisation" property="organisationId" />
+<html:hidden name="organisationType" property="organisationTypeId">
+<table>
+	<tr>
+		<td>Name:</td>
+		<td><html:text property="name" size="20" /> *</td>
+	</tr>
+	<tr>
+	<td>Code:</td>
+		<td><html:text property="code" size="20" /></td>
+	</tr>
+	<tr>
+		<td>Description:</td>
+		<td><html:textarea property="description" cols="50" rows="3" /></td>
+	</tr>
+	<tr>
+		<td>Language:</td>
+		<td>
+			<html:select property="localeLanguage">
+				<html:option key="locale.language.English" value="en" />
+			</html:select>
+		</td>
+	</tr>
+	<tr>
+		<td>Country:</td>
+		<td>
+			<html:select property="localeCountry">
+				<html:option key="locale.country.English" value="AU" />
+			</html:select>
+		</td>
+	</tr>
+	<tr>
+		<td>State</td>
+		<td>
+			<html:select name="organisationState" property="organisationStateId">
+				<html:option key="organisation.state.active" value="1" />
+				<html:option key="organisation.state.hidden" value="2" />
+				<html:option key="organisation.state.archived" value="3" />
+				<html:option key="organisation.state.removed" value="4" />
+			</html:select>
+		</td>
+	</tr>
+<table>
+<p>
+<html:submit>Save</html:submit>
+<html:cancel>Cancel</html:cancel>
+</p>
+</html:form>
+
Index: lams_admin/web/orglist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/Attic/orglist.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_admin/web/orglist.jsp	6 Jun 2006 07:12:54 -0000	1.1
@@ -0,0 +1,57 @@
+<html:form>
+<logic:equal name="type" value="2">
+	<h4><bean:message key="admin.course.manage" /></h4>
+	<p>Parent Organisation:<bean:write name="parentOrganisaton" property="name"/></p>
+	<p align="right"><html:button titleKey="admin.course.add" onClick="javascript:document.location=/organisation.do?method=add&type=<bean:write name='organisationType' property='name'/>&parent=<bean:write name='parentOrganisation' property='organisationId'>"/></p>
+</logic:equal>
+<logic:equal name="type" value="3">
+	<h4><bean:message key="admin.class.manage" /></h4>
+	<p>Parent Organisation:<bean:write name="parentOrganisaton" property="name"/></p>
+	<p align="right"><html:button titleKey="admin.class.add" onClick="javascript:document.location=/organisation.do?method=add&type=<bean:write name='organisationType' property='name'/>&parent=<bean:write name='parentOrganisation' property='organisationId'>"/></p>
+</logic:equal>
+<table width=80%>
+<tr>
+	<th>Name</th>
+	<th>Code</th>
+	<th>Description</th>
+	<th>Language</th>
+	<th>Country</th>
+	<th>Status</th>
+	<th></th>
+</tr>
+<logic:iterate id="orgManageBean" name="OrgManageForm" property="orgManageBeans">
+	<tr>
+		<td>
+			<bean:write name="orgManageBean" property="name" />
+		</td>
+		<td>
+			<bean:write name="orgManageBean" property="code" />
+		</td>
+		<td>
+			<bean:write name="orgManageBean" property="description" />
+		</td>
+		<td>
+			<fmt:message key="locale.language.<bean:write name='orgManageBean' property='localeLanguage'/>"/>
+		</td>
+		<td>
+			<fmt:message key="locale.country.<bean:write name='orgManageBean' property='localeCountry'/>"/>
+		</td>
+		<td>
+			<fmt:message key="organisation.state.<bean:write name='orgManageBean' property='status'/>"/>
+		</td>
+		<td>
+			<logic:equal name='orgManageBean' property='editable' value="true">
+				<a href="/organisation.do?method=edit&org=<bean:write name='orgManageBean' property='organisationId' />"><fmt:message key="admin.edit"/></a>
+				&nbsp;
+				<a href="/organisation.do?method=remove&org=<bean:write name='orgManageBean' property='organisationId' />"><fmt:message key="admin.remove"/></a>
+				<br/>
+				<a href="/organisation.do?method=manageUsers?org=<bean:write name='orgManageBean' property='organisationId'/>"><fmt:message key="admin.user.manage"/></a>
+				<logic:equal name="type" value="2">
+					<a href="/orgmanage.do?org=<bean:write name='orgManageBean' property='organisationId'/>"><fmt:message key="admin.class.manage"/></a>
+				</logic:equal>
+			</logic:equal>
+		</td>		
+	</tr>
+</logic:iterate>
+</table>
+</html:form>
\ No newline at end of file
Index: lams_admin/web/sysadmin.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/sysadmin.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_admin/web/sysadmin.jsp	6 Jun 2006 07:12:53 -0000	1.1
@@ -0,0 +1,15 @@
+<H1>System Administration</H1>
+
+<UL>
+<LI><A HREF="cache.do"><fmt:message key="cache.title"/></A></LI>
+<LI><fmt:message key="sysadmin.manage.config.file"/></LI>
+</UL>
+
+<H2><fmt:message key="sysadmin.batch.heading"/></H2>
+<P><fmt:message key="sysadmin.batch.description"/>.</P>
+
+<UL>
+<LI><fmt:message key="sysadmin.batch.temp.file.delete"/></LI>
+<LI><A HREF="<lams:LAMSURL/>/monitoring/monitoring.do?method=deleteOldPreviewLessons"><fmt:message key="sysadmin.batch.preview.delete"/></a></LI>
+</UL>
+
Index: lams_admin/web/template.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/template.jsp,v
diff -u -r1.6 -r1.7
--- lams_admin/web/template.jsp	23 Feb 2006 00:23:25 -0000	1.6
+++ lams_admin/web/template.jsp	6 Jun 2006 07:12:54 -0000	1.7
@@ -18,7 +18,6 @@
 <table width="95%" height="95%" border="0" cellspacing="0" cellpadding="0" align="center">
 	<tr>
 		<td>
-	        <c:set var="pageHeader" scope="session"><tiles:getAsString name="pageHeader"/></c:set>
 			<tiles:insert attribute="header" />
 		</td>
 	</tr>