Merge branch 'devel' of codecrew.fi:bortal into devel

Conflicts:
	code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
	code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties

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

@@ -73,7 +73,7 @@ public class MenuBean implements MenuBeanLocal {
 		logger.info("Initializing new default menu");
 		logger.info("Initializing new default menu");
 		LanEvent ev = eventbean.getCurrentEvent();
 		LanEvent ev = eventbean.getCurrentEvent();
 
 
-		MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.usernavi", menusort = +10);
+		MenuNavigation usermenu = new MenuNavigation(ev, "topmenu.user", menusort = +10);
 
 
 		usermenu.addPage(menuitemfacade.findOrCreate("/frontpage"), UserPermission.ANYUSER);
 		usermenu.addPage(menuitemfacade.findOrCreate("/frontpage"), UserPermission.ANYUSER);
 		usermenu.addPage(menuitemfacade.findOrCreate("/permissionDenied"), null).setVisible(false);
 		usermenu.addPage(menuitemfacade.findOrCreate("/permissionDenied"), null).setVisible(false);
@@ -102,7 +102,7 @@ public class MenuBean implements MenuBeanLocal {
 		MenuNavigation userPlaces = usermenu.addPage(null, null);
 		MenuNavigation userPlaces = usermenu.addPage(null, null);
 		userPlaces.setKey("topnavi.userplaces");
 		userPlaces.setKey("topnavi.userplaces");
 		userPlaces.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
 		userPlaces.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
-		userPlaces.addPage(menuitemfacade.findOrCreate("/place/myGroups"), MapPermission.VIEW);
+		userPlaces.addPage(menuitemfacade.findOrCreate("/place/myGroups"), MapPermission.BUY_PLACES);
 		
 		
 		
 		
 		MenuNavigation usercompetitions = usermenu.addPage(null, null);
 		MenuNavigation usercompetitions = usermenu.addPage(null, null);
@@ -134,7 +134,7 @@ public class MenuBean implements MenuBeanLocal {
 		// Admin menu
 		// Admin menu
 		//
 		//
 		
 		
-		MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminnavi", menusort = +10);
+		MenuNavigation adminmenu = new MenuNavigation(ev, "topmenu.admin", menusort = +10);
 		
 		
 		//user management
 		//user management
 		MenuNavigation adminuser = adminmenu.addPage(null, null);
 		MenuNavigation adminuser = adminmenu.addPage(null, null);

code/MoyaWeb/WebContent/place/adminGroups.xhtml

@@ -15,9 +15,12 @@
 		
 		
 		<ui:define name="title">
 		<ui:define name="title">
 			<h1>#{i18n['placegroupview.header']}</h1>
 			<h1>#{i18n['placegroupview.header']}</h1>
+			<!-- <users:usertabs tabId="groups" /> -->
+		</ui:define>
+		<ui:define name="edittab">
 			<users:usertabs tabId="groups" />
 			<users:usertabs tabId="groups" />
 		</ui:define>
 		</ui:define>
-
+		
 		<ui:define name="content">
 		<ui:define name="content">
 			<h:outputText rendered="#{empty placeGroupView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" />
 			<h:outputText rendered="#{empty placeGroupView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" />
 			<h:form rendered="#{!empty placeGroupView.groupMemberships}" id="placelistform">
 			<h:form rendered="#{!empty placeGroupView.groupMemberships}" id="placelistform">

code/MoyaWeb/WebContent/shop/shopToUser.xhtml

@@ -15,6 +15,9 @@
 
 
 		<ui:define name="title">
 		<ui:define name="title">
 			<h1>#{i18n['user.shop.title']}</h1>
 			<h1>#{i18n['user.shop.title']}</h1>
+			<!-- <users:usertabs tabId="shop" />  -->
+		</ui:define>
+		<ui:define name="edittab">
 			<users:usertabs tabId="shop" />
 			<users:usertabs tabId="shop" />
 		</ui:define>
 		</ui:define>
 		<ui:define name="content">
 		<ui:define name="content">

code/MoyaWeb/WebContent/useradmin/accountEvents.xhtml

@@ -13,6 +13,9 @@
 		</f:metadata>
 		</f:metadata>
 		<ui:define name="title">
 		<ui:define name="title">
 			<h1>#{i18n['user.accountevents']}</h1>
 			<h1>#{i18n['user.accountevents']}</h1>
+			<!--  <users:usertabs tabId="accountevents" /> -->
+		</ui:define>
+		<ui:define name="edittab">
 			<users:usertabs tabId="accountevents" />
 			<users:usertabs tabId="accountevents" />
 		</ui:define>
 		</ui:define>
 		<ui:define name="content">
 		<ui:define name="content">

code/MoyaWeb/WebContent/useradmin/foodwaveshop.xhtml

@@ -21,6 +21,9 @@
 
 
 		<ui:define name="title">
 		<ui:define name="title">
 			<h1>#{i18n['user.foodwavelist.title']}</h1>		
 			<h1>#{i18n['user.foodwavelist.title']}</h1>		
+			<!-- <users:usertabs tabId="foodwave" /> -->
+		</ui:define>
+		<ui:define name="edittab">
 			<users:usertabs tabId="foodwave" />
 			<users:usertabs tabId="foodwave" />
 		</ui:define>
 		</ui:define>
 		<ui:define name="content">
 		<ui:define name="content">

code/MoyaWeb/WebContent/useradmin/sendPicture.xhtml

@@ -14,10 +14,12 @@
 		</f:metadata>
 		</f:metadata>
 		<ui:define name="title">
 		<ui:define name="title">
 			<h1>#{i18n['sendPicture.header']}</h1>
 			<h1>#{i18n['sendPicture.header']}</h1>
+			<!-- <users:usertabs tabId="picture" /> -->
+		</ui:define>
+		<ui:define name="edittab">
 			<users:usertabs tabId="picture" />
 			<users:usertabs tabId="picture" />
 		</ui:define>
 		</ui:define>
 
 
-
 		<ui:define name="content">
 		<ui:define name="content">
 
 
 
 

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

@@ -56,7 +56,7 @@ public class AuthView extends GenericCDIView {
 		
 		
 		req.getSession().invalidate();
 		req.getSession().invalidate();
 
 
-		navihandler.forward("/index");
+		navihandler.forward("/frontpage");
 	}
 	}
 	
 	
 	
 	
@@ -72,7 +72,9 @@ public class AuthView extends GenericCDIView {
 		
 		
 		req.getSession().invalidate();
 		req.getSession().invalidate();
 		
 		
-		return "/index";
+		navihandler.forward("/frontpage");
+		
+		return "/frontpage";
 	}
 	}
 	
 	
 	public void executeLogin() {
 	public void executeLogin() {