menu and login change

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

@@ -116,7 +116,8 @@ public class MenuBean implements MenuBeanLocal {
 		MenuNavigation userprofile = usermenu.addPage(null, null);
 		userprofile.setKey("topnavi.profile");
 
-		userprofile.addPage(menuitemfacade.findOrCreate("/user/edit"), UserPermission.MODIFY);			
+		userprofile.addPage(menuitemfacade.findOrCreate("/user/edit"), UserPermission.MODIFY);	
+		userprofile.addPage(menuitemfacade.findOrCreate("/user/changePassword"), UserPermission.VIEW_SELF);
 		userprofile.addPage(menuitemfacade.findOrCreate("/auth/logout"), UserPermission.LOGOUT);
 		
 		/*
@@ -195,6 +196,12 @@ public class MenuBean implements MenuBeanLocal {
 		adminPlaces.addPage(menuitemfacade.findOrCreate("/place/adminPlacemap"), UserPermission.VIEW_ALL);
 		// adminPlaces.addPage(menuitemfacade.findOrCreate("/place/adminGroups"), UserPermission.VIEW_ALL);  // todo: make new view for managing
 		
+		MenuNavigation mapnavi = adminPlaces.addPage(null, null);
+		mapnavi.setKey("topnavi.maps");
+		mapnavi.addPage(menuitemfacade.findOrCreate("/map/list"), MapPermission.MANAGE_MAPS);
+		mapnavi.addPage(menuitemfacade.findOrCreate("/map/create"), MapPermission.MANAGE_MAPS);
+		mapnavi.addPage(menuitemfacade.findOrCreate("/map/edit"), null).setVisible(false);
+
 		
 		// event
 		MenuNavigation adminevent = adminmenu.addPage(null, null);

code/MoyaWeb/WebContent/resources/cditools/loginLogout.xhtml

@@ -17,6 +17,10 @@
 		</c:when>
 		<c:otherwise>
 			<login:login isOneliner="true" />
+			<br/>
+			<h:link value="#{i18n['submenu.user.create']}" outcome="/user/create" />
+			<br/>
+			<h:link value="#{i18n['submenu.auth.sendResetMail']}" outcome="/auth/sendResetMail" />
 		</c:otherwise>
 	</c:choose>
 </composite:implementation>