Index: lams_central/conf/xdoclet/taglib-tag.xml =================================================================== diff -u -r827fef1c3da3692dc865c3ae99a92ddecfdc643b -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_central/conf/xdoclet/taglib-tag.xml (.../taglib-tag.xml) (revision 827fef1c3da3692dc865c3ae99a92ddecfdc643b) +++ lams_central/conf/xdoclet/taglib-tag.xml (.../taglib-tag.xml) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -209,4 +209,9 @@ Passon /WEB-INF/tags/Passon.tag - \ No newline at end of file + + + ExportPortOutput + /WEB-INF/tags/ExportPortOutput.tag + + \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java =================================================================== diff -u -r58f4d51ae2af20778d6f8a4992eb6e625a4bdc6d -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java (.../CssTag.java) (revision 58f4d51ae2af20778d6f8a4992eb6e625a4bdc6d) +++ lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java (.../CssTag.java) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -53,7 +53,7 @@ private static final Logger log = Logger.getLogger(CssTag.class); private static final String IE_STYLESHEET_NAME = "ie-styles"; - private boolean generateLocalLink = false; + private String localLinkPath = null; /** * @@ -80,7 +80,7 @@ { String theme = (String)i.next(); if ( theme != null) { - if (generateLocalLink) + if (localLinkPath != null) customStylesheetLink = generateLocalLink(theme,serverURL); else customStylesheetLink = generateLink(theme,serverURL); @@ -96,7 +96,7 @@ } // Special IE stylesheet for all those IE related formatting issues - String ieLink = generateLocalLink ? generateLocalLink(IE_STYLESHEET_NAME,serverURL) : generateLink(IE_STYLESHEET_NAME,serverURL); + String ieLink = localLinkPath != null ? generateLocalLink(IE_STYLESHEET_NAME,serverURL) : generateLink(IE_STYLESHEET_NAME,serverURL); writer.println(" - Index: lams_central/web/WEB-INF/web.xml =================================================================== diff -u -rb3da97f5c8cfdd02a2c2cb566dcee601100f3c07 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_central/web/WEB-INF/web.xml (.../web.xml) (revision b3da97f5c8cfdd02a2c2cb566dcee601100f3c07) +++ lams_central/web/WEB-INF/web.xml (.../web.xml) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -90,12 +90,6 @@ - context - org.springframework.web.context.ContextLoaderServlet - 1 - - - action org.apache.struts.action.ActionServlet Index: lams_learning/web/WEB-INF/lams.tld =================================================================== diff -u -r1204423f3ae4b0d99b71c80a09875211d7bbfb22 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_learning/web/WEB-INF/lams.tld (.../lams.tld) (revision 1204423f3ae4b0d99b71c80a09875211d7bbfb22) +++ lams_learning/web/WEB-INF/lams.tld (.../lams.tld) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -r058624bba137d9124eed6784321dbecc72a12550 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_learning/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 058624bba137d9124eed6784321dbecc72a12550) +++ lams_learning/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -reb7240215d5100a3624b61903fac9af0d8a26b5e -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_learning/web/exportPortfolio/main.jsp (.../main.jsp) (revision eb7240215d5100a3624b61903fac9af0d8a26b5e) +++ lams_learning/web/exportPortfolio/main.jsp (.../main.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -r580e9bb194e76263d8a5ff2132d20dc1876010e8 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_monitoring/build.xml (.../build.xml) (revision 580e9bb194e76263d8a5ff2132d20dc1876010e8) +++ lams_monitoring/build.xml (.../build.xml) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -131,6 +131,7 @@ + Index: lams_monitoring/web/WEB-INF/lams.tld =================================================================== diff -u -r8ba43ae6cd465e24431866147a53ae7e43102efd -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_monitoring/web/WEB-INF/lams.tld (.../lams.tld) (revision 8ba43ae6cd465e24431866147a53ae7e43102efd) +++ lams_monitoring/web/WEB-INF/lams.tld (.../lams.tld) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u --- lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag (revision 0) +++ lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u --- lams_monitoring/web/WEB-INF/tags/ExportPortOutput.tag (revision 0) +++ lams_monitoring/web/WEB-INF/tags/ExportPortOutput.tag (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u --- lams_monitoring/web/WEB-INF/tags/HTMLEditor.tag (revision 0) +++ lams_monitoring/web/WEB-INF/tags/HTMLEditor.tag (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u --- lams_monitoring/web/WEB-INF/tags/Passon.tag (revision 0) +++ lams_monitoring/web/WEB-INF/tags/Passon.tag (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u --- lams_monitoring/web/WEB-INF/tags/SetEditor.tag (revision 0) +++ lams_monitoring/web/WEB-INF/tags/SetEditor.tag (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u --- lams_monitoring/web/WEB-INF/tags/Tab.tag (revision 0) +++ lams_monitoring/web/WEB-INF/tags/Tab.tag (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u --- lams_monitoring/web/WEB-INF/tags/TabBody.tag (revision 0) +++ lams_monitoring/web/WEB-INF/tags/TabBody.tag (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u --- lams_monitoring/web/WEB-INF/tags/Tabs.tag (revision 0) +++ lams_monitoring/web/WEB-INF/tags/Tabs.tag (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u --- lams_monitoring/web/WEB-INF/tags/headItems.tag (revision 0) +++ lams_monitoring/web/WEB-INF/tags/headItems.tag (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -rf72a9f7b81e9cba6311443135dee1fb358362836 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_chat/web/WEB-INF/lams.tld (.../lams.tld) (revision f72a9f7b81e9cba6311443135dee1fb358362836) +++ lams_tool_chat/web/WEB-INF/lams.tld (.../lams.tld) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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/struts/struts-config.xml =================================================================== diff -u -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_chat/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e) +++ lams_tool_chat/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -45,10 +45,15 @@ validate="true" > + + Index: lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml =================================================================== diff -u -r6e0f6145136b39b5736a6a1e20c596f54cf7f5b0 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision 6e0f6145136b39b5736a6a1e20c596f54cf7f5b0) +++ lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -80,6 +80,7 @@ + Index: lams_tool_chat/web/WEB-INF/tags/ExportPortOutput.tag =================================================================== diff -u --- lams_tool_chat/web/WEB-INF/tags/ExportPortOutput.tag (revision 0) +++ lams_tool_chat/web/WEB-INF/tags/ExportPortOutput.tag (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -rd8995652544c9412e237362533c95ee99c8683c1 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag (.../HTMLEditor.tag) (revision d8995652544c9412e237362533c95ee99c8683c1) +++ lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag (.../HTMLEditor.tag) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -31,7 +31,7 @@ %> <%@ tag body-content="empty"%> <%@ taglib uri="fck-editor" prefix="FCK"%> -<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-lams" prefix="lams"%> @@ -43,16 +43,14 @@
    - +
    - <bean:message key=" />      <bean:message key=" /> + <fmt:message key=" /> + <fmt:message key=" />
    Index: lams_tool_chat/web/WEB-INF/tags/Passon.tag =================================================================== diff -u --- lams_tool_chat/web/WEB-INF/tags/Passon.tag (revision 0) +++ lams_tool_chat/web/WEB-INF/tags/Passon.tag (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -rca5b5585d24a75d70f3e04346b647a25dd2247c4 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_chat/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision ca5b5585d24a75d70f3e04346b647a25dd2247c4) +++ lams_tool_chat/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -45,12 +45,6 @@ - - Index: lams_tool_chat/web/WEB-INF/web.xml =================================================================== diff -u -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_chat/web/WEB-INF/web.xml (.../web.xml) (revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e) +++ lams_tool_chat/web/WEB-INF/web.xml (.../web.xml) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -68,12 +68,6 @@ - context - org.springframework.web.context.ContextLoaderServlet - 1 - - - action org.apache.struts.action.ActionServlet Index: lams_tool_chat/web/layouts/defaultLayout.jsp =================================================================== diff -u -r380c7df4490feb08b78bee945acfe846da342b46 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_chat/web/layouts/defaultLayout.jsp (.../defaultLayout.jsp) (revision 380c7df4490feb08b78bee945acfe846da342b46) +++ lams_tool_chat/web/layouts/defaultLayout.jsp (.../defaultLayout.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -7,7 +7,7 @@
    - +

    Index: lams_tool_chat/web/pages/export/exportPortfolio.jsp =================================================================== diff -u -rbf784a8c0762cda26d7d4c5af7c51004ec6bcc2b -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_chat/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision bf784a8c0762cda26d7d4c5af7c51004ec6bcc2b) +++ lams_tool_chat/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -r9bf9b53faf1c91294d4c2d9a306cb896e131d373 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_example/web/WEB-INF/lams.tld (.../lams.tld) (revision 9bf9b53faf1c91294d4c2d9a306cb896e131d373) +++ lams_tool_example/web/WEB-INF/lams.tld (.../lams.tld) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -r9bf9b53faf1c91294d4c2d9a306cb896e131d373 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_example/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 9bf9b53faf1c91294d4c2d9a306cb896e131d373) +++ lams_tool_example/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -r986325607ed5b06059666353e7beb4bff152901f -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_forum/web/WEB-INF/lams.tld (.../lams.tld) (revision 986325607ed5b06059666353e7beb4bff152901f) +++ lams_tool_forum/web/WEB-INF/lams.tld (.../lams.tld) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_forum/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b) +++ lams_tool_forum/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -45,12 +45,6 @@ - - Index: lams_tool_forum/web/common/header.jsp =================================================================== diff -u -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_forum/web/common/header.jsp (.../header.jsp) (revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b) +++ lams_tool_forum/web/common/header.jsp (.../header.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -19,14 +19,15 @@ - - + + + + + + + + - Fisheye: Tag c277bb1c30c1283b5f66c6f651855c51a5f87bc5 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 =================================================================== diff -u -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_forum/web/jsps/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888) +++ lams_tool_forum/web/jsps/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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/WEB-INF/lams.tld =================================================================== diff -u -rbe0f74b3d01318467107b6a074df9a097ca56fc1 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_lamc/web/WEB-INF/lams.tld (.../lams.tld) (revision be0f74b3d01318467107b6a074df9a097ca56fc1) +++ lams_tool_lamc/web/WEB-INF/lams.tld (.../lams.tld) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -re48a67de27af42221ddce80419f05c1be4680430 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_lamc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision e48a67de27af42221ddce80419f05c1be4680430) +++ lams_tool_lamc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -45,12 +45,6 @@ - - Index: lams_tool_lamc/web/common/header.jsp =================================================================== diff -u -re48a67de27af42221ddce80419f05c1be4680430 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_lamc/web/common/header.jsp (.../header.jsp) (revision e48a67de27af42221ddce80419f05c1be4680430) +++ lams_tool_lamc/web/common/header.jsp (.../header.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -14,14 +14,7 @@ - - - Fisheye: Tag c277bb1c30c1283b5f66c6f651855c51a5f87bc5 refers to a dead (removed) revision in file `lams_tool_lamc/web/css/tool_custom.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/export/exportportfolio.jsp =================================================================== diff -u -rd88c2be1f35c033d6b7cb0bdced5ca72d8b13d99 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_lamc/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision d88c2be1f35c033d6b7cb0bdced5ca72d8b13d99) +++ lams_tool_lamc/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -28,50 +28,54 @@ <bean:message key="label.exportPortfolio"/> - + + +
    - - - - - -
    - -
    -     - - +

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

    -
    -

    -
    - - -     - - - + +

    + +

    +
    + +
    + +
    + + + + + + +
    + +
    +     + + + + + + +
    + + + + +
    + + + Fisheye: Tag c277bb1c30c1283b5f66c6f651855c51a5f87bc5 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_lamc/web/login.jsp =================================================================== diff -u -re6e6aa4b83b6a5f62f7cae530495663c3bab242e -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_lamc/web/login.jsp (.../login.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) +++ lams_tool_lamc/web/login.jsp (.../login.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -12,9 +12,6 @@ System logon required - Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java =================================================================== diff -u -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -rf5f65dc49c173cb6bef72ba8281762814c12b315 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision f5f65dc49c173cb6bef72ba8281762814c12b315) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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/WEB-INF/lams.tld =================================================================== diff -u -r79aa6d305d1c62b1aed8e0f8dfdedcc8e5c4bedb -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_laqa/web/WEB-INF/lams.tld (.../lams.tld) (revision 79aa6d305d1c62b1aed8e0f8dfdedcc8e5c4bedb) +++ lams_tool_laqa/web/WEB-INF/lams.tld (.../lams.tld) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -re48a67de27af42221ddce80419f05c1be4680430 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_laqa/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision e48a67de27af42221ddce80419f05c1be4680430) +++ lams_tool_laqa/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -45,12 +45,6 @@ - - Index: lams_tool_laqa/web/common/header.jsp =================================================================== diff -u -re48a67de27af42221ddce80419f05c1be4680430 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_laqa/web/common/header.jsp (.../header.jsp) (revision e48a67de27af42221ddce80419f05c1be4680430) +++ lams_tool_laqa/web/common/header.jsp (.../header.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -14,16 +14,8 @@ - - - - Fisheye: Tag c277bb1c30c1283b5f66c6f651855c51a5f87bc5 refers to a dead (removed) revision in file `lams_tool_laqa/web/css/tool_custom.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/export/exportportfolio.jsp =================================================================== diff -u -r83ffc3b6e09ef381722a0991cb1db317c35f8351 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_laqa/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 83ffc3b6e09ef381722a0991cb1db317c35f8351) +++ lams_tool_laqa/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -26,51 +26,54 @@ <bean:message key="label.exportPortfolio"/> - + +
    - - - - - -
    - -
    -     - - +

    + +

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

    -
    -

    -
    - - - + + + + + +
    + +
    +     + + + + + + +
    + + + + +
    -     Fisheye: Tag c277bb1c30c1283b5f66c6f651855c51a5f87bc5 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_laqa/web/login.jsp =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_laqa/web/login.jsp (.../login.jsp) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/web/login.jsp (.../login.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -32,9 +32,6 @@ System logon required - Index: lams_tool_larsrc/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r8d06fff29ec080cfdbfe976fe31379903e51e389 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_larsrc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 8d06fff29ec080cfdbfe976fe31379903e51e389) +++ lams_tool_larsrc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -45,12 +45,6 @@ - - Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r986325607ed5b06059666353e7beb4bff152901f -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 986325607ed5b06059666353e7beb4bff152901f) +++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -r356eb906d0a80130e76929e9cd914b57304887ff -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_larsrc/web/common/header.jsp (.../header.jsp) (revision 356eb906d0a80130e76929e9cd914b57304887ff) +++ lams_tool_larsrc/web/common/header.jsp (.../header.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -14,14 +14,15 @@ - - - + + + + + + + + Fisheye: Tag c277bb1c30c1283b5f66c6f651855c51a5f87bc5 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 =================================================================== diff -u -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_larsrc/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888) +++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -r0a9205737ad38f2cde57c92fbee07f8d895aaf44 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_nb/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44) +++ lams_tool_nb/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -45,12 +45,6 @@ - - Index: lams_tool_nb/web/WEB-INF/web.xml =================================================================== diff -u -reb34584421f5dd5cb2a537c66826cd4da3e52cc8 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_nb/web/WEB-INF/web.xml (.../web.xml) (revision eb34584421f5dd5cb2a537c66826cd4da3e52cc8) +++ lams_tool_nb/web/WEB-INF/web.xml (.../web.xml) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -74,32 +74,13 @@ /* - + + + org.springframework.web.context.ContextLoaderListener + + - - - context - org.springframework.web.context.ContextLoaderServlet - 1 - - - + action org.apache.struts.action.ActionServlet @@ -118,7 +99,7 @@ validate true - 2 + 1 @@ -212,7 +193,7 @@ - tags-fck-editor + fck-editor /WEB-INF/fckeditor/tlds/FCKeditor.tld Index: lams_tool_nb/web/exportPortfolio.jsp =================================================================== diff -u -re6e6aa4b83b6a5f62f7cae530495663c3bab242e -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_nb/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision e6e6aa4b83b6a5f62f7cae530495663c3bab242e) +++ lams_tool_nb/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -7,31 +7,30 @@ - Noticeboard Export + <c:out value="${NbExportForm.title}"/> - + -

    Export Portfolio

    -

    Noticeboard

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

    + +

    + +
    +
    + +
    + +

    + +

    +
    + + +
    Index: lams_tool_sbmt/web/WEB-INF/lams.tld =================================================================== diff -u -r4166df6f6aeb3bf252c4365751108e34b5481f67 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_sbmt/web/WEB-INF/lams.tld (.../lams.tld) (revision 4166df6f6aeb3bf252c4365751108e34b5481f67) +++ lams_tool_sbmt/web/WEB-INF/lams.tld (.../lams.tld) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u --- lams_tool_sbmt/web/WEB-INF/tags/ExportPortOutput.tag (revision 0) +++ lams_tool_sbmt/web/WEB-INF/tags/ExportPortOutput.tag (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u --- lams_tool_sbmt/web/WEB-INF/tags/Passon.tag (revision 0) +++ lams_tool_sbmt/web/WEB-INF/tags/Passon.tag (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -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 =================================================================== diff -u -r29516de2d9ed294b03e1b886245e71266794e714 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_sbmt/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 29516de2d9ed294b03e1b886245e71266794e714) +++ lams_tool_sbmt/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -45,12 +45,6 @@ - - Index: lams_tool_sbmt/web/authoring/definelater.jsp =================================================================== diff -u -r9afc72ff4f6555b8a6133cb29d597303d12ca5a0 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_sbmt/web/authoring/definelater.jsp (.../definelater.jsp) (revision 9afc72ff4f6555b8a6133cb29d597303d12ca5a0) +++ lams_tool_sbmt/web/authoring/definelater.jsp (.../definelater.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -23,8 +23,6 @@ <fmt:message key="activity.title" /> - - Index: lams_tool_vote/web/common/header.jsp =================================================================== diff -u -re48a67de27af42221ddce80419f05c1be4680430 -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_vote/web/common/header.jsp (.../header.jsp) (revision e48a67de27af42221ddce80419f05c1be4680430) +++ lams_tool_vote/web/common/header.jsp (.../header.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -14,16 +14,8 @@ - - - - Fisheye: Tag c277bb1c30c1283b5f66c6f651855c51a5f87bc5 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 c277bb1c30c1283b5f66c6f651855c51a5f87bc5 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 =================================================================== diff -u -raebd956bdbe82443e851bbf4c87277da3cf9c2ca -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_vote/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision aebd956bdbe82443e851bbf4c87277da3cf9c2ca) +++ lams_tool_vote/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -27,15 +27,28 @@ <bean:message key="label.export"/> - + +
    +

    + + +

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

    -
    -

    -
    -     + +
    + + + + +
    -     +     Fisheye: Tag c277bb1c30c1283b5f66c6f651855c51a5f87bc5 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? Index: lams_tool_vote/web/login.jsp =================================================================== diff -u -r402985c35e80fbce6960c7d7598b0262292398eb -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 --- lams_tool_vote/web/login.jsp (.../login.jsp) (revision 402985c35e80fbce6960c7d7598b0262292398eb) +++ lams_tool_vote/web/login.jsp (.../login.jsp) (revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5) @@ -13,9 +13,6 @@ System logon required -