menu changes, anyuser is from my...

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java

@@ -75,7 +75,7 @@ public class MenuBean implements MenuBeanLocal {
 
 		MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.usernavi", menusort = +10);
 
-		usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.ANYUSER);
+		usermenu.addPage(menuitemfacade.findOrCreate("/frontpage"), UserPermission.ANYUSER);
 		usermenu.addPage(menuitemfacade.findOrCreate("/permissionDenied"), null).setVisible(false);
 		usermenu.addPage(menuitemfacade.findOrCreate("/auth/login"), null).setVisible(false);
 		usermenu.addPage(menuitemfacade.findOrCreate("/auth/loginError"), null).setVisible(false);
@@ -89,8 +89,8 @@ public class MenuBean implements MenuBeanLocal {
 		MenuNavigation userEvent = usermenu.addPage(null, null);
 		userEvent.setKey("topnavi.userevent");		
 		userEvent.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER);
-		userEvent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.ANYUSER);
-		userEvent.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.ANYUSER);
+		userEvent.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.INVITE_USERS);
+		userEvent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.VITUTTAAKO);
 
 		MenuNavigation userkauppa = usermenu.addPage(null, null);
 		userkauppa.setKey("topnavi.usershop");
@@ -229,8 +229,12 @@ public class MenuBean implements MenuBeanLocal {
 		gamenavi.setKey("topnavi.license");
 		gamenavi.addPage(menuitemfacade.findOrCreate("/license/manageCodes"), LicensePermission.MANAGE);
 		
+		
 		adminevent.addPage(menuitemfacade.findOrCreate("/eventorg/list"), EventPermission.MANAGE_PROPERTIES);
 		
+		
+		adminevent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.VITUTTAAKO);
+		
 		navifacade.create(adminmenu);
 
 		MenuNavigation shopmenu = new MenuNavigation(ev, "topnavi.shopnavi", menusort = +10);
@@ -309,7 +313,7 @@ public class MenuBean implements MenuBeanLocal {
 
 		MenuNavigation frontTopnavi = usernavi.addPage(null, null);
 		frontTopnavi.setKey("topnavi.frontpage");
-		frontTopnavi.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.ANYUSER);
+		frontTopnavi.addPage(menuitemfacade.findOrCreate("/frontpage"), UserPermission.ANYUSER);
 		frontTopnavi.addPage(menuitemfacade.findOrCreate("/user/create"), UserPermission.CREATE_NEW);
 		frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/sendResetMail"), UserPermission.LOGIN);
 		frontTopnavi.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.INVITE_USERS);

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties

@@ -226,8 +226,8 @@ subnavi.cards = \u0009\u0009
 
 topnavi.license = Lisenssikoodit
 
-user.cropImage         = Crop
-user.unauthenticated   = Kirjautumaton
+user.cropImage        = Crop
+user.unauthenticated  = Kirjautumaton
 
-usercart.downloadCsv   = CSV
-usercart.showoverview  = Vie tarkastusn\u00E4kym\u00E4\u00E4n
+usercart.downloadCsv  = CSV
+usercart.showoverview = Vie tarkastusn\u00E4kym\u00E4\u00E4n

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties

@@ -875,7 +875,7 @@ submenu.bill.billSummary             = Bill summary
 submenu.bill.list                    = My bills
 submenu.bill.listAll                 = All bills
 submenu.eventorg.list                = Manage Event
-submenu.feedback.index               = Feedback
+submenu.feedback.index               = U Mad?!
 submenu.foodadmin.createTemplate     = Create foodwave template
 submenu.foodadmin.listTemplates      = List foodwave templates
 submenu.foodmanager.listFoodwaves    = List active foodwaves

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties

@@ -856,7 +856,7 @@ submenu.bill.billSummary             = Laskujen yhteenveto
 submenu.bill.list                    = N\u00E4yt\u00E4 omat laskut
 submenu.bill.listAll                 = Kaikki laskut
 submenu.eventorg.list                = Organisaation hallinta
-submenu.feedback.index               = Palaute
+submenu.feedback.index               = Vituttaako?
 submenu.foodadmin.createTemplate     = Luo tilauspohja 
 submenu.foodadmin.listTemplates      = Muokkaa tilauspohjia
 submenu.foodmanager.listFoodwaves    = Aktiiviset ruokatilaukset

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/AuthView.java

@@ -53,8 +53,10 @@ public class AuthView extends GenericCDIView {
 				logger.warn("Error executing logout", e);
 			}
 		}
-		req.getSession().invalidate();
 		
+		req.getSession().invalidate();
+
+		navihandler.forward("/index");
 	}