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

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

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

@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import fi.codecrew.moya.enums.apps.BillPermission;
 import fi.codecrew.moya.enums.apps.CompoPermission;
 import fi.codecrew.moya.enums.apps.ContentPermission;
+import fi.codecrew.moya.enums.apps.EventPermission;
 import fi.codecrew.moya.enums.apps.LicensePermission;
 import fi.codecrew.moya.enums.apps.MapPermission;
 import fi.codecrew.moya.enums.apps.PollPermission;
@@ -127,6 +128,11 @@ public class MenuBean implements MenuBeanLocal {
 
 		navifacade.create(usermenu);
 
+		
+		//
+		// Admin menu
+		//
+		
 		MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminnavi", menusort = +10);
 		
 		//user management
@@ -154,7 +160,7 @@ public class MenuBean implements MenuBeanLocal {
 		adminEventCards.addPage(menuitemfacade.findOrCreate("/useradmin/editCardTemplate"), null).setVisible(false);
 		adminEventCards.addPage(menuitemfacade.findOrCreate("/shop/shopToUser"), null).setVisible(false);
 		adminEventCards.addPage(menuitemfacade.findOrCreate("/shop/assocToUser"), null).setVisible(false);
-
+			
 		// shop
 		MenuNavigation adminshop = adminmenu.addPage(null, null);
 		adminshop.setKey("topnavi.adminshop");
@@ -187,7 +193,7 @@ public class MenuBean implements MenuBeanLocal {
 		MenuNavigation adminPlaces = adminmenu.addPage(null, null);
 		adminPlaces.setKey("topnavi.userplaces");
 		adminPlaces.addPage(menuitemfacade.findOrCreate("/place/adminPlacemap"), UserPermission.VIEW_ALL);
-		adminPlaces.addPage(menuitemfacade.findOrCreate("/place/adminGroups"), UserPermission.VIEW_ALL);
+		// adminPlaces.addPage(menuitemfacade.findOrCreate("/place/adminGroups"), UserPermission.VIEW_ALL);  // todo: make new view for managing
 		
 		
 		// event
@@ -205,6 +211,7 @@ public class MenuBean implements MenuBeanLocal {
 		lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/messagelist"), UserPermission.VIEW_ALL);
 		lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/taskview"), UserPermission.VIEW_ALL).setVisible(false);
 		
+		adminevent.addPage(menuitemfacade.findOrCreate("/eventorg/list"), EventPermission.MANAGE_PROPERTIES);
 		
 		navifacade.create(adminmenu);
 

code/MoyaWeb/WebContent/resources/cditools/user/usertabs.xhtml

@@ -10,12 +10,12 @@
 	<h:outputStylesheet library="templates/#{sessionHandler.templateName}/css" name="tabnav.css" />
 
 
-	<h2>
+	<h3>
 		<h:outputText value="#{i18n['usertitle.managingUser']}: #{userView.user.nick} / #{userView.user.wholeName} " />
-	</h2>
-	<h2>
+	</h3>
+	<h3>
 		<h:outputText value="#{i18n['user.cardPower']}: #{userView.usersCardtemplate.name}" />
-	</h2>
+	</h3>
 
 	<div id="#{cc.attrs.tabId}">
 		<ul id="usertabnav">

code/MoyaWeb/WebContent/resources/templates/template1/css/style.css

@@ -34,6 +34,13 @@
     padding-left: 0.5em; 
 }
 
+.center h3 {
+    font-family: Oxygen, Calibri;
+    font-size: 11pt; 
+    color: #101D27;
+    font-weight: lighter;
+}
+
 .center {
       font-family: Oxygen, Calibri;
       font-size: 10pt;
@@ -276,6 +283,7 @@ h1 {
 #main a {
    color: #2694e8;
 }
+
 .bgColor1 {
     background-color: #68A3C2;
 }

code/MoyaWeb/WebContent/resources/templates/template1/css/tabnav.css

+#edit { float: left; width:100%; border-bottom: 1px solid black; }
+#usertabnav { font-size: 90%; }
+ul#usertabnav { float:left; width: 100%; border:1px solid rgba(200,200,200,0); background:rgba(200,200,200,0); border-radius: 16px 16px 0 0; }
+ul#usertabnav li {display:inline; list-style:none; }
+ul#usertabnav li a {display:block; line-height: 1.7em; float:left; padding:2px 5px 2px 5px; color:rgb(125,125,125); text-decoration:none; font-size:120%; background-color:rgba(100,100,100,0.3); color: rgba(0,0,0,1); border-radius: 12px 12px 0 0; border: 1px solid rgba(0,0,0,0.1); border-bottom: none;}
+ul#usertabnava:hover {text-decoration:none; color:rgb(50,50,50);}
+ul#usertabnav li.active {font-weight: bold; background-color:rgba(250,250,250,0.4); color: rgba(0,0,0,1); border-radius: 12px 12px 0 0; border: 1px solid black; border-bottom: none }
+#edit {
+clear: both;
+}
\ No newline at end of file

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

@@ -714,6 +714,7 @@ submenu.auth.sendResetMail           = Password reset
 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.foodadmin.createTemplate     = Create foodwave template
 submenu.foodadmin.listTemplates      = List foodwave templates

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

@@ -697,6 +697,7 @@ submenu.auth.sendResetMail           = Salasanan palautus
 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.foodadmin.createTemplate     = Luo tilauspohja 
 submenu.foodadmin.listTemplates      = Muokkaa tilauspohjia