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.2.2 -r1.19.2.3
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	17 Apr 2009 08:22:34 -0000	1.19.2.2
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	23 Apr 2009 01:41:00 -0000	1.19.2.3
@@ -183,10 +183,9 @@
 
 	    } else {//CLASS_TYPE
 		if (contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles, Role.ROLE_MONITOR))
-		    moreLinks.add(new IndexLinkBean("index.coursegradebook", Configuration
-			    .get(ConfigurationKeys.SERVER_URL)
-			    + "/gradebook/ggradebookMonitoring.do?dispatch=courseMonitor&organisationID="
-			    + org.getParentOrganisation().getOrganisationId()
+		    links.add(new IndexLinkBean("index.addlesson", Configuration.get(ConfigurationKeys.SERVER_URL)
+			    + "/home.do?method=addLesson&courseID=" + org.getParentOrganisation().getOrganisationId()
+			    + "&classID=" + org.getOrganisationId()
 			    + "&KeepThis=true&TB_iframe=true&height=480&width=610", "add-lesson-button thickbox"
 			    + org.getOrganisationId(), null));
 	    }
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v
diff -u -r1.36 -r1.36.2.1
--- lams_central/web/includes/javascript/openUrls.js	9 Apr 2009 05:05:06 -0000	1.36
+++ lams_central/web/includes/javascript/openUrls.js	23 Apr 2009 01:41:00 -0000	1.36.2.1
@@ -33,6 +33,7 @@
 			if (copyrightWin && !copyrightWin.closed) copyrightWin.close();
 			if (gradebookMonWin && !gradebookMonWin.closed) gradebookMonWin.close();
 			if (gradebookLrnWin && !gradebookLrnWin.closed) gradebookLrnWin.close();
+			if (gradebookMonLessonWin && !gradebookMonLessonWin.closed) gradebookMonLessonWin.close();
 		}
 		
 		function openProfile()
@@ -318,7 +319,7 @@
 			if(gradebookMonWin && !gradebookMonWin.closed ){
 				gradebookMonWin.focus();
 			}else{
-				gradebookMonWin = window.open(url, winname,'resizable,left='+left+',top='+top+',width='+width+',height='+height+',scrollbars');
+				gradebookMonWin = window.open(url, "gradebookMonWin",'resizable,left='+left+',top='+top+',width='+width+',height='+height+',scrollbars');
 				gradebookMonWin.focus();
 			}
 		}
@@ -327,7 +328,7 @@
 			if(gradebookLrnWin && !gradebookLrnWin.closed ){
 				gradebookLrnWin.focus();
 			}else{
-				gradebookLrnWin = window.open(url, winname,'resizable,left='+left+',top='+top+',width='+width+',height='+height+',scrollbars');
+				gradebookLrnWin = window.open(url, "gradebookLrnWin",'resizable,left='+left+',top='+top+',width='+width+',height='+height+',scrollbars');
 				gradebookLrnWin.focus();
 			}
 		}
@@ -336,7 +337,7 @@
 			if(gradebookMonLessonWin && !gradebookMonLessonWin.closed ){
 				gradebookMonLessonWin.focus();
 			}else{
-				gradebookMonLessonWin = window.open(url, winname,'resizable,left='+left+',top='+top+',width='+width+',height='+height+',scrollbars');
+				gradebookMonLessonWin = window.open(url, "gradebookMonLessonWin",'resizable,left='+left+',top='+top+',width='+width+',height='+height+',scrollbars');
 				gradebookMonLessonWin.focus();
 			}
 		}
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.1.2.11 -r1.1.2.12
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	23 Apr 2009 00:26:41 -0000	1.1.2.11
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	23 Apr 2009 01:41:00 -0000	1.1.2.12
@@ -504,7 +504,7 @@
 		    if (lesson.getOrganisation().getOrganisationId() != organisation.getOrganisationId()) {
 			lessonRow.setSubGroup(lesson.getOrganisation().getName());
 		    } else {
-			lessonRow.setSubGroup("-");
+			lessonRow.setSubGroup("");
 		    }
 
 		    lessonRows.add(lessonRow);
@@ -807,9 +807,9 @@
 			if (toolOutput != null && toolOutput.getValue().getType() != OutputType.OUTPUT_COMPLEX) {
 			    toolOutputs.add(toolOutput);
 
-			    toolOutputsStr += "<option style='width:100%;'>";
+
 			    toolOutputsStr += toolOutput.getDescription() + ": " + toolOutput.getValue().getString();
-			    toolOutputsStr += "</option>";
+			    toolOutputsStr += "<br />";
 
 			    noOutputs = false;
 			}
@@ -819,18 +819,15 @@
 				+ toolAct.getActivityId() + ", continuing for other activities", e);
 		    }
 		}
-		toolOutputsStr += "</select>";
+		//toolOutputsStr += "</ul>";
 	    }
 	}
 
 	// Fix up outputs html if there are not outputs available
 	if (noOutputs) {
 	    toolOutputsStr = "-";
-	} else {
-	    toolOutputsStr = "<select style='width:150px;'><option style='width:100%;'>View outputs</option>"
-		    + toolOutputsStr;
-	}
-
+	} 
+	
 	return toolOutputsStr;
     }
 
Index: lams_gradebook/web/gradebookCourseLearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookCourseLearner.jsp,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_gradebook/web/gradebookCourseLearner.jsp	21 Apr 2009 06:39:49 -0000	1.1.2.4
+++ lams_gradebook/web/gradebookCourseLearner.jsp	23 Apr 2009 01:41:00 -0000	1.1.2.5
@@ -11,6 +11,20 @@
 <lams:head>
 	<title>Course Gradebook Learner</title>
 	<lams:css />
+	
+	<style>
+		#content {
+			margin-top:20px;
+			margin-left:auto;
+			margin-right:auto;
+			margin-bottom:30px; 
+			width:680px; 
+			height:100%; 
+			border:1px solid #d4d8da;
+			background-color:#fff;
+			padding:20px 25px;
+		}
+	</style>
 
 	<jsp:include page="includes/jsp/jqGridIncludes.jsp"></jsp:include>
 
@@ -89,7 +103,7 @@
 						       	{name:'id', index:'id', sortable:false, hidden:true, hidedlg:true},
 								{name:'rowName', index:'rowName', sortable:false, editable: false, width:100},
 								{name:'status', index:'status', sortable:false, editable:false, width:50, align:"center"},
-								{name:'feedback', index:'feedback', sortable:false, editable: false},
+								{name:'feedback', index:'feedback', sortable:false, editable: false, hidden:true},
 								{name:'averageTimeTaken',index:'averageTimeTaken', sortable:true, hidden:true, editable:false, search:false, width:80, align:"center"},
 			      				{name:'timeTaken',index:'timeTaken', sortable:true, editable:false, hidden:true, search:false, width:80, align:"center"},
 			      				{name:'averageMark',index:'averageMark', sortable:true, editable:false, search:false, width:50, align:"center"},
@@ -156,7 +170,7 @@
 				</fmt:message>
 			</h1>
 			<br />
-			<div style="width: 600px; margin-left: auto; margin-right: auto;">
+			<div style="width: 600px; margin-left: 20px; margin-right: 20px">
 				<table id="organisationGrid" class="scroll"></table>
 				<div id="organisationGridPager" class="scroll"></div>
 				
Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookCourseMonitor.jsp,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_gradebook/web/gradebookCourseMonitor.jsp	22 Apr 2009 03:30:58 -0000	1.1.2.4
+++ lams_gradebook/web/gradebookCourseMonitor.jsp	23 Apr 2009 01:41:00 -0000	1.1.2.5
@@ -11,7 +11,21 @@
 <lams:head>
 	<title><fmt:message key="gradebook.title.window.courseMonitor"/></title>
 	<lams:css />
-
+	
+	<style>
+		#content {
+			margin-top:20px;
+			margin-left:auto;
+			margin-right:auto;
+			margin-bottom:30px; 
+			width:707px; 
+			height:100%; 
+			border:1px solid #d4d8da;
+			background-color:#fff;
+			padding:20px 25px;
+		}
+	</style>
+	
 	<jsp:include page="includes/jsp/jqGridIncludes.jsp"></jsp:include>
 
 	<script type="text/javascript">
@@ -23,7 +37,7 @@
 			    datatype: "xml",
 			    url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getCourseGridData&view=monCourse&organisationID=${organisationID}",
 			    height: "100%",
-			    width: 700,
+			    width: 660,
 			    imgpath: '<lams:LAMSURL />includes/javascript/jqgrid/themes/basic/images',
 			    sortorder: "asc", 
 			    sortname: "id", 
@@ -41,7 +55,7 @@
 			    colModel:[
 			      {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 			      {name:'rowName',index:'rowName', sortable:true, editable:false},
-			      {name:'subGroup',index:'subGroup', sortable:false, editable:false, search:false},
+			      {name:'subGroup',index:'subGroup', sortable:false, editable:false, search:false, width:80},
 			      {name:'startDate',index:'startDate', sortable:false, editable:false, search:false, width:80, align:"center"},
 			      {name:'avgTimeTaken',index:'avgTimeTaken', sortable:true, editable:false, search:false, width:80, align:"center"},
 			      {name:'avgMark',index:'avgMark', sortable:true, editable:false, search:false, width:50, align:"center"}
@@ -60,7 +74,7 @@
 					     datatype: "xml",
 					     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getUserGridData&view=monCourse&lessonID=" + lessonID,
 					     height: "100%",
-					     width: 650,
+					     width: 600,
 					     imgpath: '<lams:LAMSURL />includes/javascript/jqgrid/themes/basic/images',
 					     cellEdit:true,
 					     cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserLessonGradebookData&lessonID=" + lessonID,
@@ -168,7 +182,7 @@
 				</fmt:message>
 			</h1>
 			<br />
-			<div style="width: 700px; margin-left: auto; margin-right: auto;">
+			<div style="width: 700px; margin-left: 10px; margin-right: 10px;">
 				<table id="organisationGrid" class="scroll"></table>
 				<div id="organisationGridPager" class="scroll"></div>
 				
Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookMonitor.jsp,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_gradebook/web/gradebookMonitor.jsp	22 Apr 2009 03:30:58 -0000	1.1.2.7
+++ lams_gradebook/web/gradebookMonitor.jsp	23 Apr 2009 01:41:00 -0000	1.1.2.8
@@ -11,6 +11,20 @@
 	<title><fmt:message key="gradebook.title.window.lessonMonitor"/></title>
 	<lams:css/>
 	
+	<style>
+		#content {
+			margin-top:20px;
+			margin-left:auto;
+			margin-right:auto;
+			margin-bottom:30px; 
+			width:707px; 
+			height:100%; 
+			border:1px solid #d4d8da;
+			background-color:#fff;
+			padding:20px 25px;
+		}
+	</style>
+	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-latest.pack.js"></script>
 	
 	<jsp:include page="includes/jsp/jqGridIncludes.jsp"></jsp:include>
@@ -65,7 +79,7 @@
 			    datatype: "xml",
 			    url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getUserGridData&view=monUserView&lessonID=${lessonDetails.lessonID}",
 			    height: "100%",
-			    width: 700,
+			    width: 670,
 			    imgpath: '<lams:LAMSURL />includes/javascript/jqgrid/themes/basic/images',
 			    cellEdit: true,
 			    viewrecords: true,
@@ -104,7 +118,7 @@
 						     datatype: "xml",
 						     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityGridData&lessonID=${lessonDetails.lessonID}&view=monUserView&userID=" + userID,
 						     height: "100%",
-						     width: 650,
+						     width: 620,
 						     cellEdit:true,
 						     imgpath: '<lams:LAMSURL />includes/javascript/jqgrid/themes/basic/images',
 						     pager: subgrid_table_id + "_pager",
@@ -127,10 +141,10 @@
 						       	{name:'marksAvailable',index:'marksAvailable', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 								{name:'rowName',  index:'rowName', sortable:false, editable: false},
 								{name:'status',  index:'status', sortable:false, editable:false, width:50, align:"center"},
-								{name:'output',  index:'output', sortable:false, editable: false, width:200},
+								{name:'output',  index:'output', sortable:false, editable: false, width:200, hidden:true},
 								{name:'competences',  index:'competences', sortable:false, editable: false, hidden:true},
 								{name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:80, align:"center"},
-								{name:'feedback',  index:'feedback', sortable:false, editable: true, edittype:'textarea', editoptions:{rows:'4',cols:'20'}, width:200},
+								{name:'feedback',  index:'feedback', sortable:false, editable: true, edittype:'textarea', editoptions:{rows:'4',cols:'20'}, width:200, hidden:true},
 								{name:'mark', index:'mark', sortable:true, editable: true, editrules:{number:true}, width:50, align:"center" }
 						     ],
 						     loadError: function(xhr,st,err) {
@@ -254,7 +268,7 @@
 				    datatype: "xml",
 				    url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityGridData&view=monActivityView&lessonID=${lessonDetails.lessonID}",
 				    height: "100%",
-				    width: 700,
+				    width: 670,
 				    cellEdit: true,
 				    pager: "activityViewPager",
 				    rowList:[5,10,20,30],
@@ -294,7 +308,7 @@
 						     datatype: "xml",
 						     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getUserGridData&view=monActivityView&lessonID=${lessonDetails.lessonID}&activityID=" + activityID + "&groupId=" + groupID,
 						     height: "100%",
-						     width: 600,
+						     width: 580,
 						     cellEdit:true,
 						     imgpath: '<lams:LAMSURL />includes/javascript/jqgrid/themes/basic/images',
 						     cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradebookData&lessonID=${lessonDetails.lessonID}&view=monActivityView&activityID=" + activityID,
@@ -319,8 +333,8 @@
 						     	{name:'rowName',index:'rowName', sortable:true, editable:false},
 						      	{name:'status', align:'center', width:30, index:'status', sortable:false, editable:false, search:false, width:50, align:"center"},
 						      	{name:'timeTaken', index:'timeTaken', sortable:true, editable: false, width:80, align:"center"},
-						      	{name:'output', index:'output', sortable:false, editable: false, search:false, width:200},
-						     	{name:'feedback',index:'feedback', sortable:false, editable:true, edittype:'textarea', editoptions:{rows:'4',cols:'20'} , search:false, width:200},
+						      	{name:'output', index:'output', sortable:false, editable: false, search:false, width:200, hidden:true},
+						     	{name:'feedback',index:'feedback', sortable:false, editable:true, edittype:'textarea', editoptions:{rows:'4',cols:'20'} , search:false, width:200, hidden:true},
 						     	{name:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}, search:false, width:50, align:"center"}
 						     ],
 						     loadError: function(xhr,st,err) {
@@ -461,7 +475,7 @@
 				<br />
 			</div>
 			
-			<div style="width:700px; margin-left:auto; margin-right:auto;">
+			<div style="width: 700px; margin-left: 10px; margin-right: 10px;">
 				<table id="userView" class="scroll" ></table>
 				<div id="userViewPager" class="scroll" ></div>