<fmt:message key="${title}"/>

Index: lams_central/web/admin.jsp =================================================================== diff -u -rb2498b9d3035d0c59d571da832f1082d99e74d40 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/admin.jsp (.../admin.jsp) (revision b2498b9d3035d0c59d571da832f1082d99e74d40) +++ lams_central/web/admin.jsp (.../admin.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -6,12 +6,11 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> - + - <fmt:message key="title.admin.window"/> - + Index: lams_central/web/author.jsp =================================================================== diff -u -r7457cc82a05752050f053af407be12d4f7f33db2 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/author.jsp (.../author.jsp) (revision 7457cc82a05752050f053af407be12d4f7f33db2) +++ lams_central/web/author.jsp (.../author.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -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 =================================================================== diff -u -rb96e1b5656d7c094f6717eac9ced88c63a14e597 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/authoringConfirm.jsp (.../authoringConfirm.jsp) (revision b96e1b5656d7c094f6717eac9ced88c63a14e597) +++ lams_central/web/authoringConfirm.jsp (.../authoringConfirm.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -8,8 +8,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> - - + - +

Index: lams_central/web/development/wddxPost.jsp =================================================================== diff -u -rec052dc8b365e1d1322f50e4a4ff8c2ddd2a7bbc -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/development/wddxPost.jsp (.../wddxPost.jsp) (revision ec052dc8b365e1d1322f50e4a4ff8c2ddd2a7bbc) +++ lams_central/web/development/wddxPost.jsp (.../wddxPost.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -6,12 +6,10 @@ - - - + Send WDDX Packet To Server - + Index: lams_central/web/errorpages/403.jsp =================================================================== diff -u -r98376b63a67253b44707c446c08287a0375e9745 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/errorpages/403.jsp (.../403.jsp) (revision 98376b63a67253b44707c446c08287a0375e9745) +++ lams_central/web/errorpages/403.jsp (.../403.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -11,11 +11,10 @@ "http://www.w3.org/TR/html4/loose.dtd"> - - + <fmt:message key="403.title" /> - + Index: lams_central/web/errorpages/404.jsp =================================================================== diff -u -rec052dc8b365e1d1322f50e4a4ff8c2ddd2a7bbc -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/errorpages/404.jsp (.../404.jsp) (revision ec052dc8b365e1d1322f50e4a4ff8c2ddd2a7bbc) +++ lams_central/web/errorpages/404.jsp (.../404.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -11,12 +11,10 @@ "http://www.w3.org/TR/html4/loose.dtd"> - - + <fmt:message key="404.title" /> - - + Index: lams_central/web/errorpages/error.jsp =================================================================== diff -u -rec052dc8b365e1d1322f50e4a4ff8c2ddd2a7bbc -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/errorpages/error.jsp (.../error.jsp) (revision ec052dc8b365e1d1322f50e4a4ff8c2ddd2a7bbc) +++ lams_central/web/errorpages/error.jsp (.../error.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -10,8 +10,7 @@ - - + <fmt:message key="heading.general.error" /> @@ -32,7 +31,7 @@ } } - + Index: lams_central/web/favicon.ico =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r64938df458cbab9999f9a826ef2902d061648d7d Binary files differ Index: lams_central/web/index.jsp =================================================================== diff -u -rc886568918fd31b3a716947b95fbc80934767ec2 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/index.jsp (.../index.jsp) (revision c886568918fd31b3a716947b95fbc80934767ec2) +++ lams_central/web/index.jsp (.../index.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -6,12 +6,11 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> - + - <fmt:message key="index.welcome" /> - + Index: lams_central/web/launchlearner.jsp =================================================================== diff -u -rb2498b9d3035d0c59d571da832f1082d99e74d40 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/launchlearner.jsp (.../launchlearner.jsp) (revision b2498b9d3035d0c59d571da832f1082d99e74d40) +++ lams_central/web/launchlearner.jsp (.../launchlearner.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -8,12 +8,12 @@ <%@ taglib uri="tags-core" prefix="c" %> - + <fmt:message key="index.welcome" /> - +

Index: lams_central/web/learner.jsp =================================================================== diff -u -rb2498b9d3035d0c59d571da832f1082d99e74d40 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/learner.jsp (.../learner.jsp) (revision b2498b9d3035d0c59d571da832f1082d99e74d40) +++ lams_central/web/learner.jsp (.../learner.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -7,12 +7,11 @@ <%@ taglib uri="tags-core" prefix="c" %> - + &mode="> - <fmt:message key="title.learner.window"/> - + Index: lams_central/web/login.jsp =================================================================== diff -u -rc19b66107c7e2a0c3398f5ab5433477658fd7780 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/login.jsp (.../login.jsp) (revision c19b66107c7e2a0c3398f5ab5433477658fd7780) +++ lams_central/web/login.jsp (.../login.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -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 =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/main.jsp (.../main.jsp) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_central/web/main.jsp (.../main.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -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 =================================================================== diff -u -rb2498b9d3035d0c59d571da832f1082d99e74d40 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/monitorLesson.jsp (.../monitorLesson.jsp) (revision b2498b9d3035d0c59d571da832f1082d99e74d40) +++ lams_central/web/monitorLesson.jsp (.../monitorLesson.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -7,12 +7,11 @@ <%@ taglib uri="tags-core" prefix="c" %> - + "/> - <fmt:message key="title.monitor.lesson.window"/> - + Index: lams_central/web/sysadmin.jsp =================================================================== diff -u -rb2498b9d3035d0c59d571da832f1082d99e74d40 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/sysadmin.jsp (.../sysadmin.jsp) (revision b2498b9d3035d0c59d571da832f1082d99e74d40) +++ lams_central/web/sysadmin.jsp (.../sysadmin.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -6,12 +6,11 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> - + - <fmt:message key="title.system.admin.window"/> - + Index: lams_central/web/template.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/template.jsp (.../template.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_central/web/template.jsp (.../template.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -7,20 +7,17 @@ - + <fmt:message><tiles:getAsString name="titleKey"/></fmt:message> - - - - +

Index: lams_central/web/toolcontent/exportchoice.jsp =================================================================== diff -u -r2725a41b5f107861d0d0d9654df4a9f41995384a -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/toolcontent/exportchoice.jsp (.../exportchoice.jsp) (revision 2725a41b5f107861d0d0d9654df4a9f41995384a) +++ lams_central/web/toolcontent/exportchoice.jsp (.../exportchoice.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -8,8 +8,7 @@ - - + <fmt:message key="title.export.choose.format" /> @@ -25,7 +24,7 @@ window.close(); } - + Index: lams_central/web/toolcontent/exportloading.jsp =================================================================== diff -u -rec052dc8b365e1d1322f50e4a4ff8c2ddd2a7bbc -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/toolcontent/exportloading.jsp (.../exportloading.jsp) (revision ec052dc8b365e1d1322f50e4a4ff8c2ddd2a7bbc) +++ lams_central/web/toolcontent/exportloading.jsp (.../exportloading.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -8,8 +8,7 @@ - - + <fmt:message key="title.export.loading" /> @@ -25,7 +24,7 @@ window.close(); } - + Index: lams_central/web/toolcontent/exportresult.jsp =================================================================== diff -u -rec052dc8b365e1d1322f50e4a4ff8c2ddd2a7bbc -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/toolcontent/exportresult.jsp (.../exportresult.jsp) (revision ec052dc8b365e1d1322f50e4a4ff8c2ddd2a7bbc) +++ lams_central/web/toolcontent/exportresult.jsp (.../exportresult.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -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 =================================================================== diff -u -rec052dc8b365e1d1322f50e4a4ff8c2ddd2a7bbc -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/toolcontent/import.jsp (.../import.jsp) (revision ec052dc8b365e1d1322f50e4a4ff8c2ddd2a7bbc) +++ lams_central/web/toolcontent/import.jsp (.../import.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -5,8 +5,7 @@ - - + <fmt:message key="title.import" /> @@ -15,7 +14,7 @@ window.close(); } - + Index: lams_central/web/toolcontent/importresult.jsp =================================================================== diff -u -r2725a41b5f107861d0d0d9654df4a9f41995384a -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_central/web/toolcontent/importresult.jsp (.../importresult.jsp) (revision 2725a41b5f107861d0d0d9654df4a9f41995384a) +++ lams_central/web/toolcontent/importresult.jsp (.../importresult.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -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/WEB-INF/lams.tld =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_learning/web/WEB-INF/lams.tld (.../lams.tld) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_learning/web/WEB-INF/lams.tld (.../lams.tld) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_learning/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_learning/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_learning/web/WEB-INF/tags/Head.tag (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -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/controlFrame.jsp =================================================================== diff -u -r07bdeb1ca1ca44acb357de2c547836db915a5976 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_learning/web/controlFrame.jsp (.../controlFrame.jsp) (revision 07bdeb1ca1ca44acb357de2c547836db915a5976) +++ lams_learning/web/controlFrame.jsp (.../controlFrame.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -28,8 +28,7 @@ - - + <fmt:message key="learner.title"/> @@ -97,7 +96,7 @@ } //--> - + <% Index: lams_learning/web/exportPortfolio/main.jsp =================================================================== diff -u -rdf5b6fa9c178fb7e74243cd91dbde88c9f59acc0 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_learning/web/exportPortfolio/main.jsp (.../main.jsp) (revision df5b6fa9c178fb7e74243cd91dbde88c9f59acc0) +++ lams_learning/web/exportPortfolio/main.jsp (.../main.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -31,14 +31,13 @@ "http://www.w3.org/TR/html4/loose.dtd"> - - + <c:out value="${portfolio.lessonName}"/> - + Index: lams_learning/web/exportPortfolio/notebook.jsp =================================================================== diff -u -r23c1f7b6a82b8dbe18defcecfe254c05c27db929 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_learning/web/exportPortfolio/notebook.jsp (.../notebook.jsp) (revision 23c1f7b6a82b8dbe18defcecfe254c05c27db929) +++ lams_learning/web/exportPortfolio/notebook.jsp (.../notebook.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -30,8 +30,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> - - + @@ -42,7 +41,7 @@ - + Index: lams_learning/web/exportWaitingPage.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_learning/web/exportWaitingPage.jsp (.../exportWaitingPage.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_learning/web/exportWaitingPage.jsp (.../exportWaitingPage.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -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/layout/gateLayout.jsp =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_learning/web/layout/gateLayout.jsp (.../gateLayout.jsp) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_learning/web/layout/gateLayout.jsp (.../gateLayout.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -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 =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_learning/web/layout/groupWaitLayout.jsp (.../groupWaitLayout.jsp) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_learning/web/layout/groupWaitLayout.jsp (.../groupWaitLayout.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -30,13 +30,12 @@ - + <fmt:message key="${label.view.groups.title}"/> - - + Index: lams_learning/web/layout/layout.jsp =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_learning/web/layout/layout.jsp (.../layout.jsp) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_learning/web/layout/layout.jsp (.../layout.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -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_learning/web/main.jsp =================================================================== diff -u -ra7aed1a665e96e520f9a78e48a7d40214dda33b7 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_learning/web/main.jsp (.../main.jsp) (revision a7aed1a665e96e520f9a78e48a7d40214dda33b7) +++ lams_learning/web/main.jsp (.../main.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -28,8 +28,7 @@ - - + <fmt:message key="learner.title"/> - + Index: lams_learning/web/requestURL.jsp =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_learning/web/requestURL.jsp (.../requestURL.jsp) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_learning/web/requestURL.jsp (.../requestURL.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -28,10 +28,8 @@ - - LAMS - - + + Index: lams_monitoring/web/WEB-INF/lams.tld =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_monitoring/web/WEB-INF/lams.tld (.../lams.tld) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_monitoring/web/WEB-INF/lams.tld (.../lams.tld) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_monitoring/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_monitoring/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_monitoring/web/WEB-INF/tags/Head.tag (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -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/addLesson.jsp =================================================================== diff -u -r675bac7b3dbcd69d2a00f6118bf4f86a0e137117 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_monitoring/web/addLesson.jsp (.../addLesson.jsp) (revision 675bac7b3dbcd69d2a00f6118bf4f86a0e137117) +++ lams_monitoring/web/addLesson.jsp (.../addLesson.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -31,8 +31,7 @@ - - + <fmt:message key="monitor.title"/> @@ -44,7 +43,7 @@ } //--> - + Index: lams_monitoring/web/grouping/chosenGrouping.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_monitoring/web/grouping/chosenGrouping.jsp (.../chosenGrouping.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_monitoring/web/grouping/chosenGrouping.jsp (.../chosenGrouping.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -28,14 +28,10 @@ - - + <c:out value="${title}"/> - - - @@ -406,7 +402,7 @@ - + Index: lams_monitoring/web/monitorLesson.jsp =================================================================== diff -u -r3c18ced10eacf7f72bfc22abf3dcd9b3e0b829a8 -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_monitoring/web/monitorLesson.jsp (.../monitorLesson.jsp) (revision 3c18ced10eacf7f72bfc22abf3dcd9b3e0b829a8) +++ lams_monitoring/web/monitorLesson.jsp (.../monitorLesson.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -31,11 +31,7 @@ - - - - - + <fmt:message key="monitor.title"/> @@ -130,7 +126,7 @@ //--> - + Index: lams_monitoring/web/previewdeleted.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_monitoring/web/previewdeleted.jsp (.../previewdeleted.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_monitoring/web/previewdeleted.jsp (.../previewdeleted.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -28,11 +28,10 @@ - - + - +

Index: lams_monitoring/web/template/template.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r64938df458cbab9999f9a826ef2902d061648d7d --- lams_monitoring/web/template/template.jsp (.../template.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_monitoring/web/template/template.jsp (.../template.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) @@ -29,8 +29,7 @@ - - + <%-- if localFiles == true then wanted for export portfolio and must run offline --%> @@ -44,9 +43,7 @@ - - - +