Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v diff -u -r1.100.2.10 -r1.100.2.11 --- lams_admin/conf/language/lams/ApplicationResources.properties 16 Jun 2016 03:10:21 -0000 1.100.2.10 +++ lams_admin/conf/language/lams/ApplicationResources.properties 23 Jun 2016 02:55:23 -0000 1.100.2.11 @@ -513,5 +513,8 @@ tool.groups.save.error =Error while saving groups config.live.edit =Enable live edit sysadmin.extGroupsUrl =External groups URL +server.config.title =Server Configuration +server.monitor.title =Server Monitoring +user.course.title=User and Course Configuration #======= End labels: Exported 515 labels for en AU ===== Index: lams_admin/src/java/org/lamsfoundation/lams/admin/AdminConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/AdminConstants.java,v diff -u -r1.2.18.2 -r1.2.18.3 --- lams_admin/src/java/org/lamsfoundation/lams/admin/AdminConstants.java 11 May 2016 07:06:57 -0000 1.2.18.2 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/AdminConstants.java 23 Jun 2016 02:55:23 -0000 1.2.18.3 @@ -28,4 +28,8 @@ public static final String MODULE_NAME = "admin"; + public static final String START_CONFIG_LINKS = "server.config.title"; + public static final String START_MONITOR_LINKS = "server.monitor.title"; + public static final String START_COURSE_LINKS = "user.course.title"; + } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java,v diff -u -r1.17.2.6 -r1.17.2.7 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java 11 May 2016 07:06:57 -0000 1.17.2.6 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java 23 Jun 2016 02:55:22 -0000 1.17.2.7 @@ -24,14 +24,14 @@ package org.lamsfoundation.lams.admin.web.action; import java.util.ArrayList; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; +import org.lamsfoundation.lams.admin.AdminConstants; import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.dto.LinkBean; import org.lamsfoundation.lams.usermanagement.Role; @@ -46,44 +46,56 @@ public class SysAdminStartAction extends Action { private static IUserManagementService service; - + @Override public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { service = AdminServiceProxy.getService(getServlet().getServletContext()); - ArrayList links = new ArrayList(); + ArrayList groupedLinks = new ArrayList(); + if (request.isUserInRole(Role.SYSADMIN)) { - links.add(new LinkBean("cleanup.do", "sysadmin.batch.temp.file.delete")); + ArrayList links = new ArrayList(); links.add(new LinkBean("config.do", "sysadmin.config.settings.edit")); + links.add(new LinkBean("timezonemanagement.do", "admin.timezone.title")); + links.add(new LinkBean("loginmaintain.do", "sysadmin.maintain.loginpage")); + links.add(new LinkBean("signupManagement.do", "admin.signup.title")); + links.add(new LinkBean("serverlist.do", "sysadmin.maintain.external.servers")); + links.add(new LinkBean("register.do", "sysadmin.register.server")); links.add(new LinkBean("toolcontentlist.do", "sysadmin.tool.management")); + links.add(new LinkBean("themeManagement.do", "admin.themes.title")); + groupedLinks.add(new Object[]{AdminConstants.START_CONFIG_LINKS,links}); + + links = new ArrayList(); + links.add(new LinkBean("cleanup.do", "sysadmin.batch.temp.file.delete")); + links.add(new LinkBean("statistics.do", "admin.statistics.title")); + groupedLinks.add(new Object[]{AdminConstants.START_MONITOR_LINKS,links}); + + links = new ArrayList(); links.add(new LinkBean("usersearch.do", "admin.user.find")); links.add(new LinkBean("importgroups.do", "sysadmin.import.groups.title")); links.add(new LinkBean("importexcel.do", "admin.user.import")); - links.add(new LinkBean("ldap.do", "sysadmin.ldap.configuration")); links.add(new LinkBean("disabledmanage.do", "admin.list.disabled.users")); - links.add(new LinkBean("loginmaintain.do", "sysadmin.maintain.loginpage")); - links.add(new LinkBean("serverlist.do", "sysadmin.maintain.external.servers")); - links.add(new LinkBean("register.do", "sysadmin.register.server")); - links.add(new LinkBean("statistics.do", "admin.statistics.title")); - links.add(new LinkBean("signupManagement.do", "admin.signup.title")); - links.add(new LinkBean("themeManagement.do", "admin.themes.title")); - links.add(new LinkBean("timezonemanagement.do", "admin.timezone.title")); + links.add(new LinkBean("ldap.do", "sysadmin.ldap.configuration")); + groupedLinks.add(new Object[]{AdminConstants.START_COURSE_LINKS,links}); + } else if (service.isUserGlobalGroupAdmin()) { - LinkBean linkBean = new LinkBean("usersearch.do", "admin.user.find"); - links.add(linkBean); + ArrayList links = new ArrayList(); + links.add(new LinkBean("usersearch.do", "admin.user.find")); links.add(new LinkBean("importgroups.do", "sysadmin.import.groups.title")); links.add(new LinkBean("importexcel.do", "admin.user.import")); links.add(new LinkBean("disabledmanage.do", "admin.list.disabled.users")); + groupedLinks.add(new Object[]{AdminConstants.START_COURSE_LINKS,links}); + } else { request.setAttribute("errorName", "SysAdminStartAction"); request.setAttribute("errorMessage", AdminServiceProxy.getMessageService(getServlet().getServletContext()) .getMessage("error.authorisation")); return mapping.findForward("error"); } - request.setAttribute("links", links); + request.setAttribute("groupedLinks", groupedLinks); return mapping.findForward("sysadmin"); } Index: lams_admin/web/sysadmin.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/sysadmin.jsp,v diff -u -r1.16.18.1 -r1.16.18.2 --- lams_admin/web/sysadmin.jsp 16 Jun 2016 03:10:20 -0000 1.16.18.1 +++ lams_admin/web/sysadmin.jsp 23 Jun 2016 02:55:22 -0000 1.16.18.2 @@ -1,12 +1,20 @@ <%@ include file="/taglibs.jsp"%> -
- - - "> - - - - -
- + +
+
+
+
+
+ + + + "> + + + + +
+
+ +