Index: lams_webct_integration/web/teach.vm
===================================================================
diff -u -rdc39866a1a6af7b9534cccd65bb4e5ec2cec8911 -r164cf767789b4c58d9ccb41f0d71d00d4a4c9ed9
--- lams_webct_integration/web/teach.vm	(.../teach.vm)	(revision dc39866a1a6af7b9534cccd65bb4e5ec2cec8911)
+++ lams_webct_integration/web/teach.vm	(.../teach.vm)	(revision 164cf767789b4c58d9ccb41f0d71d00d4a4c9ed9)
@@ -34,6 +34,8 @@
 	var liveEditUrl= null;
 	var learnerUrl = null;
 	var monitorUrl = null;
+	var authorUrl = null;
+	var authorWin = null;
 	
 	function openLearner(lsID)
 	{
@@ -118,6 +120,27 @@
 	{
 		document.teach_form.submit();
 	}
+	
+	function openAuthor()
+    {
+    	authorUrl = '${authorUrl}'; 
+    	authorUrl += "&notifyCloseURL="
+    	if(authorWin && authorWin.open && !authorWin.closed){
+    		try {
+            	authorWin.focus();
+            }catch(e){
+		        // popups blocked by a 3rd party
+		   	}
+        }
+        else{
+            try {
+            	authorWin = window.open(authorUrl,'aWindow','width=800,height=600,resizable');
+            	authorWin.focus();
+            }catch(e){
+		        // popups blocked by a 3rd party
+		    }
+        }
+    }
 
 	
 //-->
@@ -134,66 +157,69 @@
 	<input type="hidden" name="form_action" id="form_action" value="create_lesson"/>
 	<input type="hidden" name="lsID" id="lsID" value="0"/>
 	#if ( $canAuthor )
-		<div class="actionbuttondiv"><a class="action" tabindex="1" href="javascript:formSubmit()">Create LAMS Lesson</a></div>
+		<div class="actionbuttondiv">
+			<a class="action" tabindex="1" href="javascript:openAuthor()">Open LAMS Author</a>
+			<a class="action" tabindex="1" href="javascript:formSubmit()">Create LAMS Lesson</a>
+		</div>
 	
 		<br><br>
 		<hr>
 		<br>
 	#end
-	<h3>LAMS Lessons Running</h3>
-	<br>
+
 		
 	
 	
 #if( $lessons.size() > 0 )	
-	<table width='100%' border='1' cellpadding='10' style="padding:10px 10px 10px 10px;" class="tablebody">	
+	<table width='100%' cellpadding='10' style="padding:10px 10px 10px 10px;" class="tablebody">	
 	<thead>
 	<tr>
-		<th width="20%">Title</th>
-		<th width="30%">Description</th>
-		<th width="20%">Status</th>
-
-		
-		<th width="30%">Actions</th>
+		<th>LAMS Lessons Running</th>
+		<th></th>
+		<th></th>
+		<th></th>
 	</tr>
 	</thead>
 	<tbody>
+	
 	#foreach ($lesson in $lessons)
 		<tr>
-			<td valign='top'><b>$lesson.getTitle()</b></td>
-			<td valign='top'><i>$lesson.getDescription()</i></td>
-			
-			#set( $start = '' )
-			#set( $end = '' )
-			#set( $endStr = '' )
-			
-			<td valign='top'>
-				<i>
-				#if ( $lesson.getSchedule() )
-					#set( $start = $lesson.getStartTimestamp() )
-					#set( $end = $lesson.getEndTimestamp() )
-					#set( $endStr = $end.toString() )
-					
+			<td valign='top'><b>$lesson.getTitle()</b>&nbsp;&nbsp;&nbsp;&nbsp;
+			<i>
+				
+				#set( $startStr = $lesson.getStartStr() )
+				#set( $endStr = $lesson.getEndStr() ) 
+				
+				
+				#if( $startStr != '' )
 					#if( $endStr != '' )
-						Scheduled from:<br>
-						&nbsp;&nbsp;&nbsp;&nbsp;$start.toString() to<br>	
-						&nbsp;&nbsp;&nbsp;&nbsp;$endStr	
+						Scheduled from: $startStr to $endStr &nbsp;	 
 					#else
-						Scheduled from:<br>
-						&nbsp;&nbsp;&nbsp;&nbsp;$start.toString()
+						Scheduled from: $startStr &nbsp;
 					#end
 					
 					#if( $lesson.getHidden() )
-						<br>&nbsp;&nbsp;&nbsp;&nbsp;(Hidden)
+						(Hidden)
 					#end
 				#elseif( $lesson.getHidden() )
 					Hidden
 				#else
 					Running
 				#end
-				</i>
-			</td>
+
 			
+			</i>
+			
+			<p>
+			<i>$lesson.getDescription()</i>
+			</p>
+			
+			#set( $start = '' )
+			#set( $end = '' )
+			#set( $endStr = '' )
+			
+			
+			
 			<!--
 			<td valign='top'><i>$lesson.getHidden()</i></td>
 			<td valign='top'><i>$lesson.getSchedule()</i></td>
@@ -212,20 +238,28 @@
 			#end
 			-->
 	
-			<td valign='top'>
-				#if ( $canMonitor )
-					<a class="actionlight" href="javascript:openLearner($lesson.getLessonId())">Open Learner</a>
-					<a class="actionlight" href="javascript:openMonitor($lesson.getLessonId())">Open Monitor</a>
-				#end
-				#if ( $canAuthor )
-					<a class="actionlight" href="javascript:modifyLesson($lesson.getLessonId(),'modify_lesson')">Modify</a>
-					<a class="actionlight" href="javascript:deleteLesson($lesson.getLessonId(),'delete_lesson')">Delete</a>
-				#end
+			<p>
+				
+					#if ( $canMonitor )
+						
+						<a class="actionlight" href="javascript:openLearner($lesson.getLessonId())">Open Learner</a>&nbsp;
+						
+						<a class="actionlight" href="javascript:openMonitor($lesson.getLessonId())">Open Monitor</a>&nbsp;
+						
+					#end
+					#if ( $canAuthor )
+						
+						<a class="actionlight" href="javascript:modifyLesson($lesson.getLessonId(),'modify_lesson')">Modify</a>&nbsp;
+						
+						<a class="actionlight" href="javascript:deleteLesson($lesson.getLessonId(),'delete_lesson')">Delete</a>&nbsp;
+						
+					#end
+			</p>		
 			</td>
 	
 		</tr>
 	#end
-	
+	</tbody>
 	</table>
 #else
     <i>No LAMS lessons running.</i>