Index: lams_learning/web/common/taglibs.jsp =================================================================== diff -u --- lams_learning/web/common/taglibs.jsp (revision 0) +++ lams_learning/web/common/taglibs.jsp (revision 6f4f941aa643be2ce87817d820204dd22f25c4aa) @@ -0,0 +1,11 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-logic" prefix="logic"%> +<%@ taglib uri="tags-tiles" prefix="tiles"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-function" prefix="fn" %> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-lams" prefix="lams"%> + \ No newline at end of file Index: lams_learning/web/layout/branchingWaitLayout.jsp =================================================================== diff -u -rccf0c98665da622cc43ff39393de652596752cdf -r6f4f941aa643be2ce87817d820204dd22f25c4aa --- lams_learning/web/layout/branchingWaitLayout.jsp (.../branchingWaitLayout.jsp) (revision ccf0c98665da622cc43ff39393de652596752cdf) +++ lams_learning/web/layout/branchingWaitLayout.jsp (.../branchingWaitLayout.jsp) (revision 6f4f941aa643be2ce87817d820204dd22f25c4aa) @@ -19,13 +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"%> -<%@ taglib uri="tags-tiles" prefix="tiles"%> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ include file="/common/taglibs.jsp"%> Index: lams_learning/web/layout/framesetLayout.jsp =================================================================== diff -u --- lams_learning/web/layout/framesetLayout.jsp (revision 0) +++ lams_learning/web/layout/framesetLayout.jsp (revision 6f4f941aa643be2ce87817d820204dd22f25c4aa) @@ -0,0 +1,70 @@ +<%-- +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 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 +--%> + + + +<%@ include file="/common/taglibs.jsp"%> + + + + + +<%-- includeBodyTag, this variable is used to stop the default behaviour of + displaying body tags (for use with a frameset) --%> + + + + + <fmt:message key="${pageTitleKey}" /> + + + <%-- if localFiles == true then wanted for export portfolio and must run offline --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_learning/web/layout/gateLayout.jsp =================================================================== diff -u -r64938df458cbab9999f9a826ef2902d061648d7d -r6f4f941aa643be2ce87817d820204dd22f25c4aa --- lams_learning/web/layout/gateLayout.jsp (.../gateLayout.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) +++ lams_learning/web/layout/gateLayout.jsp (.../gateLayout.jsp) (revision 6f4f941aa643be2ce87817d820204dd22f25c4aa) @@ -19,13 +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"%> -<%@ taglib uri="tags-tiles" prefix="tiles"%> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ include file="/common/taglibs.jsp"%> Index: lams_learning/web/layout/groupWaitLayout.jsp =================================================================== diff -u -r64938df458cbab9999f9a826ef2902d061648d7d -r6f4f941aa643be2ce87817d820204dd22f25c4aa --- lams_learning/web/layout/groupWaitLayout.jsp (.../groupWaitLayout.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) +++ lams_learning/web/layout/groupWaitLayout.jsp (.../groupWaitLayout.jsp) (revision 6f4f941aa643be2ce87817d820204dd22f25c4aa) @@ -19,13 +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"%> -<%@ taglib uri="tags-tiles" prefix="tiles"%> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ include file="/common/taglibs.jsp"%> Index: lams_learning/web/layout/layout.jsp =================================================================== diff -u -r64938df458cbab9999f9a826ef2902d061648d7d -r6f4f941aa643be2ce87817d820204dd22f25c4aa --- lams_learning/web/layout/layout.jsp (.../layout.jsp) (revision 64938df458cbab9999f9a826ef2902d061648d7d) +++ lams_learning/web/layout/layout.jsp (.../layout.jsp) (revision 6f4f941aa643be2ce87817d820204dd22f25c4aa) @@ -19,51 +19,52 @@ 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-tiles" prefix="tiles"%> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> + - - +<%@ include file="/common/taglibs.jsp"%> - + - <%-- includeBodyTag, this variable is used to stop the default behaviour of + + +<%-- includeBodyTag, this variable is used to stop the default behaviour of displaying body tags (for use with a frameset) --%> - + - - - <fmt:message key="${pageTitleKey}"/> - - <%-- if localFiles == true then wanted for export portfolio and must run offline --%> - + + + <fmt:message key="${pageTitleKey}" /> + + + <%-- if localFiles == true then wanted for export portfolio and must run offline --%> + - + - - - - + + + + + + - - + + - - - - - - - - - + + + + + + + + + - + Index: lams_learning/web/optionsActivity.jsp =================================================================== diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r6f4f941aa643be2ce87817d820204dd22f25c4aa --- lams_learning/web/optionsActivity.jsp (.../optionsActivity.jsp) (revision 472bcb813040efc160e074021be5c71c15455f00) +++ lams_learning/web/optionsActivity.jsp (.../optionsActivity.jsp) (revision 6f4f941aa643be2ce87817d820204dd22f25c4aa) @@ -1,130 +1,124 @@ - -<%@ 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-core" prefix="c"%> -<%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-lams" prefix="lams" %> - - - - - - -

+ } + //--> + -

+ +

- - - - - - -

- -

+ +

+ + +

+ +

- - - )"> - - - - -

- - - <%--html:img page="/images/tick.gif" /--%> - - - " /> - - -

- -

+ + -

+ + + + + + + +

+ + + +

+ + + + + + + + + + +

- -

- +

+ + +

- -

- + +

- - - - - - - +

+ +

+ + + + + + +

+ + + +

- + + +

+ +