Index: lams_central/web/css/pedagogicalPlanner.css
===================================================================
diff -u
--- lams_central/web/css/pedagogicalPlanner.css	(revision 0)
+++ lams_central/web/css/pedagogicalPlanner.css	(revision 0cf0add4991151d21aeac41ddca7a40e76dc78f6)
@@ -0,0 +1,62 @@
+/*
+*************************************************
+LAMS 2.2
+Date modified:  24/01/2009
+
+*************************************************
+CSS for PedagogicalPlanner
+********************************************** */
+
+.toolFrame {
+    width: 580px;
+    border: 1px lightgrey solid;
+   }
+   
+.pedagogicalPlannerButtons {
+     margin-right: 10px;
+     float: right;
+   }
+   
+.pedagogicalPlannerTable{
+     table-layout: fixed;
+   }
+   
+.titleCell {
+   	padding: 0px 0px 0px 5px;
+   	width: 85px;
+   	text-align: center;
+   }
+   
+.titleCell span{
+	font-size: smaller;
+	}
+   
+.formCell {
+   	width: 580px;
+   }
+   
+#pedagogicalPlannerInfoArea {
+	color: #000000;
+	padding:8px 10px 10px 40px;
+	margin-top: 25px;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: 20px;
+	text-align: left;
+	font-weight: normal;
+	background: url('../images/css/edit.gif') no-repeat #d8e4f1 10px 8px;
+	width: 60%;
+	border: 1px solid #3c78b5;
+	float: none;
+}
+
+div#buttonArea{
+	padding: 0px 10px 40px 0px;
+}
+div#pedagogicalPlannerBusy{
+	margin: 0px 0px 20px 40%;
+}
+div#pedagogicalPlannerErrorArea{
+	margin-bottom: 20px;
+	width: 60%;
+}
\ No newline at end of file
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -re456cbdff56a950306015c2e58a9c0460cba7888 -r0cf0add4991151d21aeac41ddca7a40e76dc78f6
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision e456cbdff56a950306015c2e58a9c0460cba7888)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 0cf0add4991151d21aeac41ddca7a40e76dc78f6)
@@ -51,11 +51,10 @@
 			}
 		}
 		
-		function openAuthor(learningDesignId){
-			var learningDesignParam = learningDesignId==null ? "":"&learningDesignID="+learningDesignId;
+		function openAuthor(){
 			if(isMac)
 				{
-					authorWin = window.open('home.do?method=author'+learningDesignParam,'aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
+					authorWin = window.open('home.do?method=author','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
 				}
 			else
 				{
@@ -66,11 +65,30 @@
 					}
 					else
 					{
-						authorWin = window.open('home.do?method=author'+learningDesignParam,'aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
+						authorWin = window.open('home.do?method=author','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable');
 						authorWin.focus();
 					}
 				}
 		}
+		
+		function openPedagogicalPlanner(){
+			if(isMac)
+				{
+					authorWin = window.open('pedagogicalPlanner.do','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable,scrollbars');
+				}
+			else
+				{
+					if(authorWin && !authorWin.closed)
+					{
+						authorWin.focus();
+					}
+					else
+					{
+						authorWin = window.open('pedagogicalPlanner.do','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable,scrollbars');
+						authorWin.focus();
+					}
+				}
+		}
 
 		function openAuthorForEditOnFly( learningDesignID )
 		{
Index: lams_central/web/includes/javascript/pedagogicalPlanner.js
===================================================================
diff -u -r8d32e52903d230f8018ac609041934db7f180e73 -r0cf0add4991151d21aeac41ddca7a40e76dc78f6
--- lams_central/web/includes/javascript/pedagogicalPlanner.js	(.../pedagogicalPlanner.js)	(revision 8d32e52903d230f8018ac609041934db7f180e73)
+++ lams_central/web/includes/javascript/pedagogicalPlanner.js	(.../pedagogicalPlanner.js)	(revision 0cf0add4991151d21aeac41ddca7a40e76dc78f6)
@@ -141,7 +141,7 @@
   	   		window.open(startPreviewUrl,'Preview','width=800,height=600,scrollbars=yes,resizable=yes');
   	   	}
   	   	else if (actionAfterCompleted==ACTION_OPEN_AUTHOR){
-  	   		 openAuthor(learningDesignId);
+  	   		 document.location.href="home.do?method=author&learningDesignID="+learningDesignId;
   	   	}
   	}
   	else {
Index: lams_central/web/pedagogical_planner/base.jsp
===================================================================
diff -u -re456cbdff56a950306015c2e58a9c0460cba7888 -r0cf0add4991151d21aeac41ddca7a40e76dc78f6
--- lams_central/web/pedagogical_planner/base.jsp	(.../base.jsp)	(revision e456cbdff56a950306015c2e58a9c0460cba7888)
+++ lams_central/web/pedagogical_planner/base.jsp	(.../base.jsp)	(revision 0cf0add4991151d21aeac41ddca7a40e76dc78f6)
@@ -6,139 +6,114 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-function" prefix="fn" %>
-
-
-<style type="text/css">
-    .toolFrame {
-     width: 550px;
-     border: 1px lightgrey solid;
-    }
-    
-    .pedagogicalPlannerButtons {
-      margin-right: 10px;
-      float: right;
-    }
-    
-    .pedagogicalPlannerTable{
-      table-layout: fixed;
-    }
-    
-    .titleCell {
-    	padding: 0px;
-    	width: 85px;
-    	text-align: center;
-    }
-    
-    .formCell {
-    	width: 550px;
-    }
-    
-    #pedagogicalPlannerInfoArea {
-	color: #000000;
-	padding:8px 10px 10px 40px;
-	margin-top: 25px;
-	margin-left: auto;
-	margin-right: auto;
-	margin-bottom: 20px;
-	text-align: left;
-	font-weight: normal;
-	background: url('images/css/edit.gif') no-repeat #d8e4f1 10px 8px;
-	width: 60%;
-	border: 1px solid #3c78b5;
-	float: none;
-	}
-  </style>
-  
-  <script type="text/javascript">
-   var activityCount = ${fn:length(planner.activities)}; //How many activities are there in the sequence
-   var activitySupportingPlannerCount = ${planner.activitySupportingPlannerCount}; //How many of activities support the planner (their data will be submitted)
-   var sendInPortions = ${planner.sendInPortions}; //Should the forms be send all at once or rather in parts
-   var activitiesInPortion =  ${planner.activitiesInPortion}; //After how many submitted forms the script should pause
-   var submitDelay =  ${planner.submitDelay}; //How many miliseconds should the script wait before sending another portion of forms
-   var saveDetailsUrl = "<c:url value='/pedagogicalPlanner.do'/>";
-   var errorPlannerNotSaved = '<fmt:message key="planner.not.saved" />';
-  </script>
-  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-latest.pack.js"></script>
-  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/pedagogicalPlanner.js"></script>
-
-<div style="clear:both"></div>
-<h2 class="small-space-top"><fmt:message key="planner.title" /></h2>
-
-<div class="shading-bg">
-	<!-- A small form for learning design title only -->
-	<form id="sequenceDetailsForm">
-		<table cellspacing="0" cellpadding="0" class="pedagogicalPlannerTable">
+<lams:html>
+<lams:head>
+	<title><fmt:message key="title.lams"/> :: <fmt:message key="planner.title" /></title>
+	<lams:css style="main" />
+	<link href="<lams:LAMSURL />css/pedagogicalPlanner.css" rel="stylesheet" type="text/css">
+	  
+	  <script type="text/javascript">
+	   var activityCount = ${fn:length(planner.activities)}; //How many activities are there in the sequence
+	   var activitySupportingPlannerCount = ${planner.activitySupportingPlannerCount}; //How many of activities support the planner (their data will be submitted)
+	   var sendInPortions = ${planner.sendInPortions}; //Should the forms be send all at once or rather in parts
+	   var activitiesInPortion =  ${planner.activitiesInPortion}; //After how many submitted forms the script should pause
+	   var submitDelay =  ${planner.submitDelay}; //How many miliseconds should the script wait before sending another portion of forms
+	   var saveDetailsUrl = "<c:url value='/pedagogicalPlanner.do'/>";
+	   var errorPlannerNotSaved = '<fmt:message key="planner.not.saved" />';
+	  </script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/getSysInfo.js"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>loadVars.jsp"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/openUrls.js"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-latest.pack.js"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+	  <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/pedagogicalPlanner.js"></script>
+</lams:head>
+<body class="stripes">
+<div id="page">
+<div id="content">
+	<h1 style="text-align: center" class="small-space-top"><fmt:message key="planner.title" /></h1>
+	
+	<div class="shading-bg" style="width: 97%">
+		<!-- A small form for learning design title only -->
+		<form id="sequenceDetailsForm">
+			<table cellspacing="0" cellpadding="0" class="pedagogicalPlannerTable">
+				<tr>
+					<td class="titleCell">
+						<span class="field-name"><fmt:message key="label.title" />:</span>
+					</td>
+					<td>
+						<input type="text" name="sequenceTitle" size="80" value="<c:out value='${planner.sequenceTitle}'/>" />
+					</td>
+				</tr>
+			</table>
+			<input type="hidden" id="callAttemptedID" name="callAttemptedID" />
+			<input type="hidden" name="ldId" value="${planner.learningDesignID}" />
+			<input type="hidden" name="method" value="saveSequenceDetails" />
+		</form>
+	</div>
+	
+	<!-- IFrames with activities. -->
+	<table cellspacing="0" cellpadding="0" class="pedagogicalPlannerTable">
+		<c:forEach var="activity" varStatus="activityStatus" items="${planner.activities}">
 			<tr>
 				<td class="titleCell">
-					<span class="field-name"><fmt:message key="label.title" />:</span>
+					<span>${activity.type}<br /></span>
+					<c:choose>
+						<c:when test="${fn:endsWith(activity.toolIconUrl,'.swf')}">
+							<object width="35" height="35">
+								<param name="movie" value="<lams:LAMSURL/>${activity.toolIconUrl}" ></param>
+								<embed bgcolor="#ffffff" type="application/x-shockwave-flash" src="<lams:LAMSURL/>${activity.toolIconUrl}" width="35" height="35">
+								</embed>
+							</object>
+						</c:when>
+						<c:otherwise>
+							<img src="<lams:LAMSURL/>${activity.toolIconUrl}" />
+						</c:otherwise>
+					</c:choose>
+	
+					<h4>${activity.title}</h4>
 				</td>
-				<td>
-					<input type="text" name="sequenceTitle" size="80" value="<c:out value='${planner.sequenceTitle}'/>" />
+				<td class="formCell">
+				<iframe frameborder="0" marginheight="0" marginwidth="0" name="activity${activityStatus.index+1}" id="activity${activityStatus.index+1}" class="toolFrame"
+					src="<lams:LAMSURL/>${activity.pedagogicalPlannerUrl}toolContentID=${activity.toolContentID}">
+				</iframe>
 				</td>
 			</tr>
-		</table>
-		<input type="hidden" id="callAttemptedID" name="callAttemptedID" />
-		<input type="hidden" name="ldId" value="${planner.learningDesignID}" />
-		<input type="hidden" name="method" value="saveSequenceDetails" />
-	</form>
+			<c:if test="${not activityStatus.last}">
+				<tr>
+					<td class="titleCell">
+						<img src="<lams:LAMSURL/>images/pedag_down_arrow.gif" />
+					</td>
+					<td>
+					</td>
+				</tr>
+			</c:if>
+		</c:forEach>
+	</table>
+	
+	<div  id="pedagogicalPlannerErrorArea" style="display:none;" class="warning" >
+	</div>
+	
+	<div  id="pedagogicalPlannerInfoArea" style="display:none;" class="info" >
+		<fmt:message key="planner.saved" />
+	</div>
+	
+	<div id="pedagogicalPlannerBusy" style="display:none;">
+		<img src="<lams:LAMSURL />images/loadingAnimation.gif"  />
+	</div>
+	
+	<c:url var="startPreviewUrl" value="/pedagogicalPlanner.do">
+		<c:param name="method" value="startPreview" />
+		<c:param name="ldId" value="${planner.learningDesignID}" />
+	</c:url>
+	<div id="buttonArea">
+		<a class="button pedagogicalPlannerButtons" href="javascript:window.close()"><fmt:message key="button.close" /></a>
+		<a class="button pedagogicalPlannerButtons" href="javascript:submitAll(ACTION_OPEN_AUTHOR,${planner.learningDesignID})"><fmt:message key="button.planner.view.full.author" /></a>
+		<a class="button pedagogicalPlannerButtons" href="javascript:submitAll(ACTION_PREVIEW,'${startPreviewUrl}')"><fmt:message key="button.planner.preview" /></a>
+		<a class="button pedagogicalPlannerButtons" href="javascript:submitAll(ACTION_DO_NOTHING,null)"><fmt:message key="button.planner.save" /></a>
+	</div>
 </div>
-
-<!-- IFrames with activities. -->
-<table cellspacing="0" cellpadding="0" class="pedagogicalPlannerTable">
-	<c:forEach var="activity" varStatus="activityStatus" items="${planner.activities}">
-		<tr>
-			<td class="titleCell">
-				<span style="font-size: smaller;">${activity.type}<br /></span>
-				<c:choose>
-					<c:when test="${fn:endsWith(activity.toolIconUrl,'.swf')}">
-						<object width="35" height="35">
-							<param name="movie" value="<lams:LAMSURL/>${activity.toolIconUrl}" ></param>
-							<embed bgcolor="#ffffff" type="application/x-shockwave-flash" src="<lams:LAMSURL/>${activity.toolIconUrl}" width="35" height="35">
-							</embed>
-						</object>
-					</c:when>
-					<c:otherwise>
-						<img src="<lams:LAMSURL/>${activity.toolIconUrl}" />
-					</c:otherwise>
-				</c:choose>
-
-				<h4>${activity.title}</h4>
-			</td>
-			<td class="formCell">
-			<iframe frameborder="0" marginheight="0" marginwidth="0" name="activity${activityStatus.index+1}" id="activity${activityStatus.index+1}" class="toolFrame"
-				src="<lams:LAMSURL/>${activity.pedagogicalPlannerUrl}toolContentID=${activity.toolContentID}">
-			</iframe>
-			</td>
-		</tr>
-		<c:if test="${not activityStatus.last}">
-			<tr>
-				<td class="titleCell">
-					<img src="<lams:LAMSURL/>images/pedag_down_arrow.gif" />
-				</td>
-				<td>
-				</td>
-			</tr>
-		</c:if>
-	</c:forEach>
-</table>
-
-<div  id="pedagogicalPlannerErrorArea" style="display:none; margin-bottom: 20px; width: 60%;" class="warning" >
+<div id="footer"></div>
 </div>
-
-<div  id="pedagogicalPlannerInfoArea" style="display:none;" class="info" >
-	<fmt:message key="planner.saved" />
-</div>
-
-<div id="pedagogicalPlannerBusy" style="display:none; margin: 0px 0px 20px 40%;">
-	<img src="<lams:LAMSURL />images/loadingAnimation.gif"  />
-</div>
-
-<c:url var="startPreviewUrl" value="/pedagogicalPlanner.do">
-	<c:param name="method" value="startPreview" />
-	<c:param name="ldId" value="${planner.learningDesignID}" />
-</c:url>
-
-<a class="button pedagogicalPlannerButtons" href="javascript:submitAll(ACTION_OPEN_AUTHOR,${planner.learningDesignID})"><fmt:message key="button.planner.view.full.author" /></a>
-<a class="button pedagogicalPlannerButtons" href="javascript:submitAll(ACTION_PREVIEW,'${startPreviewUrl}')"><fmt:message key="button.planner.preview" /></a>
-<a  class="button pedagogicalPlannerButtons" href="javascript:submitAll(ACTION_DO_NOTHING,null)"><fmt:message key="button.planner.save" /></a>
\ No newline at end of file
+</body>
+</lams:html>
\ No newline at end of file