Index: lams_tool_imscc/web/WEB-INF/tags/AdvancedAccordian.tag =================================================================== diff -u --- lams_tool_imscc/web/WEB-INF/tags/AdvancedAccordian.tag (revision 0) +++ lams_tool_imscc/web/WEB-INF/tags/AdvancedAccordian.tag (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -0,0 +1,53 @@ +<% + /**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + /** + * AdvancedAccordian.tag + * Author: Fiona Malikoff + * Description: Creates the show/hide entry for the Advanced Settings in Montoring. + * Wiki: + */ +%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> + +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-lams" prefix="lams"%> + +
+
+ + +
+ +
+
+
+ \ No newline at end of file Index: lams_tool_imscc/web/WEB-INF/tags/Arrow.tag =================================================================== diff -u --- lams_tool_imscc/web/WEB-INF/tags/Arrow.tag (revision 0) +++ lams_tool_imscc/web/WEB-INF/tags/Arrow.tag (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -0,0 +1,35 @@ +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-function" prefix="fn" %> + +<%-- state = up: up arrow; state = down: down arrow --%> +<%@ attribute name="state" required="true" rtexprvalue="true"%> +<%@ attribute name="title" required="false" rtexprvalue="true"%> +<%@ attribute name="onclick" required="false" rtexprvalue="true"%> + + + + title="${title}" + + + + + + + + + onclick="${onclick}" + + + + + + + + + + + + + + Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag =================================================================== diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520) +++ lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -122,12 +122,12 @@ window.close(); } -

- - - - +

+ -

+ + + +
\ No newline at end of file Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag =================================================================== diff -u -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag (.../AuthoringRatingCriteria.tag) (revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d) +++ lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag (.../AuthoringRatingCriteria.tag) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -18,6 +18,7 @@ <%-- Optional attribute --%> <%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %> <%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %> +<%@ attribute name="styleId" required="false" rtexprvalue="true" %> <%@ attribute name="headerLabel" required="false" rtexprvalue="true" %> <%@ attribute name="addLabel" required="false" rtexprvalue="true" %> <%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %> @@ -106,16 +107,16 @@ jQuery('').append(jQuery('', { 'class': 'criteria-info', html: '' + - '' + '' })).append(jQuery('', { width: '40px', - html: '
" />' + - '
" />' + html: '
" />' + + '
" />' })).append(jQuery('', { width: '20px', - html: '
" />' + html: '">' })).appendTo('#criterias-table'); reactivateArrows(); @@ -124,30 +125,29 @@ addCriteria(); addCriteria(); + reactivateArrows(); function reactivateArrows() { $('#criterias-table tr').each(function() { $this = $(this); // cache $(this) if ($this.is(':first-child')) { - $(".up-arrow", $this).addClass("up-arrow-disabled").removeClass("up-arrow"); - + $(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left"); } else { - $(".up-arrow-disabled", $this).addClass("up-arrow").removeClass("up-arrow-disabled"); + $(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left"); } if ($this.is(':last-child')) { - $(".down-arrow", $this).addClass("down-arrow-disabled").removeClass("down-arrow"); - + $(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right"); } else { - $(".down-arrow-disabled", $this).addClass("down-arrow").removeClass("down-arrow-disabled"); + $(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right"); } }); } //upCriteria - $( "body" ).on( "click", ".up-arrow", function() { + $( "body" ).on( "click", ".fa-long-arrow-up", function() { var currentRow = $(this).closest('tr'); var currentCriteriaTd = $( ".criteria-info", currentRow); var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd); @@ -170,7 +170,7 @@ } ); //downCriteria - $( "body" ).on( "click", ".down-arrow", function() { + $( "body" ).on( "click", ".fa-long-arrow-down", function() { var currentRow = $(this).closest('tr'); var currentCriteriaTd = $( ".criteria-info", currentRow); var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd); @@ -193,7 +193,7 @@ }); //deleteCriteria - $( "body" ).on( "click", ".delete-arrow", function() { + $( "body" ).on( "click", ".fa-times", function() { var currentRow = $(this).closest('tr'); currentRow.remove(); @@ -241,112 +241,109 @@ } -
-

- -

- +
- - - - - - - - - - - - + + + +
+ + + + + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + + + + + + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + +
- -
- - - - -
">
- -
">
- - +
+
+ +
- - -
">
- +
+ + + + + + + + + + + + + + + +
+ + + +
">
+
">
+ 		+ "> +
-
">
- -
-
" >
-
-
- - - -
+
+ +
- -
- - - - - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - - - - - - - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - +
+ + +
- - -
- checked="checked" - /> - - -
- - -
-
-
\ No newline at end of file Index: lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rdc884b8e6274ebbc664d1ee940e565803445bb26 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision dc884b8e6274ebbc664d1ee940e565803445bb26) +++ lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -10,7 +10,12 @@ <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%> <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%> <%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%> +<%@ attribute name="method" required="false" rtexprvalue="true"%> + + + + @@ -19,6 +24,10 @@ + + ${toolbarSet}Replace + + @@ -33,10 +42,10 @@ - + - ckeditor/ + /lams/ckeditor/ @@ -59,10 +68,9 @@ var editor = CKEDITOR.instances["${id}"]; if (editor) { editor.destroy(true); } - var instance = CKEDITOR.replace( "${id}", { + var instance = CKEDITOR.${method}( "${id}", { width : "${width}", height : "${height}", - autoGrow_minHeight : "${height}".replace("px", ""), toolbar : "${toolbarSet}", language : "${language}", defaultLangugage : "en", Index: lams_tool_imscc/web/WEB-INF/tags/Comments.tag =================================================================== diff -u --- lams_tool_imscc/web/WEB-INF/tags/Comments.tag (revision 0) +++ lams_tool_imscc/web/WEB-INF/tags/Comments.tag (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -0,0 +1,47 @@ +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="tags-function" prefix="fn" %> + +<%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%> +<%@ attribute name="toolSignature" required="true" rtexprvalue="true"%> +<%@ attribute name="height" required="false" rtexprvalue="true"%> +<%@ attribute name="width" required="false" rtexprvalue="true"%> +<%@ attribute name="mode" required="false" rtexprvalue="true"%> +<%@ attribute name="likeAndDislike" required="false" rtexprvalue="true"%> +<%@ attribute name="readOnly" required="false" rtexprvalue="true"%> +<%@ attribute name="pageSize" required="false" rtexprvalue="true"%> +<%@ attribute name="sortBy" required="false" rtexprvalue="true"%> + + + + + + + + + + + + + &mode=${mode} + + + + + + + + + + + + + + +
+ \ No newline at end of file Index: lams_tool_imscc/web/WEB-INF/tags/CommentsAuthor.tag =================================================================== diff -u --- lams_tool_imscc/web/WEB-INF/tags/CommentsAuthor.tag (revision 0) +++ lams_tool_imscc/web/WEB-INF/tags/CommentsAuthor.tag (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -0,0 +1,51 @@ +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> + +<%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%> +<%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%> +<%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%> +<%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%> +<%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%> + + + + + + + + + + + + + + + + + +
+ +
+
+     +   +
+ + + + Index: lams_tool_imscc/web/WEB-INF/tags/ImgButtonWrapper.tag =================================================================== diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/WEB-INF/tags/ImgButtonWrapper.tag (.../ImgButtonWrapper.tag) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05) +++ lams_tool_imscc/web/WEB-INF/tags/ImgButtonWrapper.tag (.../ImgButtonWrapper.tag) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,37 +1,37 @@ -<% -/**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * ============================================================= - * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2.0 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ - - /** - * ImgButtonWrapper.tag - * Author: Mitchell Seaton - * Description: Simple wrapper that will display buttons correctly when RTL page rendering is used. - */ - - %> -<%@ tag body-content="scriptless" %> -
-
- -
-
+<% +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + /** + * ImgButtonWrapper.tag + * Author: Mitchell Seaton + * Description: Simple wrapper that will display buttons correctly when RTL page rendering is used. + */ + + %> +<%@ tag body-content="scriptless" %> +
+
+ +
+
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag =================================================================== diff -u -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d) +++ lams_tool_imscc/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -12,25 +12,38 @@
+ + + + + +
-
- + +
- - - - -
+ + + +
+
+ + +
+ + + + Index: lams_tool_imscc/web/WEB-INF/tags/RestrictedUsageAccordian.tag =================================================================== diff -u --- lams_tool_imscc/web/WEB-INF/tags/RestrictedUsageAccordian.tag (revision 0) +++ lams_tool_imscc/web/WEB-INF/tags/RestrictedUsageAccordian.tag (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -0,0 +1,54 @@ +<% + /**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + /** + * AdvancedAccordian.tag + * Author: Fiona Malikoff + * Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring. + * Wiki: + */ +%> +<%@ attribute name="title" required="true" rtexprvalue="true"%> + +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-lams" prefix="lams"%> + +
+
+ + + +
+ +
+
+
+ \ No newline at end of file Index: lams_tool_imscc/web/WEB-INF/tags/TSTable.tag =================================================================== diff -u -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/WEB-INF/tags/TSTable.tag (.../TSTable.tag) (revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d) +++ lams_tool_imscc/web/WEB-INF/tags/TSTable.tag (.../TSTable.tag) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -29,12 +29,12 @@ - - + + - - - Index: lams_tool_imscc/web/WEB-INF/tags/Tab.tag =================================================================== diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/WEB-INF/tags/Tab.tag (.../Tab.tag) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05) +++ lams_tool_imscc/web/WEB-INF/tags/Tab.tag (.../Tab.tag) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -24,8 +24,8 @@ /** * Tab.tag - * Author: Mitchell Seaton - * Description: Creates a tab element. + * Author: Fiona Malikoff + * Description: Creates a tab element within the Hybrid Tab Header. * Wiki: */ %> @@ -54,6 +54,9 @@ <%-- 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 + + -- onclick="${methodCall}(${id});return false;"> + --%> @@ -73,13 +76,14 @@ -
-
- -
-
+ + + class="active" + + + + + class="disabled" + + +
  • ${tabTitle}
    • Index: lams_tool_imscc/web/WEB-INF/tags/TabBody.tag =================================================================== diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05) +++ lams_tool_imscc/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -28,25 +28,17 @@ * 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"%> - -
    - - - - - - - - + + + active + -
    - +
    Index: lams_tool_imscc/web/WEB-INF/tags/TabBodyArea.tag =================================================================== diff -u --- lams_tool_imscc/web/WEB-INF/tags/TabBodyArea.tag (revision 0) +++ lams_tool_imscc/web/WEB-INF/tags/TabBodyArea.tag (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -0,0 +1,39 @@ +<%/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/** + * TabBodyArea.tag + * Author: Fiona Malikoff + * Description: Creates the panel body area for a nav bar screen + * Wiki: + */ + +%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-bean" prefix="bean"%> + +
    + +
    + +
    \ No newline at end of file Index: lams_tool_imscc/web/WEB-INF/tags/TabBodys.tag =================================================================== diff -u --- lams_tool_imscc/web/WEB-INF/tags/TabBodys.tag (revision 0) +++ lams_tool_imscc/web/WEB-INF/tags/TabBodys.tag (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -0,0 +1,37 @@ +<%/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/** + * TabBodys.tag + * Author: Fiona Malikoff + * Description: Create a tabbody list from nested TabBody tags. + * Wiki: + */ + + %> +<%@ tag body-content="scriptless"%> + + +
    + +
    Index: lams_tool_imscc/web/WEB-INF/tags/Tabs.tag =================================================================== diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/WEB-INF/tags/Tabs.tag (.../Tabs.tag) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05) +++ lams_tool_imscc/web/WEB-INF/tags/Tabs.tag (.../Tabs.tag) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -23,47 +23,70 @@ /** * Tabs.tag - * Author: Mitchell Seaton - * Description: Create a tab list from a input collection or nested Tab tags. - * Wiki: + * Author: Fiona Malikoff + * Description: Create a hybrid panel header that contains a nav bar that acts like tabs. */ - %> -<%@ 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"%> +<%@ attribute name="title" required="false" rtexprvalue="true"%> +<%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%> +<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%> +<%@ attribute name="helpModule" required="false" rtexprvalue="true"%> +<%@ attribute name="extraControl" 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_imscc/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) +++ lams_tool_imscc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -41,7 +41,9 @@ - + - + + + Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d) +++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -178,7 +178,7 @@ css org.lamsfoundation.lams.web.tag.CssTag empty - + Output stylesheet based on the user preferences. style @@ -408,10 +408,18 @@ /WEB-INF/tags/TabBody.tag + TabBodys + /WEB-INF/tags/TabBodys.tag + + TabName /WEB-INF/tags/TabName.tag + TabBodyArea + /WEB-INF/tags/TabBodyArea.tag + + CKEditor /WEB-INF/tags/CKEditor.tag @@ -440,17 +448,29 @@ /WEB-INF/tags/DefineLater.tag - TSTable - /WEB-INF/tags/TSTable.tag - - Alert /WEB-INF/tags/Alert.tag Page /WEB-INF/tags/Page.tag + + + TSTable + /WEB-INF/tags/TSTable.tag + + + Arrow + /WEB-INF/tags/Arrow.tag + + + AdvancedAccordian + /WEB-INF/tags/AdvancedAccordian.tag + + RestrictedUsageAccordian + /WEB-INF/tags/RestrictedUsageAccordian.tag + ImgButtonWrapper /WEB-INF/tags/ImgButtonWrapper.tag @@ -493,5 +513,13 @@ head /WEB-INF/tags/Head.tag + + Comments + /WEB-INF/tags/Comments.tag + + + CommentsAuthor + /WEB-INF/tags/CommentsAuthor.tag + Index: lams_tool_imscc/web/common/header.jsp =================================================================== diff -u -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/common/header.jsp (.../header.jsp) (revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d) +++ lams_tool_imscc/web/common/header.jsp (.../header.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -4,13 +4,14 @@ - + + + - Index: lams_tool_imscc/web/common/messages.jsp =================================================================== diff -u -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/common/messages.jsp (.../messages.jsp) (revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d) +++ lams_tool_imscc/web/common/messages.jsp (.../messages.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -6,3 +6,4 @@ + Index: lams_tool_imscc/web/common/tabbedheader.jsp =================================================================== diff -u -r6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 6cdf24c93efb8cc7b3a7deb2250581d1b9b2d86d) +++ lams_tool_imscc/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -4,12 +4,14 @@ + - + + + - Index: lams_tool_imscc/web/pages/authoring/advance.jsp =================================================================== diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05) +++ lams_tool_imscc/web/pages/authoring/advance.jsp (.../advance.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,35 +1,28 @@ <%@ include file="/common/taglibs.jsp"%> - + -

    - - - -

    + -

    +
    -

    - - -

    + -

    +
    -

    +

    - + styleId="viewNumList" styleClass="form-control form-control-inline roffset5"> + - + @@ -43,37 +36,35 @@ + +
    -

    - - -

    + -

    +
    -

    - -

    +
    + +
    + Index: lams_tool_imscc/web/pages/authoring/authoring.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_imscc/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,10 +1,7 @@ - - <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.tool.commonCartridge.CommonCartridgeConstants"%> - <fmt:message key="label.author.title" /> @@ -13,17 +10,14 @@ - - - - - -
    -

    - -

    - - -
    - - - <%@ include file="/common/messages.jsp"%> - - + - - - - - - - - - - - - - - - - - <%-- Default value - cancelButtonLabelKey="label.authoring.cancel.button" - saveButtonLabelKey="label.authoring.save.button" - cancelConfirmMsgKey="authoring.msg.cancel.save" - accessMode="author" - --%> - + + + + + + + + + + + + + + + + <%@ include file="/common/messages.jsp"%> + + + + + + + + +
    + +
    +     + + + + +     +     -
    - - - -
    - - +     Index: lams_tool_imscc/web/pages/authoring/basic.jsp =================================================================== diff -u -rfb10906fb7b35d813643db3f60a0b005163196f7 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/authoring/basic.jsp (.../basic.jsp) (revision fb10906fb7b35d813643db3f60a0b005163196f7) +++ lams_tool_imscc/web/pages/authoring/basic.jsp (.../basic.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,16 +1,16 @@ <%@ include file="/common/taglibs.jsp"%> + + - - - - - - - +
    + + +
    -
    -
    - -
    - -
    -
    - -
    - -
    +
    + + + +
    @@ -97,7 +91,7 @@ --> - &KeepThis=true&TB_iframe=true&height=540&width=850&modal=true" class="space-left thickbox"> + &KeepThis=true&TB_iframe=true&height=540&width=580&modal=true" class="btn btn-default btn-sm thickbox">

    Index: lams_tool_imscc/web/pages/authoring/definelater.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/authoring/definelater.jsp (.../definelater.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_imscc/web/pages/authoring/definelater.jsp (.../definelater.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,32 +1,17 @@ - - <%@ include file="/common/taglibs.jsp"%> -<%@ page import="java.util.HashSet"%> <%@ page import="org.lamsfoundation.lams.tool.commonCartridge.CommonCartridgeConstants"%> -<%@ page import="java.util.Set"%> -<%Set tabs = new HashSet(); - tabs.add("label.authoring.heading.basic"); - pageContext.setAttribute("tabs", tabs); - %> <fmt:message key="label.author.title" /> <%@ include file="/common/tabbedheader.jsp"%> + - - - - + -
    -

    - -

    - -
    - <%@ include file="/common/messages.jsp"%> + + - - -
    - - - - - - - -
    - - + + + + + + <%@ include file="/common/messages.jsp"%> + + + + + + + + +
    + +
    +     + + + +     - -
    - -
     Index: lams_tool_imscc/web/pages/authoring/definelaterforbid.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/authoring/definelaterforbid.jsp (.../definelaterforbid.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_imscc/web/pages/authoring/definelaterforbid.jsp (.../definelaterforbid.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,21 +1,17 @@ -<%@ include file="/common/taglibs.jsp"%> +<%@ include file="/common/taglibs.jsp"%> <fmt:message key="label.author.title" /> <%@ include file="/common/header.jsp"%> - -
    -
    -

    - -

    + + + -
    -
    +     Index: lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp (.../addbasiclti.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp (.../addbasiclti.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,112 +1,108 @@ - - <%@ include file="/common/taglibs.jsp"%> + - - <%@ include file="/common/header.jsp"%> - + + <%@ include file="/common/header.jsp"%> - - - - - + + + + - -
    + + + + + + - - <%@ include file="/common/messages.jsp"%> - - + <%@ include file="/common/messages.jsp"%> + - -

    - -

    - -
    - + +
    + +
    - - - - <%-- Remove description in as LDEV-617 - - - - - - - - - --%> - -
    - + +
    + +
    - - -
    - + +
    + +
    - - -
    - + +
    + +
    - - -
    - + +
    + +
    - - -
    - + +
    - -
    - + +
    + +
    - - + -
    - -
    - +
    + + +
    - +
    + + + + + + +
    + + -
    - - - - - - - - - - -
    - + + + Index: lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp (.../addcommoncartridge.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp (.../addcommoncartridge.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,44 +1,43 @@ - - <%@ include file="/common/taglibs.jsp"%> + - - <%@ include file="/common/header.jsp"%> - + + <%@ include file="/common/header.jsp"%> - - + + - -
    - <%@ include file="/common/messages.jsp"%> - + + + + + + + + <%@ include file="/common/messages.jsp"%> + -

    - -

    - - -
    - <%@ include file="/pages/authoring/parts/itemattachment.jsp"%> -
    - - - - - - +
    +
    + <%@ include file="/pages/authoring/parts/itemattachment.jsp"%> +
    +
    + +
    + - -
    + + + +
    + +     -     - -
    - + +     Index: lams_tool_imscc/web/pages/authoring/parts/itemattachment.jsp =================================================================== diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/authoring/parts/itemattachment.jsp (.../itemattachment.jsp) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05) +++ lams_tool_imscc/web/pages/authoring/parts/itemattachment.jsp (.../itemattachment.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,7 +1,8 @@ <%@ include file="/common/taglibs.jsp"%> - + + + @@ -10,17 +11,17 @@
    - + + + - +
    + Index: lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp =================================================================== diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59) +++ lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,129 +1,119 @@ <%@ include file="/common/taglibs.jsp"%> - + + + - - - -
    -

    - - -

    +
    +
    + + +
    - - - - - - <%-- CommonCartridge Type:1=URL,2=File,3=Website,4=Learning Object --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - : - - - - - - - - ?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true - - - " style="border-style: none;"/> - - - - " - onclick="deleteItem(${status.index},'${sessionMapID}')" /> - - : - - - - - " - onclick="editItem(${status.index},'${sessionMapID}')" /> - - - " - onclick="deleteItem(${status.index},'${sessionMapID}')" /> - - : - - - - - " - onclick="editItem(${status.index},'${sessionMapID}')" /> - - " - onclick="deleteItem(${status.index},'${sessionMapID}')" /> - - : - - - - - " - onclick="editItem(${status.index},'${sessionMapID}')" /> - - " - onclick="deleteItem(${status.index},'${sessionMapID}')" /> -
    + + + + + <%-- CommonCartridge Type:1=URL,2=File,3=Website,4=Learning Object --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + : + + + + + + + + + ?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true + + + "> + + + " + onclick="javascript:deleteItem(${status.index},'${sessionMapID}')"> + + + : + + + + + + + + " + onclick="javascript:editItem(${status.index},'${sessionMapID}')"> + + " + onclick="javascript:deleteItem(${status.index},'${sessionMapID}')"> + + + : + + + + + + + + " + onclick="javascript:editItem(${status.index},'${sessionMapID}')"> + + " + onclick="javascript:deleteItem(${status.index},'${sessionMapID}')"> + + + : + + + + + + + + " + onclick="javascript:editItem(${status.index},'${sessionMapID}')"> + + " + onclick="javascript:deleteItem(${status.index},'${sessionMapID}')"> +
    +
    <%-- This script will works when a new resoruce item submit in order to refresh "CommonCartridge List" panel. --%> - - - - - - + + + + + - -
    - <%@ include file="/common/messages.jsp"%> - +
    - -
    -

    - -

    - - + + + + + - - - <%-- resource Type:1=URL,2=File,3=Website,4=Learning Object --%> - - - -
    - -    - - : - - -
    - - - - - - - -
    -
    +
    + + + + + + +
    +
    - - - - - - - - - - -
    - + Index: lams_tool_imscc/web/pages/authoring/pedagogicalPlannerForm.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_imscc/web/pages/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,12 +1,9 @@ - - <%@ include file="/common/taglibs.jsp"%> + - - - - + + - - + + + <%@ include file="/common/messages.jsp"%> Index: lams_tool_imscc/web/pages/authoring/start.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/authoring/start.jsp (.../start.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_imscc/web/pages/authoring/start.jsp (.../start.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,16 +1,15 @@ - - <%@ include file="/common/taglibs.jsp" %> + - - - - - - + + + + + + Index: lams_tool_imscc/web/pages/monitoring/advanceOptions.jsp =================================================================== diff -u --- lams_tool_imscc/web/pages/monitoring/advanceOptions.jsp (revision 0) +++ lams_tool_imscc/web/pages/monitoring/advanceOptions.jsp (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -0,0 +1,82 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + +
    + + + + + + + + + + +
    + + + ${sessionMap.commonCartridge.miniViewCommonCartridgeNumber} +
    + + + + + + + + + + +
    + + + +
    +     Index: lams_tool_imscc/web/pages/monitoring/editactivity.jsp =================================================================== diff -u -rb0a6e6d35ab909144c15a0d7dcd0cf8909a46ac4 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/monitoring/editactivity.jsp (.../editactivity.jsp) (revision b0a6e6d35ab909144c15a0d7dcd0cf8909a46ac4) +++ lams_tool_imscc/web/pages/monitoring/editactivity.jsp (.../editactivity.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -3,12 +3,12 @@ -

    + -

    +     - +
    Index: lams_tool_imscc/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_imscc/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,57 +1,54 @@ - - <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.tool.commonCartridge.CommonCartridgeConstants"%> - - <%@ include file="/common/tabbedheader.jsp" %> - + + <%@ include file="/common/tabbedheader.jsp" %> - + - - -
    -

    - -

    - -
    - - - - -
    - + + + + + + + -
    - + + +     Index: lams_tool_imscc/web/pages/monitoring/notebook.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/monitoring/notebook.jsp (.../notebook.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_imscc/web/pages/monitoring/notebook.jsp (.../notebook.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,48 +1,43 @@ -<%@ include file="/common/taglibs.jsp"%> - +<%@ include file="/common/taglibs.jsp"%> <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> + + + + -
    -

    - -

    -

    -
    @@ -35,7 +35,7 @@ - +
    - - - - - - -
    - -
    - - - - - - - - -
    - - - - -
    - -
    -
    - - +

    + + + + + + + +
    + +
    + + + + + + + + +
    + + + + + + + Index: lams_tool_imscc/web/pages/monitoring/statistic.jsp =================================================================== diff -u -rd84e43cd35b212ddccdfa0bea55487cf000355ed -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/monitoring/statistic.jsp (.../statistic.jsp) (revision d84e43cd35b212ddccdfa0bea55487cf000355ed) +++ lams_tool_imscc/web/pages/monitoring/statistic.jsp (.../statistic.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -2,40 +2,42 @@ + + + + + - - -
    - + + + +
    +
    + + ${group[0].sessionName} + +
    - - + +
    +
    + + + + + + - <%-- display group name on first row--%> - - - - - - - - - - - - -
    + + + + + +
    - ${item.sessionName} - - -
    - - - - - -
    +
    @@ -69,15 +71,18 @@ - ${item.viewNumber} + + ${item.viewNumber} + - 0 - + 0 +
    + +
    + Index: lams_tool_imscc/web/pages/monitoring/summary.jsp =================================================================== diff -u -r8e82822f01004847270d9984980e9a354ff97d46 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 8e82822f01004847270d9984980e9a354ff97d46) +++ lams_tool_imscc/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,56 +1,66 @@ <%@ include file="/common/taglibs.jsp"%> - -

    - -

    -
    - +
    +

    + +

    + +
    + +
    + + + + + +
    - -
    - -
    + +
    -
    - - - + + + + + + +
    +
    + + + : + + +
    + +
    + + +
    + + + + + + + - <%-- display group name on first row--%> - - - - - - - - - - - <%-- End group title display --%> - - - @@ -110,8 +128,8 @@ - @@ -131,103 +149,26 @@ - + - - - -
    + + + + + + + +
    - ${item.sessionName} - - - - - -
    - - - - - - - -
    +
    @@ -78,26 +88,34 @@     		+ - + + + - 0 + 0 - + + + - + + +
    -

    +     		+
    + + + + +
    +
    + + ${ !sessionMap.isGroupedActivity || ! status.last ? '
     
    ' : ''} + + +
    + - -

    - - - - - -

    - - +<%@ include file="advanceOptions.jsp"%> Index: lams_tool_imscc/web/pages/monitoring/userlist.jsp =================================================================== diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 --- lams_tool_imscc/web/pages/monitoring/userlist.jsp (.../userlist.jsp) (revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0) +++ lams_tool_imscc/web/pages/monitoring/userlist.jsp (.../userlist.jsp) (revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3) @@ -1,48 +1,43 @@ - - - <%@ include file="/common/taglibs.jsp"%> + - <%@ include file="/common/header.jsp" %> + <%@ include file="/common/header.jsp" %> + - -
    + + -

    - -

    - - - - - - - +
    - - - -
    - - + + - - - - -
    - - - - + + + +
    - Close -
    -
    - -
    + + + + + + + + + + + + + + + + + + +