Index: lams_learning/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/lams.tld,v diff -u -r1.8 -r1.9 --- lams_learning/web/WEB-INF/lams.tld 23 Jun 2006 01:40:06 -0000 1.8 +++ lams_learning/web/WEB-INF/lams.tld 6 Jul 2006 04:42:50 -0000 1.9 @@ -85,7 +85,7 @@ Output stylesheet based on the user preferences. - localLink + localLinkPath false true @@ -308,6 +308,7 @@ ExportPortOutput - /WEB-INF/tags/ExportPortOutput.tag + /WEB-INF/tags/ExportPortOutput.tag + Index: lams_learning/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/headItems.tag,v diff -u -r1.1 -r1.2 --- lams_learning/web/WEB-INF/tags/headItems.tag 2 May 2006 05:42:49 -0000 1.1 +++ lams_learning/web/WEB-INF/tags/headItems.tag 6 Jul 2006 04:42:50 -0000 1.2 @@ -1,41 +1,40 @@ -<% -/**************************************************************** - * 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 - * **************************************************************** - */ - - /** - * 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" %> +<%/**************************************************************** + * 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 + * **************************************************************** + */ -<%@ taglib uri="tags-core" prefix="c" %> -<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> + /** + * 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"%> + +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> + @@ -53,4 +52,4 @@ - + Index: lams_learning/web/exportPortfolio/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/exportPortfolio/main.jsp,v diff -u -r1.5 -r1.6 --- lams_learning/web/exportPortfolio/main.jsp 3 Jul 2006 00:22:44 -0000 1.5 +++ lams_learning/web/exportPortfolio/main.jsp 6 Jul 2006 04:42:50 -0000 1.6 @@ -35,14 +35,7 @@ <c:out value="${portfolio.lessonName}"/> - <%-- can't use the normal "lams:css localLink=true" as that points to ../default.css --%> - - - + Index: lams_monitoring/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/build.xml,v diff -u -r1.20 -r1.21 --- lams_monitoring/build.xml 6 Jun 2006 02:34:58 -0000 1.20 +++ lams_monitoring/build.xml 6 Jul 2006 04:41:25 -0000 1.21 @@ -131,6 +131,7 @@ + Index: lams_monitoring/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/Attic/lams.tld,v diff -u -r1.2 -r1.3 --- lams_monitoring/web/WEB-INF/lams.tld 9 Nov 2005 06:34:08 -0000 1.2 +++ lams_monitoring/web/WEB-INF/lams.tld 6 Jul 2006 04:41:25 -0000 1.3 @@ -1,48 +1,314 @@ - - + - 1.0 - 1.1 - lams + 1.0 + lams - + LAMSTags + + Output the Server URL as defined in the lams.xml configuration file. + LAMS URL + + LAMSURL - org.lamsfoundation.lams.web.tag.LAMSURLTag - + org.lamsfoundation.lams.web.tag.LAMSURLTag + empty + Output a random number for the learner and passon flash movies to communicate directly. + generate unique ID + + + generateID + org.lamsfoundation.lams.web.tag.GenerateIDTag + empty + + + Output a random number for the learner and passon flash movies to communicate directly. + id + false + + true + + + + + + + Output details from the shared session UserDTO object + user details + + user - org.lamsfoundation.lams.web.tag.UserTag - + org.lamsfoundation.lams.web.tag.UserTag + empty + Output details from the shared session UserDTO object property true - true + true + - css - org.lamsfoundation.lams.web.tag.CssTag - + Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/ + Base URL for the current web app + + + WebAppURL + org.lamsfoundation.lams.web.tag.WebAppURLTag + empty - WebAppURL - org.lamsfoundation.lams.web.tag.WebAppURLTag - + Output stylesheet based on the user preferences. + User's chosen stylesheet + + + css + org.lamsfoundation.lams.web.tag.CssTag + empty + + Output stylesheet based on the user preferences. + localLinkPath + false + + true + + + + + STRUTS-textarea + org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag + empty + + accesskey + false + true + + + alt + false + true + + + altKey + false + true + + + bundle + false + true + + + cols + false + true + + + disabled + false + true + + + errorKey + false + true + + + errorStyle + false + true + + + errorStyleClass + false + true + + + errorStyleId + false + true + + + indexed + false + true + + + name + false + true + + + onblur + false + true + + + onchange + false + true + + + onclick + false + true + + + ondblclick + false + true + + + onfocus + false + true + + + onkeydown + false + true + + + onkeypress + false + true + + + onkeyup + false + true + + + onmousedown + false + true + + + onmousemove + false + true + + + onmouseout + false + true + + + onmouseover + false + true + + + onmouseup + false + true + + + property + true + true + + + readonly + false + true + + + rows + false + true + + + style + false + true + + + styleClass + false + true + + + styleId + false + true + + + tabindex + false + true + + + title + false + true + + + titleKey + false + true + + + value + false + true + + + + Tab + /WEB-INF/tags/Tab.tag + + + Tabs + /WEB-INF/tags/Tabs.tag + + + TabBody + /WEB-INF/tags/TabBody.tag + + + HTMLEditor + /WEB-INF/tags/HTMLEditor.tag + + + SetEditor + /WEB-INF/tags/SetEditor.tag + + + AuthoringButton + /WEB-INF/tags/AuthoringButton.tag + + + headItems + /WEB-INF/tags/headItems.tag + + + Passon + /WEB-INF/tags/Passon.tag + + + ExportPortOutput + /WEB-INF/tags/ExportPortOutput.tag + + Index: lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag 6 Jul 2006 04:41:25 -0000 1.1 @@ -0,0 +1,91 @@ +<% +/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * AuthoringButton.tag + * Author: Dapeng Ni + * Description: Creates the save/cancel button for authoring page + */ + + %> +<%@ tag body-content="scriptless" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-html" prefix="html" %> + +<%@ attribute name="formID" required="true" rtexprvalue="true" %> +<%@ attribute name="toolSignature" required="true" rtexprvalue="true" %> +<%@ attribute name="toolContentID" required="true" rtexprvalue="true" %> +<%@ attribute name="clearSessionActionUrl" required="true" rtexprvalue="true" %> + +<%-- Optional attribute --%> +<%@ attribute name="accessMode" required="false" rtexprvalue="true" %> +<%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %> +<%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %> +<%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %> +<%@ attribute name="defineLater" required="false" rtexprvalue="true" %> + +<%-- Default value for message key --%> + + + + + + + + + + + + + + + +

+ + + + + + +

+ \ No newline at end of file Index: lams_monitoring/web/WEB-INF/tags/ExportPortOutput.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/ExportPortOutput.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_monitoring/web/WEB-INF/tags/ExportPortOutput.tag 6 Jul 2006 04:41:25 -0000 1.1 @@ -0,0 +1,59 @@ +<% +/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * Passon + * Author: Fiona Malikoff + * Description: Outputs the Activity details on the main page in export portfolio. Recursive tag. + * + */ + + %> +<%@ tag body-content="empty" %> +<%@ attribute name="actport" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.learning.export.ActivityPortfolio" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + +
  • + + + "/> + + + + + + + + +
      + + + +
    +     +     + +
    • + Index: lams_monitoring/web/WEB-INF/tags/HTMLEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/HTMLEditor.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_monitoring/web/WEB-INF/tags/HTMLEditor.tag 6 Jul 2006 04:41:25 -0000 1.1 @@ -0,0 +1,56 @@ +<%/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * HTMLEditor.tag + * Author: Mitchell Seaton + * Description: Creates a single instance of FCK Editor used over multiple fields. + * Wiki: + */ + + %> +<%@ tag body-content="empty"%> +<%@ taglib uri="fck-editor" prefix="FCK"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams"%> + + + + + Index: lams_monitoring/web/WEB-INF/tags/Passon.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/Passon.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_monitoring/web/WEB-INF/tags/Passon.tag 6 Jul 2006 04:41:25 -0000 1.1 @@ -0,0 +1,82 @@ +<% +/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * Passon + * Author: Mitchell Seaton + * Description: Passes on progress data to the Flash Learner to update the progress bar. + * + */ + + %> +<%@ tag body-content="empty" %> +<%@ attribute name="progress" required="true" rtexprvalue="true" type="java.lang.String" %> +<%@ attribute name="id" required="true" rtexprvalue="true" %> +<%@ attribute name="redirect" required="false" rtexprvalue="true" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_monitoring/web/WEB-INF/tags/SetEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/SetEditor.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_monitoring/web/WEB-INF/tags/SetEditor.tag 6 Jul 2006 04:41:25 -0000 1.1 @@ -0,0 +1,96 @@ +<%/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * SetEditor.tag + * Author: Mitchell Seaton + * Description: Creates a dynamic textarea field using a HTML Editor. + * Wiki: + */ + + %> +<%@ tag body-content="empty"%> +<%@ attribute name="id" required="true" rtexprvalue="true"%> +<%@ attribute name="text" required="true" rtexprvalue="true"%> +<%@ attribute name="small" required="false" rtexprvalue="true"%> +<%@ attribute name="key" required="false" rtexprvalue="true"%> +<%@ attribute name="alt" required="false" rtexprvalue="true"%> + + +<%@ taglib uri="tags-function" prefix="fn"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + +
    Index: lams_monitoring/web/WEB-INF/tags/Tab.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Tab.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_monitoring/web/WEB-INF/tags/Tab.tag 6 Jul 2006 04:41:25 -0000 1.1 @@ -0,0 +1,99 @@ +<%/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * 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"%> +<%@ attribute name="key" required="false" rtexprvalue="true"%> +<%@ attribute name="inactive" required="false" rtexprvalue="true"%> +<%@ attribute name="methodCall" required="false" rtexprvalue="true"%> + +<%@ taglib uri="tags-core" prefix="c"%> +<%@ 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 %> + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    +
    Index: lams_monitoring/web/WEB-INF/tags/TabBody.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/TabBody.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_monitoring/web/WEB-INF/tags/TabBody.tag 6 Jul 2006 04:41:25 -0000 1.1 @@ -0,0 +1,52 @@ +<%/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * 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"%> +<%@ attribute name="titleKey" required="false" rtexprvalue="true"%> +<%@ attribute name="page" required="false" rtexprvalue="true"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-bean" prefix="bean"%> + + +
    + + + + + + + + + +
    + Index: lams_monitoring/web/WEB-INF/tags/Tabs.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Tabs.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_monitoring/web/WEB-INF/tags/Tabs.tag 6 Jul 2006 04:41:25 -0000 1.1 @@ -0,0 +1,69 @@ +<%/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * 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="control" required="false" rtexprvalue="true"%> +<%@ attribute name="useKey" required="false" rtexprvalue="true"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams"%> + + + + + + + + + + + + Index: lams_monitoring/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/headItems.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_monitoring/web/WEB-INF/tags/headItems.tag 6 Jul 2006 04:41:25 -0000 1.1 @@ -0,0 +1,55 @@ +<%/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * 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"%> + +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> + + + + + + + + + + + + + + + + + + + Index: lams_tool_chat/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/Attic/lams.tld,v diff -u -r1.6 -r1.7 --- lams_tool_chat/web/WEB-INF/lams.tld 8 Jun 2006 06:08:18 -0000 1.6 +++ lams_tool_chat/web/WEB-INF/lams.tld 6 Jul 2006 04:40:53 -0000 1.7 @@ -24,6 +24,26 @@ + Output a random number for the learner and passon flash movies to communicate directly. + generate unique ID + + + generateID + org.lamsfoundation.lams.web.tag.GenerateIDTag + empty + + + Output a random number for the learner and passon flash movies to communicate directly. + id + false + + true + + + + + + Output details from the shared session UserDTO object user details @@ -65,7 +85,7 @@ Output stylesheet based on the user preferences. - localLink + localLinkPath false true @@ -282,5 +302,13 @@ headItems /WEB-INF/tags/headItems.tag + + Passon + /WEB-INF/tags/Passon.tag + + + ExportPortOutput + /WEB-INF/tags/ExportPortOutput.tag +     Index: lams_tool_chat/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/Attic/web.xml,v diff -u -r1.8 -r1.9 --- lams_tool_chat/web/WEB-INF/web.xml 17 Jun 2006 05:15:59 -0000 1.8 +++ lams_tool_chat/web/WEB-INF/web.xml 6 Jul 2006 04:40:53 -0000 1.9 @@ -68,12 +68,6 @@ - context - org.springframework.web.context.ContextLoaderServlet - 1 - - - action org.apache.struts.action.ActionServlet Index: lams_tool_chat/web/WEB-INF/struts/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/struts/Attic/struts-config.xml,v diff -u -r1.5 -r1.6 --- lams_tool_chat/web/WEB-INF/struts/struts-config.xml 17 Jun 2006 05:15:59 -0000 1.5 +++ lams_tool_chat/web/WEB-INF/struts/struts-config.xml 6 Jul 2006 04:40:53 -0000 1.6 @@ -45,10 +45,15 @@ validate="true" > + + Index: lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/struts/Attic/tiles-defs.xml,v diff -u -r1.12 -r1.13 --- lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml 2 Jul 2006 07:12:17 -0000 1.12 +++ lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml 6 Jul 2006 04:40:53 -0000 1.13 @@ -80,6 +80,7 @@ + Index: lams_tool_chat/web/WEB-INF/tags/ExportPortOutput.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/ExportPortOutput.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_chat/web/WEB-INF/tags/ExportPortOutput.tag 6 Jul 2006 04:40:53 -0000 1.1 @@ -0,0 +1,59 @@ +<% +/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * Passon + * Author: Fiona Malikoff + * Description: Outputs the Activity details on the main page in export portfolio. Recursive tag. + * + */ + + %> +<%@ tag body-content="empty" %> +<%@ attribute name="actport" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.learning.export.ActivityPortfolio" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + +
  • + + + "/> + + + + + + + + +
      + + + +
    +     +     + +
    • + Index: lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/HTMLEditor.tag,v diff -u -r1.4 -r1.5 Binary files differ Index: lams_tool_chat/web/WEB-INF/tags/Passon.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/Passon.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_chat/web/WEB-INF/tags/Passon.tag 6 Jul 2006 04:40:53 -0000 1.1 @@ -0,0 +1,82 @@ +<% +/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * Passon + * Author: Mitchell Seaton + * Description: Passes on progress data to the Flash Learner to update the progress bar. + * + */ + + %> +<%@ tag body-content="empty" %> +<%@ attribute name="progress" required="true" rtexprvalue="true" type="java.lang.String" %> +<%@ attribute name="id" required="true" rtexprvalue="true" %> +<%@ attribute name="redirect" required="false" rtexprvalue="true" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_tool_chat/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/headItems.tag,v diff -u -r1.5 -r1.6 Binary files differ Index: lams_tool_chat/web/layouts/defaultLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/layouts/defaultLayout.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_chat/web/layouts/defaultLayout.jsp 26 Jun 2006 07:04:45 -0000 1.5 +++ lams_tool_chat/web/layouts/defaultLayout.jsp 6 Jul 2006 04:40:54 -0000 1.6 @@ -7,7 +7,7 @@
    - +

    Index: lams_tool_chat/web/pages/export/exportPortfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/export/exportPortfolio.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_chat/web/pages/export/exportPortfolio.jsp 14 Jun 2006 23:39:54 -0000 1.1 +++ lams_tool_chat/web/pages/export/exportPortfolio.jsp 6 Jul 2006 04:40:53 -0000 1.2 @@ -5,43 +5,55 @@ - <fmt:message key="titleHeading.exportPortfolio" /> - + <c:out value="${chatDTO.title} escapeXml="false" /> + + -

    - ${chatDTO.title} -

    - -

    - ${chatDTO.instructions} -

    - - -
    - -
    -     - - -
    -

    - ${session.sessionName} -

    - -
    - ${message.from} : ${message.body} +
    + +

    +
    + +
    + +
    + +

    + + +
    +
    +     + + +
    +

    + ${session.sessionName} +

    + +
    + ${message.from} : ${message.body} +
    +     +
    -
    - + +
    + + + + +
    Index: lams_tool_example/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_example/web/WEB-INF/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_example/web/WEB-INF/lams.tld 19 Apr 2006 02:23:04 -0000 1.2 +++ lams_tool_example/web/WEB-INF/lams.tld 6 Jul 2006 04:38:26 -0000 1.3 @@ -24,6 +24,26 @@ + Output a random number for the learner and passon flash movies to communicate directly. + generate unique ID + + + generateID + org.lamsfoundation.lams.web.tag.GenerateIDTag + empty + + + Output a random number for the learner and passon flash movies to communicate directly. + id + false + + true + + + + + + Output details from the shared session UserDTO object user details @@ -65,7 +85,7 @@ Output stylesheet based on the user preferences. - localLink + localLinkPath false true @@ -275,7 +295,20 @@ /WEB-INF/tags/SetEditor.tag + AuthoringButton + /WEB-INF/tags/AuthoringButton.tag + + headItems /WEB-INF/tags/headItems.tag - + + + Passon + /WEB-INF/tags/Passon.tag + + + ExportPortOutput + /WEB-INF/tags/ExportPortOutput.tag + + Index: lams_tool_example/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_example/web/WEB-INF/tags/headItems.tag,v diff -u -r1.1 -r1.2 --- lams_tool_example/web/WEB-INF/tags/headItems.tag 19 Apr 2006 02:23:04 -0000 1.1 +++ lams_tool_example/web/WEB-INF/tags/headItems.tag 6 Jul 2006 04:38:26 -0000 1.2 @@ -1,41 +1,40 @@ -<% -/**************************************************************** - * 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 - * **************************************************************** - */ - - /** - * 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" %> +<%/**************************************************************** + * 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 + * **************************************************************** + */ -<%@ taglib uri="tags-core" prefix="c" %> -<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> + /** + * 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"%> + +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> + @@ -53,4 +52,4 @@ - + Index: lams_tool_forum/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/lams.tld,v diff -u -r1.6 -r1.7 --- lams_tool_forum/web/WEB-INF/lams.tld 16 May 2006 00:00:06 -0000 1.6 +++ lams_tool_forum/web/WEB-INF/lams.tld 6 Jul 2006 04:38:14 -0000 1.7 @@ -24,6 +24,26 @@ + Output a random number for the learner and passon flash movies to communicate directly. + generate unique ID + + + generateID + org.lamsfoundation.lams.web.tag.GenerateIDTag + empty + + + Output a random number for the learner and passon flash movies to communicate directly. + id + false + + true + + + + + + Output details from the shared session UserDTO object user details @@ -65,7 +85,7 @@ Output stylesheet based on the user preferences. - localLink + localLinkPath false true @@ -282,5 +302,13 @@ headItems /WEB-INF/tags/headItems.tag + + Passon + /WEB-INF/tags/Passon.tag + + + ExportPortOutput + /WEB-INF/tags/ExportPortOutput.tag + Index: lams_tool_forum/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.3 --- lams_tool_forum/web/WEB-INF/tags/headItems.tag 29 Jun 2006 08:16:01 -0000 1.2 +++ lams_tool_forum/web/WEB-INF/tags/headItems.tag 6 Jul 2006 04:38:14 -0000 1.3 @@ -45,12 +45,6 @@ - - Index: lams_tool_forum/web/common/header.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/common/header.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_forum/web/common/header.jsp 29 Jun 2006 08:16:01 -0000 1.3 +++ lams_tool_forum/web/common/header.jsp 6 Jul 2006 04:38:14 -0000 1.4 @@ -19,14 +19,15 @@ - - + + + + + + + + - Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_forum/web/css/fckeditor_style.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/export/exportportfolio.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_forum/web/jsps/export/exportportfolio.jsp 14 Jun 2006 06:02:59 -0000 1.3 +++ lams_tool_forum/web/jsps/export/exportportfolio.jsp 6 Jul 2006 04:38:14 -0000 1.4 @@ -1,10 +1,22 @@ <%@ include file="/common/taglibs.jsp"%> +<%-- flag indicated to header.jsp to use the local path option for the css --%> + <%@ include file="/common/header.jsp"%> + +
    + +

    +
    + +
    + +
    +
    @@ -111,5 +123,14 @@ + +
    + + + + +
    +     Index: lams_tool_lamc/web/login.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/login.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_lamc/web/login.jsp 19 Apr 2006 02:30:28 -0000 1.3 +++ lams_tool_lamc/web/login.jsp 6 Jul 2006 04:37:54 -0000 1.4 @@ -12,9 +12,6 @@ System logon required - Index: lams_tool_lamc/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/Attic/lams.tld,v diff -u -r1.6 -r1.7 --- lams_tool_lamc/web/WEB-INF/lams.tld 16 May 2006 05:15:49 -0000 1.6 +++ lams_tool_lamc/web/WEB-INF/lams.tld 6 Jul 2006 04:37:54 -0000 1.7 @@ -24,6 +24,26 @@     + Output a random number for the learner and passon flash movies to communicate directly. + generate unique ID + + + generateID + org.lamsfoundation.lams.web.tag.GenerateIDTag + empty + + + Output a random number for the learner and passon flash movies to communicate directly. + id + false + + true + + + + + + Output details from the shared session UserDTO object user details @@ -65,7 +85,7 @@ Output stylesheet based on the user preferences. - localLink + localLinkPath false true @@ -282,5 +302,13 @@ headItems /WEB-INF/tags/headItems.tag + + Passon + /WEB-INF/tags/Passon.tag + + + ExportPortOutput + /WEB-INF/tags/ExportPortOutput.tag + Index: lams_tool_lamc/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/web/WEB-INF/tags/headItems.tag 29 Jun 2006 00:44:45 -0000 1.2 +++ lams_tool_lamc/web/WEB-INF/tags/headItems.tag 6 Jul 2006 04:37:54 -0000 1.3 @@ -45,12 +45,6 @@ - - Index: lams_tool_lamc/web/common/header.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/common/header.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_lamc/web/common/header.jsp 29 Jun 2006 00:44:45 -0000 1.1 +++ lams_tool_lamc/web/common/header.jsp 6 Jul 2006 04:37:54 -0000 1.2 @@ -14,14 +14,7 @@ - - - Index: lams_tool_lamc/web/export/exportportfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/export/exportportfolio.jsp,v diff -u -r1.7 -r1.8 --- lams_tool_lamc/web/export/exportportfolio.jsp 4 Jul 2006 00:25:21 -0000 1.7 +++ lams_tool_lamc/web/export/exportportfolio.jsp 6 Jul 2006 04:37:54 -0000 1.8 @@ -28,50 +28,54 @@ <bean:message key="label.exportPortfolio"/> - + + +
    - - - - - -
    - -
    -     - - +

    - - - - - - - - - - - - -
    -

    -
    -

    -
    - - -     - - - + +

    + +

    +
    + +
    + +
    + + + + + + +
    + +
    +     + + + + + + +
    + + + + +
    + + + Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_lamc/web/includes/css/tool_custom.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/MonitoringUtil.java,v diff -u -r1.30 -r1.31 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 27 Jun 2006 13:34:47 -0000 1.30 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 6 Jul 2006 04:37:27 -0000 1.31 @@ -201,14 +201,12 @@ * @param mcContent * @return List */ - public static List buildGroupsQuestionData(HttpServletRequest request, QaContent qaContent, + public static List buildGroupsQuestionData(HttpServletRequest request, QaContent qaContent, IQaService qaService, boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId, String userId) { logger.debug("isUserNamesVisible: " + isUserNamesVisible); logger.debug("isLearnerRequest: " + isLearnerRequest); logger.debug("userId: " + userId); - - IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); logger.debug("qaService: " + qaService); logger.debug("will be building groups question data for content:..." + qaContent); @@ -230,7 +228,7 @@ qaMonitoredAnswersDTO.setQuestion(qaQueContent.getQuestion()); logger.debug("using allUsersData to retrieve users data: " + isUserNamesVisible); - Map questionAttemptData= buildGroupsAttemptData(request, qaContent, qaQueContent, qaQueContent.getUid().toString(), + Map questionAttemptData= buildGroupsAttemptData(request, qaContent, qaService, qaQueContent, qaQueContent.getUid().toString(), isUserNamesVisible,isLearnerRequest, currentSessionId, userId); logger.debug("questionAttemptData:..." + questionAttemptData); qaMonitoredAnswersDTO.setQuestionAttempts(questionAttemptData); @@ -243,7 +241,7 @@ } - public static Map buildGroupsAttemptData(HttpServletRequest request, QaContent qaContent, QaQueContent qaQueContent, String questionUid, + public static Map buildGroupsAttemptData(HttpServletRequest request, QaContent qaContent, IQaService qaService, QaQueContent qaQueContent, String questionUid, boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId, String userId) { logger.debug("isUserNamesVisible: " + isUserNamesVisible); @@ -252,7 +250,6 @@ logger.debug("userId: " + userId); logger.debug("doing buildGroupsAttemptData..."); - IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); logger.debug("qaService: " + qaService); Map mapMonitoredAttemptsContainerDTO= new TreeMap(new QaStringComparator()); @@ -281,7 +278,7 @@ { List listUsers=qaService.getUserBySessionOnly(qaSession); logger.debug("listMcUsers for session id:" + qaSession.getQaSessionId() + " = " + listUsers); - Map sessionUsersAttempts=populateSessionUsersAttempts(request,qaSession.getQaSessionId(), listUsers, questionUid, + Map sessionUsersAttempts=populateSessionUsersAttempts(request, qaService, qaSession.getQaSessionId(), listUsers, questionUid, isUserNamesVisible, isLearnerRequest, userId); listMonitoredAttemptsContainerDTO.add(sessionUsersAttempts); } @@ -310,7 +307,7 @@ { List listUsers=qaService.getUserBySessionOnly(qaSession); logger.debug("listQaUsers for session id:" + qaSession.getQaSessionId() + " = " + listUsers); - Map sessionUsersAttempts=populateSessionUsersAttempts(request,qaSession.getQaSessionId(), listUsers, questionUid, + Map sessionUsersAttempts=populateSessionUsersAttempts(request, qaService, qaSession.getQaSessionId(), listUsers, questionUid, isUserNamesVisible, isLearnerRequest, userId); listMonitoredAttemptsContainerDTO.add(sessionUsersAttempts); } @@ -334,15 +331,14 @@ * @param listUsers * @return List */ - public static Map populateSessionUsersAttempts(HttpServletRequest request,Long sessionId, List listUsers, String questionUid, + public static Map populateSessionUsersAttempts(HttpServletRequest request,IQaService qaService, Long sessionId, List listUsers, String questionUid, boolean isUserNamesVisible, boolean isLearnerRequest, String userId) { logger.debug("isUserNamesVisible: " + isUserNamesVisible); logger.debug("isLearnerRequest: " + isLearnerRequest); logger.debug("userId: " + userId); logger.debug("doing populateSessionUsersAttempts..."); - IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); logger.debug("qaService: " + qaService); Map mapMonitoredUserContainerDTO= new TreeMap(new QaStringComparator()); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v diff -u -r1.38 -r1.39 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 27 Jun 2006 18:32:17 -0000 1.38 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 6 Jul 2006 04:37:27 -0000 1.39 @@ -665,7 +665,7 @@ QaContent qaContent=qaService.loadQa(toolContentId.longValue()); logger.debug("existing qaContent:" + qaContent); - List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, qaContent, true, false, null, null); + List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, qaContent, qaService, true, false, null, null); request.getSession().setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO); logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO)); } @@ -852,7 +852,7 @@ logger.debug("using allUsersData to retrieve data: " + isUserNamesVisible); - List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, qaContent, + List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, qaContent, qaService, isUserNamesVisible, isLearnerRequest, currentSessionId, userId); request.getSession().setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO); logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO)); Index: lams_tool_laqa/web/login.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/login.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_laqa/web/login.jsp 7 Apr 2006 00:44:22 -0000 1.5 +++ lams_tool_laqa/web/login.jsp 6 Jul 2006 04:37:26 -0000 1.6 @@ -32,9 +32,6 @@ System logon required - Index: lams_tool_laqa/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/Attic/lams.tld,v diff -u -r1.9 -r1.10 --- lams_tool_laqa/web/WEB-INF/lams.tld 16 May 2006 01:20:20 -0000 1.9 +++ lams_tool_laqa/web/WEB-INF/lams.tld 6 Jul 2006 04:37:26 -0000 1.10 @@ -24,6 +24,26 @@ + Output a random number for the learner and passon flash movies to communicate directly. + generate unique ID + + + generateID + org.lamsfoundation.lams.web.tag.GenerateIDTag + empty + + + Output a random number for the learner and passon flash movies to communicate directly. + id + false + + true + + + + + + Output details from the shared session UserDTO object user details @@ -65,7 +85,7 @@ Output stylesheet based on the user preferences. - localLink + localLinkPath false true @@ -282,5 +302,13 @@ headItems /WEB-INF/tags/headItems.tag + + Passon + /WEB-INF/tags/Passon.tag + + + ExportPortOutput + /WEB-INF/tags/ExportPortOutput.tag + Index: lams_tool_laqa/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.3 --- lams_tool_laqa/web/WEB-INF/tags/headItems.tag 29 Jun 2006 00:41:24 -0000 1.2 +++ lams_tool_laqa/web/WEB-INF/tags/headItems.tag 6 Jul 2006 04:37:35 -0000 1.3 @@ -45,12 +45,6 @@ - - Index: lams_tool_laqa/web/common/header.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/common/header.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_laqa/web/common/header.jsp 29 Jun 2006 00:41:25 -0000 1.1 +++ lams_tool_laqa/web/common/header.jsp 6 Jul 2006 04:37:27 -0000 1.2 @@ -14,16 +14,8 @@ - - - - Index: lams_tool_laqa/web/export/exportportfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/export/exportportfolio.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_laqa/web/export/exportportfolio.jsp 3 Jul 2006 00:49:17 -0000 1.6 +++ lams_tool_laqa/web/export/exportportfolio.jsp 6 Jul 2006 04:37:26 -0000 1.7 @@ -26,51 +26,54 @@ <bean:message key="label.exportPortfolio"/> - + +
    - - - - - -
    - -
    -     - - +

    + +

    + + +
    + +
    + +
    + - - - - - - - - - - - -
    -

    -
    -

    -
    - - - + + + + + +
    + +
    +     + + + + + + +
    + + + + +
    -     Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_laqa/web/includes/css/tool_custom.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_larsrc/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/headItems.tag,v diff -u -r1.3 -r1.4 --- lams_tool_larsrc/web/WEB-INF/tags/headItems.tag 28 Jun 2006 02:37:42 -0000 1.3 +++ lams_tool_larsrc/web/WEB-INF/tags/headItems.tag 6 Jul 2006 04:37:03 -0000 1.4 @@ -45,12 +45,6 @@ - - Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.3 -r1.4 --- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld 16 May 2006 00:03:58 -0000 1.3 +++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld 6 Jul 2006 04:37:03 -0000 1.4 @@ -24,6 +24,26 @@     + Output a random number for the learner and passon flash movies to communicate directly. + generate unique ID + + + generateID + org.lamsfoundation.lams.web.tag.GenerateIDTag + empty + + + Output a random number for the learner and passon flash movies to communicate directly. + id + false + + true + + + + + + Output details from the shared session UserDTO object user details @@ -65,7 +85,7 @@ Output stylesheet based on the user preferences. - localLink + localLinkPath false true @@ -282,5 +302,13 @@ headItems /WEB-INF/tags/headItems.tag + + Passon + /WEB-INF/tags/Passon.tag + + + ExportPortOutput + /WEB-INF/tags/ExportPortOutput.tag + Index: lams_tool_larsrc/web/common/header.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/common/header.jsp,v diff -u -r1.7 -r1.8 --- lams_tool_larsrc/web/common/header.jsp 28 Jun 2006 07:09:28 -0000 1.7 +++ lams_tool_larsrc/web/common/header.jsp 6 Jul 2006 04:37:03 -0000 1.8 @@ -14,14 +14,15 @@ - - - + + + + + + + + Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_larsrc/web/includes/css/tool_custom.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_larsrc/web/pages/export/exportportfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/export/exportportfolio.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_larsrc/web/pages/export/exportportfolio.jsp 14 Jun 2006 06:03:11 -0000 1.5 +++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp 6 Jul 2006 04:37:03 -0000 1.6 @@ -1,12 +1,13 @@ <%@ include file="/common/taglibs.jsp"%> +<%-- flag indicated to header.jsp to use the local path option for the css --%> + <fmt:message key="export.title" /> - css/aqua.css" rel="stylesheet" type="text/css"> + + + \ No newline at end of file Index: lams_tool_nb/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.3 --- lams_tool_nb/web/WEB-INF/tags/headItems.tag 28 Jun 2006 03:54:38 -0000 1.2 +++ lams_tool_nb/web/WEB-INF/tags/headItems.tag 6 Jul 2006 04:36:25 -0000 1.3 @@ -45,12 +45,6 @@ - - Index: lams_tool_sbmt/web/login.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/login.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_sbmt/web/login.jsp 14 Sep 2005 06:33:56 -0000 1.1 +++ lams_tool_sbmt/web/login.jsp 6 Jul 2006 04:36:06 -0000 1.2 @@ -12,9 +12,6 @@ System logon required - Index: lams_tool_sbmt/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/Attic/lams.tld,v diff -u -r1.6 -r1.7 --- lams_tool_sbmt/web/WEB-INF/lams.tld 12 May 2006 06:34:09 -0000 1.6 +++ lams_tool_sbmt/web/WEB-INF/lams.tld 6 Jul 2006 04:36:06 -0000 1.7 @@ -24,6 +24,26 @@ + Output a random number for the learner and passon flash movies to communicate directly. + generate unique ID + + + generateID + org.lamsfoundation.lams.web.tag.GenerateIDTag + empty + + + Output a random number for the learner and passon flash movies to communicate directly. + id + false + + true + + + + + + Output details from the shared session UserDTO object user details @@ -65,7 +85,7 @@ Output stylesheet based on the user preferences. - localLink + localLinkPath false true @@ -282,4 +302,13 @@ headItems /WEB-INF/tags/headItems.tag + + Passon + /WEB-INF/tags/Passon.tag + + + ExportPortOutput + /WEB-INF/tags/ExportPortOutput.tag + + Index: lams_tool_sbmt/web/WEB-INF/tags/ExportPortOutput.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/ExportPortOutput.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_sbmt/web/WEB-INF/tags/ExportPortOutput.tag 6 Jul 2006 04:36:06 -0000 1.1 @@ -0,0 +1,59 @@ +<% +/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * Passon + * Author: Fiona Malikoff + * Description: Outputs the Activity details on the main page in export portfolio. Recursive tag. + * + */ + + %> +<%@ tag body-content="empty" %> +<%@ attribute name="actport" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.learning.export.ActivityPortfolio" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + +
  • + + + "/> + + + + + + + + +
      + + + +
    +     +     + +
    • + Index: lams_tool_sbmt/web/WEB-INF/tags/Passon.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/Passon.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_sbmt/web/WEB-INF/tags/Passon.tag 6 Jul 2006 04:36:06 -0000 1.1 @@ -0,0 +1,82 @@ +<% +/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * Passon + * Author: Mitchell Seaton + * Description: Passes on progress data to the Flash Learner to update the progress bar. + * + */ + + %> +<%@ tag body-content="empty" %> +<%@ attribute name="progress" required="true" rtexprvalue="true" type="java.lang.String" %> +<%@ attribute name="id" required="true" rtexprvalue="true" %> +<%@ attribute name="redirect" required="false" rtexprvalue="true" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_tool_sbmt/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/web/WEB-INF/tags/headItems.tag 29 Jun 2006 04:59:46 -0000 1.2 +++ lams_tool_sbmt/web/WEB-INF/tags/headItems.tag 6 Jul 2006 04:36:06 -0000 1.3 @@ -45,12 +45,6 @@ - - Index: lams_tool_sbmt/web/authoring/definelater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/definelater.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_sbmt/web/authoring/definelater.jsp 3 Jul 2006 07:23:03 -0000 1.3 +++ lams_tool_sbmt/web/authoring/definelater.jsp 6 Jul 2006 04:36:06 -0000 1.4 @@ -23,8 +23,6 @@ <fmt:message key="activity.title" /> - - Index: lams_tool_vote/web/common/header.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/common/header.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_vote/web/common/header.jsp 29 Jun 2006 00:38:11 -0000 1.1 +++ lams_tool_vote/web/common/header.jsp 6 Jul 2006 04:33:37 -0000 1.2 @@ -14,16 +14,8 @@ - - - - Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_vote/web/css/fckeditor_style.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_vote/web/css/tool_custom.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/web/export/exportportfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/export/exportportfolio.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_vote/web/export/exportportfolio.jsp 3 Jul 2006 01:37:36 -0000 1.8 +++ lams_tool_vote/web/export/exportportfolio.jsp 6 Jul 2006 04:33:37 -0000 1.9 @@ -27,15 +27,28 @@ <bean:message key="label.export"/> - + +
    +

    + + +

    + + +
    + +
    + +
    + @@ -48,28 +61,18 @@ - -
    - - - - - - - - - - -
    -

    -
    -

    -
    -     + +
    + + + + +
    -     +     Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_vote/web/includes/css/tool_custom.css'. Fisheye: No comparison available. Pass `N' to diff?