Skip to content

Linnea Samila / Moya

Go to a project
Commit e101c7ce by Tuomas Riihimäki
Options

Merge branch 'viplistToInfo' into 'master' 

Viplist to info

menu

See merge request !239
2 parents 2c3e6382 6caf19fd
Inline Side-by-side
Showing with 5 additions and 1 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
...@@ -358,6 +358,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -358,6 +358,7 @@ public class MenuBean implements MenuBeanLocal {
infonavi.addPage(menuitemfacade.findOrCreate("/info/cardlessIncoming"), 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/viplist"), TerminalPermission.INFO);
infonavi.addPage(menuitemfacade.findOrCreate("/info/foodwave/foodwaveProducts"), TerminalPermission.INFO).setVisible(false); infonavi.addPage(menuitemfacade.findOrCreate("/info/foodwave/foodwaveProducts"), TerminalPermission.INFO).setVisible(false);
navifacade.create(adminmenu); navifacade.create(adminmenu);
......
code/moya-web/WebContent/resources/templates/infoview/css/style.css
...@@ -282,7 +282,7 @@ label { ...@@ -282,7 +282,7 @@ label {
#header_left { #header_left {
float: left; float: left;
width: 400px; width: 600px;
} }
#header_center { #header_center {
float: left; float: left;
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
...@@ -509,3 +509,4 @@ vipProduct.quantity = Lukum\u00E4\u00E4r\u00E4 ...@@ -509,3 +509,4 @@ vipProduct.quantity = Lukum\u00E4\u00E4r\u00E4
yes = Kyll\u00E4 yes = Kyll\u00E4
vip.backToList=Takaisin listaukseen vip.backToList=Takaisin listaukseen
submenu.info.viplist=Vippilista
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
...@@ -1726,3 +1726,4 @@ voting.create.voteStart = Voting start ...@@ -1726,3 +1726,4 @@ voting.create.voteStart = Voting start
yes = Yes yes = Yes
vip.backToList=Back to viplist list vip.backToList=Back to viplist list
submenu.info.viplist=Viplist
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -1709,3 +1709,4 @@ voting.create.voteStart = \u00C4\u00E4nestys auki ...@@ -1709,3 +1709,4 @@ voting.create.voteStart = \u00C4\u00E4nestys auki
yes = Kyll\u00E4 yes = Kyll\u00E4
vip.backToList=Takaisin listaukseen vip.backToList=Takaisin listaukseen
submenu.info.viplist=Vippilista
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!