Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc66eb16fd82d488f15aadc9c4c3d615b4493b12e
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java (.../GBActivityGridRowDTO.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java (.../GBActivityGridRowDTO.java) (revision c66eb16fd82d488f15aadc9c4c3d615b4493b12e)
@@ -120,8 +120,8 @@
ret.add(marksAvailable != null ? marksAvailable.toString() : "");
if (activityUrl != null && activityUrl.length() != 0) {
- ret.add(""
- + rowName + "");
+ ret.add("" + rowName
+ + "");
} else {
ret.add(rowName);
}
@@ -138,8 +138,8 @@
ret.add(groupId != null ? groupId.toString() : "");
if (monitorUrl != null && monitorUrl.length() != 0) {
- ret.add(""
- + rowName + "");
+ ret.add("" + rowName
+ + "");
} else {
ret.add(rowName);
}
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc66eb16fd82d488f15aadc9c4c3d615b4493b12e
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java (.../GBLessonGridRowDTO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java (.../GBLessonGridRowDTO.java) (revision c66eb16fd82d488f15aadc9c4c3d615b4493b12e)
@@ -57,8 +57,8 @@
if (view == GBGridView.MON_COURSE) {
if (gradebookMonitorURL != null && gradebookMonitorURL.length() != 0) {
- ret.add("" + rowName + "");
+ ret.add(""
+ + rowName + "");
} else {
ret.add(rowName);
}
@@ -70,7 +70,7 @@
} else if ((view == GBGridView.LRN_COURSE) || (view == GBGridView.MON_USER)) {
if (gradebookLearnerURL != null && gradebookLearnerURL.length() != 0) {
- ret.add(""
+ ret.add(""
+ rowName + "");
} else {
ret.add(rowName);
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc66eb16fd82d488f15aadc9c4c3d615b4493b12e
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java (.../GBUserGridRowDTO.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java (.../GBUserGridRowDTO.java) (revision c66eb16fd82d488f15aadc9c4c3d615b4493b12e)
@@ -87,7 +87,7 @@
ret.add((mark != null) ? GradebookUtil.niceFormatting(mark) : CELL_EMPTY);
ret.add(portraitId != null ? portraitId.toString() : "");
if (activityUrl != null && activityUrl.length() != 0) {
- ret.add("javascript:launchPopup(\"" + activityUrl + "\",\"" + rowName + "\",796,570)'>");
+ ret.add("javascript:launchPopup(\"" + activityUrl + "\",\"" + rowName + "\")'>");
}
} else if (view == GBGridView.MON_COURSE) {
Index: lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc66eb16fd82d488f15aadc9c4c3d615b4493b12e
--- lams_gradebook/web/includes/jsp/jqGridIncludes.jsp (.../jqGridIncludes.jsp) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_gradebook/web/includes/jsp/jqGridIncludes.jsp (.../jqGridIncludes.jsp) (revision c66eb16fd82d488f15aadc9c4c3d615b4493b12e)
@@ -14,6 +14,9 @@