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.11 -r1.12
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 10 Nov 2008 03:46:27 -0000 1.11
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 17 Nov 2008 06:02:57 -0000 1.12
@@ -52,6 +52,8 @@
import org.lamsfoundation.lams.usermanagement.User;
import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
import org.lamsfoundation.lams.util.IndexUtils;
import org.lamsfoundation.lams.util.WebUtil;
import org.springframework.web.context.WebApplicationContext;
@@ -139,7 +141,7 @@
}
if(contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles,Role.ROLE_MONITOR))
links.add(new IndexLinkBean("index.addlesson", "javascript:openAddLesson(" + org.getOrganisationId()+",'')", "add-lesson-button", null));
- links.add(new IndexLinkBean("index.searchlesson", "javascript:openSearchLesson(" + org.getOrganisationId()+",'')", "search-lesson-button", "index.searchlesson.tooltip"));
+ links.add(new IndexLinkBean("index.searchlesson", Configuration.get(ConfigurationKeys.SERVER_URL) + "/findUserLessons.do?dispatch=getResults&courseID=" + org.getOrganisationId()+"&KeepThis=true&TB_iframe=true&height=400&width=600", "thickbox"+org.getOrganisationId(), "index.searchlesson.tooltip"));
}else{//CLASS_TYPE
if(contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles,Role.ROLE_MONITOR))
links.add(new IndexLinkBean("index.addlesson","javascript:openAddLesson("+org.getParentOrganisation().getOrganisationId()+","+org.getOrganisationId()+")", "add-lesson-button", null));
Index: lams_central/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.33 -r1.34
--- lams_central/web/main.jsp 10 Apr 2008 06:37:29 -0000 1.33
+++ lams_central/web/main.jsp 17 Nov 2008 06:02:57 -0000 1.34
@@ -26,10 +26,12 @@
+
+
Index: lams_central/web/includes/javascript/groupDisplay.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/groupDisplay.js,v
diff -u -r1.6 -r1.7
--- lams_central/web/includes/javascript/groupDisplay.js 19 Dec 2007 06:02:38 -0000 1.6
+++ lams_central/web/includes/javascript/groupDisplay.js 17 Nov 2008 06:02:57 -0000 1.7
@@ -16,6 +16,7 @@
toggleGroupContents(element, stateId);
registerToolTip(element);
jQuery(element).css("display", "block");
+ tb_init('a.thickbox'+jQuery(element).attr("id"));
}
);
}
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v
diff -u -r1.28 -r1.29
--- lams_central/web/includes/javascript/openUrls.js 7 Nov 2008 06:19:28 -0000 1.28
+++ lams_central/web/includes/javascript/openUrls.js 17 Nov 2008 06:02:57 -0000 1.29
@@ -291,10 +291,4 @@
}
}
}
-
- function openSearchLesson( courseID, classID ) {
- window.open('findUserLessons.do?dispatch=getResults&courseID='+courseID+'&classID='+classID,'slWindow','width=610,height=480,scrollbars');
- }
-
-
//-->