diff --git a/src/main/java/org/olat/course/groupsandrights/ui/CourseGroupManagementMainController.java b/src/main/java/org/olat/course/groupsandrights/ui/CourseGroupManagementMainController.java index 5ba03b15eb092866242e3a9db3ddd9a276aa8a01..fb0874452807090a041c7006754dcc06e75acd6b 100644 --- a/src/main/java/org/olat/course/groupsandrights/ui/CourseGroupManagementMainController.java +++ b/src/main/java/org/olat/course/groupsandrights/ui/CourseGroupManagementMainController.java @@ -75,7 +75,7 @@ public class CourseGroupManagementMainController extends MainLayoutBasicControll CourseGroupManager groupManager = course.getCourseEnvironment().getCourseGroupManager(); OLATResource courseResource = groupManager.getCourseResource(); - groupManageCtr = new BGManagementController(ureq, getWindowControl(), courseResource, false); + groupManageCtr = new BGManagementController(ureq, getWindowControl(), courseResource, course.getCourseTitle(), false); listenTo(groupManageCtr); putInitialPanel(groupManageCtr.getInitialComponent()); diff --git a/src/main/java/org/olat/group/ui/management/BGManagementController.java b/src/main/java/org/olat/group/ui/management/BGManagementController.java index 7a6220c5410f44630416038f0d4840f3d1822b5d..bf3828c728d08ce24bb165de5a904f3b15e14d35 100644 --- a/src/main/java/org/olat/group/ui/management/BGManagementController.java +++ b/src/main/java/org/olat/group/ui/management/BGManagementController.java @@ -216,7 +216,7 @@ public class BGManagementController extends MainLayoutBasicController implements * @param bgContext * @param controllerFlags */ - public BGManagementController(UserRequest ureq, WindowControl wControl, OLATResource resource, boolean backLink) { + public BGManagementController(UserRequest ureq, WindowControl wControl, OLATResource resource, String resourceName, boolean backLink) { super(ureq, wControl); this.resource = resource; this.backLink = backLink; @@ -235,7 +235,7 @@ public class BGManagementController extends MainLayoutBasicController implements // user translator // initialize all velocity containers - initVC(); + initVC(resourceName); // Layout is controlled with generic controller: menu - content - tools // Navigation menu @@ -660,24 +660,14 @@ public class BGManagementController extends MainLayoutBasicController implements } private TreeModel buildTreeModel(UserRequest ureq) { - GenericTreeNode root, gtn; - GenericTreeModel gtm = new GenericTreeModel(); - root = new GenericTreeNode(); + GenericTreeNode root = new GenericTreeNode(); root.setTitle(translate("menu.index")); root.setUserObject(CMD_OVERVIEW); root.setAltText(translate("menu.index.alt")); gtm.setRootNode(root); - if (ureq.getUserSession().getRoles().isOLATAdmin()) { - gtn = new GenericTreeNode(); - gtn.setTitle(translate("menu.editcontext")); - gtn.setUserObject(CMD_EDITCONTEXT); - gtn.setAltText(translate("menu.editcontext.alt")); - root.addChild(gtn); - } - - gtn = new GenericTreeNode(); + GenericTreeNode gtn = new GenericTreeNode(); gtn.setTitle(translate("menu.allgroups")); gtn.setUserObject(CMD_GROUPLIST); gtn.setAltText(translate("menu.allgroups.alt")); @@ -748,10 +738,12 @@ public class BGManagementController extends MainLayoutBasicController implements } - private void initVC() { + private void initVC(String resourceName) { // push group type as 'type' for type specific help pages // Overview page overviewVC = createVelocityContainer("overview"); + overviewVC.contextPut("resourceName", resourceName); + // Create new group form newGroupVC = createVelocityContainer("newgroup"); // Group list diff --git a/src/main/java/org/olat/group/ui/management/_content/overview.html b/src/main/java/org/olat/group/ui/management/_content/overview.html index e213058c6e2e3140426c065c1c76ceefecdd6e06..a26a337892f0a28b1f0a7e19883fd1be29552b50 100644 --- a/src/main/java/org/olat/group/ui/management/_content/overview.html +++ b/src/main/java/org/olat/group/ui/management/_content/overview.html @@ -1,17 +1,7 @@ <h4 class="b_with_small_icon_left b_group_icon"> - $r.translate("overview.title") - #if (!$isDefaultContext) - "$contextName" - #end + $r.translate("overview.title") "$resourceName" </h4> -#if (!$isDefaultContext) - <p> - <i>$r.formatLatexFormulas($contextDesc)</i> - </p> -#end -<p> - $r.translate("overview.intro") -</p> +<p>$r.translate("overview.intro")</p> <hr /> <h5>$r.translate("overview.overview")</h5> <p> @@ -23,17 +13,3 @@ <tr><td>$r.translate("overview.numb.areas"):</td><td>$numbAreas</td></tr> </table> </p> -<hr /> -#if(!$isDefaultContext) - #if ($usedByOtherResources) - <p class="b_important"> - <strong>$r.translate("overview.otherResources")</strong> - <br /> - $r.translate("overview.otherResources.info") - </p> - <p> - $r.render("otherResources") - </p> - <hr /> - #end -#end