Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v
diff -u -r1.32.2.1 -r1.32.2.2
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	12 Mar 2007 01:17:31 -0000	1.32.2.1
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	5 Jul 2007 01:29:40 -0000	1.32.2.2
@@ -36,6 +36,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.federation.LessonFederation;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationState;
@@ -271,6 +272,38 @@
 				}
 			}
 		}
+		// get external lessons
+		List extLessons = service.findByProperty(LessonFederation.class, "org", org);
+		List<IndexLinkBean> lessonLinks = new ArrayList<IndexLinkBean>();
+		if (extLessons != null) {
+			for (int i=0; i<extLessons.size(); i++) {
+				LessonFederation lessonFed = (LessonFederation)extLessons.get(i);
+				String fedServerUrl = lessonFed.getFedServer().getUrl();
+				String url = null;
+				if(contains(roles,Role.ROLE_LEARNER)) {
+					if (state.equals(OrganisationState.ACTIVE)) {
+						url = "javascript:openFedLearner("+lessonFed.getExtLessonId()+", '"+fedServerUrl+"')";
+					} else if (state.equals(OrganisationState.ARCHIVED)) {
+						lessonLinks.add(new IndexLinkBean("label.export.portfolio","javascript:openExportPortfolio("+lessonFed.getExtLessonId()+")"));
+					}
+				}
+				if(contains(roles,Role.ROLE_MONITOR)) {
+					if (state.equals(OrganisationState.ACTIVE)) {
+						lessonLinks.add(new IndexLinkBean("index.monitor", "javascript:openMonitorLesson(" + lessonFed.getExtLessonId()+")"));
+					}
+				}
+				if(contains(roles,Role.ROLE_GROUP_MANAGER)) {
+					lessonLinks.add(new IndexLinkBean("index.monitor", "javascript:openMonitorLesson(" + lessonFed.getExtLessonId()+")"));
+				}
+				if(lessonLinks.size()>0 || url!=null){
+					IndexLessonBean lessonBean = new IndexLessonBean(lessonFed.getExtLessonName(), lessonLinks);
+					lessonBean.setUrl(url);
+					lessonBean.setState(lessonFed.getLessonStateId());
+					lessonBeans.add(lessonBean);
+				}
+			}
+		}
+		
 		Collections.sort(lessonBeans);
 		orgBean.setLessons(lessonBeans);
 
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v
diff -u -r1.20.2.1 -r1.20.2.2
--- lams_central/web/includes/javascript/openUrls.js	7 Jun 2007 04:47:34 -0000	1.20.2.1
+++ lams_central/web/includes/javascript/openUrls.js	5 Jul 2007 01:29:40 -0000	1.20.2.2
@@ -163,7 +163,27 @@
 			}
 		}
 		
+		function openFedLearner( lessonId, fedServer )
+		{
+			if(isMac)
+			{
+				learnWin = window.open(fedServer+'/home.do?method=learner&lessonID='+lessonId,'lWindow','width=796,height=570,resizable,status=yes');
+			}
+			else
+			{
+				if(learnWin && !learnWin.closed )
+				{
+					learnWin.location = fedServer+'/home.do?method=learner&lessonID='+lessonId;		
+					learnWin.focus();
+				}
+				else
+				{
+					learnWin = window.open(fedServer+'/home.do?method=learner&lessonID='+lessonId,'lWindow','width=796,height=570,resizable,status=yes');
+				}
+			}
+		}
 		
+		
 		function openExportPortfolio( lessonId )
 		{
 			if(isMac)