Index: lams_tool_laqa/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts-config.xml,v diff -u -r1.53.2.1 -r1.53.2.2 --- lams_tool_laqa/web/WEB-INF/struts-config.xml 3 Jul 2015 16:43:32 -0000 1.53.2.1 +++ lams_tool_laqa/web/WEB-INF/struts-config.xml 25 May 2016 16:25:17 -0000 1.53.2.2 @@ -85,7 +85,7 @@ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/AdvancedAccordian.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/Arrow.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag,v diff -u -r1.20 -r1.20.2.1 --- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag 23 Jul 2013 17:53:24 -0000 1.20 +++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag 25 May 2016 16:25:17 -0000 1.20.2.1 @@ -122,12 +122,12 @@ window.close(); } -

- - - - +

+ -

+ + + +
\ No newline at end of file Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag 15 Jun 2015 22:24:55 -0000 1.2.2.2 +++ lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag 25 May 2016 16:25:17 -0000 1.2.2.3 @@ -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_laqa/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.14.2.1 -r1.14.2.2 --- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag 3 Sep 2014 13:19:48 -0000 1.14.2.1 +++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag 25 May 2016 16:25:17 -0000 1.14.2.2 @@ -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}Inline + + @@ -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", Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/Comments.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/CommentsAuthor.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_tool_laqa/web/WEB-INF/tags/Page.tag 6 Mar 2016 08:17:32 -0000 1.1.2.2 +++ lams_tool_laqa/web/WEB-INF/tags/Page.tag 25 May 2016 16:25:17 -0000 1.1.2.3 @@ -12,25 +12,38 @@
+ + + + + +
-
- + +
- - - - -
+ + + +
+
+ + +
+ + + + Index: lams_tool_laqa/web/WEB-INF/tags/Rating.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Rating.tag,v diff -u -r1.2.2.5 -r1.2.2.6 --- lams_tool_laqa/web/WEB-INF/tags/Rating.tag 23 Feb 2016 14:36:04 -0000 1.2.2.5 +++ lams_tool_laqa/web/WEB-INF/tags/Rating.tag 25 May 2016 16:25:17 -0000 1.2.2.6 @@ -167,21 +167,25 @@
- + -
+ : -
+ - - -
-
+
+
+ +
+
+
+
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/RestrictedUsageAccordian.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/WEB-INF/tags/Tab.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Tab.tag,v diff -u -r1.10 -r1.10.12.1 --- lams_tool_laqa/web/WEB-INF/tags/Tab.tag 7 Mar 2008 00:36:31 -0000 1.10 +++ lams_tool_laqa/web/WEB-INF/tags/Tab.tag 25 May 2016 16:25:17 -0000 1.10.12.1 @@ -1,85 +1,89 @@ -<% - /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * ============================================================= - * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2.0 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ - - /** - * Tab.tag - * Author: Mitchell Seaton - * Description: Creates a tab element. - * Wiki: - */ -%> -<%@ 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-fmt" prefix="fmt"%> -<%@ taglib uri="tags-lams" prefix="lams"%> - -<%-- Check if bundle is set --%> - - - - - - - - - - -<%-- - 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 ---%> - - - - - - - - - - - - - - - - - - -
-
- -
-
+<% + /**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + /** + * Tab.tag + * Author: Fiona Malikoff + * Description: Creates a tab element within the Hybrid Tab Header. + * 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-fmt" prefix="fmt"%> +<%@ taglib uri="tags-lams" prefix="lams"%> + +<%-- Check if bundle is set --%> + + + + + + + + + + +<%-- + 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;"> + +--%> + + + + + + + + + + + + + + + + + + + + + class="active" + + + + + class="disabled" + + +
  • ${tabTitle}
    • Index: lams_tool_laqa/web/WEB-INF/tags/TabBody.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/TabBody.tag,v diff -u -r1.8 -r1.8.12.1 --- lams_tool_laqa/web/WEB-INF/tags/TabBody.tag 9 May 2007 00:57:33 -0000 1.8 +++ lams_tool_laqa/web/WEB-INF/tags/TabBody.tag 25 May 2016 16:25:17 -0000 1.8.12.1 @@ -1,52 +1,44 @@ -<%/**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * ============================================================= - * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2.0 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ - -/** - * TabBody.tag - * Author: Mitchell Seaton - * Description: Creates the body container for a tab element - * Wiki: - */ - - %> -<%@ 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"%> - - -
    - - - - - - - - - -
    - +<%/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/** + * TabBody.tag + * Author: Mitchell Seaton + * Description: Creates the body container for a tab element + * Wiki: + */ + +%> +<%@ 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 + + +
    Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/TabBodyArea.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/TabBodys.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/WEB-INF/tags/TabName.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/TabName.tag,v diff -u -r1.5 -r1.5.2.1 Binary files differ Index: lams_tool_laqa/web/WEB-INF/tags/Tabs.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Tabs.tag,v diff -u -r1.8 -r1.8.12.1 --- lams_tool_laqa/web/WEB-INF/tags/Tabs.tag 9 May 2007 00:57:33 -0000 1.8 +++ lams_tool_laqa/web/WEB-INF/tags/Tabs.tag 25 May 2016 16:25:17 -0000 1.8.12.1 @@ -1,69 +1,92 @@ -<%/**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * ============================================================= - * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2.0 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ - -/** - * Tabs.tag - * Author: Mitchell Seaton - * Description: Create a tab list from a input collection or nested Tab tags. - * Wiki: - */ - - %> -<%@ 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"%> - - - - - - - - - - - - +<%/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/** + * Tabs.tag + * Author: Fiona Malikoff + * Description: Create a hybrid panel header that contains a nav bar that acts like tabs. + */ + +%> +<%@ attribute name="control" 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_laqa/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/headItems.tag,v diff -u -r1.10.2.1 -r1.10.2.2 --- lams_tool_laqa/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:21 -0000 1.10.2.1 +++ lams_tool_laqa/web/WEB-INF/tags/headItems.tag 25 May 2016 16:25:17 -0000 1.10.2.2 @@ -41,7 +41,9 @@ - + - + + + Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.3.2.5 -r1.3.2.6 --- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld 9 Mar 2016 00:50:25 -0000 1.3.2.5 +++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld 25 May 2016 16:25:18 -0000 1.3.2.6 @@ -178,7 +178,7 @@ css org.lamsfoundation.lams.web.tag.CssTag empty - + Output stylesheet based on the user preferences. style @@ -408,25 +408,33 @@ /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 AuthoringButton /WEB-INF/tags/AuthoringButton.tag - + AuthoringRatingCriteria /WEB-INF/tags/AuthoringRatingCriteria.tag Rating /WEB-INF/tags/Rating.tag - + headItems /WEB-INF/tags/headItems.tag @@ -440,18 +448,30 @@ /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_laqa/web/authoring/AdvancedContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AdvancedContent.jsp,v diff -u -r1.34.2.2 -r1.34.2.3 --- lams_tool_laqa/web/authoring/AdvancedContent.jsp 3 Jul 2015 17:01:11 -0000 1.34.2.2 +++ lams_tool_laqa/web/authoring/AdvancedContent.jsp 25 May 2016 16:25:17 -0000 1.34.2.3 @@ -1,10 +1,8 @@ <%@ include file="/common/taglibs.jsp"%> - - -

    - +

    -

    +
    -

    - +

    -

    +
    -
    -

    - + +

    +
    -

    - -

    - -

    + +
    + -

    - -
    -
    -
    style="display:none;"> - -
    -
    - + +
    + +
    -

    - +

    -

    +
    -

    - +

    -

    -

    - -

    +
    - - -

    - +

    -

    +
    -

    - -

    + -

    +
    -

    - +

    -

    +
    -

    - +

    -

    +
    \ No newline at end of file Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp,v diff -u -r1.33.2.2 -r1.33.2.3 --- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp 26 Feb 2016 07:17:47 -0000 1.33.2.2 +++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp 25 May 2016 16:25:17 -0000 1.33.2.3 @@ -1,32 +1,27 @@ - <%@ include file="/common/taglibs.jsp"%> - -<%@ page import="java.util.LinkedHashSet" %> -<%@ page import="java.util.Set" %> <%@ page import="org.lamsfoundation.lams.tool.qa.QaAppConstants"%> + + + + + + - <% - Set tabs = new LinkedHashSet(); - tabs.add("label.basic"); - tabs.add("label.advanced"); - tabs.add("label.conditions"); - pageContext.setAttribute("tabs", tabs); - %> - <fmt:message key="activity.title" /> - - <%@ include file="/common/tabbedheader.jsp"%> - + + + + + + - - - - -
    -

    + + + + + - + + + + + + + + + + + + + + -
    - - - - - - - - - - - - <%@ include file="/common/messages.jsp"%> - - + + + + +
    +     +     +     + + - - - - - - -     -
    - + + + + + + + + + - -
    - + + + -     + \ No newline at end of file Index: lams_tool_laqa/web/authoring/BasicContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/BasicContent.jsp,v diff -u -r1.42.2.1 -r1.42.2.2 --- lams_tool_laqa/web/authoring/BasicContent.jsp 12 Sep 2014 21:20:36 -0000 1.42.2.1 +++ lams_tool_laqa/web/authoring/BasicContent.jsp 25 May 2016 16:25:18 -0000 1.42.2.2 @@ -6,92 +6,66 @@ * Launches the popup window for the instruction files */ function showMessage(url) { - var area=document.getElementById("messageArea"); - if(area != null){ - area.style.width="95%"; - area.src=url; - area.style.display="block"; - } - var elem = document.getElementById("saveCancelButtons"); - if (elem != null) { - elem.style.display="none"; - } + $("#messageArea").load(url, function() { + $(this).show(); + $('#saveCancelButtons').hide(); + }); location.hash = "messageArea"; } function hideMessage(){ - var area=document.getElementById("messageArea"); - if(area != null){ - area.style.width="0px"; - area.style.height="0px"; - area.style.display="none"; - } - var elem = document.getElementById("saveCancelButtons"); - if (elem != null) { - elem.style.display="block"; - } + $("#messageArea").hide(); + $('#saveCancelButtons').show(); } - function removeQuestion(questionIndex) - { + function removeQuestion(questionIndex){ document.QaAuthoringForm.questionIndex.value=questionIndex; submitMethod('removeQuestion'); } - function removeMonitoringQuestion(questionIndex) - { - document.QaMonitoringForm.questionIndex.value=questionIndex; - submitMonitoringMethod('removeQuestion'); - } - - function resizeIframe(heightOffSet) - { - var iframe = document.getElementById("messageArea"); - iframe.style.height = parseInt(iframe.style.height) + heightOffSet + "px"; - } + function submitMessage(){ + if ( typeof CKEDITOR !== 'undefined' ) { + for ( instance in CKEDITOR.instances ) + CKEDITOR.instances[instance].updateElement(); + } + var formData = new FormData(document.getElementById("newQuestionForm")); + + $.ajax({ // create an AJAX call... + data: formData, + processData: false, // tell jQuery not to process the data + contentType: false, // tell jQuery not to set contentType + type: $("#newQuestionForm").attr('method'), + url: $("#newQuestionForm").attr('action'), + success: function(data) { + $('#resourceListArea').html($(data).find('#itemList')); + hideMessage(); + } + }); + } - - - - +
    + + +
    +
    + + + +
    - - - -
    -
    - -
    - -
    -
    - -
    - -
    - -
    <%@ include file="/authoring/itemlist.jsp"%>
    -

    +

    ');" - class="button-add-item"> - + id="addTopic" class="btn btn-default btn-sm">  -

    +
    -

    - -

    +
    \ No newline at end of file Index: lams_tool_laqa/web/authoring/addCondition.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/addCondition.jsp,v diff -u -r1.5.2.4 -r1.5.2.5 --- lams_tool_laqa/web/authoring/addCondition.jsp 26 Feb 2016 07:17:47 -0000 1.5.2.4 +++ lams_tool_laqa/web/authoring/addCondition.jsp 25 May 2016 16:25:17 -0000 1.5.2.5 @@ -1,59 +1,45 @@ <%@ include file="/common/taglibs.jsp"%> + +
    +
    +
    +
    - - - <%@ include file="/common/header.jsp"%> - - - - - - <%@ include file="/common/messages.jsp"%> - - -

    - -

    +
    -
    - -
    + + <%@ include file="/common/messages.jsp"%> + + + +
    + + +
    -
    - -
    - <%-- Text search form fields are being included --%> - -

    - - - - - -
    -     + <%-- Text search form fields are being included --%> + + +

    +
    + +
    + +
    +     + + - - - - - - - - +
    + + +
    +
    +
    \ No newline at end of file Index: lams_tool_laqa/web/authoring/conditionList.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/conditionList.jsp,v diff -u -r1.4.2.3 -r1.4.2.4 --- lams_tool_laqa/web/authoring/conditionList.jsp 24 Apr 2015 10:00:51 -0000 1.4.2.3 +++ lams_tool_laqa/web/authoring/conditionList.jsp 25 May 2016 16:25:18 -0000 1.4.2.4 @@ -1,18 +1,15 @@ <%@ include file="/common/taglibs.jsp"%> - -
    -

    - - -

    +
    + +
    - +
    - + - - - - - - + + - - - - - + + + + + + + + + + +
    @@ -29,73 +26,43 @@
    - ${status.index + 1} - - ${condition.displayName} - - - " - onclick="upCondition(${status.index},'${sessionMapID}')"> - - "> - - - - - - "> - - - " - onclick="downCondition(${status.index},'${sessionMapID}')"> - -
    + ${status.index + 1} + - " - onclick="editCondition(${status.index},'${sessionMapID}')" /> - - " - onclick="deleteCondition(${status.index},'${sessionMapID}')" /> -
    + ${condition.displayName} + + + + + + + + + + " + onclick="editCondition(${status.index},'${sessionMapID}')">" + onclick="deleteCondition(${status.index},'${sessionMapID}')">
    -<%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%> - \ No newline at end of file Index: lams_tool_laqa/web/authoring/conditions.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/conditions.jsp,v diff -u -r1.1.12.1 -r1.1.12.2 --- lams_tool_laqa/web/authoring/conditions.jsp 15 Jun 2015 22:24:55 -0000 1.1.12.1 +++ lams_tool_laqa/web/authoring/conditions.jsp 25 May 2016 16:25:18 -0000 1.1.12.2 @@ -1,102 +1,60 @@ <%@ include file="/common/taglibs.jsp"%> - - -
    <%@ include file="/authoring/conditionList.jsp"%>
    + +
    + ');" + class="btn btn-default btn-sm">  +
    -

    - ');" class="button-add-item"> - -

    - - -

    - -

    +
    \ No newline at end of file Fisheye: Tag 1.13.2.6 refers to a dead (removed) revision in file `lams_tool_laqa/web/authoring/editQuestionBox.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/authoring/itemlist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/itemlist.jsp,v diff -u -r1.12.2.3 -r1.12.2.4 --- lams_tool_laqa/web/authoring/itemlist.jsp 24 Apr 2015 10:00:51 -0000 1.12.2.3 +++ lams_tool_laqa/web/authoring/itemlist.jsp 25 May 2016 16:25:18 -0000 1.12.2.4 @@ -1,100 +1,40 @@ <%@ include file="/common/taglibs.jsp"%> - +
    -

    - - -

    + + + + - - -
    - - - - - - - - + - - - - - - - - -
    + - + + - - - - images/down.gif" border="0" - title="" - onclick="javascript:submitModifyAuthoringQuestion('','moveQuestionDown');"> - images/up_disabled.gif" - border="0"> - - - - images/down_disabled.gif" - border="0"> - images/up.gif" border="0" - title="" - onclick="javascript:submitModifyAuthoringQuestion('','moveQuestionUp');"> - - - - - images/down.gif" border="0" - title="" - onclick="javascript:submitModifyAuthoringQuestion('','moveQuestionDown');"> - images/up.gif" border="0" - title="" - onclick="javascript:submitModifyAuthoringQuestion('','moveQuestionUp');"> - - - + + + + + + + + + - - images/edit.gif" border="0" - title="" - onclick="javascript:showMessage('');"> + " + onclick="javascript:showMessage('')"> - images/delete.gif" border="0" - title="" - onclick="removeQuestion(${queIndex});"> + " + onclick="removeQuestion(${status.count})">
    -
    -<%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%> - +
    \ No newline at end of file Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/newQuestionBox.jsp,v diff -u -r1.25.2.7 -r1.25.2.8 --- lams_tool_laqa/web/authoring/newQuestionBox.jsp 26 Feb 2016 07:17:47 -0000 1.25.2.7 +++ lams_tool_laqa/web/authoring/newQuestionBox.jsp 25 May 2016 16:25:18 -0000 1.25.2.8 @@ -1,237 +1,57 @@ - - - <%@ include file="/common/taglibs.jsp"%> - - - <%@ include file="/common/header.jsp"%> - <%@ include file="/includes/jsp/qaWizardCommon.jsp"%> - - - - - - - - // Creating a 3-dimentional javascript array for category/cognitive skill/question - // ------------------------------------------------------------------------------- - var categoryArray = new Array(); - var categoryIndex = 0; - var skillIndex = 0; - var qIndex = 0; - - categoryIndex = categoryArray.length; - addCategory(unescape("${category.title}"), "${category.uid}", categoryArray.length); - - skillIndex = categoryArray[categoryIndex].skills.length; - addSkill(unescape("${skill.title}"), "${skill.uid}", categoryIndex , skillIndex); - - qIndex = categoryArray[categoryIndex].skills[skillIndex].questions.length; - addQuestion(unescape("${question.question}"), "${question.uid}", categoryIndex, skillIndex, qIndex) - - - - // ------------------------------------------------------------------------------- - - // the menus - var catMenu = null; - var skillMenu = null; - var qMenu = null; - - // Sets up the triple menu with the appropriate data - function setUpTripleMenu() { - var qaWizardEnabledBox = document.QaAuthoringForm.qaWizardEnabled; +
    +
    +
    +
    - catMenu = document.QaAuthoringForm.catMenu; - skillMenu = document.QaAuthoringForm.skillMenu; - qMenu = document.QaAuthoringForm.qMenu; - - nullOptions(catMenu); - nullOptions(skillMenu); - nullOptions(qMenu); - - var i; - with (catMenu) { - options[0] = new Option("", "none"); - for(i = 0; i < categoryArray.length; i++) - { - options[i+1] = new Option(categoryArray[i].title, i); - } - options[0].selected = true; - } - } +
    + + + + + + + + + + - var heightOffSet = 0; - $(document).ready(function() { - $("a#gwizard").click(function() { - $("div.wizard").toggle(); - - if (heightOffSet == 0) - { - heightOffSet = document.getElementById('wizardDiv').offsetHeight; - } - - try { - if (window.parent && window.parent.resizeIframe) { - window.parent.resizeIframe(heightOffSet); - } else if (window.top && window.top.resizeIframe) { - window.top.resizeIframe(heightOffSet); - } - } catch(err) { - // mute cross-domain iframe access errors - } - - heightOffSet = heightOffSet * -1; - }); - }); - - // Inserts the question template into the new question fckeditor area - function useQuestionTemplate(aMenu) { - if (aMenu.selectedIndex > 0) { - var obj = document.getElementById("newQuestion"); - obj.value += aMenu.options[aMenu.selectedIndex].text; - var oEditor = CKEDITOR.instances["newQuestion"]; - oEditor.insertHtml(aMenu.options[aMenu.selectedIndex].text); - } - } - - - - function setUpTripleMenu() {} - - - - - - - - - - - - - - - - - - - - - - -
    - -
    - - - -
    - - - -
    - -
    - - -
    - -
    - -
    - - - - - - - - - -     - - +
    + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    +     +
    +
    \ No newline at end of file