Index: lams_admin/web/WEB-INF/tags/TabBody.tag =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/TabBody.tag,v diff -u -r1.3.14.1 -r1.3.14.2 --- lams_admin/web/WEB-INF/tags/TabBody.tag 16 Jun 2016 03:10:21 -0000 1.3.14.1 +++ lams_admin/web/WEB-INF/tags/TabBody.tag 17 Oct 2016 15:22:13 -0000 1.3.14.2 @@ -41,4 +41,13 @@ active -
+
+ + + + + + + + +
\ No newline at end of file Index: lams_admin/web/WEB-INF/tags/Tabs.tag =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/Tabs.tag,v diff -u -r1.3.14.1 -r1.3.14.2 --- lams_admin/web/WEB-INF/tags/Tabs.tag 16 Jun 2016 03:10:20 -0000 1.3.14.1 +++ lams_admin/web/WEB-INF/tags/Tabs.tag 17 Oct 2016 15:22:13 -0000 1.3.14.2 @@ -31,6 +31,7 @@ <%@ attribute name="control" required="false" rtexprvalue="true"%> <%@ attribute name="title" required="false" rtexprvalue="true"%> <%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%> +<%@ attribute name="helpPage" 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"%> @@ -39,7 +40,7 @@ <%@ taglib uri="tags-lams" prefix="lams"%> - + @@ -62,27 +63,34 @@ - ${title} + + ${title} + Index: lams_central/web/WEB-INF/tags/TabBody.tag =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/TabBody.tag,v diff -u -r1.5.22.1 -r1.5.22.2 Binary files differ Index: lams_central/web/WEB-INF/tags/Tabs.tag =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Tabs.tag,v diff -u -r1.7.22.2 -r1.7.22.3 Binary files differ Index: lams_central/web/css/index.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/index.css,v diff -u -r1.10.2.9 -r1.10.2.10 --- lams_central/web/css/index.css 14 Oct 2016 11:25:59 -0000 1.10.2.9 +++ lams_central/web/css/index.css 17 Oct 2016 15:22:07 -0000 1.10.2.10 @@ -29,6 +29,7 @@ .dialogContainer .modal-body { height : 100%; max-height: calc(100% - 60px); + padding: 0; } .dialogContainer iframe { Index: lams_central/web/includes/javascript/dialog.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/dialog.js,v diff -u -r1.1.2.7 -r1.1.2.8 --- lams_central/web/includes/javascript/dialog.js 14 Oct 2016 11:25:59 -0000 1.1.2.7 +++ lams_central/web/includes/javascript/dialog.js 17 Oct 2016 15:22:07 -0000 1.1.2.8 @@ -126,6 +126,8 @@ 'at' : 'center top+20px', 'of' : window }); + + internalContent.trigger('resizestop'); }); $('.dialogMinimise', dialog).click(function() { Index: lams_central/web/includes/javascript/groupDisplay.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/groupDisplay.js,v diff -u -r1.37.2.20 -r1.37.2.21 --- lams_central/web/includes/javascript/groupDisplay.js 15 Oct 2016 00:17:28 -0000 1.37.2.20 +++ lams_central/web/includes/javascript/groupDisplay.js 17 Oct 2016 15:22:07 -0000 1.37.2.21 @@ -175,16 +175,26 @@ // if it was just created if (dialog) { // tell the dialog contents that it was resized - $('.modal-content', dialog).on('resizestop dialogextendmaximize dialogextendrestore', function(){ - var frame = $('iframe', dialog)[0], - win = frame.contentWindow || frame.contentDocument; - win.resizeSequenceCanvas(dialog.width() - 10, dialog.height() - 10); - }); + $('.modal-content', dialog).on('resizestop', resizeSequenceCanvas); + // initial resize + $('iframe', dialog).load(resizeSequenceCanvas); + dialog.modal('show'); } } +function resizeSequenceCanvas(){ + var body = $('.modal-body'), + frame = $('iframe', body); + if (frame.length > 0) { + var win = frame[0].contentWindow || frame[0].contentDocument; + if (win.resizeSequenceCanvas) { + win.resizeSequenceCanvas(body.width(), body.height()); + } + } +} + function showAddLessonDialog(orgID) { showDialog("dialogAddLesson", { 'data' : { Index: lams_gradebook/web/WEB-INF/tags/Tab.tag =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/Tab.tag,v diff -u -r1.1 -r1.1.8.1 --- lams_gradebook/web/WEB-INF/tags/Tab.tag 9 Apr 2009 04:55:53 -0000 1.1 +++ lams_gradebook/web/WEB-INF/tags/Tab.tag 17 Oct 2016 15:22:15 -0000 1.1.8.1 @@ -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 @@ -
-
-
- - ${tabTitle} - -
-
-
+ + + class="active" + + + + + class="disabled" + + +
  • ${tabTitle}
    • Index: lams_gradebook/web/WEB-INF/tags/TabBody.tag =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/TabBody.tag,v diff -u -r1.1 -r1.1.8.1 --- lams_gradebook/web/WEB-INF/tags/TabBody.tag 9 Apr 2009 04:55:54 -0000 1.1 +++ lams_gradebook/web/WEB-INF/tags/TabBody.tag 17 Oct 2016 15:22:15 -0000 1.1.8.1 @@ -28,25 +28,26 @@ * 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 + -
    - +
    + + + + + + + + +
    \ No newline at end of file Index: lams_learning/web/WEB-INF/tags/Tab.tag =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Tab.tag,v diff -u -r1.7 -r1.7.12.1 --- lams_learning/web/WEB-INF/tags/Tab.tag 5 Mar 2008 07:29:41 -0000 1.7 +++ lams_learning/web/WEB-INF/tags/Tab.tag 17 Oct 2016 15:22:08 -0000 1.7.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_learning/web/WEB-INF/tags/TabBody.tag =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/TabBody.tag,v diff -u -r1.5 -r1.5.12.1 --- lams_learning/web/WEB-INF/tags/TabBody.tag 9 May 2007 00:59:25 -0000 1.5 +++ lams_learning/web/WEB-INF/tags/TabBody.tag 17 Oct 2016 15:22:08 -0000 1.5.12.1 @@ -1,52 +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 - * **************************************************************** - */ - -/** - * 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 + + +
    + + + + + + + + +
    \ No newline at end of file Index: lams_monitoring/web/monitor.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v diff -u -r1.27.2.25 -r1.27.2.26 --- lams_monitoring/web/monitor.jsp 13 Oct 2016 13:45:59 -0000 1.27.2.25 +++ lams_monitoring/web/monitor.jsp 17 Oct 2016 15:22:33 -0000 1.27.2.26 @@ -10,31 +10,35 @@ - + - + - - - + + + + + - -