changed menu tab names

This commit is contained in:
Fredrik Friis 2012-04-06 14:35:44 +09:00
parent 704ba00aa6
commit 61b2eb47ba
2 changed files with 9 additions and 23 deletions
src/main/java/se/su/dsv/scipro

@ -1,27 +1,14 @@
package se.su.dsv.scipro.admin.panels;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.Page;
import se.su.dsv.scipro.admin.pages.AbstractAdminPage;
import se.su.dsv.scipro.admin.pages.AdminCheckListPage;
import se.su.dsv.scipro.admin.pages.AdminFinalSeminarPage;
import se.su.dsv.scipro.admin.pages.AdminMailPage;
import se.su.dsv.scipro.admin.pages.AdminPeerListPage;
import se.su.dsv.scipro.admin.pages.AdminProjectPartnerPage;
import se.su.dsv.scipro.admin.pages.AdminRolePage;
import se.su.dsv.scipro.admin.pages.AdminScheduleTemplatesPage;
import se.su.dsv.scipro.admin.pages.AdminStartPage;
import se.su.dsv.scipro.admin.pages.AdminStatisticsPage;
import se.su.dsv.scipro.admin.pages.ProjectManagementPage;
import se.su.dsv.scipro.admin.pages.SystemMaintenancePage;
import se.su.dsv.scipro.admin.pages.*;
import se.su.dsv.scipro.admin.pages.match.AdminManageProjectIdeaPage;
import se.su.dsv.scipro.admin.pages.settings.AdminGeneralSettingsPage;
import se.su.dsv.scipro.components.AbstractMenuPanel;
import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightAdminPeer;
import se.su.dsv.scipro.icons.ImageIcon;
import java.util.ArrayList;
import java.util.List;
public class AdminTabMenuPanel extends AbstractMenuPanel {
@ -43,7 +30,7 @@ public class AdminTabMenuPanel extends AbstractMenuPanel {
items.add(new MenuItem("All peers", AdminPeerListPage.class, MenuHighlightAdminPeer.class));
//items.add(new MenuItem("Peer review templates", PeerReviewTemplatePage.class)); Peer should use the same Checklist as projects.
// items.add(new MenuItem("Settings", AdminGeneralSettingsPage.class, ImageIcon.ICON_SETTINGS));
items.add(new MenuItem("Settings", AdminGeneralSettingsPage.class));
items.add(new MenuItem("System Settings", AdminGeneralSettingsPage.class));
items.add(new MenuItem("Role management", AdminRolePage.class));
items.add(new MenuItem("Project partner", AdminProjectPartnerPage.class));
items.add(new MenuItem("CheckList", AdminCheckListPage.class));

@ -1,17 +1,16 @@
package se.su.dsv.scipro.basepanels;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.Page;
import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.basepages.MenuPage;
import se.su.dsv.scipro.data.dao.interfaces.WebNotificationDao;
import se.su.dsv.scipro.notifications.NotificationsPage;
import se.su.dsv.scipro.settings.pages.SettingsPage;
import java.util.ArrayList;
import java.util.List;
public class ServiceMenuPanel extends AbstractBaseMenuPanel {
private static final long serialVersionUID = 3738086567246191811L;
@ -24,7 +23,7 @@ public class ServiceMenuPanel extends AbstractBaseMenuPanel {
@Override
protected List<MenuItem> getItemList(){
List<MenuItem> list = new ArrayList<MenuItem>();
list.add(new MenuItem("Settings", SettingsPage.class));
list.add(new MenuItem("My settings", SettingsPage.class));
list.add(new MenuItem("Notifications " + "(" + Integer.toString(webNotificationDao.getCountOfWebNotifications(SciProSession.get().getUser())) + ")" ,NotificationsPage.class));
return list;
}