Index: lams_admin/web/cache.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/cache.jsp,v
diff -u -r1.8 -r1.9
--- lams_admin/web/cache.jsp	16 Oct 2006 07:06:43 -0000	1.8
+++ lams_admin/web/cache.jsp	26 Oct 2006 02:32:26 -0000	1.9
@@ -1,9 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-
 <h2>
 	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> :
 	<fmt:message key="cache.title"/>
Index: lams_admin/web/disabledusers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/disabledusers.jsp,v
diff -u -r1.2 -r1.3
--- lams_admin/web/disabledusers.jsp	25 Oct 2006 01:43:55 -0000	1.2
+++ lams_admin/web/disabledusers.jsp	26 Oct 2006 02:32:26 -0000	1.3
@@ -1,10 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <form>
 <h2>
 	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
Index: lams_admin/web/joblist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/joblist.jsp,v
diff -u -r1.3 -r1.4
--- lams_admin/web/joblist.jsp	24 Aug 2006 00:06:35 -0000	1.3
+++ lams_admin/web/joblist.jsp	26 Oct 2006 02:32:26 -0000	1.4
@@ -1,10 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-
 <div align="center" id="jobList">
 	<div id="datatablecontainer">
 	<table width="100%" align="CENTER" 	class="form">
Index: lams_admin/web/loginmaintain.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/loginmaintain.jsp,v
diff -u -r1.5 -r1.6
--- lams_admin/web/loginmaintain.jsp	16 Oct 2006 07:06:43 -0000	1.5
+++ lams_admin/web/loginmaintain.jsp	26 Oct 2006 02:32:26 -0000	1.6
@@ -1,11 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
-
+<%@ include file="/taglibs.jsp"%>
 <%@ taglib uri="fck-editor" prefix="fck"%>
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-core" prefix="c" %>
 
 <h2>
 	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> :
Index: lams_admin/web/organisation.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/Attic/organisation.jsp,v
diff -u -r1.12 -r1.13
--- lams_admin/web/organisation.jsp	25 Oct 2006 01:43:55 -0000	1.12
+++ lams_admin/web/organisation.jsp	26 Oct 2006 02:32:26 -0000	1.13
@@ -1,11 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html-el" prefix="html-el" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <html-el:form action="/orgsave.do" method="post">
 <html-el:hidden property="orgId" />
 <html-el:hidden property="parentId" />
Index: lams_admin/web/orglist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/Attic/orglist.jsp,v
diff -u -r1.15 -r1.16
--- lams_admin/web/orglist.jsp	25 Oct 2006 01:43:55 -0000	1.15
+++ lams_admin/web/orglist.jsp	26 Oct 2006 02:32:26 -0000	1.16
@@ -1,10 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <form>
 <logic:equal name="OrgManageForm" property="type" value="1">
 	<h2>
Index: lams_admin/web/register.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/register.jsp,v
diff -u -r1.3 -r1.4
--- lams_admin/web/register.jsp	25 Oct 2006 03:18:47 -0000	1.3
+++ lams_admin/web/register.jsp	26 Oct 2006 02:32:26 -0000	1.4
@@ -1,11 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
-<%@ 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-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/taglibs.jsp"%>
 
 <html:form action="/register" method="post">
 	<html:hidden property="method" value="register"/>
Index: lams_admin/web/remove.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/remove.jsp,v
diff -u -r1.4 -r1.5
--- lams_admin/web/remove.jsp	25 Oct 2006 01:53:41 -0000	1.4
+++ lams_admin/web/remove.jsp	26 Oct 2006 02:32:26 -0000	1.5
@@ -1,10 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <form>
 
 <logic:empty name="orgId">
Index: lams_admin/web/serverlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/serverlist.jsp,v
diff -u -r1.2 -r1.3
--- lams_admin/web/serverlist.jsp	13 Oct 2006 00:18:04 -0000	1.2
+++ lams_admin/web/serverlist.jsp	26 Oct 2006 02:32:26 -0000	1.3
@@ -1,10 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-
 <h2><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> : <fmt:message key="sysadmin.maintain.external.servers" /></h2>
 <p align="right"><input type="button" value="<fmt:message key='sysadmin.server.add' />" onClick="javascript:document.location='servermaintain.do?method=edit'" /></p>
 <table class=alternative-color width=100%>
Index: lams_admin/web/servermaintain.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/servermaintain.jsp,v
diff -u -r1.2 -r1.3
--- lams_admin/web/servermaintain.jsp	13 Oct 2006 00:19:01 -0000	1.2
+++ lams_admin/web/servermaintain.jsp	26 Oct 2006 02:32:26 -0000	1.3
@@ -1,11 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-
 <h2>
 	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> :
 	<a href="serverlist.do"><fmt:message key="sysadmin.maintain.external.servers" /></a> :
Index: lams_admin/web/sysadmin.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/sysadmin.jsp,v
diff -u -r1.13 -r1.14
--- lams_admin/web/sysadmin.jsp	26 Oct 2006 00:07:33 -0000	1.13
+++ lams_admin/web/sysadmin.jsp	26 Oct 2006 02:32:26 -0000	1.14
@@ -1,8 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-
 <h1 class=no-tabs-below><fmt:message key="sysadmin.headline"/></h1>
 <br />
 <p><a href="cache.do"><fmt:message key="cache.title"/></a></p>
Index: lams_admin/web/taglibs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/taglibs.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_admin/web/taglibs.jsp	26 Oct 2006 02:32:26 -0000	1.1
@@ -0,0 +1,12 @@
+<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
+<%@ taglib uri="tags-html-el" prefix="html-el" %>
+<%@ taglib uri="tags-bean-el" prefix="bean-el" %>
+<%@ taglib uri="tags-logic-el" prefix="logic-el" %>
Index: lams_admin/web/template.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/template.jsp,v
diff -u -r1.15 -r1.16
--- lams_admin/web/template.jsp	25 Oct 2006 01:43:55 -0000	1.15
+++ lams_admin/web/template.jsp	26 Oct 2006 02:32:26 -0000	1.16
@@ -1,9 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-tiles" prefix="tiles" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-bean-el" prefix="bean-el" %>
-<%@ taglib uri="tags-core" prefix="c" %>
+<%@ include file="/taglibs.jsp"%>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
Index: lams_admin/web/user.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/user.jsp,v
diff -u -r1.16 -r1.17
--- lams_admin/web/user.jsp	25 Oct 2006 01:43:55 -0000	1.16
+++ lams_admin/web/user.jsp	26 Oct 2006 02:32:26 -0000	1.17
@@ -1,11 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html-el" prefix="html-el" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <html-el:form action="/usersave.do" method="post">
 <html-el:hidden property="userId" />
 <html-el:hidden property="orgId" />
Index: lams_admin/web/userlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/userlist.jsp,v
diff -u -r1.17 -r1.18
--- lams_admin/web/userlist.jsp	25 Oct 2006 02:32:24 -0000	1.17
+++ lams_admin/web/userlist.jsp	26 Oct 2006 02:32:26 -0000	1.18
@@ -1,11 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-
 <form>
 <h2 align="left">
 	<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
Index: lams_admin/web/userorg.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/userorg.jsp,v
diff -u -r1.6 -r1.7
--- lams_admin/web/userorg.jsp	25 Oct 2006 01:43:55 -0000	1.6
+++ lams_admin/web/userorg.jsp	26 Oct 2006 02:32:26 -0000	1.7
@@ -1,11 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html-el" prefix="html-el" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <script language="javascript" type="text/JavaScript">
 function toggleCheckboxes(){
 	<logic:iterate id="user" name="userlist" indexId="index" >
Index: lams_admin/web/userorgrole.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/userorgrole.jsp,v
diff -u -r1.6 -r1.7
--- lams_admin/web/userorgrole.jsp	25 Oct 2006 01:43:55 -0000	1.6
+++ lams_admin/web/userorgrole.jsp	26 Oct 2006 02:32:26 -0000	1.7
@@ -1,12 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html-el" prefix="html-el" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-
 <script language="javascript" type="text/JavaScript">
 function toggleCheckboxes(roleIndex, object){
 	<logic:iterate id="userBean" name="UserOrgRoleForm" property="userBeans" indexId="beanIndex" >
Index: lams_admin/web/userrole.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/userrole.jsp,v
diff -u -r1.4 -r1.5
--- lams_admin/web/userrole.jsp	25 Oct 2006 01:43:55 -0000	1.4
+++ lams_admin/web/userrole.jsp	26 Oct 2006 02:32:26 -0000	1.5
@@ -1,12 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html-el" prefix="html-el" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-
 <html-el:form action="/userrolessave.do" method="post">
 <html-el:hidden property="userId" />
 <html-el:hidden property="orgId" />
Index: lams_admin/web/usersearchlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/usersearchlist.jsp,v
diff -u -r1.4 -r1.5
--- lams_admin/web/usersearchlist.jsp	25 Oct 2006 01:43:55 -0000	1.4
+++ lams_admin/web/usersearchlist.jsp	26 Oct 2006 02:32:26 -0000	1.5
@@ -1,11 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html-el" prefix="html-el" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <script language="JavaScript" type="text/javascript">
 	function resetFields() {
 		document.UserSearchForm.sUserId.value = '';
Index: lams_admin/web/config/editconfig.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/config/editconfig.jsp,v
diff -u -r1.4 -r1.5
--- lams_admin/web/config/editconfig.jsp	20 Oct 2006 07:04:30 -0000	1.4
+++ lams_admin/web/config/editconfig.jsp	26 Oct 2006 02:32:26 -0000	1.5
@@ -1,10 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/taglibs.jsp"%>
 
 <html:form action="/config" method="post">
 	<html:hidden property="method" value="save"/>
Index: lams_admin/web/import/importexcel.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/import/importexcel.jsp,v
diff -u -r1.2 -r1.3
--- lams_admin/web/import/importexcel.jsp	25 Oct 2006 01:43:56 -0000	1.2
+++ lams_admin/web/import/importexcel.jsp	26 Oct 2006 02:32:26 -0000	1.3
@@ -1,11 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <h2>
 	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
 	: <fmt:message key="admin.user.import" />
Index: lams_admin/web/import/importresult.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/import/importresult.jsp,v
diff -u -r1.3 -r1.4
--- lams_admin/web/import/importresult.jsp	25 Oct 2006 06:43:13 -0000	1.3
+++ lams_admin/web/import/importresult.jsp	26 Oct 2006 02:32:26 -0000	1.4
@@ -1,11 +1,5 @@
-<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ include file="/taglibs.jsp"%>
 
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <h2>
 	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
 	: <fmt:message key="admin.user.import" />