Index: lams_gradebook/web/gradebookCourseLearner.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookCourseLearner.jsp,v diff -u -r1.9 -r1.9.2.1 --- lams_gradebook/web/gradebookCourseLearner.jsp 5 Apr 2014 18:48:09 -0000 1.9 +++ lams_gradebook/web/gradebookCourseLearner.jsp 2 Sep 2014 22:02:23 -0000 1.9.2.1 @@ -1,7 +1,6 @@ -<%@ page language="java" pageEncoding="UTF-8" - contentType="text/html;charset=utf-8"%> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> @@ -63,7 +62,7 @@ ], loadError: function(xhr,st,err) { jQuery("#organisationGrid").clearGridData(); - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); }, subGrid: true, subGridRowExpanded: function(subgrid_id, row_id) { @@ -101,7 +100,7 @@ ], loadError: function(xhr,st,err) { jQuery("#"+subgrid_table_id).clearGridData(); - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); }, gridComplete: function(){ toolTip($(".jqgrow")); Index: lams_gradebook/web/gradebookCourseMonitor.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookCourseMonitor.jsp,v diff -u -r1.16 -r1.16.2.1 --- lams_gradebook/web/gradebookCourseMonitor.jsp 5 Apr 2014 18:48:09 -0000 1.16 +++ lams_gradebook/web/gradebookCourseMonitor.jsp 2 Sep 2014 22:02:24 -0000 1.16.2.1 @@ -1,7 +1,6 @@ -<%@ page language="java" pageEncoding="UTF-8" - contentType="text/html;charset=utf-8"%> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> @@ -53,7 +52,7 @@ ], loadError: function(xhr,st,err) { jQuery("#organisationGrid").clearGridData(); - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); }, subGrid: true, subGridRowExpanded: function(subgrid_id, row_id) { @@ -91,7 +90,7 @@ ], loadError: function(xhr,st,err) { jQuery("#"+subgrid_table_id).clearGridData(); - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); }, formatCell: function(rowid, cellname,value, iRow, iCol) { if (cellname == "mark") { @@ -199,7 +198,7 @@ ], loadError: function(xhr,st,err) { jQuery("#userView").clearGridData(); - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); }, subGrid: true, subGridRowExpanded: function(subgrid_id, row_id) { @@ -245,7 +244,7 @@ ], loadError: function(xhr,st,err) { jQuery("#"+subgrid_table_id).clearGridData(); - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); }, formatCell: function(rowid, cellname,value, iRow, iCol) { if (cellname == "mark") { @@ -285,7 +284,7 @@ var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid); if (currRowData['marksAvailable'] != null && currRowData['marksAvailable'] != "") { if (parseFloat(value) > parseFloat(currRowData['marksAvailable'])){ - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); jQuery("#"+subgrid_table_id).restoreCell( iRow, iCol); throw("Mark must be lower than maximum mark"); } @@ -319,7 +318,7 @@ $("#organisationGrid").trigger("reloadGrid"); }, errorCell: function(serverresponse, status) { - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); }, gridComplete: function(){ toolTip($(".jqgrow")); Index: lams_gradebook/web/gradebookMonitor.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookMonitor.jsp,v diff -u -r1.12 -r1.12.2.1 --- lams_gradebook/web/gradebookMonitor.jsp 5 Apr 2014 18:46:04 -0000 1.12 +++ lams_gradebook/web/gradebookMonitor.jsp 2 Sep 2014 22:02:23 -0000 1.12.2.1 @@ -44,7 +44,7 @@ displayReleaseOption(); } else { - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); } }); } @@ -96,7 +96,7 @@ ], loadError: function(xhr,st,err) { jQuery("#userView").clearGridData(); - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); }, subGrid: true, subGridRowExpanded: function(subgrid_id, row_id) { @@ -140,7 +140,7 @@ ], loadError: function(xhr,st,err) { jQuery("#"+subgrid_table_id).clearGridData(); - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); }, formatCell: function(rowid, cellname,value, iRow, iCol) { if (cellname == "mark") { @@ -180,7 +180,7 @@ var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid); if (currRowData['marksAvailable'] != null && currRowData['marksAvailable'] != "") { if (parseFloat(value) > parseFloat(currRowData['marksAvailable'])){ - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); jQuery("#"+subgrid_table_id).restoreCell( iRow, iCol); throw("Mark must be lower than maximum mark"); } @@ -208,7 +208,7 @@ } }, errorCell: function(serverresponse, status) { - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); }, gridComplete: function(){ toolTip($(".jqgrow")); @@ -284,7 +284,7 @@ ], loadError: function(xhr,st,err) { jQuery("#activityView").clearGridData(); - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); }, subGrid: true, subGridRowExpanded: function(subgrid_id, row_id) { @@ -330,7 +330,7 @@ ], loadError: function(xhr,st,err) { jQuery("#"+subgrid_table_id).clearGridData(); - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); }, formatCell: function(rowid, cellname,value, iRow, iCol) { if (cellname == "mark") { @@ -370,7 +370,7 @@ var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid); if (currRowData['marksAvailable'] != null && currRowData['marksAvailable'] != "") { if (parseFloat(value) > parseFloat(currRowData['marksAvailable'])){ - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); jQuery("#"+subgrid_table_id).restoreCell( iRow, iCol); throw("Mark must be lower than maximum mark"); } @@ -394,7 +394,7 @@ } }, errorCell: function(serverresponse, status) { - info_dialog("", "", ""); + $.jgrid.info_dialog("", "", ""); }, gridComplete: function(){ toolTip($(".jqgrow")); // applying tooltips for this grid