Index: lams_tool_survey/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/build.xml,v diff -u -r1.3 -r1.4 --- lams_tool_survey/build.xml 14 Sep 2006 06:44:13 -0000 1.3 +++ lams_tool_survey/build.xml 28 Sep 2006 23:38:36 -0000 1.4 @@ -276,6 +276,15 @@ + + + + + + + + + Index: lams_tool_survey/web/error.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/error.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_survey/web/error.jsp 12 Sep 2006 04:15:18 -0000 1.1 +++ lams_tool_survey/web/error.jsp 28 Sep 2006 23:38:35 -0000 1.2 @@ -51,7 +51,7 @@ <% } %> - +
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag,v diff -u -r1.2 -r1.3 --- lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag 25 Sep 2006 23:20:31 -0000 1.2 +++ lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag 28 Sep 2006 23:38:35 -0000 1.3 @@ -90,4 +90,4 @@

- + \ No newline at end of file Index: lams_tool_survey/web/WEB-INF/tags/Date.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/Date.tag,v diff -u -r1.2 -r1.3 --- lams_tool_survey/web/WEB-INF/tags/Date.tag 25 Sep 2006 23:20:31 -0000 1.2 +++ lams_tool_survey/web/WEB-INF/tags/Date.tag 28 Sep 2006 23:38:35 -0000 1.3 @@ -32,6 +32,21 @@ %> <%@ tag body-content="empty" %> <%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %> +<%@ attribute name="style" required="false" rtexprvalue="true"%> +<%@ attribute name="type" required="false" rtexprvalue="true"%> + <%@ taglib uri="tags-fmt" prefix="fmt" %> - +<%@ taglib uri="tags-core" prefix="c" %> + + + + + + + + + + + + Index: lams_tool_survey/web/WEB-INF/tags/Passon.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/Attic/Passon.tag,v diff -u -r1.2 -r1.3 --- lams_tool_survey/web/WEB-INF/tags/Passon.tag 25 Sep 2006 23:20:31 -0000 1.2 +++ lams_tool_survey/web/WEB-INF/tags/Passon.tag 28 Sep 2006 23:38:35 -0000 1.3 @@ -79,4 +79,4 @@ pluginspage="http://www.macromedia.com/go/getflashplayer" /> - + \ No newline at end of file Index: lams_tool_survey/web/WEB-INF/tags/Tab.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/Tab.tag,v diff -u -r1.2 -r1.3 --- lams_tool_survey/web/WEB-INF/tags/Tab.tag 25 Sep 2006 23:20:31 -0000 1.2 +++ lams_tool_survey/web/WEB-INF/tags/Tab.tag 28 Sep 2006 23:38:35 -0000 1.3 @@ -1,32 +1,32 @@ <%/**************************************************************** - * 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 - * **************************************************************** - */ + * 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 + * **************************************************************** + */ - /** - * Tab.tag - * Author: Mitchell Seaton - * Description: Creates a tab element. - * Wiki: - */ +/** + * Tab.tag + * Author: Mitchell Seaton + * Description: Creates a tab element. + * Wiki: + */ %> <%@ tag body-content="empty"%> Index: lams_tool_survey/web/WEB-INF/tags/TabBody.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/TabBody.tag,v diff -u -r1.2 -r1.3 --- lams_tool_survey/web/WEB-INF/tags/TabBody.tag 25 Sep 2006 23:20:31 -0000 1.2 +++ lams_tool_survey/web/WEB-INF/tags/TabBody.tag 28 Sep 2006 23:38:35 -0000 1.3 @@ -1,32 +1,32 @@ <%/**************************************************************** - * 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 - * **************************************************************** - */ + * 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 + * **************************************************************** + */ - /** - * TabBody.tag - * Author: Mitchell Seaton - * Description: Creates the body container for a tab element - * Wiki: - */ +/** + * TabBody.tag + * Author: Mitchell Seaton + * Description: Creates the body container for a tab element + * Wiki: + */ %> <%@ tag body-content="scriptless"%> Index: lams_tool_survey/web/WEB-INF/tags/Tabs.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/Tabs.tag,v diff -u -r1.2 -r1.3 --- lams_tool_survey/web/WEB-INF/tags/Tabs.tag 25 Sep 2006 23:20:20 -0000 1.2 +++ lams_tool_survey/web/WEB-INF/tags/Tabs.tag 28 Sep 2006 23:38:35 -0000 1.3 @@ -1,32 +1,32 @@ <%/**************************************************************** - * 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 - * **************************************************************** - */ + * 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 + * **************************************************************** + */ - /** - * Tabs.tag - * Author: Mitchell Seaton - * Description: Create a tab list from a input collection or nested Tab tags. - * Wiki: - */ +/** + * Tabs.tag + * Author: Mitchell Seaton + * Description: Create a tab list from a input collection or nested Tab tags. + * Wiki: + */ %> <%@ tag body-content="scriptless"%> Index: lams_tool_survey/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.3 --- lams_tool_survey/web/WEB-INF/tags/headItems.tag 25 Sep 2006 23:20:31 -0000 1.2 +++ lams_tool_survey/web/WEB-INF/tags/headItems.tag 28 Sep 2006 23:38:35 -0000 1.3 @@ -1,32 +1,32 @@ <%/**************************************************************** - * 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 - * **************************************************************** - */ + * 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 + * **************************************************************** + */ - /** - * Standard Head Items - * Author: Fiona Malikoff - * Description: Includes all the standard head items e.g. the - * lams css files, sets the content type, standard javascript files. - */ +/** + * Standard Head Items + * Author: Fiona Malikoff + * Description: Includes all the standard head items e.g. the + * lams css files, sets the content type, standard javascript files. + */ %> <%@ tag body-content="empty"%> @@ -44,12 +44,11 @@ - + + - - Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.3 -r1.4 --- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld 28 Sep 2006 07:38:23 -0000 1.3 +++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld 28 Sep 2006 23:38:35 -0000 1.4 @@ -179,7 +179,15 @@ true + + Output stylesheet based on the user preferences. + style + false + true + + + Index: lams_tool_survey/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/common/tabbedheader.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_survey/web/common/tabbedheader.jsp 28 Sep 2006 23:38:36 -0000 1.1 @@ -0,0 +1,27 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_survey/web/layout/default.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/layout/Attic/default.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_survey/web/layout/default.jsp 12 Sep 2006 04:15:20 -0000 1.1 +++ lams_tool_survey/web/layout/default.jsp 28 Sep 2006 23:38:36 -0000 1.2 @@ -5,7 +5,7 @@ - + Index: lams_tool_survey/web/pages/authoring/authoring.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/authoring.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_survey/web/pages/authoring/authoring.jsp 21 Sep 2006 08:27:56 -0000 1.5 +++ lams_tool_survey/web/pages/authoring/authoring.jsp 28 Sep 2006 23:38:36 -0000 1.6 @@ -17,7 +17,7 @@ <fmt:message key="label.author.title" /> - <%@ include file="/common/header.jsp"%> + <%@ include file="/common/tabbedheader.jsp"%> <%@ include file="/common/fckeditorheader.jsp"%> - + Index: lams_tool_survey/web/pages/export/exportportfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/export/exportportfolio.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_survey/web/pages/export/exportportfolio.jsp 28 Sep 2006 05:44:04 -0000 1.3 +++ lams_tool_survey/web/pages/export/exportportfolio.jsp 28 Sep 2006 23:38:36 -0000 1.4 @@ -12,13 +12,11 @@ <%@ include file="/common/header.jsp" %> -
-

+
+

${sessionMap.title}

-
-
-
+ @@ -110,8 +108,7 @@ <%-- End session table --%> - +
-
Index: lams_tool_survey/web/pages/learning/definelater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/definelater.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_survey/web/pages/learning/definelater.jsp 12 Sep 2006 04:15:18 -0000 1.1 +++ lams_tool_survey/web/pages/learning/definelater.jsp 28 Sep 2006 23:38:35 -0000 1.2 @@ -6,25 +6,20 @@ - + -
-

+
+

${survey.title}

-
-
- -
- Index: lams_tool_survey/web/pages/learning/finish.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/finish.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_survey/web/pages/learning/finish.jsp 12 Sep 2006 04:15:18 -0000 1.1 +++ lams_tool_survey/web/pages/learning/finish.jsp 28 Sep 2006 23:38:35 -0000 1.2 @@ -1,13 +1,13 @@ <%@ include file="/common/taglibs.jsp"%> <%-- This page just for : redir finish page to parent rather that part of the frame --%> - + - + Index: lams_tool_survey/web/pages/learning/learning.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/learning.jsp,v diff -u -r1.7 -r1.8 --- lams_tool_survey/web/pages/learning/learning.jsp 27 Sep 2006 07:11:45 -0000 1.7 +++ lams_tool_survey/web/pages/learning/learning.jsp 28 Sep 2006 23:38:35 -0000 1.8 @@ -26,7 +26,7 @@ --> - + @@ -38,15 +38,12 @@ -
-

- ${sessionMap.title} -

-
-
- -
+
+

+ ${sessionMap.title} +

+

${sessionMap.instructions}

@@ -70,6 +67,8 @@ <%-- Display button according to different situation --%> <%--POSITION: 0=middle of survey, 1=first question, 2=last question, 3=Only one question available--%> + + + +
@@ -104,14 +103,15 @@ - +
- Index: lams_tool_survey/web/pages/learning/notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/notebook.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_survey/web/pages/learning/notebook.jsp 12 Sep 2006 04:15:18 -0000 1.1 +++ lams_tool_survey/web/pages/learning/notebook.jsp 28 Sep 2006 23:38:35 -0000 1.2 @@ -7,19 +7,19 @@ <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> - -
+ + -

+ +
+

${sessionMap.title}

-
-
@@ -49,10 +49,9 @@ - Index: lams_tool_survey/web/pages/learning/result.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/result.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_survey/web/pages/learning/result.jsp 22 Sep 2006 04:21:51 -0000 1.3 +++ lams_tool_survey/web/pages/learning/result.jsp 28 Sep 2006 23:38:35 -0000 1.4 @@ -30,16 +30,13 @@ - -
-

+ + + +
+

${sessionMap.title}

-
-
- - -

${sessionMap.instructions}

@@ -92,6 +89,9 @@

@@ -34,7 +34,7 @@
- +
+ + + +
- +
- - Index: lams_tool_survey/web/pages/learning/runoffline.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/Attic/runoffline.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_survey/web/pages/learning/runoffline.jsp 12 Sep 2006 04:15:18 -0000 1.1 +++ lams_tool_survey/web/pages/learning/runoffline.jsp 28 Sep 2006 23:38:35 -0000 1.2 @@ -21,13 +21,12 @@ - -
-

+ +
+

${sessionMap.title}

-
-
+
@@ -51,10 +50,9 @@ - Index: lams_tool_survey/web/pages/learning/start.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/start.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_survey/web/pages/learning/start.jsp 21 Sep 2006 07:46:41 -0000 1.2 +++ lams_tool_survey/web/pages/learning/start.jsp 28 Sep 2006 23:38:35 -0000 1.3 @@ -1,7 +1,7 @@ <%@ include file="/common/taglibs.jsp"%> - + @@ -15,5 +15,5 @@ - + Index: lams_tool_survey/web/pages/monitoring/chartreport.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/Attic/chartreport.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_survey/web/pages/monitoring/chartreport.jsp 27 Sep 2006 04:41:00 -0000 1.2 +++ lams_tool_survey/web/pages/monitoring/chartreport.jsp 28 Sep 2006 23:38:35 -0000 1.3 @@ -9,13 +9,11 @@ <%@ include file="/common/header.jsp" %> -
-

- -

-
-
-
+
+

+ +

+ <%-- --%> @@ -49,8 +47,7 @@ title=""> - +
- Index: lams_tool_survey/web/pages/monitoring/listanswers.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/listanswers.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_survey/web/pages/monitoring/listanswers.jsp 27 Sep 2006 07:11:45 -0000 1.2 +++ lams_tool_survey/web/pages/monitoring/listanswers.jsp 28 Sep 2006 23:38:35 -0000 1.3 @@ -10,13 +10,11 @@ <%@ include file="/common/header.jsp" %> -
-

+
+

-
-
-
+ @@ -108,7 +106,7 @@
- +

Index: lams_tool_survey/web/pages/monitoring/monitoring.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/monitoring.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_survey/web/pages/monitoring/monitoring.jsp 21 Sep 2006 08:27:56 -0000 1.3 +++ lams_tool_survey/web/pages/monitoring/monitoring.jsp 28 Sep 2006 23:38:36 -0000 1.4 @@ -6,7 +6,7 @@ - <%@ include file="/common/header.jsp" %> + <%@ include file="/common/tabbedheader.jsp" %> - +

Index: lams_tool_survey/web/pages/monitoring/notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/Attic/notebook.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_survey/web/pages/monitoring/notebook.jsp 27 Sep 2006 07:44:19 -0000 1.2 +++ lams_tool_survey/web/pages/monitoring/notebook.jsp 28 Sep 2006 23:38:36 -0000 1.3 @@ -7,13 +7,13 @@ <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> - -
-

+ + +
+

-
-
+

@@ -50,9 +50,8 @@
- - + \ No newline at end of file Index: lams_tool_vote/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/build.xml,v diff -u -r1.7 -r1.8 --- lams_tool_vote/build.xml 20 Sep 2006 01:11:18 -0000 1.7 +++ lams_tool_vote/build.xml 28 Sep 2006 23:38:56 -0000 1.8 @@ -292,6 +292,15 @@ todir="${jboss.deploy}"/> + + + + + + + + + @@ -467,4 +476,15 @@ + + + + + + + + + \ No newline at end of file Index: lams_tool_vote/web/Template.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/Attic/Template.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_vote/web/Template.jsp 17 Sep 2006 06:29:21 -0000 1.3 +++ lams_tool_vote/web/Template.jsp 28 Sep 2006 23:38:56 -0000 1.4 @@ -35,7 +35,7 @@ - + Index: lams_tool_vote/web/error.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/error.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_vote/web/error.jsp 26 Sep 2006 02:26:48 -0000 1.3 +++ lams_tool_vote/web/error.jsp 28 Sep 2006 23:38:56 -0000 1.4 @@ -72,7 +72,7 @@ <% } %> - + Index: lams_tool_vote/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/Attic/lams.tld,v diff -u -r1.7 -r1.8 --- lams_tool_vote/web/WEB-INF/lams.tld 26 Sep 2006 02:26:47 -0000 1.7 +++ lams_tool_vote/web/WEB-INF/lams.tld 28 Sep 2006 23:38:56 -0000 1.8 @@ -13,6 +13,26 @@ + Converts role name into form usable as message resources key + Converts role name into form usable as message resources key + + + role + org.lamsfoundation.lams.web.tag.RoleTag + empty + + + Converts role name into form usable as message resources key + role + true + + true + + + + + + Output the Server URL as defined in the lams.xml configuration file. LAMS URL @@ -64,6 +84,34 @@ + Help tag + Help tag + + + help + org.lamsfoundation.lams.web.tag.HelpTag + empty + + + Help tag + module + true + + true + + + + Help tag + toolSignature + true + + true + + + + + + Output a random number for the learner and passon flash movies to communicate directly. generate unique ID @@ -131,7 +179,15 @@ true + + Output stylesheet based on the user preferences. + style + false + true + + + Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag,v diff -u -r1.5 -r1.6 --- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag 26 Sep 2006 02:26:48 -0000 1.5 +++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag 28 Sep 2006 23:38:56 -0000 1.6 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA * * http://www.gnu.org/licenses/gpl.txt Index: lams_tool_vote/web/WEB-INF/tags/Date.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/Date.tag,v diff -u -r1.4 -r1.5 --- lams_tool_vote/web/WEB-INF/tags/Date.tag 26 Sep 2006 02:26:48 -0000 1.4 +++ lams_tool_vote/web/WEB-INF/tags/Date.tag 28 Sep 2006 23:38:56 -0000 1.5 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA * * http://www.gnu.org/licenses/gpl.txt Index: lams_tool_vote/web/WEB-INF/tags/DefineLater.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/DefineLater.tag,v diff -u -r1.3 -r1.4 --- lams_tool_vote/web/WEB-INF/tags/DefineLater.tag 26 Sep 2006 02:26:48 -0000 1.3 +++ lams_tool_vote/web/WEB-INF/tags/DefineLater.tag 28 Sep 2006 23:38:56 -0000 1.4 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA * * http://www.gnu.org/licenses/gpl.txt Index: lams_tool_vote/web/WEB-INF/tags/ExportPortOutput.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/Attic/ExportPortOutput.tag,v diff -u -r1.3 -r1.4 Binary files differ Index: lams_tool_vote/web/WEB-INF/tags/Passon.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/Attic/Passon.tag,v diff -u -r1.3 -r1.4 Binary files differ Index: lams_tool_vote/web/WEB-INF/tags/Tab.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/Tab.tag,v diff -u -r1.4 -r1.5 --- lams_tool_vote/web/WEB-INF/tags/Tab.tag 26 Sep 2006 02:26:48 -0000 1.4 +++ lams_tool_vote/web/WEB-INF/tags/Tab.tag 28 Sep 2006 23:38:56 -0000 1.5 @@ -1,32 +1,32 @@ <%/**************************************************************** - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ + * 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 + * **************************************************************** + */ - /** - * Tab.tag - * Author: Mitchell Seaton - * Description: Creates a tab element. - * Wiki: - */ +/** + * Tab.tag + * Author: Mitchell Seaton + * Description: Creates a tab element. + * Wiki: + */ %> <%@ tag body-content="empty"%> Index: lams_tool_vote/web/WEB-INF/tags/TabBody.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/TabBody.tag,v diff -u -r1.4 -r1.5 --- lams_tool_vote/web/WEB-INF/tags/TabBody.tag 26 Sep 2006 02:26:48 -0000 1.4 +++ lams_tool_vote/web/WEB-INF/tags/TabBody.tag 28 Sep 2006 23:38:56 -0000 1.5 @@ -1,32 +1,32 @@ <%/**************************************************************** - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ + * 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 + * **************************************************************** + */ - /** - * TabBody.tag - * Author: Mitchell Seaton - * Description: Creates the body container for a tab element - * Wiki: - */ +/** + * TabBody.tag + * Author: Mitchell Seaton + * Description: Creates the body container for a tab element + * Wiki: + */ %> <%@ tag body-content="scriptless"%> Index: lams_tool_vote/web/WEB-INF/tags/Tabs.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/Tabs.tag,v diff -u -r1.4 -r1.5 --- lams_tool_vote/web/WEB-INF/tags/Tabs.tag 26 Sep 2006 02:26:48 -0000 1.4 +++ lams_tool_vote/web/WEB-INF/tags/Tabs.tag 28 Sep 2006 23:38:56 -0000 1.5 @@ -1,32 +1,32 @@ <%/**************************************************************** - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ + * 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 + * **************************************************************** + */ - /** - * Tabs.tag - * Author: Mitchell Seaton - * Description: Create a tab list from a input collection or nested Tab tags. - * Wiki: - */ +/** + * Tabs.tag + * Author: Mitchell Seaton + * Description: Create a tab list from a input collection or nested Tab tags. + * Wiki: + */ %> <%@ tag body-content="scriptless"%> Index: lams_tool_vote/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/headItems.tag,v diff -u -r1.6 -r1.7 --- lams_tool_vote/web/WEB-INF/tags/headItems.tag 26 Sep 2006 02:26:48 -0000 1.6 +++ lams_tool_vote/web/WEB-INF/tags/headItems.tag 28 Sep 2006 23:38:56 -0000 1.7 @@ -1,32 +1,32 @@ <%/**************************************************************** - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ + * 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 + * **************************************************************** + */ - /** - * Standard Head Items - * Author: Fiona Malikoff - * Description: Includes all the standard head items e.g. the - * lams css files, sets the content type, standard javascript files. - */ +/** + * Standard Head Items + * Author: Fiona Malikoff + * Description: Includes all the standard head items e.g. the + * lams css files, sets the content type, standard javascript files. + */ %> <%@ tag body-content="empty"%> @@ -44,7 +44,8 @@ - + + Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/AuthoringMaincontent.jsp,v diff -u -r1.24 -r1.25 --- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp 26 Sep 2006 02:26:48 -0000 1.24 +++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp 28 Sep 2006 23:38:56 -0000 1.25 @@ -44,7 +44,7 @@ <bean:message key="activity.title"/> - <%@ include file="/common/header.jsp"%> + <%@ include file="/common/tabbedheader.jsp"%> @@ -125,7 +125,7 @@ - +

Index: lams_tool_vote/web/authoring/editNominationBox.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/editNominationBox.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_vote/web/authoring/editNominationBox.jsp 26 Sep 2006 02:26:48 -0000 1.1 +++ lams_tool_vote/web/authoring/editNominationBox.jsp 28 Sep 2006 23:38:56 -0000 1.2 @@ -27,7 +27,7 @@ <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_vote/web/authoring/newNominationBox.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/newNominationBox.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_vote/web/authoring/newNominationBox.jsp 26 Sep 2006 02:26:48 -0000 1.1 +++ lams_tool_vote/web/authoring/newNominationBox.jsp 28 Sep 2006 23:38:56 -0000 1.2 @@ -27,7 +27,7 @@ <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_vote/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/common/tabbedheader.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_vote/web/common/tabbedheader.jsp 28 Sep 2006 23:38:56 -0000 1.1 @@ -0,0 +1,36 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%@ include file="/common/fckeditorheader.jsp"%> + Index: lams_tool_vote/web/export/exportportfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/export/exportportfolio.jsp,v diff -u -r1.11 -r1.12 --- lams_tool_vote/web/export/exportportfolio.jsp 17 Sep 2006 06:29:23 -0000 1.11 +++ lams_tool_vote/web/export/exportportfolio.jsp 28 Sep 2006 23:38:56 -0000 1.12 @@ -29,26 +29,21 @@ <bean:message key="label.export"/> - + -
- -

+
+ +

-
-
- -
-
@@ -67,11 +62,9 @@ - - Index: lams_tool_vote/web/includes/layout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/includes/Attic/layout.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_vote/web/includes/layout.jsp 26 Sep 2006 02:26:48 -0000 1.1 +++ lams_tool_vote/web/includes/layout.jsp 28 Sep 2006 23:38:56 -0000 1.2 @@ -9,7 +9,7 @@ <bean:message key="activity.title" /> <%@ include file="/common/header.jsp"%> - +
Index: lams_tool_vote/web/includes/learnerLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/includes/Attic/learnerLayout.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_vote/web/includes/learnerLayout.jsp 26 Sep 2006 02:26:48 -0000 1.1 +++ lams_tool_vote/web/includes/learnerLayout.jsp 28 Sep 2006 23:38:56 -0000 1.2 @@ -25,9 +25,10 @@ - -
+ +
- + + Index: lams_tool_vote/web/includes/tablayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/includes/Attic/tablayout.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_vote/web/includes/tablayout.jsp 26 Sep 2006 02:26:48 -0000 1.1 +++ lams_tool_vote/web/includes/tablayout.jsp 28 Sep 2006 23:38:56 -0000 1.2 @@ -7,12 +7,12 @@ <bean:message key="activity.title" /> - <%@ include file="/common/header.jsp"%> + <%@ include file="/common/tabbedheader.jsp"%> - +
Index: lams_tool_vote/web/layout/default.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/layout/Attic/default.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_vote/web/layout/default.jsp 29 Jun 2006 00:38:10 -0000 1.1 +++ lams_tool_vote/web/layout/default.jsp 28 Sep 2006 23:38:55 -0000 1.2 @@ -5,7 +5,7 @@ - + Index: lams_tool_vote/web/learning/AllNominations.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v diff -u -r1.25 -r1.26 --- lams_tool_vote/web/learning/AllNominations.jsp 17 Sep 2006 06:29:16 -0000 1.25 +++ lams_tool_vote/web/learning/AllNominations.jsp 28 Sep 2006 23:38:56 -0000 1.26 @@ -34,7 +34,8 @@ - + + <bean:message key="activity.title" /> - -
+ -

+
+ +

-
- -
- @@ -259,9 +257,8 @@
- + -
Index: lams_tool_vote/web/learning/AnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AnswersContent.jsp,v diff -u -r1.22 -r1.23 --- lams_tool_vote/web/learning/AnswersContent.jsp 17 Sep 2006 06:29:16 -0000 1.22 +++ lams_tool_vote/web/learning/AnswersContent.jsp 28 Sep 2006 23:38:56 -0000 1.23 @@ -34,7 +34,8 @@ - + + <bean:message key="activity.title" /> - -
+ -

- -

-
-
+
+ +

+ +

@@ -183,9 +183,8 @@
- + -
Index: lams_tool_vote/web/learning/ExitLearning.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v diff -u -r1.12 -r1.13 --- lams_tool_vote/web/learning/ExitLearning.jsp 17 Sep 2006 06:29:16 -0000 1.12 +++ lams_tool_vote/web/learning/ExitLearning.jsp 28 Sep 2006 23:38:56 -0000 1.13 @@ -34,7 +34,8 @@ - + + <bean:message key="activity.title" /> - -
+ -

+ + +
+

-
- -
@@ -112,9 +112,7 @@
- - -
+ Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/IndividualLearnerResults.jsp,v diff -u -r1.18 -r1.19 --- lams_tool_vote/web/learning/IndividualLearnerResults.jsp 17 Sep 2006 06:29:16 -0000 1.18 +++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp 28 Sep 2006 23:38:56 -0000 1.19 @@ -34,7 +34,8 @@ - + + <bean:message key="activity.title" /> - -
+ -

+ +
+ +

-
- -
- @@ -121,9 +120,8 @@
- + -
Index: lams_tool_vote/web/learning/LearnerRep.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Attic/LearnerRep.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_vote/web/learning/LearnerRep.jsp 17 Sep 2006 06:29:16 -0000 1.5 +++ lams_tool_vote/web/learning/LearnerRep.jsp 28 Sep 2006 23:38:56 -0000 1.6 @@ -34,7 +34,8 @@ - + + <bean:message key="activity.title" /> - -
- -

+ + +
+ +

-
- -
- -

@@ -172,10 +169,8 @@ + - - - Index: lams_tool_vote/web/learning/Notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Notebook.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_vote/web/learning/Notebook.jsp 17 Sep 2006 06:29:16 -0000 1.2 +++ lams_tool_vote/web/learning/Notebook.jsp 28 Sep 2006 23:38:56 -0000 1.3 @@ -34,7 +34,8 @@ - + + <bean:message key="activity.title" /> - +
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp,v diff -u -r1.13 -r1.14 --- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp 26 Sep 2006 02:26:47 -0000 1.13 +++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp 28 Sep 2006 23:38:55 -0000 1.14 @@ -42,7 +42,7 @@ <bean:message key="label.monitoring"/> - <%@ include file="/common/header.jsp"%> + <%@ include file="/common/tabbedheader.jsp"%> @@ -143,7 +143,7 @@ - +
Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/VoteNominationViewer.jsp,v diff -u -r1.7 -r1.8 --- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp 26 Sep 2006 02:26:47 -0000 1.7 +++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp 28 Sep 2006 23:38:55 -0000 1.8 @@ -34,7 +34,7 @@ - +
Index: lams_tool_vote/web/monitoring/editNominationBox.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/editNominationBox.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_vote/web/monitoring/editNominationBox.jsp 26 Sep 2006 02:26:47 -0000 1.1 +++ lams_tool_vote/web/monitoring/editNominationBox.jsp 28 Sep 2006 23:38:55 -0000 1.2 @@ -40,7 +40,7 @@ - +
Index: lams_tool_vote/web/monitoring/newNominationBox.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/newNominationBox.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_vote/web/monitoring/newNominationBox.jsp 26 Sep 2006 02:26:47 -0000 1.1 +++ lams_tool_vote/web/monitoring/newNominationBox.jsp 28 Sep 2006 23:38:55 -0000 1.2 @@ -40,7 +40,7 @@ - +
Index: lams_www/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_www/build.xml,v diff -u -r1.1 -r1.2 --- lams_www/build.xml 8 Aug 2006 02:33:42 -0000 1.1 +++ lams_www/build.xml 28 Sep 2006 23:44:02 -0000 1.2 @@ -100,5 +100,15 @@ + + + + + + + + + + Index: lams_www/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/Attic/lams.tld,v diff -u -r1.2 -r1.3 --- lams_www/web/WEB-INF/lams.tld 23 Aug 2006 07:45:09 -0000 1.2 +++ lams_www/web/WEB-INF/lams.tld 28 Sep 2006 23:44:02 -0000 1.3 @@ -13,6 +13,26 @@ + Converts role name into form usable as message resources key + Converts role name into form usable as message resources key + + + role + org.lamsfoundation.lams.web.tag.RoleTag + empty + + + Converts role name into form usable as message resources key + role + true + + true + + + + + + Output the Server URL as defined in the lams.xml configuration file. LAMS URL @@ -24,6 +44,74 @@ + converts text from \n or \r\n to <BR> before rendering + converts text from \n or \r\n to <BR> before rendering + + + out + org.lamsfoundation.lams.web.tag.MultiLinesOutputTag + empty + + + converts text from \n or \r\n to <BR> before rendering + value + true + + true + + + + + + + Render html tag with direction and language + Render html tag with direction and language + + + html + org.lamsfoundation.lams.web.tag.HtmlTag + JSP + + + Render html tag with direction and language + xhtml + false + + true + + + + + + + Help tag + Help tag + + + help + org.lamsfoundation.lams.web.tag.HelpTag + empty + + + Help tag + module + true + + true + + + + Help tag + toolSignature + true + + true + + + + + + Output a random number for the learner and passon flash movies to communicate directly. generate unique ID @@ -91,7 +179,15 @@ true + + Output stylesheet based on the user preferences. + style + false + true + + + @@ -287,14 +383,10 @@ /WEB-INF/tags/TabBody.tag - HTMLEditor - /WEB-INF/tags/HTMLEditor.tag + FCKEditor + /WEB-INF/tags/FCKEditor.tag - SetEditor - /WEB-INF/tags/SetEditor.tag - - AuthoringButton /WEB-INF/tags/AuthoringButton.tag @@ -310,8 +402,13 @@ ExportPortOutput /WEB-INF/tags/ExportPortOutput.tag - + Date /WEB-INF/tags/Date.tag + + DefineLater + /WEB-INF/tags/DefineLater.tag + + Index: lams_www/web/WEB-INF/tags/AuthoringButton.tag =================================================================== RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/AuthoringButton.tag,v diff -u -r1.2 -r1.3 --- lams_www/web/WEB-INF/tags/AuthoringButton.tag 17 Sep 2006 06:31:29 -0000 1.2 +++ lams_www/web/WEB-INF/tags/AuthoringButton.tag 28 Sep 2006 23:44:02 -0000 1.3 @@ -37,6 +37,7 @@ <%@ attribute name="formID" required="true" rtexprvalue="true" %> <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %> <%@ attribute name="toolContentID" required="true" rtexprvalue="true" %> +<%@ attribute name="contentFolderID" required="true" rtexprvalue="true" %> <%@ attribute name="clearSessionActionUrl" required="true" rtexprvalue="true" %> <%-- Optional attribute --%> @@ -64,7 +65,7 @@ -

+

Index: lams_www/web/WEB-INF/tags/Date.tag =================================================================== RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/Date.tag,v diff -u -r1.2 -r1.3 --- lams_www/web/WEB-INF/tags/Date.tag 17 Sep 2006 06:31:29 -0000 1.2 +++ lams_www/web/WEB-INF/tags/Date.tag 28 Sep 2006 23:44:02 -0000 1.3 @@ -32,6 +32,21 @@ %> <%@ tag body-content="empty" %> <%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %> +<%@ attribute name="style" required="false" rtexprvalue="true"%> +<%@ attribute name="type" required="false" rtexprvalue="true"%> + <%@ taglib uri="tags-fmt" prefix="fmt" %> - +<%@ taglib uri="tags-core" prefix="c" %> + + + + + + + + + + + + Index: lams_www/web/WEB-INF/tags/FCKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/Attic/FCKEditor.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_www/web/WEB-INF/tags/FCKEditor.tag 28 Sep 2006 23:44:02 -0000 1.1 @@ -0,0 +1,57 @@ +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="fck-editor" prefix="fck"%> + +<%@ attribute name="id" required="true" rtexprvalue="true"%> +<%@ attribute name="value" required="true" rtexprvalue="true"%> +<%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%> +<%@ attribute name="contentFolderID" required="true" rtexprvalue="true"%> + + + + + + + + + + + + + + + ${value} + + + + + Index: lams_www/web/WEB-INF/tags/Tab.tag =================================================================== RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/Tab.tag,v diff -u -r1.2 -r1.3 --- lams_www/web/WEB-INF/tags/Tab.tag 17 Sep 2006 06:31:29 -0000 1.2 +++ lams_www/web/WEB-INF/tags/Tab.tag 28 Sep 2006 23:44:02 -0000 1.3 @@ -1,32 +1,32 @@ <%/**************************************************************** - * 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 - * **************************************************************** - */ + * 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 + * **************************************************************** + */ - /** - * Tab.tag - * Author: Mitchell Seaton - * Description: Creates a tab element. - * Wiki: - */ +/** + * Tab.tag + * Author: Mitchell Seaton + * Description: Creates a tab element. + * Wiki: + */ %> <%@ tag body-content="empty"%> Index: lams_www/web/WEB-INF/tags/TabBody.tag =================================================================== RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/TabBody.tag,v diff -u -r1.2 -r1.3 --- lams_www/web/WEB-INF/tags/TabBody.tag 17 Sep 2006 06:31:29 -0000 1.2 +++ lams_www/web/WEB-INF/tags/TabBody.tag 28 Sep 2006 23:44:02 -0000 1.3 @@ -1,32 +1,32 @@ <%/**************************************************************** - * 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 - * **************************************************************** - */ + * 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 + * **************************************************************** + */ - /** - * TabBody.tag - * Author: Mitchell Seaton - * Description: Creates the body container for a tab element - * Wiki: - */ +/** + * TabBody.tag + * Author: Mitchell Seaton + * Description: Creates the body container for a tab element + * Wiki: + */ %> <%@ tag body-content="scriptless"%> Index: lams_www/web/WEB-INF/tags/Tabs.tag =================================================================== RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/Tabs.tag,v diff -u -r1.2 -r1.3 --- lams_www/web/WEB-INF/tags/Tabs.tag 17 Sep 2006 06:31:29 -0000 1.2 +++ lams_www/web/WEB-INF/tags/Tabs.tag 28 Sep 2006 23:44:02 -0000 1.3 @@ -1,32 +1,32 @@ <%/**************************************************************** - * 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 - * **************************************************************** - */ + * 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 + * **************************************************************** + */ - /** - * Tabs.tag - * Author: Mitchell Seaton - * Description: Create a tab list from a input collection or nested Tab tags. - * Wiki: - */ +/** + * Tabs.tag + * Author: Mitchell Seaton + * Description: Create a tab list from a input collection or nested Tab tags. + * Wiki: + */ %> <%@ tag body-content="scriptless"%> Index: lams_www/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/headItems.tag,v diff -u -r1.3 -r1.4 --- lams_www/web/WEB-INF/tags/headItems.tag 17 Sep 2006 06:31:29 -0000 1.3 +++ lams_www/web/WEB-INF/tags/headItems.tag 28 Sep 2006 23:44:02 -0000 1.4 @@ -1,32 +1,32 @@ <%/**************************************************************** - * 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 - * **************************************************************** - */ + * 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 + * **************************************************************** + */ - /** - * Standard Head Items - * Author: Fiona Malikoff - * Description: Includes all the standard head items e.g. the - * lams css files, sets the content type, standard javascript files. - */ +/** + * Standard Head Items + * Author: Fiona Malikoff + * Description: Includes all the standard head items e.g. the + * lams css files, sets the content type, standard javascript files. + */ %> <%@ tag body-content="empty"%> @@ -44,7 +44,8 @@ - + +