<bean:message key="activity.title"/>

Index: lams_tool_lamc/web/Header.jsp =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_lamc/web/Header.jsp (.../Header.jsp) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_lamc/web/Header.jsp (.../Header.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -26,4 +26,3 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> -<%@ page contentType="text/html; charset=iso-8859-1" language="java" %> Index: lams_tool_lamc/web/Template.jsp =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_lamc/web/Template.jsp (.../Template.jsp) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_lamc/web/Template.jsp (.../Template.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -1,3 +1,4 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) License Information: http://lamsfoundation.org/licensing/lams/2.0/ @@ -33,7 +34,10 @@ - + + + <bean:message key="activity.title"/> + Index: lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -1,3 +1,4 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) License Information: http://lamsfoundation.org/licensing/lams/2.0/ @@ -19,6 +20,7 @@ http://www.gnu.org/licenses/gpl.txt --%> + <%@ taglib uri="tags-bean" prefix="bean"%> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> @@ -49,17 +51,10 @@ - - <bean:message key="label.authoring"/> + + <fmt:message key="activity.title" /> - - - - - - - - - - - Index: lams_tool_lamc/web/exportPortfolio.jsp =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_lamc/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_lamc/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -1,3 +1,4 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) License Information: http://lamsfoundation.org/licensing/lams/2.0/ @@ -19,6 +20,7 @@ http://www.gnu.org/licenses/gpl.txt --%> + <%@ taglib uri="tags-bean" prefix="bean"%> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> @@ -35,6 +37,7 @@ <bean:message key="label.exportPortfolio"/> +

Index: lams_tool_lamc/web/learning/AnswersContent.jsp =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_lamc/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_lamc/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -1,3 +1,5 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> + <%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) License Information: http://lamsfoundation.org/licensing/lams/2.0/ @@ -33,8 +35,8 @@ - - <bean:message key="label.learning"/> + + <bean:message key="activity.title"/> Index: lams_tool_lamc/web/learning/Preview.jsp =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_lamc/web/learning/Preview.jsp (.../Preview.jsp) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_lamc/web/learning/Preview.jsp (.../Preview.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -1,3 +1,4 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) License Information: http://lamsfoundation.org/licensing/lams/2.0/ @@ -19,6 +20,7 @@ http://www.gnu.org/licenses/gpl.txt --%> + <%@ taglib uri="tags-bean" prefix="bean"%> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> Index: lams_tool_lamc/web/login.jsp =================================================================== diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_lamc/web/login.jsp (.../login.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) +++ lams_tool_lamc/web/login.jsp (.../login.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -1,6 +1,5 @@ +<%@ page language="java" import="java.util.*" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> - -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> <% String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -1,3 +1,4 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) License Information: http://lamsfoundation.org/licensing/lams/2.0/ @@ -18,6 +19,7 @@ http://www.gnu.org/licenses/gpl.txt --%> + <%@ taglib uri="tags-bean" prefix="bean"%> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> @@ -49,17 +51,10 @@ - - <bean:message key="label.monitoring"/> - + + <fmt:message key="activity.title" /> - - - - - - - - - Index: lams_tool_laqa/web/AuthoringMaincontent.jsp =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_laqa/web/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/web/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -19,7 +19,9 @@ http://www.gnu.org/licenses/gpl.txt --%> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> + <%@ taglib uri="tags-bean" prefix="bean"%> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> Index: lams_tool_laqa/web/Template.jsp =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_laqa/web/Template.jsp (.../Template.jsp) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/web/Template.jsp (.../Template.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -18,6 +18,7 @@ http://www.gnu.org/licenses/gpl.txt --%> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%@ taglib uri="tags-bean" prefix="bean"%> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp =================================================================== diff -u -re09f4fcd7f1c3cc769dcb41e949a852c84d36e4e -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp (.../AuthoringTabsHolder.jsp) (revision e09f4fcd7f1c3cc769dcb41e949a852c84d36e4e) +++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp (.../AuthoringTabsHolder.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -19,7 +19,6 @@ http://www.gnu.org/licenses/gpl.txt --%> - <%@ taglib uri="tags-bean" prefix="bean"%> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> @@ -49,16 +48,10 @@ - - <bean:message key="label.authoring"/> - - + + <fmt:message key="activity.title" /> - - - - - - - Index: lams_tool_laqa/web/exportPortfolio.jsp =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_laqa/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -18,6 +18,8 @@ http://www.gnu.org/licenses/gpl.txt --%> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> + <%@ taglib uri="tags-bean" prefix="bean"%> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> @@ -31,6 +33,7 @@ <bean:message key="label.exportPortfolio"/> +

Index: lams_tool_laqa/web/learning/AnswersContent.jsp =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_laqa/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -19,6 +19,7 @@ http://www.gnu.org/licenses/gpl.txt --%> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%@ taglib uri="tags-bean" prefix="bean"%> <%@ taglib uri="tags-html" prefix="html"%> @@ -29,8 +30,8 @@ <%@ taglib uri="tags-lams" prefix="lams" %> - + - - - - - - Index: lams_tool_nb/web/authoring/authoring.jsp =================================================================== diff -u -r1eb33358d05efe95fcd92c8acacf97029e771836 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_nb/web/authoring/authoring.jsp (.../authoring.jsp) (revision 1eb33358d05efe95fcd92c8acacf97029e771836) +++ lams_tool_nb/web/authoring/authoring.jsp (.../authoring.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -1,3 +1,4 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-core" prefix="c" %> @@ -8,23 +9,16 @@ <%@ page import="java.util.HashSet" %> <%@ page import="java.util.Set" %> - - - - <fmt:message key="tool.display.name" /> + + <fmt:message key="activity.title" /> - - - - - - - - - Index: lams_tool_nb/web/exportPortfolio.jsp =================================================================== diff -u -re77407853b225701e66f4643a28502de027ffabd -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_nb/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision e77407853b225701e66f4643a28502de027ffabd) +++ lams_tool_nb/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -1,3 +1,4 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-lams" prefix="lams" %> Index: lams_tool_nb/web/monitoring/monitoring.jsp =================================================================== diff -u -r992d0d544a920da849e7d1a6b3f2006f816f7d86 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_nb/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) +++ lams_tool_nb/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -1,3 +1,4 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-core" prefix="c" %> @@ -13,7 +14,7 @@ -<fmt:message key="tool.display.name"/> +<fmt:message key="activity.title"/> Index: lams_tool_nb/web/template/template.jsp =================================================================== diff -u -r1bf30edca36c1de9ca329e9140bf4673c1225028 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_nb/web/template/template.jsp (.../template.jsp) (revision 1bf30edca36c1de9ca329e9140bf4673c1225028) +++ lams_tool_nb/web/template/template.jsp (.../template.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -18,6 +18,7 @@ http://www.gnu.org/licenses/gpl.txt --%> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-core" prefix="c" %> @@ -32,12 +33,8 @@ - - <tiles:getAsString name="title"/> - - - - + + <fmt:message key="activity.title" /> Index: lams_tool_sbmt/web/authoring/authoring.jsp =================================================================== diff -u -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision 9e3c5045ea3431bc5327f4c4c9120e6d548e02de) +++ lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -17,17 +17,11 @@ - Submit Files - - + + <fmt:message key="activity.title" /> - - - - - - - Index: lams_tool_sbmt/web/export/exportportfolio.jsp =================================================================== diff -u -r9848807303acf3d81833156edf8dc4460ae1a7a2 -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_sbmt/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 9848807303acf3d81833156edf8dc4460ae1a7a2) +++ lams_tool_sbmt/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -1,3 +1,4 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%@include file="../sharing/share.jsp"%> <%@ taglib uri="tags-lams" prefix="lams"%> Index: lams_tool_sbmt/web/learner/sbmtLearner.jsp =================================================================== diff -u -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_sbmt/web/learner/sbmtLearner.jsp (.../sbmtLearner.jsp) (revision 9e3c5045ea3431bc5327f4c4c9120e6d548e02de) +++ lams_tool_sbmt/web/learner/sbmtLearner.jsp (.../sbmtLearner.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -2,11 +2,10 @@ + <fmt:message key="tool.display.name" /> - - Submission tool for Learner - - + + - - - - - Index: lams_tool_sbmt/web/sharing/share.jsp =================================================================== diff -u -r9e3c5045ea3431bc5327f4c4c9120e6d548e02de -re6e6aa4b83b6a5f62f7cae530495663c3bab242e --- lams_tool_sbmt/web/sharing/share.jsp (.../share.jsp) (revision 9e3c5045ea3431bc5327f4c4c9120e6d548e02de) +++ lams_tool_sbmt/web/sharing/share.jsp (.../share.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) @@ -1,5 +1,5 @@ -<%@ page language="java"%> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-bean" prefix="bean" %>