Commit b53d3472 by Petri Jarvisalo

some changes

1 parent 107eb0b6
...@@ -221,6 +221,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -221,6 +221,7 @@ public class MenuBean implements MenuBeanLocal {
lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/taskview"), UserPermission.VIEW_ALL).setVisible(false); lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/taskview"), UserPermission.VIEW_ALL).setVisible(false);
MenuNavigation compoMenu = adminevent.addPage(null, null); MenuNavigation compoMenu = adminevent.addPage(null, null);
compoMenu.setKey("topnavi.compos");
compoMenu.addPage(menuitemfacade.findOrCreate("/voting/admincompolist"), CompoPermission.VIEW_COMPOS); compoMenu.addPage(menuitemfacade.findOrCreate("/voting/admincompolist"), CompoPermission.VIEW_COMPOS);
compoMenu.addPage(menuitemfacade.findOrCreate("/voting/create"), CompoPermission.MANAGE); compoMenu.addPage(menuitemfacade.findOrCreate("/voting/create"), CompoPermission.MANAGE);
......
...@@ -927,6 +927,7 @@ submenu.useradmin.listCardTemplates = Card templates ...@@ -927,6 +927,7 @@ submenu.useradmin.listCardTemplates = Card templates
submenu.useradmin.sendPicture = Send a picture submenu.useradmin.sendPicture = Send a picture
submenu.useradmin.showTakePicture = Show webcam submenu.useradmin.showTakePicture = Show webcam
submenu.useradmin.validateUser = Validate user submenu.useradmin.validateUser = Validate user
submenu.voting.admincompolist = Compos
submenu.voting.compolist = Compos submenu.voting.compolist = Compos
submenu.voting.create = Create new compo submenu.voting.create = Create new compo
submenu.voting.myEntries = My entries submenu.voting.myEntries = My entries
......
...@@ -910,6 +910,7 @@ submenu.useradmin.listCardTemplates = Listaa korttipohjat ...@@ -910,6 +910,7 @@ submenu.useradmin.listCardTemplates = Listaa korttipohjat
submenu.useradmin.sendPicture = L\u00E4het\u00E4 kuva submenu.useradmin.sendPicture = L\u00E4het\u00E4 kuva
submenu.useradmin.showTakePicture = N\u00E4yt\u00E4 webcam submenu.useradmin.showTakePicture = N\u00E4yt\u00E4 webcam
submenu.useradmin.validateUser = Validoi k\u00E4ytt\u00E4j\u00E4 submenu.useradmin.validateUser = Validoi k\u00E4ytt\u00E4j\u00E4
submenu.voting.admincompolist = Kilpailut
submenu.voting.compolist = Kilpailut submenu.voting.compolist = Kilpailut
submenu.voting.create = Uusi kilpailu submenu.voting.create = Uusi kilpailu
submenu.voting.myEntries = Omat entryt submenu.voting.myEntries = Omat entryt
...@@ -1129,7 +1130,7 @@ voting.allcompos.submitEntry = L\u00E4het\u00E4 entry ...@@ -1129,7 +1130,7 @@ voting.allcompos.submitEntry = L\u00E4het\u00E4 entry
voting.allcompos.submitStart = Lis\u00E4ys auki voting.allcompos.submitStart = Lis\u00E4ys auki
voting.allcompos.voteEnd = \u00C4\u00E4nestys kiinni voting.allcompos.voteEnd = \u00C4\u00E4nestys kiinni
voting.allcompos.voteStart = \u00C4\u00E4nestys auki 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.compo.vote = \u00C4\u00E4nest\u00E4
voting.compoentryadd.button = L\u00E4het\u00E4 voting.compoentryadd.button = L\u00E4het\u00E4
voting.compoentryadd.description = Ilmoittaudu kilpailuun: voting.compoentryadd.description = Ilmoittaudu kilpailuun:
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!