Skip to content

Riina Antikainen / Moya

Go to a project
Commit 32711783 by Tuukka Kivilahti
Options

ja menua pukkaa

1 parent 3e3b3e9a
Inline Side-by-side
Showing with 12 additions and 3 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
...@@ -350,6 +350,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -350,6 +350,7 @@ public class MenuBean implements MenuBeanLocal {
infonavi.setKey("subnavi.info"); infonavi.setKey("subnavi.info");
infonavi.addPage(menuitemfacade.findOrCreate("/info/index"), TerminalPermission.INFO); infonavi.addPage(menuitemfacade.findOrCreate("/info/index"), TerminalPermission.INFO);
infonavi.addPage(menuitemfacade.findOrCreate("/info/incoming"), TerminalPermission.INFO); infonavi.addPage(menuitemfacade.findOrCreate("/info/incoming"), TerminalPermission.INFO);
infonavi.addPage(menuitemfacade.findOrCreate("/info/cardlessIncoming"), TerminalPermission.INFO);
infonavi.addPage(menuitemfacade.findOrCreate("/info/shop"), TerminalPermission.INFO); infonavi.addPage(menuitemfacade.findOrCreate("/info/shop"), TerminalPermission.INFO);
infonavi.addPage(menuitemfacade.findOrCreate("/info/foodwave/foodwaveshop"), TerminalPermission.INFO); infonavi.addPage(menuitemfacade.findOrCreate("/info/foodwave/foodwaveshop"), TerminalPermission.INFO);
infonavi.addPage(menuitemfacade.findOrCreate("/info/foodwave/foodwaveProducts"), TerminalPermission.INFO).setVisible(false); infonavi.addPage(menuitemfacade.findOrCreate("/info/foodwave/foodwaveProducts"), TerminalPermission.INFO).setVisible(false);
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
...@@ -412,7 +412,7 @@ submenu.admin.adduser = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys ...@@ -412,7 +412,7 @@ submenu.admin.adduser = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
submenu.admin.adduser.index = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys submenu.admin.adduser.index = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
submenu.frontpage = Frontpage submenu.frontpage = Frontpage
submenu.info.foodwave.foodwaveshop = Ruokakauppa submenu.info.foodwave.foodwaveshop = Ruokakauppa
submenu.info.incoming = Sis\u00E4\u00E4ntulo submenu.info.incoming = Laaja sis\u00E4\u00E4ntulon\u00E4kym\u00E4
submenu.info.index = Infon\u00E4kym\u00E4 submenu.info.index = Infon\u00E4kym\u00E4
submenu.info.shop = Kauppa submenu.info.shop = Kauppa
submenu.lectureadmin.lectureParticipants = Tarkastele osallistujia submenu.lectureadmin.lectureParticipants = Tarkastele osallistujia
...@@ -475,3 +475,7 @@ infoview.multisearch=K\u00E4ytt\u00E4j\u00E4haku ...@@ -475,3 +475,7 @@ infoview.multisearch=K\u00E4ytt\u00E4j\u00E4haku
incomingflow.placesummary=Paikkayhteenveto incomingflow.placesummary=Paikkayhteenveto
incomingFlow.leftCount=Noutamatta incomingFlow.leftCount=Noutamatta
incomingFlow.ount=M\u00E4\u00E4r\u00E4 incomingFlow.ount=M\u00E4\u00E4r\u00E4
incomingflow.markEverythingGiven=Anna kaikki antamattomat tuotteet
submenu.admin.incoming.index=Sis\u00E4\u00E4ntulo
submenu.admin.incoming.printCard=
submenu.info.cardlessIncoming=Sis\u00E4\u00E4ntulo
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
...@@ -1255,7 +1255,7 @@ submenu.foodwave.listTemplates = Food provides ...@@ -1255,7 +1255,7 @@ submenu.foodwave.listTemplates = Food provides
submenu.help = Ticket help submenu.help = Ticket help
submenu.index = Frontpage submenu.index = Frontpage
submenu.info.foodwave.foodwaveshop = Foodshop submenu.info.foodwave.foodwaveshop = Foodshop
submenu.info.incoming = Incomingview submenu.info.incoming = Extendet Incomingview
submenu.info.index = Infoview submenu.info.index = Infoview
submenu.info.shop = Shop submenu.info.shop = Shop
submenu.lectureadmin.lectureParticipants = Lecture participants submenu.lectureadmin.lectureParticipants = Lecture participants
...@@ -1697,3 +1697,5 @@ infoview.multisearch=Usersearch ...@@ -1697,3 +1697,5 @@ infoview.multisearch=Usersearch
incomingflow.placesummary=Placesummary incomingflow.placesummary=Placesummary
incomingFlow.leftCount=Ungiven incomingFlow.leftCount=Ungiven
incomingFlow.ount=Count incomingFlow.ount=Count
incomingflow.markEverythingGiven=Give ewerything ungiven stuff
submenu.info.cardlessIncoming=Incoming
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -1235,7 +1235,7 @@ submenu.frontpage = Etusivu ...@@ -1235,7 +1235,7 @@ submenu.frontpage = Etusivu
submenu.help = Lippuopas submenu.help = Lippuopas
submenu.index = Etusivu submenu.index = Etusivu
submenu.info.foodwave.foodwaveshop = Ruokakauppa submenu.info.foodwave.foodwaveshop = Ruokakauppa
submenu.info.incoming = Sis\u00E4\u00E4ntulo submenu.info.incoming = Laaja Sis\u00E4\u00E4ntulon\u00E4kym\u00E4
submenu.info.index = Infon\u00E4kym\u00E4 submenu.info.index = Infon\u00E4kym\u00E4
submenu.info.shop = Kauppa submenu.info.shop = Kauppa
submenu.lectureadmin.lectureParticipants = Kurssiosallistujat submenu.lectureadmin.lectureParticipants = Kurssiosallistujat
...@@ -1681,3 +1681,5 @@ incomingflow.placesummary=Paikkayhteenveto ...@@ -1681,3 +1681,5 @@ incomingflow.placesummary=Paikkayhteenveto
incomingFlow.leftCount=Noutamatta incomingFlow.leftCount=Noutamatta
user.unauthenticated= user.unauthenticated=
incomingFlow.ount=M\u00E4\u00E4r\u00E4 incomingFlow.ount=M\u00E4\u00E4r\u00E4
incomingflow.markEverythingGiven=Anna kaikki antamattomat tuotteet
submenu.info.cardlessIncoming=Sis\u00E4\u00E4ntulo
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!