Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java =================================================================== diff -u -rf4a2fe4d33e9e1302ac33016fc6f4a45b629c37e -rdda4ba88f5e0bd4d7e59f1e3b31914fd6a563208 --- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java (.../DisplayGroupAction.java) (revision f4a2fe4d33e9e1302ac33016fc6f4a45b629c37e) +++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java (.../DisplayGroupAction.java) (revision dda4ba88f5e0bd4d7e59f1e3b31914fd6a563208) @@ -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/includes/javascript/groupDisplay.js =================================================================== diff -u -r7d9b1ecc6b646f361da0b093af9f852de30e182a -rdda4ba88f5e0bd4d7e59f1e3b31914fd6a563208 --- lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision 7d9b1ecc6b646f361da0b093af9f852de30e182a) +++ lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision dda4ba88f5e0bd4d7e59f1e3b31914fd6a563208) @@ -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 =================================================================== diff -u -r9f625d1d3925aab8738ae9e64b736cd40a47b015 -rdda4ba88f5e0bd4d7e59f1e3b31914fd6a563208 --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 9f625d1d3925aab8738ae9e64b736cd40a47b015) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision dda4ba88f5e0bd4d7e59f1e3b31914fd6a563208) @@ -291,10 +291,4 @@ } } } - - function openSearchLesson( courseID, classID ) { - window.open('findUserLessons.do?dispatch=getResults&courseID='+courseID+'&classID='+classID,'slWindow','width=610,height=480,scrollbars'); - } - - //--> Index: lams_central/web/main.jsp =================================================================== diff -u -r79a6575d49778884cc7d23d028fe14e70ad04a4b -rdda4ba88f5e0bd4d7e59f1e3b31914fd6a563208 --- lams_central/web/main.jsp (.../main.jsp) (revision 79a6575d49778884cc7d23d028fe14e70ad04a4b) +++ lams_central/web/main.jsp (.../main.jsp) (revision dda4ba88f5e0bd4d7e59f1e3b31914fd6a563208) @@ -26,10 +26,12 @@ + +