Index: lams_admin/web/template.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/template.jsp,v diff -u -r1.19 -r1.20 --- lams_admin/web/template.jsp 9 May 2007 01:02:41 -0000 1.19 +++ lams_admin/web/template.jsp 5 Jun 2007 05:53:43 -0000 1.20 @@ -2,17 +2,14 @@ - + <fmt:message key="${title}"/> - - - - +
Index: lams_admin/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/Attic/lams.tld,v diff -u -r1.10 -r1.11 --- lams_admin/web/WEB-INF/lams.tld 2 Jan 2007 06:03:47 -0000 1.10 +++ lams_admin/web/WEB-INF/lams.tld 5 Jun 2007 05:53:43 -0000 1.11 @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_admin/web/WEB-INF/tags/Head.tag =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/Head.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_admin/web/WEB-INF/tags/Head.tag 5 Jun 2007 05:53:43 -0000 1.1 @@ -0,0 +1,41 @@ +<%/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/** + * Head.tag + * Author: Fiona Malikoff + * Description: Sets up the non-cache pragma statements and the UTF-8 + * encoding. Use in place of the normal head tag. + */ +%> + +<%@ tag body-content="scriptless"%> + + + + + + + + + Index: lams_central/conf/xdoclet/taglib-tag.xml =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/taglib-tag.xml,v diff -u -r1.12 -r1.13 --- lams_central/conf/xdoclet/taglib-tag.xml 22 Dec 2006 02:03:51 -0000 1.12 +++ lams_central/conf/xdoclet/taglib-tag.xml 5 Jun 2007 05:52:26 -0000 1.13 @@ -257,4 +257,9 @@ false true - \ No newline at end of file + + + head + /WEB-INF/tags/Head.tag + + \ No newline at end of file Index: lams_central/web/addLesson.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/addLesson.jsp,v diff -u -r1.7 -r1.8 --- lams_central/web/addLesson.jsp 9 Nov 2006 00:38:08 -0000 1.7 +++ lams_central/web/addLesson.jsp 5 Jun 2007 05:53:07 -0000 1.8 @@ -7,12 +7,11 @@ <%@ taglib uri="tags-core" prefix="c" %> - + &classID="/> - <fmt:message key="title.add.lesson.window"/> - +
Index: lams_central/web/admin.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/admin.jsp,v diff -u -r1.7 -r1.8 --- lams_central/web/admin.jsp 9 Nov 2006 00:38:08 -0000 1.7 +++ lams_central/web/admin.jsp 5 Jun 2007 05:53:07 -0000 1.8 @@ -6,12 +6,11 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> - + - <fmt:message key="title.admin.window"/> - + Index: lams_central/web/author.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/author.jsp,v diff -u -r1.38 -r1.39 --- lams_central/web/author.jsp 17 May 2007 06:44:07 -0000 1.38 +++ lams_central/web/author.jsp 5 Jun 2007 05:53:07 -0000 1.39 @@ -4,26 +4,16 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %> -<%@ page import="org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO" %> - - - -<% -String protocol = request.getProtocol(); -if(protocol.startsWith("HTTPS")){ - protocol = "https://"; -}else{ - protocol = "http://"; -} -String pathToRoot = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; -String pathToShare = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../.."; +<% String authoringClientVersion = Configuration.get(ConfigurationKeys.AUTHORING_CLIENT_VERSION); -String serverLanguage = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); String languageDate = Configuration.get(ConfigurationKeys.DICTIONARY_DATE_CREATED); String actColour = Configuration.get(ConfigurationKeys.AUTHORING_ACTS_COLOUR); String version = Configuration.get(ConfigurationKeys.VERSION); %> + + + <fmt:message key="title.author.window"/> - + -?loadFile=lams_authoring.swf&loadLibrary=lams_authoring_library.swf&userID=&serverURL=<%=pathToRoot%>&build=<%=authoringClientVersion%>&version=<%=version%>&lang=&country=&langDate=<%=languageDate%>&theme=&actColour=<%= actColour %>&requestSrc=${requestSrc}&learningDesignID=${learningDesignID}&layout=${layout}&uniqueID= +?loadFile=lams_authoring.swf&loadLibrary=lams_authoring_library.swf&userID=&serverURL=&build=<%=authoringClientVersion%>&version=<%=version%>&lang=&country=&langDate=<%=languageDate%>&theme=&actColour=<%= actColour %>&requestSrc=${requestSrc}&learningDesignID=${learningDesignID}&layout=${layout}&uniqueID= lams_preloader.swf lams_preloader Index: lams_central/web/authoringConfirm.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/authoringConfirm.jsp,v diff -u -r1.11 -r1.12 --- lams_central/web/authoringConfirm.jsp 13 Nov 2006 05:09:13 -0000 1.11 +++ lams_central/web/authoringConfirm.jsp 5 Jun 2007 05:53:07 -0000 1.12 @@ -8,8 +8,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> - - + - +
Index: lams_central/web/favicon.ico =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/Attic/favicon.ico,v diff -u -r1.2 -r1.3 Binary files differ Index: lams_central/web/index.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/index.jsp,v diff -u -r1.26 -r1.27 --- lams_central/web/index.jsp 2 Nov 2006 23:55:08 -0000 1.26 +++ lams_central/web/index.jsp 5 Jun 2007 05:53:07 -0000 1.27 @@ -6,12 +6,11 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> - + - <fmt:message key="index.welcome" /> - + Index: lams_central/web/launchlearner.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/launchlearner.jsp,v diff -u -r1.3 -r1.4 --- lams_central/web/launchlearner.jsp 9 Nov 2006 00:38:08 -0000 1.3 +++ lams_central/web/launchlearner.jsp 5 Jun 2007 05:53:07 -0000 1.4 @@ -8,12 +8,12 @@ <%@ taglib uri="tags-core" prefix="c" %> - + <fmt:message key="index.welcome" /> - +
Index: lams_central/web/learner.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/Attic/learner.jsp,v diff -u -r1.13 -r1.14 --- lams_central/web/learner.jsp 9 Nov 2006 00:38:08 -0000 1.13 +++ lams_central/web/learner.jsp 5 Jun 2007 05:53:07 -0000 1.14 @@ -7,12 +7,11 @@ <%@ taglib uri="tags-core" prefix="c" %> - + &mode="> - <fmt:message key="title.learner.window"/> - + Index: lams_central/web/login.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/login.jsp,v diff -u -r1.30 -r1.31 --- lams_central/web/login.jsp 24 May 2007 07:15:55 -0000 1.30 +++ lams_central/web/login.jsp 5 Jun 2007 05:53:07 -0000 1.31 @@ -32,11 +32,8 @@ flash is searching for this string, so leave it!: j_security_login_page --> - + <fmt:message key="title.login.window"/> - - - @@ -62,7 +59,7 @@ } - +
Index: lams_central/web/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v diff -u -r1.16 -r1.17 --- lams_central/web/main.jsp 9 May 2007 01:05:11 -0000 1.16 +++ lams_central/web/main.jsp 5 Jun 2007 05:53:07 -0000 1.17 @@ -13,7 +13,7 @@ - + <fmt:message key="index.welcome" /> :: <fmt:message key="title.lams"/> @@ -23,10 +23,6 @@ - - - - @@ -39,7 +35,7 @@ } //-> - +
Index: lams_central/web/monitorLesson.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/Attic/monitorLesson.jsp,v diff -u -r1.7 -r1.8 --- lams_central/web/monitorLesson.jsp 9 Nov 2006 00:38:08 -0000 1.7 +++ lams_central/web/monitorLesson.jsp 5 Jun 2007 05:53:07 -0000 1.8 @@ -7,12 +7,11 @@ <%@ taglib uri="tags-core" prefix="c" %> - + "/> - <fmt:message key="title.monitor.lesson.window"/> - + Index: lams_central/web/sysadmin.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/sysadmin.jsp,v diff -u -r1.7 -r1.8 --- lams_central/web/sysadmin.jsp 9 Nov 2006 00:38:08 -0000 1.7 +++ lams_central/web/sysadmin.jsp 5 Jun 2007 05:53:07 -0000 1.8 @@ -6,12 +6,11 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> - + - <fmt:message key="title.system.admin.window"/> - + Index: lams_central/web/template.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/template.jsp,v diff -u -r1.9 -r1.10 --- lams_central/web/template.jsp 28 Sep 2006 23:27:36 -0000 1.9 +++ lams_central/web/template.jsp 5 Jun 2007 05:53:07 -0000 1.10 @@ -7,20 +7,17 @@ - + <fmt:message><tiles:getAsString name="titleKey"/></fmt:message> - - - - +
Index: lams_central/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/lams.tld,v diff -u -r1.35 -r1.36 --- lams_central/web/WEB-INF/lams.tld 9 May 2007 01:05:11 -0000 1.35 +++ lams_central/web/WEB-INF/lams.tld 5 Jun 2007 05:53:07 -0000 1.36 @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_central/web/WEB-INF/tags/Head.tag =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Head.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_central/web/WEB-INF/tags/Head.tag 5 Jun 2007 05:53:07 -0000 1.1 @@ -0,0 +1,41 @@ +<%/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/** + * Head.tag + * Author: Fiona Malikoff + * Description: Sets up the non-cache pragma statements and the UTF-8 + * encoding. Use in place of the normal head tag. + */ +%> + +<%@ tag body-content="scriptless"%> + + + + + + + + + Index: lams_central/web/development/wddxPost.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/development/wddxPost.jsp,v diff -u -r1.7 -r1.8 --- lams_central/web/development/wddxPost.jsp 16 Nov 2006 04:24:20 -0000 1.7 +++ lams_central/web/development/wddxPost.jsp 5 Jun 2007 05:53:07 -0000 1.8 @@ -6,12 +6,10 @@ - - - + Send WDDX Packet To Server - + Index: lams_central/web/errorpages/403.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/errorpages/403.jsp,v diff -u -r1.5 -r1.6 --- lams_central/web/errorpages/403.jsp 2 Jan 2007 23:52:44 -0000 1.5 +++ lams_central/web/errorpages/403.jsp 5 Jun 2007 05:53:07 -0000 1.6 @@ -11,11 +11,10 @@ "http://www.w3.org/TR/html4/loose.dtd"> - - + <fmt:message key="403.title" /> - + Index: lams_central/web/errorpages/404.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/errorpages/404.jsp,v diff -u -r1.5 -r1.6 --- lams_central/web/errorpages/404.jsp 16 Nov 2006 04:24:20 -0000 1.5 +++ lams_central/web/errorpages/404.jsp 5 Jun 2007 05:53:07 -0000 1.6 @@ -11,12 +11,10 @@ "http://www.w3.org/TR/html4/loose.dtd"> - - + <fmt:message key="404.title" /> - - + Index: lams_central/web/errorpages/error.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/errorpages/error.jsp,v diff -u -r1.6 -r1.7 --- lams_central/web/errorpages/error.jsp 16 Nov 2006 04:24:20 -0000 1.6 +++ lams_central/web/errorpages/error.jsp 5 Jun 2007 05:53:07 -0000 1.7 @@ -10,8 +10,7 @@ - - + <fmt:message key="heading.general.error" /> @@ -32,7 +31,7 @@ } } - + Index: lams_central/web/toolcontent/exportchoice.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/toolcontent/exportchoice.jsp,v diff -u -r1.4 -r1.5 --- lams_central/web/toolcontent/exportchoice.jsp 9 May 2007 11:34:37 -0000 1.4 +++ lams_central/web/toolcontent/exportchoice.jsp 5 Jun 2007 05:53:07 -0000 1.5 @@ -8,8 +8,7 @@ - - + <fmt:message key="title.export.choose.format" /> @@ -25,7 +24,7 @@ window.close(); } - + Index: lams_central/web/toolcontent/exportloading.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/toolcontent/exportloading.jsp,v diff -u -r1.13 -r1.14 --- lams_central/web/toolcontent/exportloading.jsp 16 Nov 2006 04:24:20 -0000 1.13 +++ lams_central/web/toolcontent/exportloading.jsp 5 Jun 2007 05:53:07 -0000 1.14 @@ -8,8 +8,7 @@ - - + <fmt:message key="title.export.loading" /> @@ -25,7 +24,7 @@ window.close(); } - + Index: lams_central/web/toolcontent/exportresult.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/toolcontent/exportresult.jsp,v diff -u -r1.12 -r1.13 --- lams_central/web/toolcontent/exportresult.jsp 16 Nov 2006 04:24:20 -0000 1.12 +++ lams_central/web/toolcontent/exportresult.jsp 5 Jun 2007 05:53:07 -0000 1.13 @@ -4,8 +4,7 @@ <%@ taglib uri="tags-fmt" prefix="fmt"%> - - + <fmt:message key="title.export" /> @@ -14,7 +13,7 @@ window.close(); } - + Index: lams_central/web/toolcontent/import.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/toolcontent/import.jsp,v diff -u -r1.12 -r1.13 --- lams_central/web/toolcontent/import.jsp 16 Nov 2006 04:24:20 -0000 1.12 +++ lams_central/web/toolcontent/import.jsp 5 Jun 2007 05:53:07 -0000 1.13 @@ -5,8 +5,7 @@ - - + <fmt:message key="title.import" /> @@ -15,7 +14,7 @@ window.close(); } - + Index: lams_central/web/toolcontent/importresult.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/toolcontent/importresult.jsp,v diff -u -r1.13 -r1.14 --- lams_central/web/toolcontent/importresult.jsp 9 May 2007 11:34:37 -0000 1.13 +++ lams_central/web/toolcontent/importresult.jsp 5 Jun 2007 05:53:07 -0000 1.14 @@ -4,8 +4,7 @@ <%@ taglib uri="tags-fmt" prefix="fmt"%> - - + <fmt:message key="title.import.result" /> @@ -14,7 +13,7 @@ window.close(); } - + Index: lams_learning/web/controlFrame.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/controlFrame.jsp,v diff -u -r1.21 -r1.22 --- lams_learning/web/controlFrame.jsp 29 Jan 2007 04:08:03 -0000 1.21 +++ lams_learning/web/controlFrame.jsp 5 Jun 2007 05:54:03 -0000 1.22 @@ -28,8 +28,7 @@ - - + <fmt:message key="learner.title"/> @@ -97,7 +96,7 @@ } //--> - + <% Index: lams_learning/web/exportWaitingPage.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/exportWaitingPage.jsp,v diff -u -r1.14 -r1.15 --- lams_learning/web/exportWaitingPage.jsp 17 Nov 2006 07:30:09 -0000 1.14 +++ lams_learning/web/exportWaitingPage.jsp 5 Jun 2007 05:54:03 -0000 1.15 @@ -28,26 +28,14 @@ <%@ taglib uri="tags-lams" prefix="lams" %> -<% -String protocol = request.getProtocol(); -if(protocol.startsWith("HTTPS")){ - protocol = "https://"; -}else{ - protocol = "http://"; -} -String learning_root = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; -String exportUrl = learning_root + "portfolioExport?" + request.getQueryString(); -String downloadServlet = learning_root + "exportDownload?fileLocation="; - -%> - - + + <fmt:message key='export.portfolio.window.title'/> - + - + Index: lams_learning/web/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/main.jsp,v diff -u -r1.18 -r1.19 --- lams_learning/web/main.jsp 8 Mar 2007 03:49:47 -0000 1.18 +++ lams_learning/web/main.jsp 5 Jun 2007 05:54:03 -0000 1.19 @@ -28,8 +28,7 @@ - - + <fmt:message key="learner.title"/> - + Index: lams_learning/web/requestURL.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/requestURL.jsp,v diff -u -r1.7 -r1.8 --- lams_learning/web/requestURL.jsp 17 Sep 2006 06:18:46 -0000 1.7 +++ lams_learning/web/requestURL.jsp 5 Jun 2007 05:54:03 -0000 1.8 @@ -28,10 +28,8 @@ - - LAMS - - + + Index: lams_learning/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/lams.tld,v diff -u -r1.17 -r1.18 --- lams_learning/web/WEB-INF/lams.tld 9 May 2007 00:59:43 -0000 1.17 +++ lams_learning/web/WEB-INF/lams.tld 5 Jun 2007 05:54:04 -0000 1.18 @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_learning/web/WEB-INF/tags/Head.tag =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Head.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_learning/web/WEB-INF/tags/Head.tag 5 Jun 2007 05:54:04 -0000 1.1 @@ -0,0 +1,41 @@ +<%/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/** + * Head.tag + * Author: Fiona Malikoff + * Description: Sets up the non-cache pragma statements and the UTF-8 + * encoding. Use in place of the normal head tag. + */ +%> + +<%@ tag body-content="scriptless"%> + + + + + + + + + Index: lams_learning/web/exportPortfolio/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/exportPortfolio/main.jsp,v diff -u -r1.13 -r1.14 --- lams_learning/web/exportPortfolio/main.jsp 15 May 2007 07:07:28 -0000 1.13 +++ lams_learning/web/exportPortfolio/main.jsp 5 Jun 2007 05:54:04 -0000 1.14 @@ -31,14 +31,13 @@ "http://www.w3.org/TR/html4/loose.dtd"> - - + <c:out value="${portfolio.lessonName}"/> - + Index: lams_learning/web/exportPortfolio/notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/exportPortfolio/notebook.jsp,v diff -u -r1.8 -r1.9 --- lams_learning/web/exportPortfolio/notebook.jsp 4 May 2007 07:40:56 -0000 1.8 +++ lams_learning/web/exportPortfolio/notebook.jsp 5 Jun 2007 05:54:04 -0000 1.9 @@ -30,8 +30,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> - - + @@ -42,7 +41,7 @@ - + Index: lams_learning/web/layout/gateLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/layout/gateLayout.jsp,v diff -u -r1.9 -r1.10 --- lams_learning/web/layout/gateLayout.jsp 9 May 2007 00:59:25 -0000 1.9 +++ lams_learning/web/layout/gateLayout.jsp 5 Jun 2007 05:54:04 -0000 1.10 @@ -31,12 +31,11 @@ "http://www.w3.org/TR/html4/loose.dtd"> - + <c:out value="${GateForm.map.gate.title}"/> - - + Index: lams_learning/web/layout/groupWaitLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/layout/groupWaitLayout.jsp,v diff -u -r1.8 -r1.9 --- lams_learning/web/layout/groupWaitLayout.jsp 9 May 2007 00:59:25 -0000 1.8 +++ lams_learning/web/layout/groupWaitLayout.jsp 5 Jun 2007 05:54:04 -0000 1.9 @@ -30,13 +30,12 @@ - + <fmt:message key="${label.view.groups.title}"/> - - + Index: lams_learning/web/layout/layout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/layout/layout.jsp,v diff -u -r1.16 -r1.17 --- lams_learning/web/layout/layout.jsp 9 May 2007 00:59:25 -0000 1.16 +++ lams_learning/web/layout/layout.jsp 5 Jun 2007 05:54:04 -0000 1.17 @@ -37,9 +37,8 @@ - + <fmt:message key="${pageTitleKey}"/> - <%-- if localFiles == true then wanted for export portfolio and must run offline --%> @@ -53,7 +52,7 @@ - + Index: lams_monitoring/web/addLesson.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/addLesson.jsp,v diff -u -r1.10 -r1.11 --- lams_monitoring/web/addLesson.jsp 4 Dec 2006 06:25:57 -0000 1.10 +++ lams_monitoring/web/addLesson.jsp 5 Jun 2007 05:54:25 -0000 1.11 @@ -31,8 +31,7 @@ - - + <fmt:message key="monitor.title"/> @@ -44,7 +43,7 @@ } //--> - + Index: lams_monitoring/web/monitorLesson.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/monitorLesson.jsp,v diff -u -r1.18 -r1.19 --- lams_monitoring/web/monitorLesson.jsp 1 Jun 2007 08:26:37 -0000 1.18 +++ lams_monitoring/web/monitorLesson.jsp 5 Jun 2007 05:54:25 -0000 1.19 @@ -31,11 +31,7 @@ - - - - - + <fmt:message key="monitor.title"/> @@ -130,7 +126,7 @@ //--> - + Index: lams_monitoring/web/previewdeleted.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/previewdeleted.jsp,v diff -u -r1.6 -r1.7 --- lams_monitoring/web/previewdeleted.jsp 17 Nov 2006 07:29:56 -0000 1.6 +++ lams_monitoring/web/previewdeleted.jsp 5 Jun 2007 05:54:25 -0000 1.7 @@ -28,11 +28,10 @@ - - + - +

Index: lams_monitoring/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/Attic/lams.tld,v diff -u -r1.11 -r1.12 --- lams_monitoring/web/WEB-INF/lams.tld 9 May 2007 01:01:39 -0000 1.11 +++ lams_monitoring/web/WEB-INF/lams.tld 5 Jun 2007 05:54:25 -0000 1.12 @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_monitoring/web/WEB-INF/tags/Head.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Head.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_monitoring/web/WEB-INF/tags/Head.tag 5 Jun 2007 05:54:25 -0000 1.1 @@ -0,0 +1,41 @@ +<%/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/** + * Head.tag + * Author: Fiona Malikoff + * Description: Sets up the non-cache pragma statements and the UTF-8 + * encoding. Use in place of the normal head tag. + */ +%> + +<%@ tag body-content="scriptless"%> + + + + + + + + + Index: lams_monitoring/web/grouping/chosenGrouping.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/grouping/chosenGrouping.jsp,v diff -u -r1.9 -r1.10 --- lams_monitoring/web/grouping/chosenGrouping.jsp 17 Nov 2006 07:29:56 -0000 1.9 +++ lams_monitoring/web/grouping/chosenGrouping.jsp 5 Jun 2007 05:54:25 -0000 1.10 @@ -28,14 +28,10 @@ - - + <c:out value="${title}"/> - - - @@ -406,7 +402,7 @@ - + Index: lams_monitoring/web/template/template.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/template/template.jsp,v diff -u -r1.15 -r1.16 --- lams_monitoring/web/template/template.jsp 17 Nov 2006 07:29:56 -0000 1.15 +++ lams_monitoring/web/template/template.jsp 5 Jun 2007 05:54:25 -0000 1.16 @@ -29,8 +29,7 @@ - - + <%-- if localFiles == true then wanted for export portfolio and must run offline --%> @@ -44,9 +43,7 @@ - - - +