Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.52 -r1.52.2.1
--- lams_admin/conf/language/lams/ApplicationResources.properties	7 Apr 2009 05:24:58 -0000	1.52
+++ lams_admin/conf/language/lams/ApplicationResources.properties	14 Apr 2009 06:40:09 -0000	1.52.2.1
@@ -383,7 +383,7 @@
 config.red5.server.url  =Media Server URL
 config.red5.recordings.url  =Media Server Recordings URL
 
-admin.gradebook.learner.enable  =Enable Grade Book for Learners
-admin.gradebook.monitor.enable  =Enable Grade Book for Monitors
+admin.gradebook.learner.enable  =Enable Gradebook for Learners
+admin.gradebook.monitor.enable  =Enable Gradebook for Monitors
 
 #======= End labels: Exported 375 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.52 -r1.52.2.1
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	7 Apr 2009 05:24:58 -0000	1.52
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	14 Apr 2009 06:40:09 -0000	1.52.2.1
@@ -383,7 +383,7 @@
 config.red5.server.url  =Media Server URL
 config.red5.recordings.url  =Media Server Recordings URL
 
-admin.gradebook.learner.enable  =Enable Grade Book for Learners
-admin.gradebook.monitor.enable  =Enable Grade Book for Monitors
+admin.gradebook.learner.enable  =Enable Gradebook for Learners
+admin.gradebook.monitor.enable  =Enable Gradebook for Monitors
 
 #======= End labels: Exported 375 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.71 -r1.71.2.1
--- lams_central/conf/language/lams/ApplicationResources.properties	7 Apr 2009 05:28:28 -0000	1.71
+++ lams_central/conf/language/lams/ApplicationResources.properties	14 Apr 2009 06:40:09 -0000	1.71.2.1
@@ -316,8 +316,8 @@
 label.planner.export.sequence=Export sequence
 error.planner.export.template=There was an error while exporting the template.
 
-index.coursegradebook  =Grade Book Monitor
-index.coursegradebook.tooltip  =Open course-wide Grade Book
-index.coursegradebook.learner  =My Grade Book
-index.coursegradebookmonitor  =Grade Book
+index.coursegradebook  =Gradebook Monitor
+index.coursegradebook.tooltip  =Open course-wide Gradebook
+index.coursegradebook.learner  =My Gradebook
+index.coursegradebookmonitor  =Gradebook
 #======= End labels: Exported 222 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.67 -r1.67.2.1
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	7 Apr 2009 05:28:28 -0000	1.67
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	14 Apr 2009 06:40:09 -0000	1.67.2.1
@@ -316,18 +316,9 @@
 error.planner.export.template=There was an error while exporting the template.
 
 
-index.coursegradebook  =Grade Book Monitor
-index.coursegradebook.tooltip  =Open course-wide Grade Book
-index.coursegradebook.learner  =My Grade Book
-index.coursegradebookmonitor  =Grade Book
+index.coursegradebook  =Gradebook Monitor
+index.coursegradebook.tooltip  =Open course-wide Gradebook
+index.coursegradebook.learner  =My Gradebook
+index.coursegradebookmonitor  =Gradebook
 
-
-
-
-
-
-
-
-
-
 #======= End labels: Exported 222 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java,v
diff -u -r1.19 -r1.19.2.1
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	9 Apr 2009 00:13:09 -0000	1.19
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	14 Apr 2009 06:40:09 -0000	1.19.2.1
@@ -170,7 +170,7 @@
 			+ org.getOrganisationId(), "index.searchlesson.tooltip"));
 
 		// Adding gradebook course monitor links if enabled
-		if (org.getEnableGradebookForMonitors() && contains(roles, Role.ROLE_GROUP_MANAGER)) {
+		if (org.getEnableGradebookForMonitors() && (contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles, Role.ROLE_MONITOR))) {
 		    String link = "javascript:openGradebookCourseMonitorPopup(" + "'" + org.getName() + "','"
 			    + Configuration.get(ConfigurationKeys.SERVER_URL)
 			    + "/gradebook/gradebookMonitoring.do?dispatch=courseMonitor&organisationID="