menu order and foodwave list

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MenuBean.java

@@ -202,8 +202,8 @@ public class MenuBean implements MenuBeanLocal {
 
 		MenuNavigation foodnavi = adminnavi.addPage(null, null);
 		foodnavi.setKey("topnavi.foodwave");
-		foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/listTemplates"), ShopPermission.MANAGE_FOODWAVES);
 		foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/createTemplate"), ShopPermission.MANAGE_FOODWAVES);
+		foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/listTemplates"), ShopPermission.MANAGE_FOODWAVES);
 		foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/editTemplate"), ShopPermission.MANAGE_FOODWAVES).setVisible(false);
 
 		foodnavi.addPage(menuitemfacade.findOrCreate("/foodmanager/listFoodwaves"), ShopPermission.MANAGE_FOODWAVES);

code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.xhtml

@@ -29,7 +29,7 @@
 						<h:outputText value="${i18n['foodWave.time']}" />
 					</f:facet>
 					<h:outputText value="#{foodwave.time.time}">
-						<f:convertDateTime pattern="hh:mm d/M/yy" />
+							<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
 					</h:outputText>
 				</p:column>
 				<p:column>

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties

@@ -199,7 +199,7 @@ food = Food
 foodWave.accountevents     = Accountevents
 foodWave.billLines         = Pending Online Payments
 foodWave.description       = Description
-foodWave.list              = FoodWave Listing
+foodWave.list              = Active Foodwaves
 foodWave.name              = Foodwave
 foodWave.orders            = Amount of Orders
 foodWave.paid              = Paid

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties

@@ -197,13 +197,13 @@ food = Ruoka
 foodWave.accountevents     = Maksetut tilaukset
 foodWave.billLines         = Maksamattomat Verkkomaksut
 foodWave.description       = Kuvaus
-foodWave.list              = Ruokatilausten listaus
+foodWave.list              = Aktiviset ruokatilaukset
 foodWave.name              = Ruokatilaus
 foodWave.orders            = Tilausten M\u00E4\u00E4r\u00E4
 foodWave.paid              = Maksettuja
 foodWave.show              = N\u00E4yt\u00E4
-foodWave.template.name     = Template
-foodWave.template.waves    = Foodwaves
+foodWave.template.name     = Tilauspohja
+foodWave.template.waves    = Ruokatilaus
 foodWave.templatename      = Valitse tuotteet
 foodWave.time              = Aika
 foodWave.totalReserved     = Yhteens\u00E4
@@ -228,7 +228,7 @@ foodwaveTemplate.name = Nimi
 
 foodwavetemplate.actions            = Toimet
 foodwavetemplate.addproduct         = Lis\u00E4\u00E4
-foodwavetemplate.basicinfo          = Templeitti
+foodwavetemplate.basicinfo          = Tilauspohja
 foodwavetemplate.createFoodwave     = Luo ruokatilaus
 foodwavetemplate.createwave         = Luo tilauspohja
 foodwavetemplate.description        = Kuvaus