Index: lams_admin/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_admin/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_admin/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_central/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_central/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_central/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_learning/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_learning/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_learning/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_monitoring/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_monitoring/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_monitoring/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_tool_chat/web/WEB-INF/lams.tld =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_chat/web/WEB-INF/lams.tld (.../lams.tld) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_tool_chat/web/WEB-INF/lams.tld (.../lams.tld) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_tool_chat/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_tool_chat/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_tool_chat/web/WEB-INF/tags/Head.tag (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -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_tool_chat/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_chat/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_tool_chat/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_tool_chat/web/common/header.jsp =================================================================== diff -u -ra79f1040f9d36c6adcb499f38fc38d838cda8a0b -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_chat/web/common/header.jsp (.../header.jsp) (revision a79f1040f9d36c6adcb499f38fc38d838cda8a0b) +++ lams_tool_chat/web/common/header.jsp (.../header.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -7,11 +7,11 @@ - + <fmt:message key="activity.title" /> - + Index: lams_tool_chat/web/common/learnerheader.jsp =================================================================== diff -u -r60d54756f59597b6c1df8e0f9103a39898391b5e -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_chat/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision 60d54756f59597b6c1df8e0f9103a39898391b5e) +++ lams_tool_chat/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -7,7 +7,7 @@ - + <fmt:message key="activity.title" /> @@ -19,7 +19,6 @@ - - + Index: lams_tool_chat/web/pages/export/exportPortfolio.jsp =================================================================== diff -u -r4ff2485da68573b3cf2c6e35733de0c308eab8fc -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_chat/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 4ff2485da68573b3cf2c6e35733de0c308eab8fc) +++ lams_tool_chat/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,15 +4,14 @@ <%@ include file="/common/taglibs.jsp"%> - + <c:out value="${chatDTO.title}" escapeXml="false" /> - - + Index: lams_tool_forum/web/WEB-INF/lams.tld =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_forum/web/WEB-INF/lams.tld (.../lams.tld) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_tool_forum/web/WEB-INF/lams.tld (.../lams.tld) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_tool_forum/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_tool_forum/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_tool_forum/web/WEB-INF/tags/Head.tag (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -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_tool_forum/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_forum/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_forum/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_tool_forum/web/common/header.jsp =================================================================== diff -u -r48c1a9c4bf2b0e4b4e98135a43ea9e74ca0a1be3 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_forum/web/common/header.jsp (.../header.jsp) (revision 48c1a9c4bf2b0e4b4e98135a43ea9e74ca0a1be3) +++ lams_tool_forum/web/common/header.jsp (.../header.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -7,16 +7,6 @@ - - - - - - - - - - Index: lams_tool_forum/web/includes/layout.jsp =================================================================== diff -u -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_forum/web/includes/layout.jsp (.../layout.jsp) (revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d) +++ lams_tool_forum/web/includes/layout.jsp (.../layout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,10 +5,10 @@ <%@ taglib uri="tags-tiles" prefix="tiles"%> - + <fmt:message key="activity.title" /> <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_forum/web/includes/learnerLayout.jsp =================================================================== diff -u -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_forum/web/includes/learnerLayout.jsp (.../learnerLayout.jsp) (revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d) +++ lams_tool_forum/web/includes/learnerLayout.jsp (.../learnerLayout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -10,7 +10,7 @@ - + <fmt:message key="activity.title" /> <%@ include file="/common/header.jsp"%> - + Index: lams_tool_forum/web/includes/tablayout.jsp =================================================================== diff -u -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_forum/web/includes/tablayout.jsp (.../tablayout.jsp) (revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d) +++ lams_tool_forum/web/includes/tablayout.jsp (.../tablayout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,12 +5,12 @@ <%@ taglib uri="tags-tiles" prefix="tiles"%> - + <fmt:message key="activity.title" /> <%@ include file="/common/tabbedheader.jsp"%> - +
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp =================================================================== diff -u -rbd376d76233dad7d0a0775762385918fcbb96f4c -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_forum/web/jsps/authoring/message/create.jsp (.../create.jsp) (revision bd376d76233dad7d0a0775762385918fcbb96f4c) +++ lams_tool_forum/web/jsps/authoring/message/create.jsp (.../create.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,10 +3,10 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + <%@ include file="/common/messages.jsp"%> Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp =================================================================== diff -u -r9b2c0bcea9343b234ed746093ecb13c3ff636701 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_forum/web/jsps/authoring/message/edit.jsp (.../edit.jsp) (revision 9b2c0bcea9343b234ed746093ecb13c3ff636701) +++ lams_tool_forum/web/jsps/authoring/message/edit.jsp (.../edit.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,7 +3,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + Index: lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp =================================================================== diff -u -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp (.../forbiddenedit.jsp) (revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d) +++ lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp (.../forbiddenedit.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,9 +4,9 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + Index: lams_tool_forum/web/jsps/authoring/message/view.jsp =================================================================== diff -u -r9b2c0bcea9343b234ed746093ecb13c3ff636701 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_forum/web/jsps/authoring/message/view.jsp (.../view.jsp) (revision 9b2c0bcea9343b234ed746093ecb13c3ff636701) +++ lams_tool_forum/web/jsps/authoring/message/view.jsp (.../view.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,10 +3,10 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp =================================================================== diff -u -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_forum/web/jsps/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d) +++ lams_tool_forum/web/jsps/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -10,10 +10,9 @@ - - + - + Index: lams_tool_lamc/web/WEB-INF/lams.tld =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/WEB-INF/lams.tld (.../lams.tld) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_tool_lamc/web/WEB-INF/lams.tld (.../lams.tld) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_tool_lamc/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_tool_lamc/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_tool_lamc/web/WEB-INF/tags/Head.tag (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -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_tool_lamc/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_lamc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp =================================================================== diff -u -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp (.../AuthoringTabsHolder.jsp) (revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f) +++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp (.../AuthoringTabsHolder.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -41,7 +41,7 @@ %> - + <fmt:message key="activity.title" /> <%@ include file="/common/header.jsp"%> @@ -118,7 +118,7 @@ document.McAuthoringForm.submit(); } - + Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp =================================================================== diff -u -rbb948b046fb4d5eb811a3a24c1ce7a47d5476d7e -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/authoring/editQuestionBox.jsp (.../editQuestionBox.jsp) (revision bb948b046fb4d5eb811a3a24c1ce7a47d5476d7e) +++ lams_tool_lamc/web/authoring/editQuestionBox.jsp (.../editQuestionBox.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -23,7 +23,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp =================================================================== diff -u -rbb948b046fb4d5eb811a3a24c1ce7a47d5476d7e -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/authoring/newQuestionBox.jsp (.../newQuestionBox.jsp) (revision bb948b046fb4d5eb811a3a24c1ce7a47d5476d7e) +++ lams_tool_lamc/web/authoring/newQuestionBox.jsp (.../newQuestionBox.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -23,7 +23,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + - - - - - - - - - - Index: lams_tool_lamc/web/common/learnerheader.jsp =================================================================== diff -u -r82475bcf94096557635a347e2927c9995c8a03ee -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision 82475bcf94096557635a347e2927c9995c8a03ee) +++ lams_tool_lamc/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -7,16 +7,6 @@ - - - - - - - - - - Index: lams_tool_lamc/web/export/exportportfolio.jsp =================================================================== diff -u -rf89e6168c312c16ee2796922e8b668cea52b1358 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision f89e6168c312c16ee2796922e8b668cea52b1358) +++ lams_tool_lamc/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -26,11 +26,10 @@ <%@ include file="/common/taglibs.jsp"%> - + <fmt:message key="label.exportPortfolio"/> - - + Index: lams_tool_lamc/web/includes/layout.jsp =================================================================== diff -u -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/includes/layout.jsp (.../layout.jsp) (revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f) +++ lams_tool_lamc/web/includes/layout.jsp (.../layout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,10 +5,10 @@ <%@ taglib uri="tags-tiles" prefix="tiles"%> - + <fmt:message key="activity.title" /> <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_lamc/web/includes/learnerLayout.jsp =================================================================== diff -u -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/includes/learnerLayout.jsp (.../learnerLayout.jsp) (revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f) +++ lams_tool_lamc/web/includes/learnerLayout.jsp (.../learnerLayout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -10,7 +10,7 @@ - + <fmt:message key="activity.title" /> <%@ include file="/common/learnerheader.jsp"%> - + Index: lams_tool_lamc/web/includes/tablayout.jsp =================================================================== diff -u -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/includes/tablayout.jsp (.../tablayout.jsp) (revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f) +++ lams_tool_lamc/web/includes/tablayout.jsp (.../tablayout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,12 +5,12 @@ <%@ taglib uri="tags-tiles" prefix="tiles"%> - + <fmt:message key="activity.title" /> <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_lamc/web/learning/AnswersContent.jsp =================================================================== diff -u -rcfc98c3ffea35e539a0622b545474d802c0cda76 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision cfc98c3ffea35e539a0622b545474d802c0cda76) +++ lams_tool_lamc/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,9 +32,8 @@ - + - <fmt:message key="activity.title" /> @@ -79,7 +78,7 @@ } - + Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp =================================================================== diff -u -rd7ff61954bc3a53370382f595e1edf9684d32bd4 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision d7ff61954bc3a53370382f595e1edf9684d32bd4) +++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -31,9 +31,8 @@ - + - <fmt:message key="activity.title" /> - + Index: lams_tool_lamc/web/learning/Notebook.jsp =================================================================== diff -u -r116fb820c289bb21122b78128f27a59b8517884f -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/learning/Notebook.jsp (.../Notebook.jsp) (revision 116fb820c289bb21122b78128f27a59b8517884f) +++ lams_tool_lamc/web/learning/Notebook.jsp (.../Notebook.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,13 +32,12 @@ - + - <fmt:message key="activity.title" /> - + Index: lams_tool_lamc/web/learning/RedoQuestions.jsp =================================================================== diff -u -rd7ff61954bc3a53370382f595e1edf9684d32bd4 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/learning/RedoQuestions.jsp (.../RedoQuestions.jsp) (revision d7ff61954bc3a53370382f595e1edf9684d32bd4) +++ lams_tool_lamc/web/learning/RedoQuestions.jsp (.../RedoQuestions.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,9 +32,8 @@ - + - <fmt:message key="activity.title" /> - + Index: lams_tool_lamc/web/learning/ResultsSummary.jsp =================================================================== diff -u -rd7ff61954bc3a53370382f595e1edf9684d32bd4 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/learning/ResultsSummary.jsp (.../ResultsSummary.jsp) (revision d7ff61954bc3a53370382f595e1edf9684d32bd4) +++ lams_tool_lamc/web/learning/ResultsSummary.jsp (.../ResultsSummary.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,9 +32,8 @@ - + - <fmt:message key="activity.title" /> @@ -46,7 +45,7 @@ } } - + Index: lams_tool_lamc/web/learning/RunOffline.jsp =================================================================== diff -u -rd7ff61954bc3a53370382f595e1edf9684d32bd4 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/learning/RunOffline.jsp (.../RunOffline.jsp) (revision d7ff61954bc3a53370382f595e1edf9684d32bd4) +++ lams_tool_lamc/web/learning/RunOffline.jsp (.../RunOffline.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,9 +32,8 @@ - + - <fmt:message key="activity.title" /> @@ -47,7 +46,7 @@ } } - + Index: lams_tool_lamc/web/learning/SimpleLearnerError.jsp =================================================================== diff -u -r733cb4ac2b997bdf9f9049ed1784d93bae258607 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/learning/SimpleLearnerError.jsp (.../SimpleLearnerError.jsp) (revision 733cb4ac2b997bdf9f9049ed1784d93bae258607) +++ lams_tool_lamc/web/learning/SimpleLearnerError.jsp (.../SimpleLearnerError.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,13 +32,12 @@ - + - <fmt:message key="label.learner.error" /> - +
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp =================================================================== diff -u -r5e2a4ab81866cf20f1824d538965c0482a5c070e -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision 5e2a4ab81866cf20f1824d538965c0482a5c070e) +++ lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,9 +32,8 @@ - + - <fmt:message key="activity.title" /> - + Index: lams_tool_lamc/web/learning/defineLater.jsp =================================================================== diff -u -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/learning/defineLater.jsp (.../defineLater.jsp) (revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f) +++ lams_tool_lamc/web/learning/defineLater.jsp (.../defineLater.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,11 +32,11 @@ - + <fmt:message key="activity.title" /> - +
Index: lams_tool_lamc/web/monitoring/LearnerNotebook.jsp =================================================================== diff -u -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/monitoring/LearnerNotebook.jsp (.../LearnerNotebook.jsp) (revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f) +++ lams_tool_lamc/web/monitoring/LearnerNotebook.jsp (.../LearnerNotebook.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,13 +32,12 @@ - + - <fmt:message key="activity.title" /> - + Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp =================================================================== diff -u -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f) +++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -38,7 +38,7 @@ %> - + <fmt:message key="label.monitoring"/> @@ -136,7 +136,7 @@ - + Index: lams_tool_lamc/web/monitoring/editQuestionBox.jsp =================================================================== diff -u -rc8d50602ffa636135742c90779b11b396ea1a546 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/monitoring/editQuestionBox.jsp (.../editQuestionBox.jsp) (revision c8d50602ffa636135742c90779b11b396ea1a546) +++ lams_tool_lamc/web/monitoring/editQuestionBox.jsp (.../editQuestionBox.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -23,7 +23,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + Index: lams_tool_lamc/web/monitoring/newQuestionBox.jsp =================================================================== diff -u -rc8d50602ffa636135742c90779b11b396ea1a546 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_lamc/web/monitoring/newQuestionBox.jsp (.../newQuestionBox.jsp) (revision c8d50602ffa636135742c90779b11b396ea1a546) +++ lams_tool_lamc/web/monitoring/newQuestionBox.jsp (.../newQuestionBox.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -23,7 +23,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_laqa/web/WEB-INF/lams.tld =================================================================== diff -u -rf4cd860c47b744a582e78e104149cf215b7df558 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/WEB-INF/lams.tld (.../lams.tld) (revision f4cd860c47b744a582e78e104149cf215b7df558) +++ lams_tool_laqa/web/WEB-INF/lams.tld (.../lams.tld) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_tool_laqa/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_tool_laqa/web/WEB-INF/tags/Head.tag (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -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_tool_laqa/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_laqa/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp (.../AuthoringTabsHolder.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp (.../AuthoringTabsHolder.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -41,7 +41,7 @@ %> - + <fmt:message key="activity.title" /> <%@ include file="/common/tabbedheader.jsp"%> @@ -106,7 +106,7 @@ } - + Index: lams_tool_laqa/web/authoring/editQuestionBox.jsp =================================================================== diff -u -refd0816197b8dcc03f85b49f527db4824468185d -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/authoring/editQuestionBox.jsp (.../editQuestionBox.jsp) (revision efd0816197b8dcc03f85b49f527db4824468185d) +++ lams_tool_laqa/web/authoring/editQuestionBox.jsp (.../editQuestionBox.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -23,7 +23,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> @@ -39,7 +39,7 @@ } - + - + <%@ include file="/common/header.jsp"%> @@ -39,7 +39,7 @@ } - + - - - - - - - - - - Index: lams_tool_laqa/web/common/tabbedheader.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_laqa/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -7,16 +7,6 @@ - - - - - - - - - - Index: lams_tool_laqa/web/export/exportportfolio.jsp =================================================================== diff -u -r2430616cfd8c9d742059dfb24ab85c6ce9186159 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 2430616cfd8c9d742059dfb24ab85c6ce9186159) +++ lams_tool_laqa/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -24,11 +24,10 @@ <%@ include file="/common/taglibs.jsp"%> - - + <fmt:message key="label.exportPortfolio"/> - + Index: lams_tool_laqa/web/includes/layout.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/includes/layout.jsp (.../layout.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_laqa/web/includes/layout.jsp (.../layout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,10 +5,10 @@ <%@ taglib uri="tags-tiles" prefix="tiles"%> - + <fmt:message key="activity.title" /> <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_laqa/web/includes/learnerLayout.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/includes/learnerLayout.jsp (.../learnerLayout.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_laqa/web/includes/learnerLayout.jsp (.../learnerLayout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -10,7 +10,7 @@ - + <fmt:message key="activity.title" /> <%@ include file="/common/header.jsp"%> - + Index: lams_tool_laqa/web/includes/tablayout.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/includes/tablayout.jsp (.../tablayout.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_laqa/web/includes/tablayout.jsp (.../tablayout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,12 +5,12 @@ <%@ taglib uri="tags-tiles" prefix="tiles"%> - + <fmt:message key="activity.title" /> <%@ include file="/common/tabbedheader.jsp"%> - +
Index: lams_tool_laqa/web/learning/AnswersContent.jsp =================================================================== diff -u -r26e2c0cef30f96d91999c26177c8203d30dba235 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision 26e2c0cef30f96d91999c26177c8203d30dba235) +++ lams_tool_laqa/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,12 +32,9 @@ - + - - - <fmt:message key="activity.title" /> @@ -54,7 +51,7 @@ } - + Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp =================================================================== diff -u -r7d13e6e6b653149634a2867a4aa964bb929c773f -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 7d13e6e6b653149634a2867a4aa964bb929c773f) +++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -31,9 +31,8 @@ - + - <fmt:message key="activity.title" /> @@ -52,7 +51,7 @@ submitLearningMethod(actionMethod); } - + Index: lams_tool_laqa/web/learning/LearnerRep.jsp =================================================================== diff -u -r2430616cfd8c9d742059dfb24ab85c6ce9186159 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision 2430616cfd8c9d742059dfb24ab85c6ce9186159) +++ lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -31,9 +31,8 @@ - + - <fmt:message key="activity.title" /> @@ -52,7 +51,7 @@ submitLearningMethod(actionMethod); } - + Index: lams_tool_laqa/web/learning/Notebook.jsp =================================================================== diff -u -r7d5f89db3f522c1be3dc69b832bd1488077ffbaf -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/learning/Notebook.jsp (.../Notebook.jsp) (revision 7d5f89db3f522c1be3dc69b832bd1488077ffbaf) +++ lams_tool_laqa/web/learning/Notebook.jsp (.../Notebook.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -31,9 +31,8 @@ - + - <fmt:message key="activity.title" /> @@ -53,10 +52,8 @@ } + - - - Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp =================================================================== diff -u -r2430616cfd8c9d742059dfb24ab85c6ce9186159 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp (.../RevisitedLearnerRep.jsp) (revision 2430616cfd8c9d742059dfb24ab85c6ce9186159) +++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp (.../RevisitedLearnerRep.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -31,9 +31,8 @@ - + - <fmt:message key="activity.title" /> @@ -52,7 +51,7 @@ submitLearningMethod(actionMethod); } - + Index: lams_tool_laqa/web/learning/RunOffline.jsp =================================================================== diff -u -r7d5f89db3f522c1be3dc69b832bd1488077ffbaf -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/learning/RunOffline.jsp (.../RunOffline.jsp) (revision 7d5f89db3f522c1be3dc69b832bd1488077ffbaf) +++ lams_tool_laqa/web/learning/RunOffline.jsp (.../RunOffline.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -31,9 +31,8 @@ - + - <fmt:message key="activity.title" /> @@ -53,9 +52,8 @@ submitLearningMethod(actionMethod); } + - - - + - <fmt:message key="activity.title" /> - + Index: lams_tool_laqa/web/monitoring/LearnerNotebook.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/monitoring/LearnerNotebook.jsp (.../LearnerNotebook.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_laqa/web/monitoring/LearnerNotebook.jsp (.../LearnerNotebook.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -31,13 +31,11 @@ - + - <fmt:message key="activity.title" /> - - + Index: lams_tool_laqa/web/monitoring/LearnerRep.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/monitoring/LearnerRep.jsp (.../LearnerRep.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_laqa/web/monitoring/LearnerRep.jsp (.../LearnerRep.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -24,7 +24,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <fmt:message key="activity.title"/> <%@ include file="/common/header.jsp"%> @@ -56,7 +56,7 @@ } MM_reloadPage(true); - +
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -37,7 +37,7 @@ %> - + <fmt:message key="activity.title" /> <%@ include file="/common/tabbedheader.jsp"%> @@ -136,7 +136,7 @@ - +
Index: lams_tool_laqa/web/monitoring/editQuestionBox.jsp =================================================================== diff -u -rbc2cfa9bc56db58ec68f63e654a8b0ca2404603e -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/monitoring/editQuestionBox.jsp (.../editQuestionBox.jsp) (revision bc2cfa9bc56db58ec68f63e654a8b0ca2404603e) +++ lams_tool_laqa/web/monitoring/editQuestionBox.jsp (.../editQuestionBox.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -23,7 +23,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_laqa/web/monitoring/newQuestionBox.jsp =================================================================== diff -u -rbc2cfa9bc56db58ec68f63e654a8b0ca2404603e -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_laqa/web/monitoring/newQuestionBox.jsp (.../newQuestionBox.jsp) (revision bc2cfa9bc56db58ec68f63e654a8b0ca2404603e) +++ lams_tool_laqa/web/monitoring/newQuestionBox.jsp (.../newQuestionBox.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -23,7 +23,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_larsrc/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_tool_larsrc/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_tool_larsrc/web/WEB-INF/tags/Head.tag (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -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_tool_larsrc/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_larsrc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_tool_larsrc/web/common/header.jsp =================================================================== diff -u -r5b6a17732f3cc14cf5005aa71d92e553e21c60b0 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/common/header.jsp (.../header.jsp) (revision 5b6a17732f3cc14cf5005aa71d92e553e21c60b0) +++ lams_tool_larsrc/web/common/header.jsp (.../header.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,16 +3,6 @@ - - - - - - - - - - Index: lams_tool_larsrc/web/common/tabbedheader.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_larsrc/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,16 +3,6 @@ - - - - - - - - - - Index: lams_tool_larsrc/web/layout/ frame.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/layout/ frame.jsp (.../ frame.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_larsrc/web/layout/ frame.jsp (.../ frame.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -26,15 +26,13 @@ - + - - - + Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_larsrc/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -14,7 +14,7 @@ %> - + <fmt:message key="label.author.title" /> <%@ include file="/common/tabbedheader.jsp"%> @@ -90,7 +90,7 @@ - +

Index: lams_tool_larsrc/web/pages/authoring/definelater.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/authoring/definelater.jsp (.../definelater.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_larsrc/web/pages/authoring/definelater.jsp (.../definelater.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -11,7 +11,7 @@ %> - + <fmt:message key="label.author.title" /> <%@ include file="/common/tabbedheader.jsp"%> @@ -42,7 +42,7 @@ - +
Index: lams_tool_larsrc/web/pages/authoring/definelaterforbid.jsp =================================================================== diff -u -rb73ea10c36c8939d404f95b6e39cbcb4efbd64ba -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/authoring/definelaterforbid.jsp (.../definelaterforbid.jsp) (revision b73ea10c36c8939d404f95b6e39cbcb4efbd64ba) +++ lams_tool_larsrc/web/pages/authoring/definelaterforbid.jsp (.../definelaterforbid.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -2,11 +2,11 @@ - + <fmt:message key="label.author.title" /> <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp =================================================================== diff -u -r7867b8fe8143bdd53d828f08c95e39d08852d84e -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp (.../addfile.jsp) (revision 7867b8fe8143bdd53d828f08c95e39d08852d84e) +++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp (.../addfile.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,7 +3,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> @@ -15,7 +15,7 @@ - + Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp =================================================================== diff -u -r7867b8fe8143bdd53d828f08c95e39d08852d84e -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp (.../addlearningobject.jsp) (revision 7867b8fe8143bdd53d828f08c95e39d08852d84e) +++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp (.../addlearningobject.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,7 +3,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp =================================================================== diff -u -r7867b8fe8143bdd53d828f08c95e39d08852d84e -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp (.../addurl.jsp) (revision 7867b8fe8143bdd53d828f08c95e39d08852d84e) +++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp (.../addurl.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,7 +3,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> <%-- user for rsrcresourceitem.js --%> @@ -13,7 +13,7 @@ - + Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp =================================================================== diff -u -r7867b8fe8143bdd53d828f08c95e39d08852d84e -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp (.../addwebsite.jsp) (revision 7867b8fe8143bdd53d828f08c95e39d08852d84e) +++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp (.../addwebsite.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,7 +3,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + Index: lams_tool_larsrc/web/pages/export/exportportfolio.jsp =================================================================== diff -u -r94eb7bada81814941189436f343e9cf395e348f4 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 94eb7bada81814941189436f343e9cf395e348f4) +++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -8,8 +8,7 @@ - - + <fmt:message key="export.title" /> @@ -25,7 +24,7 @@ } - + Index: lams_tool_larsrc/web/pages/itemreview/initnav.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/itemreview/initnav.jsp (.../initnav.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_larsrc/web/pages/itemreview/initnav.jsp (.../initnav.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -10,8 +10,8 @@ - - + + Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp (.../instructionsnav.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp (.../instructionsnav.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -23,7 +23,7 @@ - + ${instructions.title} <%@ include file="/common/header.jsp"%> @@ -58,7 +58,7 @@ } //--> - +
Index: lams_tool_larsrc/web/pages/itemreview/openurl.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/itemreview/openurl.jsp (.../openurl.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_larsrc/web/pages/itemreview/openurl.jsp (.../openurl.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -2,9 +2,9 @@ - + <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/learning/addfile.jsp (.../addfile.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_larsrc/web/pages/learning/addfile.jsp (.../addfile.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,9 +3,9 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + Index: lams_tool_larsrc/web/pages/learning/addurl.jsp =================================================================== diff -u -r37a31c91ab80d663665ed6f15730138c8c12f2a4 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/learning/addurl.jsp (.../addurl.jsp) (revision 37a31c91ab80d663665ed6f15730138c8c12f2a4) +++ lams_tool_larsrc/web/pages/learning/addurl.jsp (.../addurl.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,9 +3,9 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + Index: lams_tool_larsrc/web/pages/learning/definelater.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/learning/definelater.jsp (.../definelater.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_larsrc/web/pages/learning/definelater.jsp (.../definelater.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,10 +4,10 @@ <%@include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_larsrc/web/pages/learning/learning.jsp =================================================================== diff -u -r1669429a6a7740c4ae8c5d02038720ff41c36ad3 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision 1669429a6a7740c4ae8c5d02038720ff41c36ad3) +++ lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,7 +3,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> @@ -67,7 +67,7 @@ } --> - + Index: lams_tool_larsrc/web/pages/learning/notebook.jsp =================================================================== diff -u -recfd06ed9f05e30114b9ed8d1600a251bb7681d8 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision ecfd06ed9f05e30114b9ed8d1600a251bb7681d8) +++ lams_tool_larsrc/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/strict.dtd"> - + <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> @@ -13,7 +13,7 @@ document.getElementById("finishButton").disabled = true; } - + Index: lams_tool_larsrc/web/pages/learning/runoffline.jsp =================================================================== diff -u -recfd06ed9f05e30114b9ed8d1600a251bb7681d8 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/learning/runoffline.jsp (.../runoffline.jsp) (revision ecfd06ed9f05e30114b9ed8d1600a251bb7681d8) +++ lams_tool_larsrc/web/pages/learning/runoffline.jsp (.../runoffline.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,7 +4,7 @@ <%@include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_larsrc/web/pages/learning/success.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/learning/success.jsp (.../success.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_larsrc/web/pages/learning/success.jsp (.../success.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,9 +5,9 @@ - + <%@ include file="/common/header.jsp"%> - + - + Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,7 +5,7 @@ <%@ page import="org.lamsfoundation.lams.tool.rsrc.ResourceConstants"%> - + <%@ include file="/common/tabbedheader.jsp" %> - +

Index: lams_tool_larsrc/web/pages/monitoring/notebook.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/monitoring/notebook.jsp (.../notebook.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_larsrc/web/pages/monitoring/notebook.jsp (.../notebook.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,10 +3,10 @@ "http://www.w3.org/TR/html4/strict.dtd"> - + <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_larsrc/web/pages/monitoring/userlist.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_larsrc/web/pages/monitoring/userlist.jsp (.../userlist.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_larsrc/web/pages/monitoring/userlist.jsp (.../userlist.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,9 +4,9 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp" %> - + Index: lams_tool_nb/web/WEB-INF/lams.tld =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_nb/web/WEB-INF/lams.tld (.../lams.tld) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_tool_nb/web/WEB-INF/lams.tld (.../lams.tld) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_tool_nb/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_tool_nb/web/WEB-INF/tags/Head.tag (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -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_tool_nb/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_nb/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_nb/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_tool_nb/web/authoring/authoring.jsp =================================================================== diff -u -r0eff987dabffcb85157c77e5ec92072fb26a038a -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_nb/web/authoring/authoring.jsp (.../authoring.jsp) (revision 0eff987dabffcb85157c77e5ec92072fb26a038a) +++ lams_tool_nb/web/authoring/authoring.jsp (.../authoring.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -7,7 +7,7 @@ import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%> - + <fmt:message key="activity.title" /> @@ -52,7 +52,7 @@ document.NbAuthoringForm.submit(); } - + Index: lams_tool_nb/web/exportPortfolio.jsp =================================================================== diff -u -r94eb7bada81814941189436f343e9cf395e348f4 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_nb/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 94eb7bada81814941189436f343e9cf395e348f4) +++ lams_tool_nb/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -6,12 +6,11 @@ - - - <c:out value="${NbExportForm.title}"/> + + <c:out value="${NbExportForm.title}"/> - +
Index: lams_tool_nb/web/monitoring/monitoring.jsp =================================================================== diff -u -race8b408295af831e2715b2013d64a000aa09549 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_nb/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision ace8b408295af831e2715b2013d64a000aa09549) +++ lams_tool_nb/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -14,7 +14,7 @@ - + @@ -33,7 +33,7 @@ } - + Index: lams_tool_nb/web/template/learnerTemplate.jsp =================================================================== diff -u -r58056cedf0eb43d205db8888040ed5c9454fbf29 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_nb/web/template/learnerTemplate.jsp (.../learnerTemplate.jsp) (revision 58056cedf0eb43d205db8888040ed5c9454fbf29) +++ lams_tool_nb/web/template/learnerTemplate.jsp (.../learnerTemplate.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -11,10 +11,10 @@ - + <fmt:message key="activity.title"/> - + Index: lams_tool_nb/web/template/template.jsp =================================================================== diff -u -r58056cedf0eb43d205db8888040ed5c9454fbf29 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_nb/web/template/template.jsp (.../template.jsp) (revision 58056cedf0eb43d205db8888040ed5c9454fbf29) +++ lams_tool_nb/web/template/template.jsp (.../template.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -11,10 +11,10 @@ - + <fmt:message key="activity.title"/> - + Index: lams_tool_notebook/web/WEB-INF/lams.tld =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_notebook/web/WEB-INF/lams.tld (.../lams.tld) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_tool_notebook/web/WEB-INF/lams.tld (.../lams.tld) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_tool_notebook/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_tool_notebook/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_tool_notebook/web/WEB-INF/tags/Head.tag (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -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_tool_notebook/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_notebook/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_tool_notebook/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_tool_notebook/web/common/header.jsp =================================================================== diff -u -r6d33606546871dadee0c226a40fce75c57d0808b -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_notebook/web/common/header.jsp (.../header.jsp) (revision 6d33606546871dadee0c226a40fce75c57d0808b) +++ lams_tool_notebook/web/common/header.jsp (.../header.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -7,11 +7,11 @@ - + <fmt:message key="activity.title" /> - + Index: lams_tool_notebook/web/common/learnerheader.jsp =================================================================== diff -u -r6d33606546871dadee0c226a40fce75c57d0808b -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_notebook/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision 6d33606546871dadee0c226a40fce75c57d0808b) +++ lams_tool_notebook/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -7,17 +7,16 @@ - + <fmt:message key="activity.title" /> - - + Index: lams_tool_notebook/web/pages/export/exportPortfolio.jsp =================================================================== diff -u -r72154354672e85f1117ba5f94044c94477e36a6e -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_notebook/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 72154354672e85f1117ba5f94044c94477e36a6e) +++ lams_tool_notebook/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,12 +4,11 @@ <%@ include file="/common/taglibs.jsp"%> - + <c:out value="${notebookDTO.title}" escapeXml="false" /> - - + Index: lams_tool_sbmt/web/WEB-INF/lams.tld =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/WEB-INF/lams.tld (.../lams.tld) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_tool_sbmt/web/WEB-INF/lams.tld (.../lams.tld) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_tool_sbmt/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_tool_sbmt/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_tool_sbmt/web/WEB-INF/tags/Head.tag (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -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_tool_sbmt/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_sbmt/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_tool_sbmt/web/authoring/authoring.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -11,7 +11,7 @@ <%@ page import="org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants"%> - + <fmt:message key="activity.title" /> @@ -45,7 +45,7 @@ - +
Index: lams_tool_sbmt/web/authoring/definelater.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/authoring/definelater.jsp (.../definelater.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_sbmt/web/authoring/definelater.jsp (.../definelater.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -13,7 +13,7 @@ %> - + <fmt:message key="activity.title" /> @@ -36,7 +36,7 @@ - +
Index: lams_tool_sbmt/web/authoring/definelaterforbid.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/authoring/definelaterforbid.jsp (.../definelaterforbid.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_sbmt/web/authoring/definelaterforbid.jsp (.../definelaterforbid.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,9 +3,9 @@ <%@ include file="/common/taglibs.jsp"%> - + - +

Index: lams_tool_sbmt/web/export/exportportfolio.jsp =================================================================== diff -u -r94eb7bada81814941189436f343e9cf395e348f4 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 94eb7bada81814941189436f343e9cf395e348f4) +++ lams_tool_sbmt/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -10,11 +10,10 @@ - - + <fmt:message key="activity.title" /> - + Index: lams_tool_sbmt/web/learner/definelater.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/learner/definelater.jsp (.../definelater.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_sbmt/web/learner/definelater.jsp (.../definelater.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,9 +4,9 @@ <%@include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_sbmt/web/learner/notebook.jsp =================================================================== diff -u -recfd06ed9f05e30114b9ed8d1600a251bb7681d8 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/learner/notebook.jsp (.../notebook.jsp) (revision ecfd06ed9f05e30114b9ed8d1600a251bb7681d8) +++ lams_tool_sbmt/web/learner/notebook.jsp (.../notebook.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/strict.dtd"> - + <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> @@ -12,7 +12,7 @@ document.getElementById("finishButton").disabled = true; } - + Index: lams_tool_sbmt/web/learner/runoffline.jsp =================================================================== diff -u -recfd06ed9f05e30114b9ed8d1600a251bb7681d8 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/learner/runoffline.jsp (.../runoffline.jsp) (revision ecfd06ed9f05e30114b9ed8d1600a251bb7681d8) +++ lams_tool_sbmt/web/learner/runoffline.jsp (.../runoffline.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,7 +5,7 @@ - + <%@ include file="/common/header.jsp"%> @@ -20,7 +20,7 @@ location.href= finishUrl; } - +
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp =================================================================== diff -u -recfd06ed9f05e30114b9ed8d1600a251bb7681d8 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/learner/sbmtlearner.jsp (.../sbmtlearner.jsp) (revision ecfd06ed9f05e30114b9ed8d1600a251bb7681d8) +++ lams_tool_sbmt/web/learner/sbmtlearner.jsp (.../sbmtlearner.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,7 +5,7 @@ - + <fmt:message key="tool.display.name" /> <%@ include file="/common/header.jsp"%> @@ -47,7 +47,7 @@ } - + Index: lams_tool_sbmt/web/monitoring/mark/allmarks.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/monitoring/mark/allmarks.jsp (.../allmarks.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_sbmt/web/monitoring/mark/allmarks.jsp (.../allmarks.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,9 +3,8 @@ <%@include file="/common/taglibs.jsp"%> - + <fmt:message key="activity.title" /> - - +
Index: lams_tool_sbmt/web/monitoring/mark/mark.jsp =================================================================== diff -u -r7156f5be1a717cfb615adb609d24393acf7d4fa5 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/monitoring/mark/mark.jsp (.../mark.jsp) (revision 7156f5be1a717cfb615adb609d24393acf7d4fa5) +++ lams_tool_sbmt/web/monitoring/mark/mark.jsp (.../mark.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,9 +3,8 @@ <%@include file="/common/taglibs.jsp"%> - + <fmt:message key="activity.title" /> - @@ -17,7 +16,7 @@ location.href=act + "?method=newMark&updateMode=listMark&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId+"&reportID="+reportId; } - +

Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp (.../updatemark.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp (.../updatemark.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,11 +3,10 @@ <%@include file="/common/taglibs.jsp"%> - + <fmt:message key="activity.title" /> - - +
Index: lams_tool_sbmt/web/monitoring/monitoring.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_sbmt/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,7 +5,7 @@ <%@ page import="org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants"%> - + <fmt:message key="activity.title" /> @@ -73,7 +73,7 @@ hideBusy(statisticTargetDiv); } - +
Index: lams_tool_sbmt/web/monitoring/notebook.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/monitoring/notebook.jsp (.../notebook.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_sbmt/web/monitoring/notebook.jsp (.../notebook.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,10 +3,10 @@ "http://www.w3.org/TR/html4/strict.dtd"> - + <fmt:message key="page.title.monitoring.view.reflection" /> <%@ include file="/common/header.jsp"%> - + Index: lams_tool_sbmt/web/test.jsp =================================================================== diff -u -rb73ea10c36c8939d404f95b6e39cbcb4efbd64ba -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_sbmt/web/test.jsp (.../test.jsp) (revision b73ea10c36c8939d404f95b6e39cbcb4efbd64ba) +++ lams_tool_sbmt/web/test.jsp (.../test.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -1,7 +1,7 @@ -Learning Design Details +Learning Design Details
Index: lams_tool_scribe/web/WEB-INF/lams.tld =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_scribe/web/WEB-INF/lams.tld (.../lams.tld) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_tool_scribe/web/WEB-INF/lams.tld (.../lams.tld) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_tool_scribe/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_tool_scribe/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_tool_scribe/web/WEB-INF/tags/Head.tag (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -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_tool_scribe/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -ra344998a96d6e983d83047656f74c9f15183643e -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_scribe/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision a344998a96d6e983d83047656f74c9f15183643e) +++ lams_tool_scribe/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_tool_scribe/web/common/header.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_scribe/web/common/header.jsp (.../header.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_scribe/web/common/header.jsp (.../header.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -7,10 +7,10 @@ - + <fmt:message key="activity.title" /> - + Index: lams_tool_scribe/web/common/learnerheader.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_scribe/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_scribe/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -7,12 +7,10 @@ - + <fmt:message key="activity.title" /> - - @@ -23,4 +21,4 @@ - + Index: lams_tool_scribe/web/pages/export/exportPortfolio.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_scribe/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_scribe/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,16 +4,15 @@ <%@ include file="/common/taglibs.jsp"%> - + <c:out value="${scribeDTO.title}" escapeXml="false" /> - - + Index: lams_tool_survey/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_tool_survey/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_tool_survey/web/WEB-INF/tags/Head.tag (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -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_tool_survey/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 825e32a1131e134c0e2d560418cc349973b3702f) +++ lams_tool_survey/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_tool_survey/web/common/header.jsp =================================================================== diff -u -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/common/header.jsp (.../header.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) +++ lams_tool_survey/web/common/header.jsp (.../header.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,15 +4,6 @@ - - - - - - - - - Index: lams_tool_survey/web/common/tabbedheader.jsp =================================================================== diff -u -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) +++ lams_tool_survey/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,16 +3,6 @@ - - - - - - - - - - Index: lams_tool_survey/web/pages/authoring/authoring.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_survey/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -14,7 +14,7 @@ %> - + <fmt:message key="label.author.title" /> <%@ include file="/common/tabbedheader.jsp"%> @@ -55,7 +55,7 @@ - +

Index: lams_tool_survey/web/pages/authoring/definelater.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/authoring/definelater.jsp (.../definelater.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_survey/web/pages/authoring/definelater.jsp (.../definelater.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -11,7 +11,7 @@ %> - + <fmt:message key="label.author.title" /> <%@ include file="/common/tabbedheader.jsp"%> @@ -42,7 +42,7 @@ - +
Index: lams_tool_survey/web/pages/authoring/definelaterforbid.jsp =================================================================== diff -u -rb73ea10c36c8939d404f95b6e39cbcb4efbd64ba -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/authoring/definelaterforbid.jsp (.../definelaterforbid.jsp) (revision b73ea10c36c8939d404f95b6e39cbcb4efbd64ba) +++ lams_tool_survey/web/pages/authoring/definelaterforbid.jsp (.../definelaterforbid.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -2,11 +2,11 @@ - + <fmt:message key="label.author.title" /> <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp =================================================================== diff -u -r8cbeece2c8c8f3b9a00842b4193d30d874877412 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp (.../addchoicequestion.jsp) (revision 8cbeece2c8c8f3b9a00842b4193d30d874877412) +++ lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp (.../addchoicequestion.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,7 +4,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> <%-- user for surveysurveyitem.js --%> @@ -14,7 +14,7 @@ - + Index: lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp =================================================================== diff -u -r8cbeece2c8c8f3b9a00842b4193d30d874877412 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp (.../addopenquestion.jsp) (revision 8cbeece2c8c8f3b9a00842b4193d30d874877412) +++ lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp (.../addopenquestion.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,7 +4,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> @@ -16,7 +16,7 @@ - + Index: lams_tool_survey/web/pages/export/exportportfolio.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_survey/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -8,9 +8,9 @@ - + <%@ include file="/common/header.jsp" %> - +

Index: lams_tool_survey/web/pages/learning/definelater.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/learning/definelater.jsp (.../definelater.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_survey/web/pages/learning/definelater.jsp (.../definelater.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,10 +4,10 @@ <%@include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_survey/web/pages/learning/learning.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/learning/learning.jsp (.../learning.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_survey/web/pages/learning/learning.jsp (.../learning.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,7 +3,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> @@ -26,7 +26,7 @@ } --> - + Index: lams_tool_survey/web/pages/learning/notebook.jsp =================================================================== diff -u -recfd06ed9f05e30114b9ed8d1600a251bb7681d8 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision ecfd06ed9f05e30114b9ed8d1600a251bb7681d8) +++ lams_tool_survey/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,15 +3,15 @@ "http://www.w3.org/TR/html4/strict.dtd"> - + <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> - + Index: lams_tool_survey/web/pages/learning/result.jsp =================================================================== diff -u -rb5128351d7fc3dce7a7ccd6b7a3374adfdba9774 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/learning/result.jsp (.../result.jsp) (revision b5128351d7fc3dce7a7ccd6b7a3374adfdba9774) +++ lams_tool_survey/web/pages/learning/result.jsp (.../result.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,7 +4,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> @@ -29,7 +29,7 @@ --> - + Index: lams_tool_survey/web/pages/learning/runoffline.jsp =================================================================== diff -u -recfd06ed9f05e30114b9ed8d1600a251bb7681d8 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/learning/runoffline.jsp (.../runoffline.jsp) (revision ecfd06ed9f05e30114b9ed8d1600a251bb7681d8) +++ lams_tool_survey/web/pages/learning/runoffline.jsp (.../runoffline.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -4,7 +4,7 @@ <%@include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_survey/web/pages/monitoring/chartreport.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/monitoring/chartreport.jsp (.../chartreport.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_survey/web/pages/monitoring/chartreport.jsp (.../chartreport.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,9 +5,9 @@ <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.tool.survey.SurveyConstants"%> - + <%@ include file="/common/header.jsp" %> - +

Index: lams_tool_survey/web/pages/monitoring/listanswers.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/monitoring/listanswers.jsp (.../listanswers.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_survey/web/pages/monitoring/listanswers.jsp (.../listanswers.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -6,9 +6,9 @@ <%@ page import="org.lamsfoundation.lams.tool.survey.SurveyConstants"%> - + <%@ include file="/common/header.jsp" %> - +

Index: lams_tool_survey/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_survey/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,7 +5,7 @@ <%@ page import="org.lamsfoundation.lams.tool.survey.SurveyConstants"%> - + <%@ include file="/common/tabbedheader.jsp" %> - +

Index: lams_tool_survey/web/pages/monitoring/notebook.jsp =================================================================== diff -u -rc25a09fb913ad54f4fdf424063e249223b81f4ab -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_survey/web/pages/monitoring/notebook.jsp (.../notebook.jsp) (revision c25a09fb913ad54f4fdf424063e249223b81f4ab) +++ lams_tool_survey/web/pages/monitoring/notebook.jsp (.../notebook.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -3,10 +3,10 @@ "http://www.w3.org/TR/html4/strict.dtd"> - + <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_vote/web/WEB-INF/lams.tld =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/WEB-INF/lams.tld (.../lams.tld) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_tool_vote/web/WEB-INF/lams.tld (.../lams.tld) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_tool_vote/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_tool_vote/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_tool_vote/web/WEB-INF/tags/Head.tag (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -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_tool_vote/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 825e32a1131e134c0e2d560418cc349973b3702f) +++ lams_tool_vote/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - - Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -41,7 +41,7 @@ %> - + <fmt:message key="activity.title"/> <%@ include file="/common/tabbedheader.jsp"%> @@ -115,7 +115,7 @@ - +
Index: lams_tool_vote/web/authoring/editNominationBox.jsp =================================================================== diff -u -r17205f0c699181875f6fcde2d7fc685306dfebb4 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/authoring/editNominationBox.jsp (.../editNominationBox.jsp) (revision 17205f0c699181875f6fcde2d7fc685306dfebb4) +++ lams_tool_vote/web/authoring/editNominationBox.jsp (.../editNominationBox.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -23,10 +23,10 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + Index: lams_tool_vote/web/authoring/newNominationBox.jsp =================================================================== diff -u -r17205f0c699181875f6fcde2d7fc685306dfebb4 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/authoring/newNominationBox.jsp (.../newNominationBox.jsp) (revision 17205f0c699181875f6fcde2d7fc685306dfebb4) +++ lams_tool_vote/web/authoring/newNominationBox.jsp (.../newNominationBox.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -23,10 +23,10 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + - - - - - - - - - - Index: lams_tool_vote/web/common/tabbedheader.jsp =================================================================== diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 825e32a1131e134c0e2d560418cc349973b3702f) +++ lams_tool_vote/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -7,16 +7,6 @@ - - - - - - - - - - Index: lams_tool_vote/web/export/exportportfolio.jsp =================================================================== diff -u -rf89e6168c312c16ee2796922e8b668cea52b1358 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision f89e6168c312c16ee2796922e8b668cea52b1358) +++ lams_tool_vote/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -25,11 +25,10 @@ <%@ include file="/common/taglibs.jsp"%> - - + <fmt:message key="label.export"/> - + Index: lams_tool_vote/web/includes/layout.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/includes/layout.jsp (.../layout.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_vote/web/includes/layout.jsp (.../layout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,10 +5,10 @@ <%@ taglib uri="tags-tiles" prefix="tiles"%> - + <fmt:message key="activity.title" /> <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_vote/web/includes/learnerLayout.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/includes/learnerLayout.jsp (.../learnerLayout.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_vote/web/includes/learnerLayout.jsp (.../learnerLayout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -10,7 +10,7 @@ - + <fmt:message key="activity.title" /> <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_vote/web/includes/tablayout.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/includes/tablayout.jsp (.../tablayout.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_vote/web/includes/tablayout.jsp (.../tablayout.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -5,12 +5,12 @@ <%@ taglib uri="tags-tiles" prefix="tiles"%> - + <fmt:message key="activity.title" /> <%@ include file="/common/tabbedheader.jsp"%> - +
Index: lams_tool_vote/web/learning/AllNominations.jsp =================================================================== diff -u -r67117a07cbd493af6e4b14edb160170727661445 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/learning/AllNominations.jsp (.../AllNominations.jsp) (revision 67117a07cbd493af6e4b14edb160170727661445) +++ lams_tool_vote/web/learning/AllNominations.jsp (.../AllNominations.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,9 +32,8 @@ - + - @@ -51,7 +50,7 @@ document.VoteLearningForm.submit(); } - + Index: lams_tool_vote/web/learning/AnswersContent.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_vote/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,9 +32,8 @@ - + - <fmt:message key="activity.title" /> @@ -95,7 +94,7 @@ document.VoteLearningForm.submit(); } - + Index: lams_tool_vote/web/learning/ExitLearning.jsp =================================================================== diff -u -r23957c919309e85a064474ab19c09373cbe0e03b -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/learning/ExitLearning.jsp (.../ExitLearning.jsp) (revision 23957c919309e85a064474ab19c09373cbe0e03b) +++ lams_tool_vote/web/learning/ExitLearning.jsp (.../ExitLearning.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,9 +32,8 @@ - + - @@ -51,7 +50,7 @@ document.VoteLearningForm.submit(); } - +
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,9 +32,8 @@ - + - <fmt:message key="activity.title" /> @@ -46,7 +45,7 @@ document.VoteLearningForm.submit(); } - +
Index: lams_tool_vote/web/learning/Notebook.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/learning/Notebook.jsp (.../Notebook.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_vote/web/learning/Notebook.jsp (.../Notebook.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,9 +32,8 @@ - + - <fmt:message key="activity.title" /> @@ -47,7 +46,7 @@ } - + - + - @@ -51,7 +50,7 @@ document.VoteLearningForm.submit(); } - + Index: lams_tool_vote/web/learning/RunOffline.jsp =================================================================== diff -u -r67117a07cbd493af6e4b14edb160170727661445 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/learning/RunOffline.jsp (.../RunOffline.jsp) (revision 67117a07cbd493af6e4b14edb160170727661445) +++ lams_tool_vote/web/learning/RunOffline.jsp (.../RunOffline.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,9 +32,8 @@ - + - <fmt:message key="activity.title" /> @@ -48,7 +47,7 @@ } - + Index: lams_tool_vote/web/learning/defineLater.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/learning/defineLater.jsp (.../defineLater.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_vote/web/learning/defineLater.jsp (.../defineLater.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,13 +32,12 @@ - + - <fmt:message key="activity.title" /> - +
Index: lams_tool_vote/web/monitoring/LearnerNotebook.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/monitoring/LearnerNotebook.jsp (.../LearnerNotebook.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_vote/web/monitoring/LearnerNotebook.jsp (.../LearnerNotebook.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -32,13 +32,12 @@ - + - <fmt:message key="activity.title" /> - + Index: lams_tool_vote/web/monitoring/LearnerRep.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/monitoring/LearnerRep.jsp (.../LearnerRep.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_vote/web/monitoring/LearnerRep.jsp (.../LearnerRep.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -25,7 +25,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <fmt:message key="label.learning.report"/> <%@ include file="/common/header.jsp"%> @@ -49,7 +49,7 @@ //--> - +
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -38,7 +38,7 @@ %> - + <fmt:message key="label.monitoring"/> @@ -138,7 +138,7 @@ - + Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp =================================================================== diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp (.../VoteNominationViewer.jsp) (revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de) +++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp (.../VoteNominationViewer.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -26,13 +26,13 @@ <%@ include file="/common/taglibs.jsp"%> - + <fmt:message key="label.learnersVoted"/> <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_vote/web/monitoring/editNominationBox.jsp =================================================================== diff -u -r17205f0c699181875f6fcde2d7fc685306dfebb4 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/monitoring/editNominationBox.jsp (.../editNominationBox.jsp) (revision 17205f0c699181875f6fcde2d7fc685306dfebb4) +++ lams_tool_vote/web/monitoring/editNominationBox.jsp (.../editNominationBox.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -23,7 +23,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + Index: lams_tool_vote/web/monitoring/newNominationBox.jsp =================================================================== diff -u -r17205f0c699181875f6fcde2d7fc685306dfebb4 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_tool_vote/web/monitoring/newNominationBox.jsp (.../newNominationBox.jsp) (revision 17205f0c699181875f6fcde2d7fc685306dfebb4) +++ lams_tool_vote/web/monitoring/newNominationBox.jsp (.../newNominationBox.jsp) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -23,7 +23,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%@ include file="/common/header.jsp"%> - + Index: lams_www/web/WEB-INF/lams.tld =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_www/web/WEB-INF/lams.tld (.../lams.tld) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_www/web/WEB-INF/lams.tld (.../lams.tld) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -464,5 +464,9 @@ true + + head + /WEB-INF/tags/Head.tag + Index: lams_www/web/WEB-INF/tags/Head.tag =================================================================== diff -u --- lams_www/web/WEB-INF/tags/Head.tag (revision 0) +++ lams_www/web/WEB-INF/tags/Head.tag (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -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_www/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r127b352d99616000ff79eac3a697b1a919ff0d49 -r18e5e690d2e1a7c3d918759f7a2827c8205feaac --- lams_www/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 127b352d99616000ff79eac3a697b1a919ff0d49) +++ lams_www/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac) @@ -42,8 +42,6 @@ - -