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

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

@@ -221,6 +221,7 @@ public class MenuBean implements MenuBeanLocal {
 		lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/taskview"), UserPermission.VIEW_ALL).setVisible(false);
 		
 		MenuNavigation compoMenu = adminevent.addPage(null, null);
+		compoMenu.setKey("topnavi.compos");
 		compoMenu.addPage(menuitemfacade.findOrCreate("/voting/admincompolist"), CompoPermission.VIEW_COMPOS);
 		compoMenu.addPage(menuitemfacade.findOrCreate("/voting/create"), CompoPermission.MANAGE);
 
@@ -233,7 +234,7 @@ public class MenuBean implements MenuBeanLocal {
 		adminevent.addPage(menuitemfacade.findOrCreate("/eventorg/list"), EventPermission.MANAGE_PROPERTIES);
 		
 		
-		adminevent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.VITUTTAAKO);
+
 		
 		navifacade.create(adminmenu);
 
@@ -347,7 +348,7 @@ public class MenuBean implements MenuBeanLocal {
 
 		MenuNavigation shopTopmenu = usernavi.addPage(null, null);
 		shopTopmenu.setKey("topnavi.shop");
-		shopTopmenu.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL);
+		shopTopmenu.addPage(menuitemfacade.findOrCreate("/shop/createBill"), ShopPermission.SHOP_PRODUCTS);
 		shopTopmenu.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN);
 		shopTopmenu.addPage(menuitemfacade.findOrCreate("/bill/edit"), null).setVisible(false);
 		shopTopmenu.addPage(menuitemfacade.findOrCreate("/bill/showBill"), null).setVisible(false);

code/MoyaWeb/WebContent/voting/admincompolist.xhtml

@@ -76,8 +76,6 @@
 				</h:dataTable>
 			</h:form>
 
-
-
 		</ui:define>
 	</ui:composition>
 </h:body>

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

@@ -928,6 +928,7 @@ submenu.useradmin.listCardTemplates  = Card templates
 submenu.useradmin.sendPicture        = Send a picture
 submenu.useradmin.showTakePicture    = Show webcam
 submenu.useradmin.validateUser       = Validate user
+submenu.voting.admincompolist        = Compos
 submenu.voting.compolist             = Compos
 submenu.voting.create                = Create new compo
 submenu.voting.myEntries             = My entries

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

@@ -911,6 +911,7 @@ submenu.useradmin.listCardTemplates  = Listaa korttipohjat
 submenu.useradmin.sendPicture        = L\u00E4het\u00E4 kuva
 submenu.useradmin.showTakePicture    = N\u00E4yt\u00E4 webcam
 submenu.useradmin.validateUser       = Validoi k\u00E4ytt\u00E4j\u00E4
+submenu.voting.admincompolist        = Kilpailut
 submenu.voting.compolist             = Kilpailut
 submenu.voting.create                = Uusi kilpailu
 submenu.voting.myEntries             = Omat entryt
@@ -1130,7 +1131,7 @@ voting.allcompos.submitEntry       = L\u00E4het\u00E4 entry
 voting.allcompos.submitStart       = Lis\u00E4ys auki
 voting.allcompos.voteEnd           = \u00C4\u00E4nestys kiinni
 voting.allcompos.voteStart         = \u00C4\u00E4nestys auki
-voting.compo.submit                = L\u00E4het\u00E4 kappale
+voting.compo.submit                = L\u00E4het\u00E4 teos
 voting.compo.vote                  = \u00C4\u00E4nest\u00E4
 voting.compoentryadd.button        = L\u00E4het\u00E4
 voting.compoentryadd.description   = Ilmoittaudu kilpailuun: