Index: lams_tool_scribe/web/error.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/error.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_scribe/web/error.jsp 15 Sep 2006 03:09:53 -0000 1.1 +++ lams_tool_scribe/web/error.jsp 29 Sep 2006 02:44:37 -0000 1.2 @@ -51,7 +51,7 @@ <% } %> - +
Index: lams_tool_scribe/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/Attic/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_scribe/web/WEB-INF/lams.tld 21 Sep 2006 08:27:55 -0000 1.2 +++ lams_tool_scribe/web/WEB-INF/lams.tld 29 Sep 2006 02:44:37 -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 @@ -159,7 +179,15 @@ true + + Output stylesheet based on the user preferences. + style + false + true + + + @@ -381,6 +409,6 @@ DefineLater /WEB-INF/tags/DefineLater.tag - + Index: lams_tool_scribe/web/WEB-INF/struts/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/struts/Attic/struts-config.xml,v diff -u -r1.1 -r1.2 --- lams_tool_scribe/web/WEB-INF/struts/struts-config.xml 15 Sep 2006 03:09:52 -0000 1.1 +++ lams_tool_scribe/web/WEB-INF/struts/struts-config.xml 29 Sep 2006 02:44:38 -0000 1.2 @@ -94,6 +94,16 @@ path="tiles:/generic/message" redirect="false" /> + + - + @@ -49,6 +49,9 @@ + + + @@ -97,22 +100,18 @@ - - - - Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag,v diff -u -r1.3 -r1.4 --- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag 25 Sep 2006 06:04:44 -0000 1.3 +++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag 29 Sep 2006 02:44:37 -0000 1.4 @@ -82,12 +82,12 @@ } } -

+

- + \ No newline at end of file Index: lams_tool_scribe/web/WEB-INF/tags/Date.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/Date.tag,v diff -u -r1.2 -r1.3 --- lams_tool_scribe/web/WEB-INF/tags/Date.tag 17 Sep 2006 06:28:16 -0000 1.2 +++ lams_tool_scribe/web/WEB-INF/tags/Date.tag 29 Sep 2006 02:44:37 -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_scribe/web/WEB-INF/tags/Passon.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/Attic/Passon.tag,v diff -u -r1.2 -r1.3 --- lams_tool_scribe/web/WEB-INF/tags/Passon.tag 17 Sep 2006 06:28:16 -0000 1.2 +++ lams_tool_scribe/web/WEB-INF/tags/Passon.tag 29 Sep 2006 02:44:37 -0000 1.3 @@ -79,4 +79,4 @@ pluginspage="http://www.macromedia.com/go/getflashplayer" /> - + \ No newline at end of file Index: lams_tool_scribe/web/WEB-INF/tags/Tab.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/Tab.tag,v diff -u -r1.2 -r1.3 --- lams_tool_scribe/web/WEB-INF/tags/Tab.tag 17 Sep 2006 06:28:16 -0000 1.2 +++ lams_tool_scribe/web/WEB-INF/tags/Tab.tag 29 Sep 2006 02:44:37 -0000 1.3 @@ -1,35 +1,34 @@ +<%/**************************************************************** + * 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"%> <%@ attribute name="id" required="true" rtexprvalue="true"%> <%@ attribute name="value" required="false" rtexprvalue="true"%> @@ -38,17 +37,18 @@ <%@ attribute name="methodCall" required="false" rtexprvalue="true"%> <%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-bean" prefix="bean"%> <%@ taglib uri="tags-lams" prefix="lams"%> + + + -<% - // Usually methodCall is selectTab, but the calling code can override methodCall if desired. - // this is handy if the page needs different logic on initialisation and user switching tabs -%> +<%// Usually methodCall is selectTab, but the calling code can override methodCall if desired. + // this is handy if the page needs different logic on initialisation and user switching tabs %> @@ -62,19 +62,38 @@ - + - <%-- TODO need to reimplement inactive tabs --%> + + + + +
Index: lams_tool_scribe/web/WEB-INF/tags/TabBody.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/TabBody.tag,v diff -u -r1.2 -r1.3 --- lams_tool_scribe/web/WEB-INF/tags/TabBody.tag 17 Sep 2006 06:28:16 -0000 1.2 +++ lams_tool_scribe/web/WEB-INF/tags/TabBody.tag 29 Sep 2006 02:44:37 -0000 1.3 @@ -1,35 +1,34 @@ +<%/**************************************************************** + * 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"%> <%@ attribute name="id" required="true" rtexprvalue="true"%> <%@ attribute name="tabTitle" required="false" rtexprvalue="true"%> @@ -48,5 +47,6 @@ + Index: lams_tool_scribe/web/WEB-INF/tags/Tabs.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/Tabs.tag,v diff -u -r1.2 -r1.3 --- lams_tool_scribe/web/WEB-INF/tags/Tabs.tag 17 Sep 2006 06:28:16 -0000 1.2 +++ lams_tool_scribe/web/WEB-INF/tags/Tabs.tag 29 Sep 2006 02:44:37 -0000 1.3 @@ -1,38 +1,36 @@ +<%/**************************************************************** + * 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"%> -<%@ attribute name="collection" type="java.util.Collection" - required="false" rtexprvalue="true"%> +<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%> <%@ attribute name="control" required="false" rtexprvalue="true"%> <%@ attribute name="useKey" required="false" rtexprvalue="true"%> <%@ taglib uri="tags-core" prefix="c"%> Index: lams_tool_scribe/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.3 --- lams_tool_scribe/web/WEB-INF/tags/headItems.tag 17 Sep 2006 06:28:16 -0000 1.2 +++ lams_tool_scribe/web/WEB-INF/tags/headItems.tag 29 Sep 2006 02:44:37 -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,7 +44,8 @@ - + + Index: lams_tool_scribe/web/common/learnerheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/common/learnerheader.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_scribe/web/common/learnerheader.jsp 29 Sep 2006 02:44:37 -0000 1.1 @@ -0,0 +1,27 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + <fmt:message key="activity.title" /> + + + + + + + + + + + + + + + Index: lams_tool_scribe/web/layouts/blankLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/layouts/blankLayout.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_scribe/web/layouts/blankLayout.jsp 26 Sep 2006 01:20:01 -0000 1.2 +++ lams_tool_scribe/web/layouts/blankLayout.jsp 29 Sep 2006 02:44:37 -0000 1.3 @@ -5,7 +5,7 @@ - + \ No newline at end of file Index: lams_tool_scribe/web/layouts/learningLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/layouts/learningLayout.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_scribe/web/layouts/learningLayout.jsp 25 Sep 2006 06:04:33 -0000 1.2 +++ lams_tool_scribe/web/layouts/learningLayout.jsp 29 Sep 2006 02:44:37 -0000 1.3 @@ -6,11 +6,8 @@ -
- - + -
Index: lams_tool_scribe/web/pages/export/exportPortfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/export/exportPortfolio.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_scribe/web/pages/export/exportPortfolio.jsp 15 Sep 2006 03:09:52 -0000 1.1 +++ lams_tool_scribe/web/pages/export/exportPortfolio.jsp 29 Sep 2006 02:44:38 -0000 1.2 @@ -14,20 +14,14 @@ - -
- + -

+
+

-
-
- -
-

@@ -84,11 +78,9 @@

- - Index: lams_tool_scribe/web/pages/learning/defineLater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/defineLater.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_scribe/web/pages/learning/defineLater.jsp 15 Sep 2006 03:09:53 -0000 1.1 +++ lams_tool_scribe/web/pages/learning/defineLater.jsp 29 Sep 2006 02:44:37 -0000 1.2 @@ -1,11 +1,11 @@ <%@ include file="/common/taglibs.jsp"%> -

+

-
-
+ +
- + Index: lams_tool_scribe/web/pages/learning/learning.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/learning.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_scribe/web/pages/learning/learning.jsp 15 Sep 2006 03:09:53 -0000 1.1 +++ lams_tool_scribe/web/pages/learning/learning.jsp 29 Sep 2006 02:44:37 -0000 1.2 @@ -4,11 +4,11 @@ -

+
+ +

-
-

Scribe Learning Page @@ -21,4 +21,4 @@

- + Index: lams_tool_scribe/web/pages/learning/notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/notebook.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_scribe/web/pages/learning/notebook.jsp 15 Sep 2006 03:09:53 -0000 1.1 +++ lams_tool_scribe/web/pages/learning/notebook.jsp 29 Sep 2006 02:44:37 -0000 1.2 @@ -1,10 +1,10 @@ <%@ include file="/common/taglibs.jsp"%> -

+

${scribeDTO.title}

-
-
+ +
@@ -15,7 +15,7 @@ @@ -31,4 +31,4 @@
- +
- + Index: lams_tool_scribe/web/pages/learning/runOffline.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/Attic/runOffline.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_scribe/web/pages/learning/runOffline.jsp 15 Sep 2006 03:09:53 -0000 1.1 +++ lams_tool_scribe/web/pages/learning/runOffline.jsp 29 Sep 2006 02:44:37 -0000 1.2 @@ -1,11 +1,11 @@ <%@ include file="/common/taglibs.jsp"%> -

+

-
-
+
+
@@ -19,4 +19,4 @@
- +