Merge branch 'newui' into newui-merge

Conflicts:
	code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/CardPrintBean.java
	code/LanBortalWeb/WebContent/WEB-INF/web.xml
	code/LanBortalWeb/WebContent/resources/style/insomnia2/css/general.css
	code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n.properties
	code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
	code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/ProductShopView.java
	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserValidator.java
	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserView.java

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

@@ -21,6 +21,7 @@ import com.pdfjet.TextLine;
 
 
 import fi.insomnia.bortal.facade.CardTemplateFacade;
 import fi.insomnia.bortal.facade.CardTemplateFacade;
 import fi.insomnia.bortal.facade.EventUserFacade;
 import fi.insomnia.bortal.facade.EventUserFacade;
+import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.model.CardTemplate;
 import fi.insomnia.bortal.model.CardTemplate;
 import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.PrintedCard;
 import fi.insomnia.bortal.model.PrintedCard;
@@ -34,49 +35,54 @@ import fi.insomnia.bortal.utilities.BarcodeUtils;
 @LocalBean
 @LocalBean
 public class CardPrintBean implements CardPrintBeanLocal {
 public class CardPrintBean implements CardPrintBeanLocal {
 
 
-	@EJB private UserBean userBean;
-	@EJB private EventUserFacade eventUserFacade;
-	@EJB private CardTemplateBean cardTemplateBean;
-	@EJB private CardTemplateFacade cardTemplateFacade;
-	
-    /**
-     * Default constructor.
-     */
-    public CardPrintBean() {
-        // TODO Auto-generated constructor stub
-    }
-
-    
-    //TODO: Roles?
-    public MassPrintResult getUserCardsAsPrintablePdf(List<Integer> userIdList) throws Exception {
-    	ArrayList<EventUser> listOfEventUsers = new ArrayList<EventUser>();
-    	
-    	for(Integer userId : userIdList) {
-    		listOfEventUsers.add(eventUserFacade.find(userId));
-    	}
-    	
+	@EJB
+	private UserBean userBean;
+	@EJB
+	private EventUserFacade eventUserFacade;
+	@EJB
+	private CardTemplateBean cardTemplateBean;
+	@EJB
+	private CardTemplateFacade cardTemplateFacade;
+	@EJB
+	private UserFacade userfacade;
+
+	/**
+	 * Default constructor.
+	 */
+	public CardPrintBean() {
+		// TODO Auto-generated constructor stub
+	}
+
+	// TODO: Roles?
+	public MassPrintResult getUserCardsAsPrintablePdf(List<Integer> userIdList) throws Exception {
+		ArrayList<EventUser> listOfEventUsers = new ArrayList<EventUser>();
+
+		for (Integer userId : userIdList) {
+			listOfEventUsers.add(eventUserFacade.find(userId));
+		}
+
+		return constructPdf(listOfEventUsers);
+	}
+
+	public MassPrintResult getUserCardAsPrintablePdf(Integer userId) throws Exception {
+		ArrayList<EventUser> listOfEventUsers = new ArrayList<EventUser>();
+
+		listOfEventUsers.add(eventUserFacade.find(userId));
+
 		return constructPdf(listOfEventUsers);
 		return constructPdf(listOfEventUsers);
-    }
-    
-    public MassPrintResult getUserCardAsPrintablePdf(Integer userId) throws Exception {
-    	ArrayList<EventUser> listOfEventUsers = new ArrayList<EventUser>();
-    	
-    	listOfEventUsers.add(eventUserFacade.find(userId));
-    	
-    	return constructPdf(listOfEventUsers);
-    }
-    
-    public void acceptMassPrintResult(MassPrintResult mpr) {
-    	for(EventUser eu : mpr.getAffectedUsers()) {
-    		PrintedCard printedCard = cardTemplateBean.checkPrintedCard(eu);
-    		printedCard.setPrintCount(printedCard.getPrintCount()+1);
-    		System.out.println("Print count "+printedCard.getPrintCount());
-    	}
-
-    	cardTemplateFacade.flush();
-    }
-    
-    private MassPrintResult constructPdf(List<EventUser> users) throws Exception {   	
+	}
+
+	public void acceptMassPrintResult(MassPrintResult mpr) {
+		for (EventUser eu : mpr.getAffectedUsers()) {
+			PrintedCard printedCard = cardTemplateBean.checkPrintedCard(eu);
+			printedCard.setPrintCount(printedCard.getPrintCount() + 1);
+			System.out.println("Print count " + printedCard.getPrintCount());
+		}
+
+		cardTemplateFacade.flush();
+	}
+
+	private MassPrintResult constructPdf(List<EventUser> users) throws Exception {
 
 
 		// double[] pageSize = new double[] { cardBackground.getWidth(),
 		// double[] pageSize = new double[] { cardBackground.getWidth(),
 		// cardBackground.getHeight() };
 		// cardBackground.getHeight() };
@@ -88,94 +94,94 @@ public class CardPrintBean implements CardPrintBeanLocal {
 
 
 		double pagex = 155.52; // 54,0 mm
 		double pagex = 155.52; // 54,0 mm
 		double pagey = 243.84; // 85,5 mm
 		double pagey = 243.84; // 85,5 mm
-		
+
 		MassPrintResult mpr = new MassPrintResult();
 		MassPrintResult mpr = new MassPrintResult();
-		
-		for(EventUser user : users) {
-			
+
+		for (EventUser user : users) {
+
 			PrintedCard printedCard = cardTemplateBean.checkPrintedCard(user);
 			PrintedCard printedCard = cardTemplateBean.checkPrintedCard(user);
-			
-			if(printedCard == null)
+
+			if (printedCard == null)
 				continue;
 				continue;
-			
+
 			CardTemplate cardTemplate = printedCard.getTemplate();
 			CardTemplate cardTemplate = printedCard.getTemplate();
-			
+
 			BufferedImage cardBackground = ImageIO.read(new ByteArrayInputStream(
 			BufferedImage cardBackground = ImageIO.read(new ByteArrayInputStream(
 					cardTemplate.getImage()));
 					cardTemplate.getImage()));
 
 
 			BufferedImage faceBufferedImage = ImageIO
 			BufferedImage faceBufferedImage = ImageIO
 					.read(new ByteArrayInputStream(user.getCurrentImage()
 					.read(new ByteArrayInputStream(user.getCurrentImage()
 							.getImageData()));
 							.getImageData()));
-			
+
 			if(faceBufferedImage.getWidth() > 1024 || faceBufferedImage.getHeight() > 1024) {
 			if(faceBufferedImage.getWidth() > 1024 || faceBufferedImage.getHeight() > 1024) {
 				throw new Exception("Image dimensions too large, please take/upload smaller!");
 				throw new Exception("Image dimensions too large, please take/upload smaller!");
 			}
 			}
 			
 			
 			int originalWidth = faceBufferedImage.getWidth();
 			int originalWidth = faceBufferedImage.getWidth();
 			int originalHeight = faceBufferedImage.getHeight();
 			int originalHeight = faceBufferedImage.getHeight();
-			
+
 			int width = originalWidth;
 			int width = originalWidth;
-			int height = (int)Math.round(originalWidth*(1/0.7317073170731707));
-			
-			if(height > originalHeight) {
+			int height = (int) Math.round(originalWidth * (1 / 0.7317073170731707));
+
+			if (height > originalHeight) {
 				height = originalHeight;
 				height = originalHeight;
-				width = (int)Math.round(originalHeight*0.7317073170731707);
+				width = (int) Math.round(originalHeight * 0.7317073170731707);
 			}
 			}
-			
-			int offsetx = (originalWidth - width)/2;
-			int offsety = (originalHeight - height)/2;
-			
+
+			int offsetx = (originalWidth - width) / 2;
+			int offsety = (originalHeight - height) / 2;
+
 			faceBufferedImage = faceBufferedImage.getSubimage(offsetx, offsety, width, height);
 			faceBufferedImage = faceBufferedImage.getSubimage(offsetx, offsety, width, height);
-			
+
 			Page page = new Page(pdf, new double[] { pagex, pagey });
 			Page page = new Page(pdf, new double[] { pagex, pagey });
-	
+
 			// Render background image
 			// Render background image
 			Image templateImage = new Image(pdf,
 			Image templateImage = new Image(pdf,
 					convertBufferedImageToPng(cardBackground), ImageType.PNG);
 					convertBufferedImageToPng(cardBackground), ImageType.PNG);
 			templateImage.setPosition(0, 0);
 			templateImage.setPosition(0, 0);
 			templateImage.scaleBy(0.245);
 			templateImage.scaleBy(0.245);
 			templateImage.drawOn(page);
 			templateImage.drawOn(page);
-	
+
 			// Render face image
 			// Render face image
 			Image faceImage = new Image(pdf,
 			Image faceImage = new Image(pdf,
 					convertBufferedImageToPng(faceBufferedImage), ImageType.PNG);
 					convertBufferedImageToPng(faceBufferedImage), ImageType.PNG);
 			faceImage.setPosition(15.5, 67);
 			faceImage.setPosition(15.5, 67);
-			//faceImage.scaleBy(0.32);
-			faceImage.scaleBy(((410.0*0.245)/faceImage.getHeight()));
+			// faceImage.scaleBy(0.32);
+			faceImage.scaleBy(((410.0 * 0.245) / faceImage.getHeight()));
 			faceImage.drawOn(page);
 			faceImage.drawOn(page);
-	
+
 			// Render texts
 			// Render texts
 			// Big font for nick
 			// Big font for nick
 			com.pdfjet.Font nickFont = new com.pdfjet.Font(pdf, CoreFont.HELVETICA);
 			com.pdfjet.Font nickFont = new com.pdfjet.Font(pdf, CoreFont.HELVETICA);
 			nickFont.setSize(16.0);
 			nickFont.setSize(16.0);
-	
+
 			// User nick text
 			// User nick text
 			TextLine nickTextLine = new TextLine(nickFont);
 			TextLine nickTextLine = new TextLine(nickFont);
 			nickTextLine.setText(user.getUser().getNick());
 			nickTextLine.setText(user.getUser().getNick());
 			nickTextLine.setPosition(19.0, 193.0);
 			nickTextLine.setPosition(19.0, 193.0);
-			nickTextLine.setColor(new double[] {1.0, 1.0, 1.0});
+			nickTextLine.setColor(new double[] { 1.0, 1.0, 1.0 });
 			nickTextLine.drawOn(page);
 			nickTextLine.drawOn(page);
-	
+
 			// Smaller font
 			// Smaller font
 			com.pdfjet.Font font = new com.pdfjet.Font(pdf, CoreFont.HELVETICA);
 			com.pdfjet.Font font = new com.pdfjet.Font(pdf, CoreFont.HELVETICA);
 			font.setSize(10.0);
 			font.setSize(10.0);
-			
+
 			// Full name text
 			// Full name text
 			String wholeName = user.getUser().getFirstnames() + " "
 			String wholeName = user.getUser().getFirstnames() + " "
 					+ user.getUser().getLastname();
 					+ user.getUser().getLastname();
 			TextLine wholeNameText = new TextLine(font);
 			TextLine wholeNameText = new TextLine(font);
 			wholeNameText.setText(wholeName);
 			wholeNameText.setText(wholeName);
 			wholeNameText.setPosition(17.0, 212.0);
 			wholeNameText.setPosition(17.0, 212.0);
-			wholeNameText.setColor(new double[] {1.0, 1.0, 1.0});
+			wholeNameText.setColor(new double[] { 1.0, 1.0, 1.0 });
 			wholeNameText.drawOn(page);
 			wholeNameText.drawOn(page);
-	
+
 			// Role text
 			// Role text
 			TextLine roleTextLine = new TextLine(font);
 			TextLine roleTextLine = new TextLine(font);
 			roleTextLine.setText(cardTemplate.getName());
 			roleTextLine.setText(cardTemplate.getName());
 			roleTextLine.setPosition(17.0, 223.0);
 			roleTextLine.setPosition(17.0, 223.0);
-			roleTextLine.setColor(new double[] {1.0, 1.0, 1.0});
+			roleTextLine.setColor(new double[] { 1.0, 1.0, 1.0 });
 			roleTextLine.drawOn(page);
 			roleTextLine.drawOn(page);
-	
+
 			// Barcode
 			// Barcode
 			String barcodeString = String.valueOf(user.getUser().getCreated()
 			String barcodeString = String.valueOf(user.getUser().getCreated()
 					.getTime().getTime());
 					.getTime().getTime());
@@ -187,18 +193,19 @@ public class CardPrintBean implements CardPrintBeanLocal {
 			barCodeImage.setPosition(0.0, 243.5);
 			barCodeImage.setPosition(0.0, 243.5);
 			barCodeImage.scaleBy(0.7);
 			barCodeImage.scaleBy(0.7);
 			barCodeImage.drawOn(page);
 			barCodeImage.drawOn(page);
-			
+
 			mpr.getAffectedUsers().add(user);
 			mpr.getAffectedUsers().add(user);
 		}
 		}
 		pdf.flush();
 		pdf.flush();
 		outputStream.close();
 		outputStream.close();
-		
-		if(mpr.getAffectedUsers().size() == 0) throw new Exception("No cards generated");
+
+		if (mpr.getAffectedUsers().size() == 0)
+			throw new Exception("No cards generated");
 		mpr.setPdf(outputStream.toByteArray());
 		mpr.setPdf(outputStream.toByteArray());
 		return mpr;
 		return mpr;
-    }
-    
-    private ByteArrayInputStream convertBufferedImageToPng(BufferedImage img)
+	}
+
+	private ByteArrayInputStream convertBufferedImageToPng(BufferedImage img)
 			throws IOException {
 			throws IOException {
 		ByteArrayOutputStream outStream = new ByteArrayOutputStream();
 		ByteArrayOutputStream outStream = new ByteArrayOutputStream();
 		ImageIO.write(img, "png", outStream);
 		ImageIO.write(img, "png", outStream);

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

@@ -47,7 +47,6 @@ public class MenuBean implements MenuBeanLocal {
 	@EJB
 	@EJB
 	private PermissionBeanLocal permbean;
 	private PermissionBeanLocal permbean;
 
 
-	@SuppressWarnings("unused")
 	private static final Logger logger = LoggerFactory.getLogger(MenuBean.class);
 	private static final Logger logger = LoggerFactory.getLogger(MenuBean.class);
 
 
 	@RolesAllowed(SpecialPermission.S_SUPERADMIN)
 	@RolesAllowed(SpecialPermission.S_SUPERADMIN)
@@ -58,11 +57,127 @@ public class MenuBean implements MenuBeanLocal {
 		initializeMenu();
 		initializeMenu();
 	}
 	}
 
 
+	@RolesAllowed(SpecialPermission.S_SUPERADMIN)
+	@Override
+	public void flushOldMenu()
+	{
+		navifacade.deleteAllDefaults();
+		initializeOldMenu();
+	}
+
 	private synchronized void initializeMenu() {
 	private synchronized void initializeMenu() {
 
 
+		int menusort = 100;
+		logger.info("Initializing menu");
+		LanEvent ev = eventbean.getCurrentEvent();
+
+		MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.frontpage", menusort = +10);
+		// usernavi.addPage(menuitemfacade.findOrCreate("/index"),
+		// UserPermission.ANYUSER);
+		navifacade.create(usermenu);
+
+		MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminpage", menusort = +10);
+		// adminnavi.addPage(menuitemfacade.findOrCreate("/index2"),
+		// UserPermission.ANYUSER);
+		navifacade.create(adminmenu);
+
+		MenuNavigation shopmenu = new MenuNavigation(ev, "topnavi.shopnavi", menusort = +10);
+		// shopnavi.addPage(menuitemfacade.findOrCreate("/index3"),
+		// UserPermission.ANYUSER);
+		navifacade.create(shopmenu);
+
+		// Index
+		usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.VIEW_ALL);
+		
+		// kuppa
+		MenuNavigation usershop = usermenu.addPage(null, null);
+		usermenu.setKey("topnavi.shop.products");
+		usermenu.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
+		
+		usershop.addPage(menuitemfacade.findOrCreate("/place/myGroups"), UserPermission.VIEW_SELF);
+		usershop.addPage(null, null);
+		usershop.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL);
+		usershop.addPage(menuitemfacade.findOrCreate("/user/accountEvents"), UserPermission.VIEW_SELF);
+		usershop.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN);
+
+		MenuNavigation prodsubmenu = usermenu.addPage(null, null);
+		prodsubmenu.setKey("topnavi.shop.products");
+		prodsubmenu.addPage(menuitemfacade.findOrCreate("/product/list"), ShopPermission.LIST_ALL_PRODUCTS);
+		prodsubmenu.addPage(menuitemfacade.findOrCreate("/product/create"), ShopPermission.MANAGE_PRODUCTS);
+
+		MenuNavigation adminshop = usermenu.addPage(null, null);
+		adminshop.setKey("topnavi.shop.adminshop");
+		adminshop.addPage(menuitemfacade.findOrCreate("/shop/showReaderEvents"), ShopPermission.SHOP_TO_OTHERS);
+		adminshop.addPage(menuitemfacade.findOrCreate("/shop/listReaders"), ShopPermission.SHOP_TO_OTHERS);
+
+		MenuNavigation billnavi = usermenu.addPage(null, null);
+		billnavi.setKey("topnavi.shop.bill");
+		billnavi.addPage(menuitemfacade.findOrCreate("/bill/billSummary"), BillPermission.READ_ALL);
+		billnavi.addPage(menuitemfacade.findOrCreate("/bill/listAll"), BillPermission.WRITE_ALL);
+		navifacade.create(usermenu);
+
+		MenuNavigation eventTopmenu = new MenuNavigation(ev, "topnavi.event", menusort = +10);
+		eventTopmenu.addPage(menuitemfacade.findOrCreate("/map/list"), MapPermission.MANAGE_MAPS);
+		eventTopmenu.addPage(menuitemfacade.findOrCreate("/map/create"), MapPermission.MANAGE_MAPS);
+		eventTopmenu.addPage(null, null);
+		eventTopmenu.addPage(menuitemfacade.findOrCreate("/voting/compolist"), CompoPermission.VIEW_COMPOS);
+		eventTopmenu.addPage(menuitemfacade.findOrCreate("/voting/myEntries"), CompoPermission.VIEW_COMPOS);
+		eventTopmenu.addPage(menuitemfacade.findOrCreate("/voting/create"), CompoPermission.MANAGE);
+
+		eventTopmenu.addPage(null, null);
+		eventTopmenu.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER);
+		navifacade.create(eventTopmenu);
+
+	/* 	
+	 	MenuNavigation profileTopmenu = new MenuNavigation(ev, "topnavi.profile", menusort = +10);
+		profileTopmenu.addPage(menuitemfacade.findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL);
+		profileTopmenu.addPage(menuitemfacade.findOrCreate("/useradmin/list"), UserPermission.VIEW_ALL).setHeader("submenu.user.manageuserlinks");
+		profileTopmenu.addPage(menuitemfacade.findOrCreate("/user/edit"), UserPermission.VIEW_SELF);
+		profileTopmenu.addPage(menuitemfacade.findOrCreate("/user/changePassword"), UserPermission.VIEW_SELF);
+	 */
+		
+		MenuNavigation usermgmt = profileTopmenu.addPage(null, null);
+		usermgmt.setKey("topnavi.user.mgmt");
+		usermgmt.addPage(menuitemfacade.findOrCreate("/role/create"), UserPermission.WRITE_ROLES);
+		usermgmt.addPage(menuitemfacade.findOrCreate("/role/list"), UserPermission.READ_ROLES).setHeader("submenu.user.rolelinks");
+		usermgmt.addPage(menuitemfacade.findOrCreate("/orgrole/list"), UserPermission.READ_ORGROLES);
+		usermgmt.addPage(menuitemfacade.findOrCreate("/orgrole/create"), UserPermission.WRITE_ORGROLES);
+		usermgmt.addPage(menuitemfacade.findOrCreate("/useradmin/listCardTemplates"), UserPermission.READ_ROLES);
+		usermgmt.addPage(menuitemfacade.findOrCreate("/useradmin/createCardTemplate"), UserPermission.WRITE_ROLES);
+
+		navifacade.create(profileTopmenu);
+
+		MenuNavigation miscTopmenu = new MenuNavigation(ev, "topnavi.misc", menusort = +10);
+
+		miscTopmenu.addPage(menuitemfacade.findOrCreate("/pages/list"), ContentPermission.MANAGE_PAGES);
+		miscTopmenu.addPage(menuitemfacade.findOrCreate("/pages/create"), ContentPermission.MANAGE_PAGES);
+		miscTopmenu.addPage(menuitemfacade.findOrCreate("/utils/flushCache"), ContentPermission.MANAGE_PAGES);
+
+		navifacade.create(miscTopmenu);
+
+		// frontTopnavi.addPage(menuitemfacade.findOrCreate("/user/create"),
+		// UserPermission.CREATE_NEW);
+		// frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/sendResetMail"),
+		// UserPermission.LOGIN);
+		// frontTopnavi.addPage(menuitemfacade.findOrCreate("/user/invite"),
+		// UserPermission.INVITE_USERS);
+
+		// ////////////////////////////////////////////////////
+		// ////////////////////////////////////////////////////
+		// ////////////////////////////////////////////////////
+		// ////////////////////////////////////////////////////
+		// ////////////////////////////////////////////////////
+		// ////////////////////////////////////////////////////
+		// ////////////////////////////////////////////////////
+
+	}
+
+	private synchronized void initializeOldMenu() {
+
 		LanEvent ev = eventbean.getCurrentEvent();
 		LanEvent ev = eventbean.getCurrentEvent();
+		int menusort = 100;
 
 
-		MenuNavigation usernavi = new MenuNavigation(ev, "supernavi.user");
+		MenuNavigation usernavi = new MenuNavigation(ev, "supernavi.user", menusort = +10);
 
 
 		navifacade.create(usernavi);
 		navifacade.create(usernavi);
 
 
@@ -134,7 +249,7 @@ public class MenuBean implements MenuBeanLocal {
 		compoMenu.addPage(menuitemfacade.findOrCreate("/voting/submitEntry"), null).setVisible(false);
 		compoMenu.addPage(menuitemfacade.findOrCreate("/voting/submitEntry"), null).setVisible(false);
 		compoMenu.addPage(menuitemfacade.findOrCreate("/voting/details"), null).setVisible(false);
 		compoMenu.addPage(menuitemfacade.findOrCreate("/voting/details"), null).setVisible(false);
 
 
-		MenuNavigation adminnavi = new MenuNavigation(ev, "supernavi.admin");
+		MenuNavigation adminnavi = new MenuNavigation(ev, "supernavi.admin", menusort = +10);
 		navifacade.create(adminnavi);
 		navifacade.create(adminnavi);
 
 
 		MenuNavigation adminuser = adminnavi.addPage(null, null);
 		MenuNavigation adminuser = adminnavi.addPage(null, null);

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/MenuNavigationFacade.java

@@ -71,6 +71,8 @@ public class MenuNavigationFacade extends IntegerPkGenericFacade<MenuNavigation>
 				cb.equal(root.get(MenuNavigation_.event), eventbean.getCurrentEvent()),
 				cb.equal(root.get(MenuNavigation_.event), eventbean.getCurrentEvent()),
 				cb.isTrue(root.get(MenuNavigation_.visible)));
 				cb.isTrue(root.get(MenuNavigation_.visible)));
 
 
+		cq.orderBy(cb.asc(root.get(MenuNavigation_.sort)));
+
 		return getEm().createQuery(cq).getResultList();
 		return getEm().createQuery(cq).getResultList();
 	}
 	}
 
 

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/MenuBeanLocal.java

@@ -17,4 +17,6 @@ public interface MenuBeanLocal {
 
 
 	List<MenuNavigation> getTopmenus();
 	List<MenuNavigation> getTopmenus();
 
 
+	void flushOldMenu();
+
 }
 }

code/LanBortalDatabase/src/fi/insomnia/bortal/model/MenuNavigation.java

@@ -82,8 +82,9 @@ public class MenuNavigation extends GenericEntity implements Comparable<MenuNavi
         super();
         super();
     }
     }
 
 
-    public MenuNavigation(LanEvent ev, String keyString) {
+    public MenuNavigation(LanEvent ev, String keyString, Integer sort) {
         super();
         super();
+        this.sort = sort;
         this.event = ev;
         this.event = ev;
         this.key = keyString;
         this.key = keyString;
         this.visible = true;
         this.visible = true;
@@ -186,8 +187,11 @@ public class MenuNavigation extends GenericEntity implements Comparable<MenuNavi
 
 
     // used only for initialization function...
     // used only for initialization function...
     public MenuNavigation addPage(Menuitem item, IAppPermission permission) {
     public MenuNavigation addPage(Menuitem item, IAppPermission permission) {
-        if (children == null) {
+        int childSort = 100;
+        if (children == null || children.size() == 0) {
             children = new ArrayList<MenuNavigation>();
             children = new ArrayList<MenuNavigation>();
+        } else {
+            childSort = children.get(children.size() - 1).getSort() + 10;
         }
         }
         MenuNavigation add = new MenuNavigation();
         MenuNavigation add = new MenuNavigation();
         add.setSort(pagesort += 10);
         add.setSort(pagesort += 10);
@@ -200,6 +204,7 @@ public class MenuNavigation extends GenericEntity implements Comparable<MenuNavi
         add.setPermission(permission);
         add.setPermission(permission);
         add.setParent(this);
         add.setParent(this);
         add.setVisible(true);
         add.setVisible(true);
+        add.setSort(childSort);
         children.add(add);
         children.add(add);
         return add;
         return add;
 
 

code/LanBortalUtilities/src/fi/insomnia/bortal/utilities/I18n.java

@@ -30,17 +30,19 @@ public class I18n {
 
 
 	public static String get(String key) {
 	public static String get(String key) {
 		String value = null;
 		String value = null;
-		try {
-			value = getResourceBundle().getString(key);
-		} catch (MissingResourceException e) {
-			value = null;
-		}
 
 
 		if (key == null) {
 		if (key == null) {
 			value = "########";
 			value = "########";
-		} else if (value == null) {
-			value = "???" + key + "???";
-
+		} else {
+			try {
+				value = getResourceBundle().getString(key);
+			} catch (MissingResourceException e) {
+				value = null;
+			}
+
+			if (value == null) {
+				value = "???" + key + "???";
+			}
 		}
 		}
 		return value;
 		return value;
 	}
 	}

code/LanBortalUtilities/src/fi/insomnia/bortal/utilities/SearchQuery.java

@@ -9,13 +9,14 @@ public class SearchQuery implements Serializable {
 	private int pagesize = 20;
 	private int pagesize = 20;
 	private String sort = null;
 	private String sort = null;
 	private String search = null;
 	private String search = null;
+	private Boolean direction = false;
 
 
 	public SearchQuery()
 	public SearchQuery()
 	{
 	{
 		super();
 		super();
 	}
 	}
 
 
-	public SearchQuery(int page, int pagesize, String sort, String search) {
+	public SearchQuery(int page, int pagesize, String sort, String search, boolean direction) {
 		super();
 		super();
 		this.page = page;
 		this.page = page;
 		this.pagesize = pagesize;
 		this.pagesize = pagesize;
@@ -69,4 +70,12 @@ public class SearchQuery implements Serializable {
 		}
 		}
 	}
 	}
 
 
+	public Boolean isDirection() {
+		return direction;
+	}
+
+	public void setDirection(Boolean direction) {
+		this.direction = direction;
+	}
+
 }
 }

code/LanBortalWeb/WebContent/WEB-INF/web.xml

@@ -9,9 +9,8 @@
 	</session-config>
 	</session-config>
 	<context-param>
 	<context-param>
 		<param-name>javax.faces.PROJECT_STAGE</param-name>
 		<param-name>javax.faces.PROJECT_STAGE</param-name>
-		<param-value>Production</param-value> 
-
-		 <!--   <param-value>Development</param-value>--> 
+		 <param-value>Production</param-value>
+		 <!--<param-value>Development</param-value> -->
 
 
 	</context-param>
 	</context-param>
 	<context-param>
 	<context-param>
@@ -143,8 +142,8 @@
 		<servlet-name>PlaceGroupPdf</servlet-name>
 		<servlet-name>PlaceGroupPdf</servlet-name>
 		<url-pattern>/PlaceGroupPdf</url-pattern>
 		<url-pattern>/PlaceGroupPdf</url-pattern>
 	</servlet-mapping>
 	</servlet-mapping>
-	<context-param>
+	<!--  <context-param>
 		<param-name>primefaces.THEME</param-name>
 		<param-name>primefaces.THEME</param-name>
 		<param-value>bortal</param-value>
 		<param-value>bortal</param-value>
-	</context-param>
+	</context-param> -->
 </web-app>
 </web-app>
\ No newline at end of file

code/LanBortalWeb/WebContent/admin/adduser/start.xhtml

+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools">
+<h:body>
+	<ui:composition
+		template="/layout/#{sessionHandler.adduserfullscreen}/template.xhtml">
+
+		<ui:define name="content">
+		<div style="text-align: center;">
+		<h:form>
+		<h1>#{i18n["adduser.welcome"]}</h1>
+		<br/><br/><p>#{i18n["adduser.welcometext"]}
+		
+		</p>
+		<br/><br/>
+		<p:commandButton styleClass="start" value="#{i18n['adduser.newuser']}" />  
+		<p:commandButton styleClass="start" value="#{i18n['adduser.update']}" />
+		</h:form>
+		</div>
+		
+		</ui:define>
+		
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/admin/info/computerplaces.xhtml

+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:user="http://java.sun.com/jsf/composite/cditools/user"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools"
+	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"
+	>
+<h:body>
+	<ui:composition
+		template="/layout/#{sessionHandler.fullscreen}/template.xhtml">
+		<f:metadata>
+			<f:viewParam name="userid" value="#{userView.userid}" />
+			<f:event type="preRenderView" listener="#{userView.initView}" />
+		</f:metadata>
+		
+		<ui:define name="topbar">
+			<h:link outcome="/admin/info/general" class="userbackbutton" value="">
+				<div>
+					<img src="#{request.contextPath}/resources/style/blipview/img/arrow.png" />
+					
+				</div>
+			</h:link>
+		</ui:define>
+		
+		<ui:define name="content">
+<h:outputText rendered="#{empty placeGroupView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" />
+			<h:form rendered="#{!empty placeGroupView.groupMemberships}" id="placelistform">	
+
+				<h:dataTable value="#{placeGroupView.groupMemberships}" var="member">
+
+					<h:column>
+						<f:facet name="header">
+							<h:outputText value="#{i18n['placegroupview.reservationName']}" />
+						</f:facet>
+						<h:outputText value="#{member.placeReservation.name}" />
+					</h:column>
+					<h:column>
+						<f:facet name="header">
+							<h:outputText value="#{i18n['placegroupview.reservationProduct']}" />
+						</f:facet>
+						<h:outputText value="#{member.placeReservation.product.name}" />
+					</h:column>
+					<h:column>
+						<f:facet name="header">
+							<h:outputText value="#{i18n['placegroupview.token']}" />
+						</f:facet>
+						<h:outputText rendered="#{empty member.user}" value="#{member.inviteToken}" />
+						<h:outputText rendered="#{!empty member.user}" value="#{member.user.firstnames} #{member.user.lastname} (#{member.user.nick})" />
+
+					</h:column>
+					<h:column>
+						<f:facet name="header">
+							<h:outputText value="#{i18n['placegroupview.groupCreator']}" />
+						</f:facet>
+						<h:outputText value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})" />
+
+					</h:column>
+
+					<h:column>
+						<h:commandButton rendered="#{placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull}" action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" />
+					</h:column>
+
+				</h:dataTable>
+			</h:form>
+
+				<p>
+					<input type="button" onclick="location.replace('#{request.contextPath}/PlaceGroupPdf');" value="#{i18n['placegroup.printPdf']}" />
+				</p>
+			<h2>#{i18n['placetoken.pageHeader']}</h2>
+			<p>#{i18n['placetoken.topText']}</p>
+			<h:form id="placeTokenForm">
+			
+					<h:outputLabel value="#{i18n['placetoken.token']}:" />
+					<h:inputText value="#{tokenView.token}" />
+					<h:commandButton id="commitbtn" action="#{tokenView.saveToken()}" value="#{i18n['placetoken.commit']}" />
+			</h:form>
+			
+			</ui:define>
+
+		<ui:define name="sidebar">
+		
+			<user:tileview />
+			
+		</ui:define>
+		
+	</ui:composition>
+</h:body>
+</html>
+			
\ No newline at end of file

code/LanBortalWeb/WebContent/admin/info/general.xhtml

+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:user="http://java.sun.com/jsf/composite/cditools/user"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools">
+<h:body>
+	<ui:composition
+		template="/layout/#{sessionHandler.fullscreen}/template.xhtml">
+		<f:metadata>
+			<f:viewParam name="userid" value="#{userView.userid}" />
+			<f:event type="preRenderView" listener="#{userView.initView}" />
+		</f:metadata>
+		
+		<ui:define name="topbar">
+			<h:link outcome="/admin/info/index" class="userbackbutton" value="">
+				<div>
+					<img src="#{request.contextPath}/resources/style/blipview/img/arrow.png" />
+					
+				</div>
+			</h:link>
+		</ui:define>
+		<ui:define name="content">
+
+			<h:link outcome="/admin/info/shop" class="usertile" value="">
+				<div>
+					<img src="#{request.contextPath}/resources/style/blipview/img/shop.png" />
+					<h:outputText value="#{i18n['infoview.shop']}" />
+				</div>
+				<f:param name="userid" value="#{userView.user.id}" />
+			</h:link>
+			
+			<h:link outcome="/admin/info/computerplaces" class="usertile" value="">
+				<div>
+					<img src="#{request.contextPath}/resources/style/blipview/img/computer.png" />
+					<h:outputText value="#{i18n['infoview.computerplace']}" />
+				</div>
+			</h:link>
+
+
+		</ui:define>
+
+		<ui:define name="sidebar">
+
+			<user:tileview />
+
+		</ui:define>
+
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/admin/info/index.xhtml

+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools">
+<h:body>
+	<ui:composition
+		template="/layout/#{sessionHandler.fullscreen}/template.xhtml">
+
+		<f:metadata>
+			<f:event type="preRenderView" listener="#{barcodeView.initView}" />
+		</f:metadata>
+		<f:metadata>
+			<f:event type="preRenderView" listener="#{readerListDataView.initView}" />
+		<f:event type="preRenderView" listener="#{readerList.initReaderList}" />
+		
+		</f:metadata>
+		<ui:define name="content">
+		
+			<br />
+			<br />
+			<shop:readeventtiles />
+
+		</ui:define>
+
+		<ui:define name="sidebar">
+		
+			<shop:readerlisttiles />
+			<br />
+				<h:form>
+				<h:inputText name="barcode" value="#{barcodeView.barcode}" />
+				<h:commandButton action="#{barcodeView.readBarcode}"
+					value="#{i18n['barcodeReader.readBarcode']}" />
+			</h:form>
+		</ui:define>
+		
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/admin/info/shop.xhtml

+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:user="http://java.sun.com/jsf/composite/cditools/user"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools"
+	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop">
+<h:body>
+	<ui:composition
+		template="/layout/#{sessionHandler.fullscreen}/template.xhtml">
+		<f:metadata>
+			<f:viewParam name="userid" value="#{userView.userid}" />
+			<f:event type="preRenderView" listener="#{userView.initView}" />
+			<f:event type="preRenderView" listener="#{productShopView.initShopView}" />
+		</f:metadata>
+		<ui:define name="topbar">
+			<h:link outcome="/admin/info/general" class="userbackbutton" value="">
+				<div>
+					<img src="#{request.contextPath}/resources/style/blipview/img/arrow.png" />
+				</div>
+			</h:link>
+		</ui:define>
+		<ui:define name="content">
+	
+	 	<shop:shoppingcart />
+	
+	
+		</ui:define>
+
+		<ui:define name="sidebar">
+		
+			<user:tileview />
+			
+		</ui:define>
+		
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/layout/adduser/template.xhtml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui">
+
+<f:view contentType="text/html" locale="#{sessionHandler.locale}">
+
+	<h:head>
+
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<title><h:outputText value="#{layoutView.getHeader()}" /></title>
+		<meta name="description" content="Lippukauppa" />
+		<meta name="author" content="CodeCrew ry" />
+		<meta http-equiv="Content-Language" content="fi" />
+
+		<link rel="stylesheet" type="text/css"
+			href="#{request.contextPath}/resources/style/blipview/css/style.css" />
+		<link rel="stylesheet" type="text/css"
+			href="#{request.contextPath}/resources/style/blipview/css/general.css" />
+		<ui:insert name="headerdata" />
+
+	</h:head>
+
+
+	<h:body>
+
+		<div class="container top">
+			<ui:insert name="topbar" />
+		</div>
+
+		<div class="container clearfix">
+
+			<div id="content">
+				<ui:insert name="content" />
+			</div>
+
+		</div>
+
+
+		<!-- Piwik -->
+		<script type="text/javascript">
+			var pkBaseURL = (("https:" == document.location.protocol) ? "https://jolez.pingtimeout.net/piwik/"
+					: "http://jolez.pingtimeout.net/piwik/");
+			document.write(unescape("%3Cscript src='" + pkBaseURL
+					+ "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		</script>
+		<script type="text/javascript">
+			try {
+				var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 5);
+				piwikTracker.trackPageView();
+				piwikTracker.enableLinkTracking();
+			} catch (err) {
+			}
+		</script>
+
+		<noscript>
+			<p>
+				<img src="http://jolez.pingtimeout.net/piwik/piwik.php?idsite=5"
+					style="border: 0" alt="" />
+			</p>
+		</noscript>
+		<!-- End Piwik Tracking Code -->
+	</h:body>
+
+</f:view>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/layout/blipview/template.xhtml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui">
+
+<f:view contentType="text/html" locale="#{sessionHandler.locale}">
+
+	<h:head>
+
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<title><h:outputText value="#{layoutView.getHeader()}" /></title>
+		<meta name="description" content="Lippukauppa" />
+		<meta name="author" content="CodeCrew ry" />
+		<meta http-equiv="Content-Language" content="fi" />
+
+		<link rel="stylesheet" type="text/css"
+			href="#{request.contextPath}/resources/style/blipview/css/style.css" />
+		<link rel="stylesheet" type="text/css"
+			href="#{request.contextPath}/resources/style/blipview/css/general.css" />
+		<ui:insert name="headerdata" />
+
+	</h:head>
+
+
+	<h:body>
+	
+		<p:menubar model="#{primeMenuView.menuModel}">
+
+
+		</p:menubar>
+
+		<div class="container top">
+			<ui:insert name="topbar" />
+		</div>
+
+		<div class="container clearfix">
+
+			<div id="right">
+				<ui:insert name="sidebar" />
+			</div>
+
+			<div id="left">
+				<ui:insert name="content" />
+			</div>
+
+		</div>
+
+
+		<!-- Piwik -->
+		<script type="text/javascript">
+			var pkBaseURL = (("https:" == document.location.protocol) ? "https://jolez.pingtimeout.net/piwik/"
+					: "http://jolez.pingtimeout.net/piwik/");
+			document.write(unescape("%3Cscript src='" + pkBaseURL
+					+ "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		</script>
+		<script type="text/javascript">
+			try {
+				var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 5);
+				piwikTracker.trackPageView();
+				piwikTracker.enableLinkTracking();
+			} catch (err) {
+			}
+		</script>
+
+		<noscript>
+			<p>
+				<img src="http://jolez.pingtimeout.net/piwik/piwik.php?idsite=5"
+					style="border: 0" alt="" />
+			</p>
+		</noscript>
+		<!-- End Piwik Tracking Code -->
+	</h:body>
+
+</f:view>
+</html>
\ No newline at end of file

code/LanBortalWeb/WebContent/layout/template1/template.xhtml

 <?xml version="1.0" encoding="UTF-8" ?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:tools="http://java.sun.com/jsf/composite/cditools"
-	xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui">
 
 
 <f:view contentType="text/html" locale="#{sessionHandler.locale}">
 <f:view contentType="text/html" locale="#{sessionHandler.locale}">
 
 
 	<h:head>
 	<h:head>
-	
+
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 		<title><h:outputText value="#{layoutView.getHeader()}" /></title>
 		<title><h:outputText value="#{layoutView.getHeader()}" /></title>
 		<meta name="description" content="Lippukauppa" />
 		<meta name="description" content="Lippukauppa" />
 		<meta name="author" content="CodeCrew ry" />
 		<meta name="author" content="CodeCrew ry" />
 		<meta http-equiv="Content-Language" content="fi" />
 		<meta http-equiv="Content-Language" content="fi" />
 
 
-		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/template1/css/style.css" />
-		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/template1/css/general.css" />
+		<link rel="stylesheet" type="text/css"
+			href="#{request.contextPath}/resources/style/template1/css/style.css" />
+		<link rel="stylesheet" type="text/css"
+			href="#{request.contextPath}/resources/style/template1/css/general.css" />
 		<ui:insert name="headerdata" />
 		<ui:insert name="headerdata" />
 
 
 	</h:head>
 	</h:head>
@@ -22,14 +29,16 @@
 
 
 	<h:body>
 	<h:body>
 		<div id="page-container">
 		<div id="page-container">
-		<div id="logo">
+			<div id="logo">
 				<h:link outcome="/index">
 				<h:link outcome="/index">
 					<c:choose>
 					<c:choose>
 						<c:when test="#{sessionHandler.isInDevelopmentMode()}">
 						<c:when test="#{sessionHandler.isInDevelopmentMode()}">
-							<img src="#{request.contextPath}/resources/style/insomnia2/img/devel_logo.png" />
+							<img
+								src="#{request.contextPath}/resources/style/insomnia2/img/devel_logo.png" />
 						</c:when>
 						</c:when>
 						<c:otherwise>
 						<c:otherwise>
-							<p:graphicImage rendered="#{!empty layoutView.headerimage}" value="#{layoutView.headerimage}" />
+							<p:graphicImage rendered="#{!empty layoutView.headerimage}"
+								value="#{layoutView.headerimage}" />
 							<ui:fragment rendered="#{empty layoutView.headerimage}">
 							<ui:fragment rendered="#{empty layoutView.headerimage}">
 								<h1>
 								<h1>
 									<h:outputText value="#{layoutView.headertext}" />
 									<h:outputText value="#{layoutView.headertext}" />
@@ -41,92 +50,110 @@
 
 
 
 
 			</div>
 			</div>
-		<div id="page-header">
-			
+			<div id="page-header">
+
 
 
-			<div id="login">
-				<h:outputText rendered="#{sessionHandler.loggedIn}" value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" />
-				<div>
-					<tools:loginLogout />
+				<div id="login">
+					<h:outputText rendered="#{sessionHandler.loggedIn}"
+						value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" />
+					<div>
+						<tools:loginLogout />
+					</div>
 				</div>
 				</div>
+
 			</div>
 			</div>
-			
-			<ui:fragment rendered="#{menuView.getMenu(0).size() > 1}">
-				<div id="top-menu">
-					<ul>
-						<li jsfc="ui:repeat" var="menuitem" value="#{menuView.getMenu(0)}">
-							<h:link outcome="#{menuitem.outcome}" value="#{i18n[menuitem.navigation.key]}" styleClass="#{menuitem.selected?'active':''}" />
-						</li>
-					</ul>
+
+			<div id="main">
+
+				<p:menubar model="#{primeMenuView.menuModel}" style="width:80%; float: left;">
+
+					
+				</p:menubar>
+					<p:menubar style="float:left; width: auto;">
+<p:submenu label="#{sessionHandler.currentUser.wholeName}">
+						
+						<p:submenu label="Roolit">
+						<p:menuitem value="Kävijä" url="#" />
+						<p:menuitem value="Admin" url="#" />
+						<p:menuitem value="Info" url="/admin/info/index.jsf" />
+						</p:submenu>
+						<p:menuitem value="Omat tiedot" url="/admin/info/index.jsf" />
+						<p:menuitem value="Omat konepaikat" url="/admin/info/index.jsf" />
+						<p:menuitem value="Logout" url="/admin/info/index.jsf" />
+					</p:submenu>
+					</p:menubar>
+				<div class="container top">
+					<h:link rendered="#{layoutView.manageContent}"
+						styleClass="editorlink" value="#{i18n['layout.editTop']}"
+						outcome="/pages/manage">
+						<f:param name="pagename" value="#{layoutView.pagepath}:top" />
+					</h:link>
 				</div>
 				</div>
-			</ui:fragment>
-		</div>
 
 
-		<div id="main">
-		
-			<div id="main-nav">
-				<ul>
-					<li jsfc="ui:repeat" var="menuitem" value="#{menuView.getMenu(1)}">
-						<h:link outcome="#{menuitem.outcome}" value="#{i18n[menuitem.navigation.key]}" styleClass="#{menuitem.selected?'active':''}" />
-					</li>
-				</ul>
-			</div>
-			
-			<div class="container top">
-				<h:link  rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editTop']}" outcome="/pages/manage">
-					<f:param name="pagename" value="#{layoutView.pagepath}:top" />
-				</h:link>
-			</div>
-			
-			<div class="container clearfix">
-			
-				<ui:fragment rendered="#{menuView.getMenu(2).size() > 1}">
-					<div id="right">
-						<ul>
-							<ui:repeat var="menuitem" value="#{menuView.getMenu(2)}">
-								<h:outputText rendered="#{!empty menuitem.header}" value="&lt;/ul>&lt;h1>#{i18n[menuitem.header]}&lt;/h1>&lt;ul>" escape="false" />
-								<li><h:link outcome="#{menuitem.outcome}" value="#{i18n[menuitem.navigation.key]}" styleClass="#{menuitem.selected?'active':''}" /></li>
-							</ui:repeat>
-						</ul>
+				<div class="container clearfix">
+
+					<ui:fragment rendered="#{menuView.getMenu(2).size() > 1}">
+						<div id="right">
+							<ul>
+								<ui:repeat var="menuitem" value="#{menuView.getMenu(2)}">
+									<h:outputText rendered="#{!empty menuitem.header}"
+										value="&lt;/ul>&lt;h1>#{i18n[menuitem.header]}&lt;/h1>&lt;ul>"
+										escape="false" />
+									<li><h:link outcome="#{menuitem.outcome}"
+											value="#{i18n[menuitem.navigation.key]}"
+											styleClass="#{menuitem.selected?'active':''}" /></li>
+								</ui:repeat>
+							</ul>
+						</div>
+					</ui:fragment>
+
+					<div id="left">
+						<ui:insert name="title" />
+						<p:messages severity="info" />
+						<h:messages />
+						<ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
+							<h:outputText value="#{cont1.content}" escape="false" />
+						</ui:repeat>
+						<ui:insert name="content" />
+						<ui:repeat var="cont1"
+							value="#{menuView.getPagecontent('bottom')}">
+							<h:outputText value="#{cont1.content}" escape="false" />
+						</ui:repeat>
 					</div>
 					</div>
-				</ui:fragment>
-
-		<div id="left">
-					<ui:insert name="title" />
-					<h:messages globalOnly="true" />
-					<ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
-						<h:outputText value="#{cont1.content}" escape="false" />
-					</ui:repeat>
-					<ui:insert name="content" />
-					<ui:repeat var="cont1" value="#{menuView.getPagecontent('bottom')}">
-						<h:outputText value="#{cont1.content}" escape="false" />
-					</ui:repeat>
-				</div>
 
 
-			</div>
-			<div class="container bottom">
-						<h:link  rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editBottom']}" outcome="/pages/manage">
-				<f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
-			</h:link>
+				</div>
+				<div class="container bottom">
+					<h:link rendered="#{layoutView.manageContent}"
+						styleClass="editorlink" value="#{i18n['layout.editBottom']}"
+						outcome="/pages/manage">
+						<f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
+					</h:link>
+				</div>
 			</div>
 			</div>
 		</div>
 		</div>
-		</div>
 
 
-		<!-- Piwik --> 
+		<!-- Piwik -->
 		<script type="text/javascript">
 		<script type="text/javascript">
-			var pkBaseURL = (("https:" == document.location.protocol) ? "https://jolez.pingtimeout.net/piwik/" : "http://jolez.pingtimeout.net/piwik/");
-			document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+			var pkBaseURL = (("https:" == document.location.protocol) ? "https://jolez.pingtimeout.net/piwik/"
+					: "http://jolez.pingtimeout.net/piwik/");
+			document.write(unescape("%3Cscript src='" + pkBaseURL
+					+ "piwik.js' type='text/javascript'%3E%3C/script%3E"));
 		</script>
 		</script>
 		<script type="text/javascript">
 		<script type="text/javascript">
-		try {
-			var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 5);
-			piwikTracker.trackPageView();
-			piwikTracker.enableLinkTracking();
-		}
-		catch( err ) {}
+			try {
+				var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 5);
+				piwikTracker.trackPageView();
+				piwikTracker.enableLinkTracking();
+			} catch (err) {
+			}
 		</script>
 		</script>
-		
-		<noscript><p><img src="http://jolez.pingtimeout.net/piwik/piwik.php?idsite=5" style="border:0" alt="" /></p></noscript>
+
+		<noscript>
+			<p>
+				<img src="http://jolez.pingtimeout.net/piwik/piwik.php?idsite=5"
+					style="border: 0" alt="" />
+			</p>
+		</noscript>
 		<!-- End Piwik Tracking Code -->
 		<!-- End Piwik Tracking Code -->
 	</h:body>
 	</h:body>
 
 

code/LanBortalWeb/WebContent/menu/list.xhtml

@@ -29,7 +29,6 @@
 					</h:panelGrid>
 					</h:panelGrid>
 				</h:form>
 				</h:form>
 			</h:panelGrid>
 			</h:panelGrid>
-
 		</ui:define>
 		</ui:define>
 	</ui:composition>
 	</ui:composition>
 </h:body>
 </h:body>

code/LanBortalWeb/WebContent/permissionDenied.xhtml

@@ -3,13 +3,11 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:h="http://java.sun.com/jsf/html"	
       xmlns:h="http://java.sun.com/jsf/html"	
       xmlns:tools="http://java.sun.com/jsf/composite/cditools"
       xmlns:tools="http://java.sun.com/jsf/composite/cditools"
-      xmlns:f="http://java.sun.com/jsf/core">
-    <h:head>
-        <title></title>
-    </h:head>
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:p="http://primefaces.org/ui" >
+   
  <h:body>
  <h:body>
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
-	<ui:param name="thispage" value="page.permissionDenied" />
 		<ui:define name="content">
 		<ui:define name="content">
 			<h1>#{i18n['permissiondenied.header']}</h1>
 			<h1>#{i18n['permissiondenied.header']}</h1>
 			<p>
 			<p>
@@ -19,4 +17,4 @@
 		</ui:define>
 		</ui:define>
 	</ui:composition>
 	</ui:composition>
 </h:body>
 </h:body>
-    </html>
+ </html>

code/LanBortalWeb/WebContent/resources/cditools/products/shop.xhtml

@@ -84,7 +84,7 @@
 	</h:dataTable>
 	</h:dataTable>
 	<div>
 	<div>
 		<h:outputText value="#{i18n['productshop.total']} " />
 		<h:outputText value="#{i18n['productshop.total']} " />
-		<h:outputText value="#{productShopView.totalPrice}">
+		<h:outputText value="#{productShopView.cartPrice}">
 			<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
 			<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
 		</h:outputText>
 		</h:outputText>
 	</div>
 	</div>

code/LanBortalWeb/WebContent/resources/cditools/shop/readerlisttiles.xhtml

+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:composite="http://java.sun.com/jsf/composite"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/tools"
+	xmlns:p="http://primefaces.org/ui">
+
+
+<composite:interface>
+</composite:interface>
+
+<composite:implementation>
+<h:form id="readerlist">
+	<h:dataTable id="reader" value="#{readerListDataView.readers}" var="rr">
+		<h:column>
+			<f:facet name="header">
+				<h:outputText value="${i18n['reader.name']}" />
+			</f:facet>
+			<h:outputText value="#{rr.identification}" />
+		</h:column>
+		<h:column>
+			<f:facet name="header">
+				<h:outputText value="${i18n['reader.description']}" />
+			</f:facet>
+			<h:outputText value="#{rr.description}" />
+		</h:column>
+
+		<h:column>
+			<p:commandButton ajax="false" action="#{readerView.setReaderToId(rr.id)}" value="#{i18n['reader.select']}" />
+		</h:column>
+
+	</h:dataTable>
+	</h:form>
+</composite:implementation>
+</html>
+

code/LanBortalWeb/WebContent/resources/cditools/shop/readeventtiles.xhtml

+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:composite="http://java.sun.com/jsf/composite"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui">
+
+
+<composite:interface>
+</composite:interface>
+
+<composite:implementation>
+	<h:form>
+		<p:poll interval="3" />
+		<ui:repeat value="#{readerView.readerEvents}" var="event" >
+			<h:link styleClass="userimagetile" outcome="/admin/info/general"
+				rendered="#{!empty event.printedCard.user}">
+
+				<div>
+					<img
+						src="#{request.contextPath}/dydata/userimage/#{event.printedCard.user.currentImage.id}.img" />
+					<br />
+					<h:outputText styleClass="usertilenick"
+						value="#{event.printedCard.user.nick}" />
+					<br />
+					<h:outputText value="#{event.printedCard.user.wholeName}" />
+					<br />
+
+					<ui:repeat
+						value="#{readerView.getUserRoles(event.printedCard.user)}"
+						var="role">
+						<h:outputText value="#{role.name}" />
+						<br />
+					</ui:repeat>
+
+				</div>
+				<f:param name="userid" value="#{event.printedCard.user.user.id}" />
+			</h:link>
+		</ui:repeat>
+	</h:form>
+
+
+</composite:implementation>
+</html>
+

code/LanBortalWeb/WebContent/resources/cditools/shop/shoppingcart.xhtml

+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
+	xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:p="http://primefaces.org/ui">
+
+
+	<composite:interface>
+	</composite:interface>
+
+	<composite:implementation>
+
+<h:form id="shoppingcartform">
+				<h:panelGrid columns="2">
+				
+					<h:panelGroup>
+						<div id="shopItems">
+							<ui:repeat value="#{productShopView.shoppingcart}" var="cart">
+								<h:commandLink styleClass="shopItem" action="#{productShopView.addOne}">
+									<f:ajax render="@form" />
+
+									<div>
+										#{cart.product.name}<br />
+										<h:outputText value="#{cart.product.price}">
+											<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
+										</h:outputText>
+										eur
+									</div>
+								</h:commandLink>
+							</ui:repeat>
+						</div>
+
+					</h:panelGroup>
+
+					<h:panelGroup>
+
+						<h:outputLabel value="#{i18n['shop.barcode']}" />
+						<h:inputText id="barcode" value="#{productShopView.barcode}" />
+						<h:commandButton action="#{productShopView.readBarcode}" onclick="blip(); return true;" value="#{i18n['shop.readBarcode']}">
+							<f:ajax render="@form" onevent="barcodeReadEvent" execute="@form" />
+						</h:commandButton>
+						<br />
+						<p:dataTable id="prods" value="#{productShopView.boughtItems}" var="prods">
+
+
+							<p:column>
+								<f:facet name="header">
+									<h:outputText value="#{i18n['shop.count']}" />
+								</f:facet>
+								<p:inplace>
+									<p:inputText value="#{prods.count}" size="4">
+										<f:ajax event="valueChange" render="@form" />
+										<f:convertNumber minFractionDigits="0" maxFractionDigits="2" />
+									</p:inputText>
+								</p:inplace>
+							</p:column>
+
+							<p:column>
+								<f:facet name="header">
+									<h:outputText value="#{i18n['shop.product']}" />
+								</f:facet>
+								<h:outputText value="#{prods.getProduct().name}" />
+							</p:column>
+							<p:column>
+								<f:facet name="header">
+									<h:outputText value="#{i18n['shop.price']}" />
+								</f:facet>
+								<h:outputText value="#{prods.getProduct().price}">
+									<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
+								</h:outputText>
+							</p:column>
+							<p:column>
+								<f:facet name="header">
+									<h:outputText value="#{i18n['shop.actions']}" />
+								</f:facet>
+								<h:commandButton action="#{productShopView.removeBought()}" value="Poista" />
+							</p:column>
+						</p:dataTable>
+
+						<div style="font-weight: bold;">
+							<h:outputText value="#{i18n['shop.cartPrice']}" />
+							<h:outputText id="shoptotal" value="#{productShopView.cartPrice}">
+								<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
+							</h:outputText>
+							 <br />
+							<h:outputLabel value="#{i18n['shop.currentBalance']}" />
+							<h:outputText id="currentbalance" value="#{productShopView.accountCredits}">
+								<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
+							</h:outputText>
+							 <br />
+							<h:outputLabel value="#{i18n['shop.transactionTotal']}" />
+							<h:outputText id="transactiontotal"  value="#{productShopView.transactionTotal}">
+								<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
+							</h:outputText>
+						</div>
+
+						<br />
+						<br />
+						<h:outputLabel value="#{i18n['shop.toAccountValue']}" />
+						<h:inputText styleClass="inputval" size="5"  value="#{productShopView.cash}">
+						   <f:ajax render="@form" event="valueChange" listener="#{productShopView.cashChanged}" />
+						</h:inputText> 
+
+						<br />
+						<h:outputLabel value="#{i18n['shop.cashGiven']}" />
+						<input id="returnval" type="text" size="5" value="0"  disabled="disabled"/>
+						<h:outputLabel value="#{i18n['shop.cashBack']}" />
+						<input id="returnval" type="text" size="5" value="0"  disabled="disabled"/>
+						<br />
+						
+						
+						<h:outputLabel value="#{i18n['shop.']}" />
+						<h:outputText value=" #{productShopView.balanceAfterTransaction}">
+							<f:convertNumber />
+						</h:outputText>
+
+						<h:commandButton action="#{productShopView.commitShoppingcart()}" value="#{i18n['shop.buy']}" />
+					</h:panelGroup>
+
+				</h:panelGrid>
+
+				<h:outputScript library="primefaces" name="jquery/jquery.js" />
+
+			</h:form>
+			<script>
+				var blipSnd = new Audio(
+						"#{request.contextPath}/resources/media/blip.mp3")
+
+				$(function() {
+					$("#shoppingcartform\\:barcode").focus();
+
+				});
+				
+				function blip() {
+					blipSnd.play();
+				}
+
+				function calc() {
+					$("#returnval").val($("#inputval").val() - $(".inputval").text().replace(",","."));
+				}
+
+				function barcodeReadEvent(data) {
+					if (data.status == "success") {
+						$("#shoppingcartform\\:barcode").focus();
+					}
+				}
+			</script>
+
+
+	</composite:implementation>
+</html>
+

code/LanBortalWeb/WebContent/resources/cditools/user/create.xhtml

 <?xml version='1.0' encoding='UTF-8' ?>
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:composite="http://java.sun.com/jsf/composite" xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:p="http://primefaces.org/ui">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
+	xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:p="http://primefaces.org/ui">
 
 
 
 
 <composite:interface>
 <composite:interface>
 
 
 	<composite:attribute name="creating" required="false" default="false" />
 	<composite:attribute name="creating" required="false" default="false" />
-
+	
+	<composite:attribute name="admincreate" required="false" />
 	<composite:attribute name="commitvalue" required="true" />
 	<composite:attribute name="commitvalue" required="true" />
 	<composite:attribute name="commitaction" required="true" method-signature="java.lang.String action()" />
 	<composite:attribute name="commitaction" required="true" method-signature="java.lang.String action()" />
 </composite:interface>
 </composite:interface>
 
 
 <composite:implementation>
 <composite:implementation>
+	<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
+
+	<!-- <h2>
+		<h:outputText rendered="#{!cc.attrs.creating}" disabled="#{!cc.attrs.creating and !userView.canSave}" id="viewlogin" value="#{userView.selectedUser.login}" />
+	</h2>
+	  -->
+
+	<h:form id="userform" enctype="multipart/form-data">
+		<h:panelGrid columns="2">
+
+			<h:panelGroup>
+				<ui:fragment rendered="#{not empty userView.user.id}">
+
+
+					<p:overlayPanel id="chartPanel" for="webcamButton" hideEffect="fade">
+						<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" />
+						<p:commandButton type="button" value="Capture" onclick="pc.capture()" />
+					</p:overlayPanel>
+
+					<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" />
+					<ui:fragment rendered="#{!empty userView.user.currentImage}">
+						<img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" />
+					</ui:fragment>
+					<br />
+					<p:commandButton id="webcamButton" value="#{i18n['userimage.webcam']}" type="button" />
+
+					<br />
+					<br />
+
+					<p:fileUpload id="uploadfile" required="TRUE" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" value="#{userView.image}" mode="simple" />
+					<p:message for="uploadfile" />
+					<p:commandButton action="#{userView.sendImage}" value="#{i18n['user.imagesubmit']}" />
+				</ui:fragment>
+
+				<ui:fragment rendered="#{cc.attrs.creating}">
+					<h:outputLabel value="#{i18n['user.login']}" for="login" />
+					<br />
+
+					<p:inputText size="25" id="login" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.login}" />
+
+					<p:message for="login" />
+					<br />
+
+				</ui:fragment>
+				<br />
+
+				<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.password']}" for="password" />
+				<br />
+
+				<p:password validator="#{userValidator.password}" rendered="#{cc.attrs.creating}" id="password" value="#{userView.password}" />
+
+				<br />
+				<p:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.passwordcheck']}" for="passwordcheck" />
+				<br />
+
+				<p:password validator="#{userValidator.password}" rendered="#{cc.attrs.creating}" id="passwordcheck" value="#{userView.passwordcheck}" />
+
+				<br />
+
+			</h:panelGroup>
+
+
+			<h:panelGroup>
+				<table>
+					<tr>
+						<td colspan="2"><h:outputLabel value="#{i18n['user.nick']}" for="nick" /> <br /> <p:inputText size="45" id="nick" disabled="#{!cc.attrs.creating and !userView.canSave}"
+								value="#{userView.selectedUser.nick}" /></td>
+					</tr>
+					<tr>
+						<td><h:outputLabel value="#{i18n['user.firstNames']}" for="firstnames" /><br /> <p:inputText size="22" id="firstnames" disabled="#{!cc.attrs.creating and !userView.canSave}"
+								value="#{userView.selectedUser.firstnames}" /></td>
+						<td><h:outputLabel value="#{i18n['user.lastName']}" for="lastname" /><br /> <p:inputText size="30" id="lastname" disabled="#{!cc.attrs.creating and !userView.canSave}"
+								value="#{userView.selectedUser.lastname}" /></td>
+					</tr>
+					<tr>
+						<td><h:outputLabel for="birthday" value="#{i18n['user.birthday']}" /><br /> <p:calendar id="birthday" navigator="true" yearRange="c-80:c-0" locale="fi"
+								value="#{userView.selectedUser.birthday}" pattern="#{sessionHandler.dateFormat}" timeZone="#{sessionHandler.timezone}" /> <h:message for="birthday" /></td>
+						<td><h:outputLabel value="#{i18n['user.sex']}" for="sex" /> <br /> <p:selectOneMenu disabled="#{!cc.attrs.creating and !userView.canSave}" id="sex" value="#{userView.selectedUser.gender}">
+								<f:selectItem id="undefined" itemLabel="#{i18n['user.sex.UNDEFINED']}" itemValue="UNDEFINED" />
+								<f:selectItem id="male" itemLabel="#{i18n['user.sex.MALE']}" itemValue="MALE" />
+								<f:selectItem id="female" itemLabel="#{i18n['user.sex.FEMALE']}" itemValue="FEMALE" />
+							</p:selectOneMenu></td>
+					</tr>
+				</table>
+
+				<table>
+					<tr>
+						<td colspan="2"><p:outputLabel value="#{i18n['user.address']}" for="address" /><br /> <p:inputText size="45" id="address" disabled="#{!cc.attrs.creating and !userView.canSave}"
+								value="#{userView.selectedUser.address}" /></td>
+					</tr>
+					<tr>
+						<td><p:outputLabel value="#{i18n['user.zipCode']}" for="zip" /><br /> <p:inputText styleClass="ui-input" size="7" id="zip" disabled="#{!cc.attrs.creating and !userView.canSave}"
+								value="#{userView.selectedUser.zip}" /> <p:message for="zip" /></td>
+						<td><p:outputLabel value="#{i18n['user.town']}" for="town" /><br /> <p:inputText styleClass="ui-input" size="25" id="town" disabled="#{!cc.attrs.creating and !userView.canSave}"
+								value="#{userView.selectedUser.town}" /> <p:message for="town" /></td>
+					</tr>
+					<tr>
+						<td colspan="2"><h:outputLabel value="#{i18n['user.email']}" for="email" /> <br /> <p:inputText validator="#{userValidator.validateEmail}" size="45" id="email"
+								disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.email}" /></td>
+					</tr>
+
+
+				</table>
+
+				<p:commandButton ajax="false" rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}" />
 
 
+			</h:panelGroup>
 
 
-	<h:form id="userform">
-		<h:panelGrid columns="3">
-
-			<h:outputLabel rendered="#{!cc.attrs.creating}" value="#{i18n['user.login']}:" for="viewlogin" />
-			<h:outputText rendered="#{!cc.attrs.creating}" disabled="#{!cc.attrs.creating and !userView.canSave()}"
-				id="viewlogin" value="#{userView.selectedUser.login}"
-			/>
-			<h:message rendered="#{!cc.attrs.creating}" for="viewlogin" />
-
-			<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.login']}:" for="login" />
-			<h:inputText size="45"  rendered="#{cc.attrs.creating}" validator="#{userValidator.login}"
-				disabled="#{!cc.attrs.creating and !userView.canSave()}" id="login" value="#{userView.selectedUser.login}"
-			/>
-			<h:message rendered="#{cc.attrs.creating}" for="login" />
-
-			<h:outputLabel value="#{i18n['user.nick']}:" for="nick" />
-			<h:inputText size="45"  id="nick" disabled="#{!cc.attrs.creating and !userView.canSave()}" value="#{userView.selectedUser.nick}" />
-			<h:message for="nick" />
-
-
-			<h:outputLabel value="#{i18n['user.email']}:" for="email" />
-			<h:inputText validator="#{userValidator.validateEmail}" size="45"  id="email" disabled="#{!cc.attrs.creating and !userView.canSave()}"
-				value="#{userView.selectedUser.email}"
-			/>
-			<h:message for="email" />
-
-			<h:outputLabel value="#{i18n['user.firstNames']}:" for="firstnames" />
-			<h:inputText size="45"  id="firstnames" disabled="#{!cc.attrs.creating and !userView.canSave()}"
-				value="#{userView.selectedUser.firstnames}"
-			/>
-			<h:message for="firstnames" />
-
-			<h:outputLabel value="#{i18n['user.lastName']}:" for="lastname" />
-			<h:inputText size="45"  id="lastname" disabled="#{!cc.attrs.creating and !userView.canSave()}"
-				value="#{userView.selectedUser.lastname}"
-			/>
-			<h:message for="lastname" />
-
-			<h:outputLabel value="#{i18n['user.address']}:" for="address" />
-			<h:inputText size="45"  id="address" disabled="#{!cc.attrs.creating and !userView.canSave()}"
-				value="#{userView.selectedUser.address}"
-			/>
-			<h:message for="address" />
-
-			<h:outputLabel value="#{i18n['user.zipCode']}:" for="zip" />
-			<h:inputText size="45"  id="zip" disabled="#{!cc.attrs.creating and !userView.canSave()}" value="#{userView.selectedUser.zip}" />
-			<h:message for="zip" />
-
-			<h:outputLabel value="#{i18n['user.town']}:" for="town" />
-			<h:inputText size="45" id="town" disabled="#{!cc.attrs.creating and !userView.canSave()}" value="#{userView.selectedUser.town}" />
-			<h:message for="town" />
-
-
-			
-			<!--
-                <h:outputLabel  value="#{i18n['user.defaultImage']}:" for="currentImage" />
-                	<h:selectOneMenu rendered="#{sessionHandler.hasPermission('USER', 'READ')}" id="currentImage" value="#{userView.selectedUser.currentImage}" converter="#{userimageConverter}" >
-					<f:selectItems var="image" itemLabel="#{image.description}" value="#{userView.selectedUser.userImageList}" />
-               	</h:selectOneMenu>
-				 -->
-			<h:outputLabel value="#{i18n['user.sex']}:" for="sex" />
-			<h:selectOneRadio disabled="#{!cc.attrs.creating and !userView.canSave()}" id="sex"
-				value="#{userView.selectedUser.gender}"
-			>
-				<f:selectItem id="undefined" itemLabel="#{i18n['user.sex.UNDEFINED']}" itemValue="UNDEFINED" />
-				<f:selectItem id="male" itemLabel="#{i18n['user.sex.MALE']}" itemValue="MALE" />
-				<f:selectItem id="female" itemLabel="#{i18n['user.sex.FEMALE']}" itemValue="FEMALE" />
-			</h:selectOneRadio>
-			<h:message for="sex" />
-			
-			<h:outputLabel for="birthday" value="#{i18n['user.birthday']}:"/>
-			<p:calendar id="birthday" navigator="true" yearRange="c-80:c-0" locale="fi" value="#{userView.selectedUser.birthday}" pattern="#{sessionHandler.dateFormat}" timeZone="#{sessionHandler.timezone}" />
-			<h:message for="birthday" />
-
-
-
-			<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.password']}:" for="password" />
-			<h:inputSecret validator="#{userValidator.password}" rendered="#{cc.attrs.creating}" id="password"
-				value="#{userView.password}"
-			/>
-			<h:message rendered="#{cc.attrs.creating}" for="password" />
-
-			<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.passwordcheck']}:" for="passwordcheck" />
-			<h:inputSecret validator="#{userValidator.password}" rendered="#{cc.attrs.creating}" id="passwordcheck"
-				value="#{userView.passwordcheck}"
-			/>
-			<h:message rendered="#{cc.attrs.creating}" for="passwordcheck" />
-			
-			<h:outputLabel rendered="#{sessionHandler.superadmin}" value="#{i18n['user.superadmin']}:" for="superadmin" />
-			<h:selectBooleanCheckbox disabled="#{!cc.attrs.creating and !userView.canSave()}"
-				rendered="#{sessionHandler.superadmin}" id="superadmin" value="#{userView.selectedUser.superadmin}"
-			/>
-			<h:message rendered="#{sessionHandler.superadmin}" for="superadmin" />
-			
-			
-			
-			<h:commandButton rendered="#{cc.attrs.creating or userView.canSave()}" id="commitbtn"
-				action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}"
-			/>
 		</h:panelGrid>
 		</h:panelGrid>
 	</h:form>
 	</h:form>
-
 </composite:implementation>
 </composite:implementation>
-</html>
+</html>
\ No newline at end of file
+

code/LanBortalWeb/WebContent/resources/cditools/user/list.xhtml

@@ -2,23 +2,46 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
-	xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools">
+	xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:tools="http://java.sun.com/jsf/composite/tools">
 <composite:interface>
 <composite:interface>
 </composite:interface>
 </composite:interface>
 
 
 <composite:implementation>
 <composite:implementation>
 <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
 <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
-	<h:dataTable styleClass="bordertable" id="user" value="#{userSearchView.results}" var="user">
-		
-		<h:column>
+
+	<p:dataTable id="user" value="#{userSearchView.results}" var="user">
+		<p:column>
 			<f:facet name="header">
 			<f:facet name="header">
 				<h:link value="#{i18n['user.nick']}" includeViewParams="true">
 				<h:link value="#{i18n['user.nick']}" includeViewParams="true">
 					<f:param name="sort" value="nick" />
 					<f:param name="sort" value="nick" />
 					<f:param name="page" value="0" />
 					<f:param name="page" value="0" />
 				</h:link>
 				</h:link>
 			</f:facet>
 			</f:facet>
-		<h:outputText styleClass="hoverable" value="#{(empty user.nick)?'----':user.nick}" />
-			<div class="userdata_popup">
+			<h:outputText styleClass="hoverable" value="#{(empty user.nick)?'----':user.nick}" />
+		</p:column>
+		<p:column>
+			<f:facet name="header">
+				<h:link value="#{i18n['user.firstnames']}" includeViewParams="true">
+					<f:param name="sort" value="firstnames" />
+					<f:param name="page" value="0" />
+				</h:link>
+			</f:facet>
+			<h:outputText value="#{user.firstnames}" />
+		</p:column>
+		<p:column>
+			<f:facet name="header">
+				<h:link value="#{i18n['user.lastName']}" includeViewParams="true">
+					<f:param name="sort" value="lastname" />
+
+				</h:link>
+			</f:facet>
+			<h:outputText value="#{user.lastname}" />
+		</p:column>
+		
+		<p:column>
+			<p:commandButton onClick="location.replace('#{request.contextPath}/useradmin/edit.jsf?userid=#{user.id}')">#{i18n['user.edit']}</p:commandButton>
+			<p:commandButton id="userinfoBtn" value="Info" type="button" />  
+  			<p:overlayPanel for="userinfoBtn">
 		<h:panelGrid columns="2">
 		<h:panelGrid columns="2">
 			<img style="width:100px;" src="#{request.contextPath}/dydata/userimage/#{user.currentImage.id}.img" alt="image" />
 			<img style="width:100px;" src="#{request.contextPath}/dydata/userimage/#{user.currentImage.id}.img" alt="image" />
 
 
@@ -33,43 +56,16 @@
 			<h:outputText value="#{user.email}"/> <br />
 			<h:outputText value="#{user.email}"/> <br />
 			</h:panelGroup>
 			</h:panelGroup>
 			</h:panelGrid>
 			</h:panelGrid>
-			</div>
-			
-		</h:column>
-		<h:column>
-			<f:facet name="header">
-				<h:link value="#{i18n['user.firstNames']}" includeViewParams="true">
-					<f:param name="sort" value="firstnames" />
-					<f:param name="page" value="0" />
-				</h:link>
-			</f:facet>
-			<h:outputText value="#{user.firstnames}" />
-		</h:column>
-		<h:column>
-			<f:facet name="header">
-				<h:link value="#{i18n['user.lastName']}" includeViewParams="true">
-					<f:param name="sort" value="lastname" />
-
-				</h:link>
-			</f:facet>
-			<h:outputText value="#{user.lastname}" />
-		</h:column>
-		<h:column>
-			<f:facet name="header">
-				<h:link value="#{i18n['user.email']}" includeViewParams="true">
-					<f:param name="sort" value="email" />
-				</h:link>
-			</f:facet>
-			<h:outputText value="#{user.email}" />
-		</h:column>
-		<h:column>
-			<button onClick="location.replace('#{request.contextPath}/useradmin/edit.jsf?userid=#{user.id}')">#{i18n['user.edit']}</button>
-		</h:column>
+			</p:overlayPanel>
+		</p:column>
 		
 		
+			
 		<!-- <h:column>
 		<!-- <h:column>
 				<h:commandButton action="#{userView.shop()}" value="#{i18n['user.shop']}" />
 				<h:commandButton action="#{userView.shop()}" value="#{i18n['user.shop']}" />
 			</h:column> -->
 			</h:column> -->
-	</h:dataTable>
+	</p:dataTable>
+	
+	
 	<script>
 	<script>
  jQuery(function() {
  jQuery(function() {
 	jQuery(".hoverable").hover(function () {
 	jQuery(".hoverable").hover(function () {

code/LanBortalWeb/WebContent/resources/cditools/user/readerlist.xhtml

+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
+	xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools">
+
+
+<composite:interface>
+</composite:interface>
+
+<composite:implementation>
+	<h:dataTable id="reader" value="#{readerListDataView.readers}" var="rr">
+		<h:column>
+			<f:facet name="header">
+				<h:outputText value="${i18n['reader.name']}" />
+			</f:facet>
+			<h:outputText value="#{rr.identification}" />
+		</h:column>
+		<h:column>
+			<f:facet name="header">
+				<h:outputText value="${i18n['reader.description']}" />
+			</f:facet>
+			<h:outputText value="#{rr.description}" />
+		</h:column>
+
+		<h:column>
+			<h:link outcome="/shop/showReaderEvents" value="#{i18n['reader.select']}">
+				<f:param value="#{rr.id}" name="readerId" />
+			</h:link>
+		</h:column>
+		<h:column>
+			<h:link outcome="/shop/editReader" value="#{i18n['reader.edit']}">
+				<f:param value="#{rr.id}" name="readerId" />
+			</h:link>
+		</h:column>
+
+	</h:dataTable>
+</composite:implementation>
+</html>
+

code/LanBortalWeb/WebContent/resources/cditools/user/tileview.xhtml

+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:composite="http://java.sun.com/jsf/composite"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/tools"
+	xmlns:p="http://primefaces.org/ui">
+
+
+<composite:interface>
+
+</composite:interface>
+
+<composite:implementation>
+	<h:outputScript library="primefaces" name="jquery/jquery.js"
+		target="head" />
+
+	<div style="width: 300px; margin: 0 auto;">
+		<h:form id="userform" enctype="multipart/form-data">
+			<ui:fragment rendered="#{not empty userView.user.id}">
+
+
+				<h:outputText rendered="#{empty userView.user.currentImage}"
+					value="#{i18n['user.noCurrentImage']}" />
+				<ui:fragment rendered="#{!empty userView.user.currentImage}">
+					<img style="width: 150px;"
+						src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img"
+						alt="image" />
+				</ui:fragment>
+				<br />
+
+			</ui:fragment>
+
+
+			<h:outputText value="#{userView.selectedUser.nick}" />
+			<br />
+
+			<h:outputText value="#{userView.selectedUser.wholeName}" />
+			<br /><br />
+			<h:outputText value="#{userView.selectedUser.address}" />
+			<br />
+			<h:outputText value="#{userView.selectedUser.zip}" />
+			<h:outputText value=" #{userView.selectedUser.town}" />
+			<br /><br />
+			<h:outputText value="#{userView.selectedUser.email}" />
+			<br />
+			<h:outputText value="#{userView.selectedUser.phone}" />
+			<br />
+
+		</h:form>
+	</div>
+</composite:implementation>
+</html>
+

code/LanBortalWeb/WebContent/resources/style/adduser/css/general.css

+/* General css, use for non-layout purposes for general elements */
+
+/* userlistview popup */
+
+.userdata_popup {
+	position: absolute;
+	border: 1px solid black;
+	background: white;
+	border-radius: 3px;
+	display: none;
+	width: 300px;
+	height: 150px;
+}
+
+/*  general class for hoverable usage  */
+.hoverable {
+	
+}
+
+.hidden {
+	display: none;
+}
+
+#webcamcontainer {
+	
+}
+
+#shopItems {
+	
+}
+
+.ui-panel-title {
+	text-overflow: clip;
+}
+
+.shopItem {
+	float: left;
+	width: 72px;
+	height: 72px;
+	background: burlywood;
+	border: 1px solid black;
+	margin: 2px;
+}
+
+a.shopItem {
+	color: black !important;
+}
+
+a.shopItem div {
+	position: absolute;
+	height: 72px;
+	width: 72px;
+	text-align: center;
+	/* Firefox */
+	display: -moz-box;
+	-moz-box-orient: horizontal;
+	-moz-box-pack: center;
+	-moz-box-align: center;
+	/* Safari and Chrome */
+	display: -webkit-box;
+	-webkit-box-orient: horizontal;
+	-webkit-box-pack: center;
+	-webkit-box-align: center;
+	/* W3C */
+	display: box;
+	box-orient: horizontal;
+	box-pack: center;
+	box-align: center;
+	clip: rect(0, 72px, 72px, 0);
+}
+
+}
+a.shopItem:hover {
+	background: darkgoldenrod;
+}
+
+a.shopItem:active {
+	background: red;
+}
+
+a.userimagetile, a.usertile {
+	float: left;
+}
+a.userimagetile div {
+	width: 128px;
+	height: 224px;
+	border: 1px solid black;
+	margin: 2px;
+}
+a.userimagetile div img {
+	width: 100%;
+	
+}
+.usertilenick {
+	font-size: 14pt;	
+}
+
+a.userbackbutton:link, a.userbackbutton:visited {
+	color: black;
+	text-decoration: none;
+}
+
+a.userbackbutton div{
+	background: #CEE4ED;
+	width:8em;
+	height: 2em;
+	padding: 1em;
+	border: 1px solid black;
+}
+
+a.usertile div {
+	background: #CEE4ED;
+	width: 10em;
+	height: 10em;
+	padding: 1em;
+	margin: 1em;
+	border: 1px solid black;
+}

code/LanBortalWeb/WebContent/resources/style/adduser/css/style.css

+* {
+	padding: 0;
+	margin: 0;
+}
+
+body {
+	margin: 0em;
+	font-size: 62.5%;
+	background-color: #fff;
+	font-family: verdana, arial, sans-serif;
+} /*Font-size: 1.0em = 10px when browser default size is 16px*/
+#main {
+	clear: both;
+}
+
+.container.top,.container.bottom {
+	clear: both;
+	text-align: center;
+}
+
+.container.top a,.container.bottom a {
+	font-size: 90%;
+	color: #aaa;
+	text-decoration: none;
+}
+
+.container.bottom {
+	clear: both;
+}
+
+#content {
+	width: 800px;
+	margin: 0 auto;
+}
\ No newline at end of file

code/LanBortalWeb/WebContent/resources/style/blipview/css/general.css

+/* General css, use for non-layout purposes for general elements */
+
+/* userlistview popup */
+
+.userdata_popup {
+	position: absolute;
+	border: 1px solid black;
+	background: white;
+	border-radius: 3px;
+	display: none;
+	width: 300px;
+	height: 150px;
+}
+
+/*  general class for hoverable usage  */
+.hoverable {
+	
+}
+
+.hidden {
+	display: none;
+}
+
+#webcamcontainer {
+	
+}
+
+#shopItems {
+	
+}
+
+.ui-panel-title {
+	text-overflow: clip;
+}
+
+.shopItem {
+	float: left;
+	width: 72px;
+	height: 72px;
+	background: burlywood;
+	border: 1px solid black;
+	margin: 2px;
+}
+
+a.shopItem {
+	color: black !important;
+}
+
+a.shopItem div {
+	position: absolute;
+	height: 72px;
+	width: 72px;
+	text-align: center;
+	/* Firefox */
+	display: -moz-box;
+	-moz-box-orient: horizontal;
+	-moz-box-pack: center;
+	-moz-box-align: center;
+	/* Safari and Chrome */
+	display: -webkit-box;
+	-webkit-box-orient: horizontal;
+	-webkit-box-pack: center;
+	-webkit-box-align: center;
+	/* W3C */
+	display: box;
+	box-orient: horizontal;
+	box-pack: center;
+	box-align: center;
+	clip: rect(0, 72px, 72px, 0);
+}
+
+}
+a.shopItem:hover {
+	background: darkgoldenrod;
+}
+
+a.shopItem:active {
+	background: red;
+}
+
+a.userimagetile, a.usertile {
+	float: left;
+}
+a.userimagetile div {
+	width: 128px;
+	height: 224px;
+	border: 1px solid black;
+	margin: 2px;
+}
+a.userimagetile div img {
+	width: 100%;
+	
+}
+.usertilenick {
+	font-size: 14pt;	
+}
+
+a.userbackbutton:link, a.userbackbutton:visited {
+	color: black;
+	text-decoration: none;
+}
+
+a.userbackbutton div{
+	background: #CEE4ED;
+	width:8em;
+	height: 2em;
+	padding: 1em;
+	border: 1px solid black;
+}
+
+a.usertile div {
+	background: #CEE4ED;
+	width: 10em;
+	height: 10em;
+	padding: 1em;
+	margin: 1em;
+	border: 1px solid black;
+}

code/LanBortalWeb/WebContent/resources/style/blipview/css/style.css

+* {padding:0; margin:0;}
+body {
+	margin: 0em; font-size:62.5%; background-color: #fff; font-family:verdana,arial,sans-serif;} /*Font-size: 1.0em = 10px when browser default size is 16px*/
+
+#page-container {
+	width: 900px;
+	margin: 0 auto;
+	border: 1px solid #bbb;
+	margin-top: 10px;
+	background: white;
+	border-radius: 12px;
+	background:rgb(255,255,255) url("../img/bg_main_nav.jpg");
+}
+
+#page-header {height:80px; background:rgb(240,240,240) url("../img/bg_head_top.jpg"); overflow:visible !important /*Firefox*/;  overflow:hidden /*IE6*/; border-radius: 12px 12px 0 0; }
+
+
+#login {
+	margin-top: 10px;
+	margin-right: 10px;
+	float: right;
+	text-align: right;
+}
+
+#login a, #login a:visited {
+	text-decoration: none;
+	color: black;
+	font-weight: bold;
+}
+#login a:hover {
+	color: red;
+}
+
+#top-menu {position:relative; z-index:0; top: 2em;}
+#top-menu ul { float:left; width: 100%; padding-left: 25px; border:1px solid rgba(200,200,200,0); background:rgba(200,200,200,0); border-radius: 16px 16px 0 0; }
+#top-menu li {display:inline; list-style:none; }
+#top-menu li a {display:block; line-height: 1.7em; float:left; padding:2px 5px 2px 5px; color:rgb(125,125,125); text-decoration:none; font-size:120%; background-color:rgba(100,100,100,0.1); color: rgba(0,0,0,0.3); border-radius: 12px 12px 0 0; border: 1px solid rgba(0,0,0,0.1); border-bottom: none;}
+#top-menu a:hover {text-decoration:none; color:rgb(50,50,50);}
+#top-menu li .active {font-weight: bold; background-color:rgba(250,250,250,0.4); color: rgba(0,0,0,1); border-radius: 12px 12px 0 0; border: 1px solid black; border-bottom: none }
+
+
+#pageheader {
+	background: red;
+}
+
+
+#main {
+	clear: both;	
+}
+
+#main-nav {float:left; width: 100%; border-top:1px solid #bbb; border-bottom:1px solid #bbb; background:rgb(220,220,220) url("../img/bg_head_bottom_nav.jpg") repeat-x; color:rgb(75,75,75); font-size:130%;} 
+#main-nav ul {list-style-type:none;}
+#main-nav ul li {float:left; position:relative; z-index:auto !important /*Non-IE6*/; z-index:1000 /*IE6*/; }
+#main-nav ul li a {float:none !important /*Non-IE6*/; float:left /*IE-6*/; display:block; height:3.1em; line-height:3.1em; padding:0 16px 0 16px; text-decoration:none; font-weight:bold; color: rgb(100,100,100);}
+#main-nav ul li ul {display:none; border:none;}
+
+#main-nav ul li .active { font-weight: bold; background-color:rgba(0,150,250,0.35); color: rgba(255,255,250,0.8); }
+#main-nav ul li:hover a { background-color:rgba(0,150,250,0.1); text-decoration:none; } /*Color main cells hovering mode*/
+#main-nav ul li:hover ul {display:block; width:10.0em; position:absolute; z-index:999; top:3.0em; margin-top:0.1em; left:0;}
+#main-nav ul li:hover ul li a {display:block; width:10.0em; height:auto; line-height:1.3em; margin-left:-1px; padding:4px 16px 4px 16px; border-left:solid 1px rgb(175,175,175); border-bottom: solid 1px rgb(175,175,175); background-color:rgb(237,237,237); font-weight:normal; color:rgb(50,50,50);} /*Color subcells normal mode*/
+#main-nav ul li:hover ul li a:hover {background-color:rgb(210,210,210); text-decoration:none;} /*Color subcells hovering mode*/
+
+.container.top, .container.bottom {
+	clear: both;
+	text-align: center;
+	margin-bottom: 2em;
+	margin-top: 1em;
+	padding-left: 2em;
+}
+
+.container.top a, .container.bottom a {
+	font-size: 90%;
+	color: #aaa;
+	text-decoration: none;
+}
+
+#right {display:inline /*Fix IE floating margin bug*/; float:right; overflow:visible !important /*Firefox*/; overflow:hidden /*IE6*/;}
+#right {width: 400px; float-left: 1px solid black; }
+
+
+#left {display:inline; /*Fix IE floating margin bug*/; float:left; width:660px; margin: 0 20px; overflow:visible !important /*Firefox*/; overflow:hidden /*IE6*/;}
+
+#left h1 {
+	margin-bottom: 1em;
+}
+
+#left a {
+	text-decoration: none;
+	color: blue;
+}
+
+#left:a visited {
+	color: blue;
+}
+
+#left h1, #left h2, #left p {
+margin-bottom: 1.5em;
+}
+
+.container.bottom {
+	clear: both;
+}
+
+table {
+border: none;
+border-spacing: 0;
+width: 100%;
+text-align: left;
+margin-bottom: 1.5em;
+}
+
+table thead th {
+border: none;
+font-size: 120%;
+}
+
+table thead th {
+border-bottom: 1px solid black;
+padding: 5px;
+padding-left: 1em;
+}
+
+table tbody td {
+border: none;
+padding: 5px;
+padding-left: 1em;
+vertical-align: top;
+}
+
+label {
+
+	}

code/LanBortalWeb/WebContent/resources/style/insomnia2/css/general.css

 /* General css, use for non-layout purposes for general elements */
 /* General css, use for non-layout purposes for general elements */
 
 
-
 /* userlistview popup */
 /* userlistview popup */
 .userdata_popup {
 .userdata_popup {
-position: absolute;
-border: 1px solid black;
-background: white;
-border-radius: 3px;
-display: none;
-
+	position: absolute;
+	border: 1px solid black;
+	background: white;
+	border-radius: 3px;
+	display: none;
+	width: 300px;
+	height: 150px;
 }
 }
 
 
-
 /*  general class for hoverable usage  */
 /*  general class for hoverable usage  */
 .hoverable {
 .hoverable {
+	
+}
+
+.hidden {
+	display: none;
+}
+
+#webcamcontainer {
+	
+}
+
+#shopItems {
+	
+}
+
+.ui-panel-title {
+	text-overflow: clip;
+}
 
 
+.shopItem {
+	float: left;
+	width: 72px;
+	height: 72px;
+	background: burlywood;
+	border: 1px solid black;
+	margin: 2px;
 }
 }
 
 
-.text-center {
+a.shopItem {
+	color: black !important;
+}
+
+a.shopItem div {
+	position: absolute;
+	height: 72px;
+	width: 72px;
 	text-align: center;
 	text-align: center;
+	/* Firefox */
+	display: -moz-box;
+	-moz-box-orient: horizontal;
+	-moz-box-pack: center;
+	-moz-box-align: center;
+	/* Safari and Chrome */
+	display: -webkit-box;
+	-webkit-box-orient: horizontal;
+	-webkit-box-pack: center;
+	-webkit-box-align: center;
+	/* W3C */
+	display: box;
+	box-orient: horizontal;
+	box-pack: center;
+	box-align: center;
+	clip: rect(0, 72px, 72px, 0);
 }
 }
 
 
-.closed {
-	background-color: #eee;
+}
+a.shopItem:hover {
+	background: darkgoldenrod;
 }
 }
 
 
-.hidden {
-	display: none;
+a.shopItem:active {
+	background: red;
 }
 }
\ No newline at end of file

code/LanBortalWeb/WebContent/resources/style/template1/css/general.css

 /* General css, use for non-layout purposes for general elements */
 /* General css, use for non-layout purposes for general elements */
 
 
-
 /* userlistview popup */
 /* userlistview popup */
 .userdata_popup {
 .userdata_popup {
-position: absolute;
-border: 1px solid black;
-background: white;
-border-radius: 3px;
-display: none;
-width: 300px;
-height: 150px;
+	position: absolute;
+	border: 1px solid black;
+	background: white;
+	border-radius: 3px;
+	display: none;
+	width: 300px;
+	height: 150px;
 }
 }
 
 
-
 /*  general class for hoverable usage  */
 /*  general class for hoverable usage  */
 .hoverable {
 .hoverable {
-
+	
 }
 }
 
 
 .hidden {
 .hidden {
 	display: none;
 	display: none;
-	
 }
 }
+
 #webcamcontainer {
 #webcamcontainer {
 	
 	
 }
 }
 
 
-#shopItems {}
+#shopItems {
+	
+}
+
+.ui-panel-title {
+	text-overflow: clip;
+}
 
 
 .shopItem {
 .shopItem {
-	position: relative;
-	float:left;
-	width: 64px;
-	height: 64px;
-	background: gold;
+	float: left;
+	width: 72px;
+	height: 72px;
+	background: burlywood;
 	border: 1px solid black;
 	border: 1px solid black;
 	margin: 2px;
 	margin: 2px;
 }
 }
 
 
-.shopItem:hover {
-	background: goldenrod;
-	
+a.shopItem {
+	color: black !important;
 }
 }
 
 
-.shopItem a {
-	display: block;
-	width: 100%;
-	height: 100%;
-	color: black;
-	text-decoration: none;
+a.shopItem div {
+	position: absolute;
+	height: 72px;
+	width: 72px;
+	text-align: center;
+	/* Firefox */
+	display: -moz-box;
+	-moz-box-orient: horizontal;
+	-moz-box-pack: center;
+	-moz-box-align: center;
+	/* Safari and Chrome */
+	display: -webkit-box;
+	-webkit-box-orient: horizontal;
+	-webkit-box-pack: center;
+	-webkit-box-align: center;
+	/* W3C */
+	display: box;
+	box-orient: horizontal;
+	box-pack: center;
+	box-align: center;
+	clip: rect(0, 72px, 72px, 0);
 }
 }
+
+}
+a.shopItem:hover {
+	background: darkgoldenrod;
+}
+
+a.shopItem:active {
+	background: red;
+}
\ No newline at end of file

code/LanBortalWeb/WebContent/shop/shopToUser.xhtml

@@ -2,13 +2,14 @@
      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:products="http://java.sun.com/jsf/composite/cditools/products" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
-	xmlns:c="http://java.sun.com/jsp/jstl/core">
+	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"
+	>
 <h:body>
 <h:body>
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 		<f:metadata>
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:viewParam name="userid" value="#{userView.userid}" />
-			<f:event type="preRenderView" listener="#{userView.initView}" />
 			<f:event type="preRenderView" listener="#{productShopView.initShopView}" />
 			<f:event type="preRenderView" listener="#{productShopView.initShopView}" />
 		</f:metadata>
 		</f:metadata>
 
 
@@ -17,63 +18,9 @@
 			<users:usertabs tabId="shop" />
 			<users:usertabs tabId="shop" />
 		</ui:define>
 		</ui:define>
 		<ui:define name="content">
 		<ui:define name="content">
-
-			<h:form id="shoppingcartform">
-				<h:panelGrid columns="2">
-					<h:panelGrid columns="2">
-
-						<h:outputLabel value="#{i18n['shop.accountBalance']}" />
-						<h:outputText value="#{productShopView.accountBalance}">
-							<f:convertNumber />
-						</h:outputText>
-
-						<h:outputLabel value="#{i18n['shop.totalPrice']}" />
-						<h:outputText value="#{productShopView.totalPrice}">
-							<f:convertNumber />
-						</h:outputText>
-
-						<h:outputLabel value="#{i18n['shop.cash']}" />
-						<h:inputText value="#{productShopView.cash}">
-							<f:ajax render="@form" event="valueChange" />
-							<f:convertNumber />
-						</h:inputText>
-					</h:panelGrid>
-					<h:panelGroup>
-						<h:outputLabel value="#{i18n['shop.readBarcode']}" />
-						<h:inputText id="barcode" value="#{productShopView.barcode}" />
-						<h:commandButton action="#{productShopView.readBarcode}" onclick="blip(); return true;" value="#{i18n['productShopView.readBarcode']}">
-							<f:ajax render="@form" onevent="barcodeReadEvent" execute="@form" />
-						</h:commandButton>
-
-					</h:panelGroup>
-
-
-				</h:panelGrid>
-				<h:outputText value="#{i18n['product.shopInstant']}" />
-				<h:selectBooleanCheckbox value="#{productShopView.payInstant}">
-					<f:ajax render="@form" execute="@form" />
-				</h:selectBooleanCheckbox>
-
-				<products:shop commitaction="#{productShopView.commitShoppingCart()}" items="#{productShopView.shoppingcart}" commitValue="#{i18n['productshop.commit']}" />
-			</h:form>
-			<script>
-				var blipSnd = new Audio(
-						"#{request.contextPath}/resources/media/blip.mp3")
-
-				$(function() {
-					$("#shoppingcartform\\:barcode").focus();
-				});
-
-				function blip() {
-					blipSnd.play();
-				}
-
-				function barcodeReadEvent(data) {
-					if (data.status == "success") {
-						$("#shoppingcartform\\:barcode").focus();
-					}
-				}
-			</script>
+			
+			<shop:shoppingcart />
+			
 		</ui:define>
 		</ui:define>
 
 
 
 

code/LanBortalWeb/WebContent/useradmin/list.xhtml

 <!DOCTYPE html 
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
-	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:p="http://primefaces.org/ui" xmlns:f="http://java.sun.com/jsf/core"
+>
 <h:body>
 <h:body>
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 		<f:metadata>
 		<f:metadata>

code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java

@@ -62,16 +62,29 @@ public class SessionHandler {
 		return ret;
 		return ret;
 	}
 	}
 
 
+	public String getFullscreen() {
+		template = "blipview";
+		return template;
+	}
+	
+	public String getAdduserfullscreen() {
+		template = "adduser";
+		return template;
+	}
+	
 	public String getLayout() {
 	public String getLayout() {
 		// TODO: layout selection code missing!!
 		// TODO: layout selection code missing!!
-		// return "stream1";
+		template = "template1"; 
+		return template;
+	
+		 /*
 		if (template == null) {
 		if (template == null) {
 			template = eventbean.getPropertyString(LanEventPropertyKey.EVENT_LAYOUT);
 			template = eventbean.getPropertyString(LanEventPropertyKey.EVENT_LAYOUT);
 		}
 		}
 		if (template == null) {
 		if (template == null) {
 			template = "template1";
 			template = "template1";
 		}
 		}
-		return template;
+		return template; */
 	}
 	}
 
 
 	// public boolean hasPermission(String target, String permission) {
 	// public boolean hasPermission(String target, String permission) {

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

-
-actionlog.create.header           = Create new actionmessage
-actionlog.create.message          = Message
-actionlog.create.role             = Target role
-actionlog.create.submitbutton     = Send
-actionlog.create.taskradio        = Task
-actionlog.crew                    = Crew
-actionlog.message                 = Event
-actionlog.messagelist.description = You can follow and create new action messages in this view
-actionlog.messagelist.header      = Messagelist
-actionlog.state                   = State
-actionlog.task                    = Task
-actionlog.tasklist.header         = Tasklist
-actionlog.time                    = Time
-actionlog.user                    = User
-
-bortalApplication.BILL                      = Creating, and managing bills
-bortalApplication.COMPO                     = Managing compos
-bortalApplication.CONTENT                   = Product & shop management
-bortalApplication.LAYOUT                    = Laout management
-bortalApplication.MAP                       = Map management
-bortalApplication.POLL                      = Polling stuff
-bortalApplication.SALESPOINT                = Managing salespoint
-bortalApplication.SHOP                      = Product % shop management
-bortalApplication.TERMINAL                  = Sales and self help terminal roles
-bortalApplication.USER                      = User management related
-bortalApplication.bill.CREATE_BILL          = Create bills for self
-bortalApplication.bill.READ_ALL             = "Read all bills"
-bortalApplication.bill.VIEW_OWN             = View own bills
-bortalApplication.bill.WRITE_ALL            = Modify all bills
-bortalApplication.compo.MANAGE              = Manage compos
-bortalApplication.compo.SUBMIT_ENTRY        = Submit entry
-bortalApplication.compo.VIEW_COMPOS         = View compos
-bortalApplication.compo.VOTE                = Vote
-bortalApplication.content.MANAGE_ACTIONLOG  = Manage actionlog
-bortalApplication.content.MANAGE_MENU       = Manage menus
-bortalApplication.content.MANAGE_NEWS       = Manage newsgroups
-bortalApplication.content.MANAGE_PAGES      = Manage pages
-bortalApplication.map.BUY_PLACES            = Reserve and buy places from map
-bortalApplication.map.MANAGE_MAPS           = Create and modify maps
-bortalApplication.map.MANAGE_OTHERS         = Manage other users reservations in map
-bortalApplication.map.VIEW                  = View maps
-bortalApplication.poll.ANSWER               = Can answer and view availabe polls
-bortalApplication.poll.CREATE               = Create and manage polls
-bortalApplication.poll.VIEW_RESULTS         = View anonymized poll results
-bortalApplication.salespoint.MODIFY         = Modify salespoints
-bortalApplication.salespoint.VIEW           = View salespoints
-bortalApplication.shop.LIST_ALL_PRODUCTS    = List all products in shop
-bortalApplication.shop.LIST_USERPRODUCTS    = List products for users in shop
-bortalApplication.shop.MANAGE_PRODUCTS      = Create and modify products
-bortalApplication.shop.SHOP_PRODUCTS        = Shop products to self
-bortalApplication.shop.SHOP_TO_OTHERS       = Shop to other users
-bortalApplication.terminal.CASHIER          = Access cashier terminal functions
-bortalApplication.terminal.CUSTOMER         = Access client terminal functions
-bortalApplication.terminal.SELFHELP         = Self help terminal
-bortalApplication.user.ANYUSER              = All users have this anyways
-bortalApplication.user.CREATE_NEW           = Create new user
-bortalApplication.user.INVITE_USERS         = Invite users
-bortalApplication.user.LOGIN                = Can login
-bortalApplication.user.LOGOUT               = Can logout
-bortalApplication.user.MANAGE_HTTP_SESSION  = Manage http sessions
-bortalApplication.user.MODIFY               = Modify users
-bortalApplication.user.MODIFY_ACCOUNTEVENTS = Modify Account events
-bortalApplication.user.READ_ORGROLES        = View organization roles
-bortalApplication.user.READ_ROLES           = View all roles.
-bortalApplication.user.VIEW_ACCOUNTEVENTS   = Show other users account events
-bortalApplication.user.VIEW_ALL             = View all users
-bortalApplication.user.VIEW_SELF            = Can view self
-bortalApplication.user.WRITE_ORGROLES       = Modify organization roles 
-bortalApplication.user.WRITE_ROLES          = Modify roles
-
-cardTemplate.emptyCardTemplate = ----
-
-error.contact = If this happens again, contact Info with the following code:
-error.error   = You have encountered an error.
-
-eventorg.create = Create
-
-global.cancel               = Cancel
-global.copyright            = Codecrew Ry
-global.notAuthorizedExecute = You are not authorized to do that!!
-global.notauthorized        = You don't have enough rights to enter this site.
-global.save                 = Save
-
-httpsession.creationTime = Created
-
-login.login              = Login
-login.logout             = Logout
-login.logoutmessage      = You have logged out of the system
-login.password           = Password
-login.submit             = Login
-login.username           = Username
-
-loginerror.header        = Login failed
-loginerror.message       = Username of password incorrect.
-loginerror.resetpassword = Reset password
-
-#Bill number
-# Validationmessages
-map.id = #
-
-navi.auth.login      = frontpage
-navi.auth.loginerror = frontpage
-navi.auth.logout     = frontpage
-
-pagegroup.auth.login = frontpage
-
-passwordChanged.body   = You can now login with the new password.
-passwordChanged.header = Password changed successfully.
-
-passwordReset.errorChanging = Unexpected error whilst password reset. Contact your administrator.
-passwordReset.hashNotFound  = Password change token has expired. Please send the query again.
-
-permissiondenied.alreadyLoggedIn = You don't have enough rights
-permissiondenied.header          = Access denied
-permissiondenied.notLoggedIn     = You don't have enough rights to enter this site.
-
-placegroupview.toptext = \ 
-
-poll.edit = edit
-
-product.providedRole      = Tuote m\u00E4\u00E4ritt\u00E4\u00E4 roolin
-product.returnProductEdit = Palaa tuotteeseen: 
-product.saved             = Tuote tallennettu
-
-productshop.minusOne = -1
-productshop.minusTen = -10
-productshop.plusOne  = +1
-productshop.plusTen  = +10
-
-resetMail.body     = You can change a forgotten password by inserting your username to the field below. A link where you can change the password will be sent to the email address associated to that.
-resetMail.header   = Reset lost password
-resetMail.send     = Send email
-resetMail.username = Username
-
-resetmailSent.body   = Email has been sent containing a link where you can change the password.
-resetmailSent.header = Email sent
-
-user.unauthenticated = Kirjautumaton
+
+actionlog.create.header           = Create new actionmessage
+actionlog.create.message          = Message
+actionlog.create.role             = Target role
+actionlog.create.submitbutton     = Send
+actionlog.create.taskradio        = Task
+actionlog.crew                    = Crew
+actionlog.message                 = Event
+actionlog.messagelist.description = You can follow and create new action messages in this view
+actionlog.messagelist.header      = Messagelist
+actionlog.state                   = State
+actionlog.task                    = Task
+actionlog.tasklist.header         = Tasklist
+actionlog.time                    = Time
+actionlog.user                    = User
+
+bortalApplication.BILL                      = Creating, and managing bills
+bortalApplication.COMPO                     = Managing compos
+bortalApplication.CONTENT                   = Product & shop management
+bortalApplication.LAYOUT                    = Laout management
+bortalApplication.MAP                       = Map management
+bortalApplication.POLL                      = Polling stuff
+bortalApplication.SALESPOINT                = Managing salespoint
+bortalApplication.SHOP                      = Product % shop management
+bortalApplication.TERMINAL                  = Sales and self help terminal roles
+bortalApplication.USER                      = User management related
+bortalApplication.bill.CREATE_BILL          = Create bills for self
+bortalApplication.bill.READ_ALL             = "Read all bills"
+bortalApplication.bill.VIEW_OWN             = View own bills
+bortalApplication.bill.WRITE_ALL            = Modify all bills
+bortalApplication.compo.MANAGE              = Manage compos
+bortalApplication.compo.SUBMIT_ENTRY        = Submit entry
+bortalApplication.compo.VIEW_COMPOS         = View compos
+bortalApplication.compo.VOTE                = Vote
+bortalApplication.content.MANAGE_ACTIONLOG  = Manage actionlog
+bortalApplication.content.MANAGE_MENU       = Manage menus
+bortalApplication.content.MANAGE_NEWS       = Manage newsgroups
+bortalApplication.content.MANAGE_PAGES      = Manage pages
+bortalApplication.map.BUY_PLACES            = Reserve and buy places from map
+bortalApplication.map.MANAGE_MAPS           = Create and modify maps
+bortalApplication.map.MANAGE_OTHERS         = Manage other users reservations in map
+bortalApplication.map.VIEW                  = View maps
+bortalApplication.poll.ANSWER               = Can answer and view availabe polls
+bortalApplication.poll.CREATE               = Create and manage polls
+bortalApplication.poll.VIEW_RESULTS         = View anonymized poll results
+bortalApplication.salespoint.MODIFY         = Modify salespoints
+bortalApplication.salespoint.VIEW           = View salespoints
+bortalApplication.shop.LIST_ALL_PRODUCTS    = List all products in shop
+bortalApplication.shop.LIST_USERPRODUCTS    = List products for users in shop
+bortalApplication.shop.MANAGE_PRODUCTS      = Create and modify products
+bortalApplication.shop.SHOP_PRODUCTS        = Shop products to self
+bortalApplication.shop.SHOP_TO_OTHERS       = Shop to other users
+bortalApplication.terminal.CASHIER          = Access cashier terminal functions
+bortalApplication.terminal.CUSTOMER         = Access client terminal functions
+bortalApplication.terminal.SELFHELP         = Self help terminal
+bortalApplication.user.ANYUSER              = All users have this anyways
+bortalApplication.user.CREATE_NEW           = Create new user
+bortalApplication.user.INVITE_USERS         = Invite users
+bortalApplication.user.LOGIN                = Can login
+bortalApplication.user.LOGOUT               = Can logout
+bortalApplication.user.MANAGE_HTTP_SESSION  = Manage http sessions
+bortalApplication.user.MODIFY               = Modify users
+bortalApplication.user.MODIFY_ACCOUNTEVENTS = Modify Account events
+bortalApplication.user.READ_ORGROLES        = View organization roles
+bortalApplication.user.READ_ROLES           = View all roles.
+bortalApplication.user.VIEW_ACCOUNTEVENTS   = Show other users account events
+bortalApplication.user.VIEW_ALL             = View all users
+bortalApplication.user.VIEW_SELF            = Can view self
+bortalApplication.user.WRITE_ORGROLES       = Modify organization roles 
+bortalApplication.user.WRITE_ROLES          = Modify roles
+
+cardTemplate.emptyCardTemplate = ----
+
+error.contact = If this happens again, contact Info with the following code:
+error.error   = You have encountered an error.
+
+eventorg.create = Create
+
+global.cancel               = Cancel
+global.copyright            = Codecrew Ry
+global.notAuthorizedExecute = You are not authorized to do that!!
+global.notauthorized        = You don't have enough rights to enter this site.
+global.save                 = Save
+
+httpsession.creationTime = Created
+
+login.login              = Login
+login.logout             = Logout
+login.logoutmessage      = You have logged out of the system
+login.password           = Password
+login.submit             = Login
+login.username           = Username
+
+loginerror.header        = Login failed
+loginerror.message       = Username of password incorrect.
+loginerror.resetpassword = Reset password
+
+#Bill number
+# Validationmessages
+map.id = #
+
+navi.auth.login      = frontpage
+navi.auth.loginerror = frontpage
+navi.auth.logout     = frontpage
+
+pagegroup.auth.login = frontpage
+
+passwordChanged.body   = You can now login with the new password.
+passwordChanged.header = Password changed successfully.
+
+passwordReset.errorChanging = Unexpected error whilst password reset. Contact your administrator.
+passwordReset.hashNotFound  = Password change token has expired. Please send the query again.
+
+permissiondenied.alreadyLoggedIn = You don't have enough rights
+permissiondenied.header          = Access denied
+permissiondenied.notLoggedIn     = You don't have enough rights to enter this site.
+
+placegroupview.toptext = \ 
+
+poll.edit = edit
+
+product.providedRole      = Tuote tarjoaa roolin
+product.returnProductEdit = Palaa tuotteeseen: 
+product.saved             = Tuote tallennettu
+
+productshop.minusOne = -1
+productshop.minusTen = -10
+productshop.plusOne  = +1
+productshop.plusTen  = +10
+
+resetMail.body     = You can change a forgotten password by inserting your username to the field below. A link where you can change the password will be sent to the email address associated to that.
+resetMail.header   = Reset lost password
+resetMail.send     = Send email
+resetMail.username = Username
+
+resetmailSent.body   = Email has been sent containing a link where you can change the password.
+resetmailSent.header = Email sent
+
+user.unauthenticated = Kirjautumaton

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

-
-acc_line.eventuser = Customer
-acc_line.nick      = Nick
-acc_line.product   = Product
-acc_line.quantity  = Quantity
-acc_line.time      = Transaction Date
-
-accountEvent.commit      = Save
-accountEvent.delivered   = Delivered
-accountEvent.edit        = Edit
-accountEvent.eventTime   = Time
-accountEvent.productname = Product
-accountEvent.quantity    = Count
-accountEvent.seller      = Sold by
-accountEvent.total       = Total
-accountEvent.unitPrice   = Unit price
-
-actionlog.create.header           = Create new actionmessage
-actionlog.create.message          = Message
-actionlog.create.role             = Target role
-actionlog.create.submitbutton     = Send
-actionlog.create.taskradio        = Task
-actionlog.crew                    = Crew
-actionlog.message                 = Event
-actionlog.messagelist.description = You can follow and create new action messages in this view
-actionlog.messagelist.header      = Messagelist
-actionlog.messagestate.DONE       = Done
-actionlog.messagestate.NEW        = New
-actionlog.messagestate.PENDING    = Pending
-actionlog.state                   = State
-actionlog.task                    = Task
-actionlog.tasklist.header         = Tasklist
-actionlog.time                    = Time
-actionlog.user                    = User
-
-applicationPermission.description = description
-applicationPermission.name        = Rightsgroup
-
-barcodeReader.readBarcode = Read barcode
-
-bill.addr1                = Address 1
-bill.addr2                = Address 2
-bill.addr3                = Address 3
-bill.addr4                = Address 4
-bill.addr5                = Address 5
-bill.address              = Payers address
-bill.billAmount           = Bill amount
-bill.billIsPaid           = Bill is paid
-bill.billLines            = Products
-bill.billNumber           = Bill number
-bill.billPaidDate         = Paid date
-bill.deliveryTerms        = Delivery terms
-bill.edit                 = edit
-bill.isPaid               = Paid
-bill.markPaid             = Mark paid
-bill.markedPaid           = Bill marked paid
-bill.notes                = Notes
-bill.noticetime           = Notice time
-bill.ourReference         = Our reference
-bill.paidDate             = Paid date
-bill.payer                = Payer
-bill.paymentTime          = Payment time
-bill.paymentTime.now      = Now
-bill.printBill            = Print bill
-bill.receiverAddress      = Receiver address
-bill.referenceNumberBase  = Reference number base
-bill.referencenumber      = Reference nr.
-bill.sentDate             = Sent date
-bill.show                 = Show
-bill.theirReference       = Clients reference
-bill.totalPrice           = Total
-bill.totalprice           = Total
-
-billLine.eventuser = Customer
-billLine.nick      = Nick
-billLine.price     = Unit Price
-billLine.product   = Product
-billLine.quantity  = Quantity
-billLine.time      = Order Date
-
-billedit.billnotfound = Bill not found. Select again.
-
-billine.linePrice         = Total
-billine.name              = Product
-billine.quantity          = Quantity
-billine.referencedProduct = Referenced product
-billine.save              = Save
-billine.unitName          = Unit
-billine.unitPrice         = Unit price
-billine.vat               = VAT
-
-bills.noBills = No bills
-
-card.massprint.title     = Print all
-
-cardTemplate.create      = Create
-cardTemplate.edit        = Edit
-cardTemplate.id          = Id
-cardTemplate.imageheader = Current Template
-cardTemplate.name        = Card template
-cardTemplate.power       = Card power
-cardTemplate.roles       = Associated roles
-cardTemplate.save        = Save
-cardTemplate.sendImage   = Upload Image
-
-cart.item           = Item
-cart.item_quantity  = Quantity
-cart.item_total     = Total
-cart.item_unitprice = Price
-cart.total          = Total
-
-checkout.cancel.errorMessage   = Error confirming the cancel\u2026 Please report this to code@codecrew.fi
-checkout.cancel.successMessage = You can retry payment at your own bills.
-checkout.reject.errorMessage   = Error while processing rejected payment. Please report this error to code@codecrew.fi
-checkout.reject.successMessage = Payment rejected. You can retry payment from your own bills.
-checkout.return.errorDelayed   = Error confirming delayed payment. Please contact code@codecrew.fi
-checkout.return.errorMessage   = Error confirming the successfull return message. Please report this error to code@codecrew.fi 
-checkout.return.successDelayed = Delayed payment successfull. Payment will be confirmed at a later time, usually within a hour.
-checkout.return.successMessage = Payment confirmed. Your products have been paid.
-
-compo.edit                = Edit compo
-compo.saveVotes           = Save votes
-compo.savesort            = Save order
-compo.votesSaved          = Votes saved
-
-compofile.download        = Download
-compofile.download.header = Download file
-compofile.upload          = Upload file
-
-discount.active     = Active
-discount.amountMax  = Max amount
-discount.amountMin  = Min amount
-discount.code       = Discount code
-discount.create     = Create new
-discount.details    = Details
-discount.edit       = Edit
-discount.maxNum     = Max nr of discounts
-discount.perUser    = Discounts per user
-discount.percentage = Discount percent
-discount.products   = Products
-discount.role       = Role discount
-discount.save       = Save
-discount.shortdesc  = Description
-discount.validFrom  = Valid from
-discount.validTo    = Valid to
-
-editplace.header      = Edit place
-
-editplacegroup.header = Placegroup information
-
-entry.edit = Edit entry
-
-error.contact = If this happens again, contact Info with the following code:
-error.error   = You have encountered an error.
-
-event.defaultRole         = Default user role
-event.edit                = Edit
-event.endTime             = End time
-event.name                = Event name
-event.nextBillNumber      = Initial bill number
-event.referenceNumberBase = Reference number base
-event.save                = Save
-event.startTime           = Start time
-
-eventdomain.domainname = Domain
-eventdomain.remove     = Remove
-
-eventmap.active          = Active
-eventmap.buyable.like    = Place name match
-eventmap.buyable.lock    = Lock places
-eventmap.buyable.release = Release places
-eventmap.name            = Map name
-eventmap.notes           = Notes
-eventmap.save            = Save
-
-eventorg.bankName1     = Bank name 2
-eventorg.bankName2     = Bank name 2
-eventorg.bankNumber1   = Bank account nr. 1
-eventorg.bankNumber2   = Bank account nr. 2
-eventorg.billAddress1  = Billing address 1
-eventorg.billAddress2  = Billing address 2
-eventorg.billAddress3  = Billing address 3
-eventorg.billAddress4  = Billing address 4
-eventorg.bundleCountry = Country bundle
-eventorg.create        = Create
-eventorg.createEvent   = Create event
-eventorg.createevent   = Create new event
-eventorg.edit          = Edit
-eventorg.events        = Event of the organisation
-eventorg.organisation  = Organisation name
-eventorg.save          = Save
-
-eventorgView.eventname = Name of event
-
-eventorganiser.name = Eventorganiser
-
-feedback.canFeedback = Feedback
-feedback.submit      = Submit
-feedback.thanks      = Thanks
-
-food = Food
-
-foodWave.accountevents      = Accountevents
-foodWave.activeFoodWaves    = Active Foodwaves
-foodWave.billLines          = Pending Online Payments
-foodWave.deliveredFoodWaves = Delivered Foodwaves
-foodWave.description        = Description
-foodWave.list               = Active Foodwaves
-foodWave.name               = Foodwave
-foodWave.orders             = Amount of Orders
-foodWave.paid               = Paid
-foodWave.show               = Show
-foodWave.template.name      = Template
-foodWave.template.waves     = Foodwaves
-foodWave.templatename       = Choose Products
-foodWave.time               = Time
-foodWave.totalReserved      = Total
-foodWave.unconfirmedOrders  = Unconfirmed
-
-foodadmin.editTemplate = Edit
-
-foodshop.buyAndPay       = Buy and Pay 
-foodshop.buyFromCounter  = Pay at info
-foodshop.buyFromInternet = Pay at Internet
-foodshop.total           = Total
-
-foodwave.buyInPrice                 = Buy In Price
-foodwave.foodwaveBuyInPrice         = Total buy in price
-foodwave.markPaid                   = Foodwave marked paid
-foodwave.orders                     = Foodwave Orders
-foodwave.price                      = Foodwave price
-foodwave.summaryView                = Foodwave Summary
-foodwave.template.basicinfo         = Template Information
-foodwave.template.description       = Description
-foodwave.template.edit.title        = Foodwave Template Editor
-foodwave.template.list.title        = Foodwave Templates
-foodwave.template.name              = Name
-foodwave.template.selectproducts    = Products
-foodwave.totalCount                 = Amount
-foodwave.totalPrice                 = Customer Price
-
-foodwaveTemplate.name = Name
-
-foodwavetemplate.actions            = Actions
-foodwavetemplate.addproduct         = Add
-foodwavetemplate.basicinfo          = Template
-foodwavetemplate.createFoodwave     = Create Foodwave
-foodwavetemplate.createwave         = Create foodwave
-foodwavetemplate.description        = Description
-foodwavetemplate.edit               = Edit foodwave template
-foodwavetemplate.editRow            = Edit
-foodwavetemplate.maxfoods           = Maximum orders
-foodwavetemplate.name               = Name
-foodwavetemplate.price              = Price
-foodwavetemplate.productdescription = Description
-foodwavetemplate.productname        = Name
-foodwavetemplate.removeFromList     = Remove
-foodwavetemplate.save               = Ok
-foodwavetemplate.savetemplate       = Submit
-foodwavetemplate.selectproducts     = Products
-foodwavetemplate.startTime          = Foodwave time
-foodwavetemplate.waveName           = Wave name
-
-game.gamepoints = Game points
-
-gamepoints = Gamepoints
-
-global.cancel               = Cancel
-global.copyright            = Codecrew Ry
-global.eventname            = Event name
-global.notAuthorizedExecute = You are not authorized to do that!!
-global.notauthorized        = You don't have enough rights to enter this site.
-global.save                 = Save
-
-httpsession.creationTime = Created
-httpsession.invalidate   = Invalidate
-
-imagefile.description = Description
-imagefile.file        = Imagefile
-
-importuser.file     = File
-importuser.template = Template
-
-invite.emailexists           = User with that email address already exists in the system.
-invite.notFound              = Invite invalid or already used
-invite.successfull           = Invite sent successfully
-invite.userCreateSuccessfull = User successfully created. You can now login.
-
-javax.validation.constraints.AssertFalse.message = must be false
-javax.validation.constraints.AssertTrue.message  = must be true
-javax.validation.constraints.DecimalMax.message  = must be less than or equal to {value}
-javax.validation.constraints.DecimalMin.message  = must be greater than or equal to {value}
-javax.validation.constraints.Digits.message      = numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
-javax.validation.constraints.Future.message      = must be in the future
-javax.validation.constraints.Max.message         = must be less than or equal to {value}
-javax.validation.constraints.Min.message         = must be greater than or equal to {value}
-javax.validation.constraints.NotNull.message     = may not be null
-javax.validation.constraints.Null.message        = must be null
-javax.validation.constraints.Past.message        = must be in the past
-javax.validation.constraints.Pattern.message     = must match "{regexp}"
-javax.validation.constraints.Size.message        = size must be between {min} and {max}
-
-layout.editBottom  = Edit bottom content
-layout.editContent = Edit center
-layout.editTop     = Edit topcontent
-
-login.login              = Login
-login.logout             = Logout
-login.logoutmessage      = You have logged out of the system
-login.password           = Password
-login.submit             = Login
-login.username           = Username
-
-loginerror.header        = Login failed
-loginerror.message       = Username of password incorrect.
-loginerror.resetpassword = Reset password
-
-map.edit                          = Edit
-map.generate                      = Generate places
-map.height                        = Place height (px)
-map.id                            = #
-map.name                          = Name
-map.namebase                      = Semicolon separated table prefixes
-map.oneRowTable                   = One row tables
-map.placesInRow                   = Places in row
-map.product                       = Place product
-map.startX                        = Place start X-coordinate
-map.startY                        = Place start Y-coordinate\n
-map.submitMap                     = Send map image
-map.tableCount                    = Place count
-map.tableXdiff                    = Table X difference 
-map.tableYdiff                    = Table Y difference
-map.tablesHorizontal              = Generate horizontal tables
-map.width                         = Place width (px)
-
-mapEdit.removePlaces = Remove ALL places
-
-mapManage.lockedPlaces   = Locked {0} places.
-mapManage.releasedPlaces = Released {0} places 
-
-mapView.buyPlaces                 = Lock selected places
-mapView.errorWhenReleasingPlace   = Error when releasing place
-mapView.errorWhenReservingPlace   = Error when reserving place!
-mapView.errorWhileBuyingPlaces    = Error when buying places. Please try again. If error reoccurs please contact organizers.
-mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve this place.
-
-menu.item               = Item
-menu.name               = Name
-menu.select             = Select
-menu.sort               = Sort
-
-menuitem.navigation.key = Product flag
-
-nasty.user = Go away!
-
-org.hibernate.validator.constraints.Email.message    = not a well-formed email address
-org.hibernate.validator.constraints.Length.message   = length must be between {min} and {max}
-org.hibernate.validator.constraints.NotEmpty.message = may not be empty
-org.hibernate.validator.constraints.Range.message    = must be between {min} and {max}
-
-orgrole.create  = Create
-orgrole.name    = Name
-orgrole.parents = Parent
-
-page.account.edit.header                 = Edit account events
-page.account.list.header                 = Account events
-page.admin.sendimage.header              = Send image
-page.auth.login.header                   = Login error
-page.auth.login.loginerror.header        = Kirjautumisvirhe
-page.auth.login.loginerror.pagegroup     = frontpage
-page.auth.login.logout.header            = Uloskirjautuminen
-page.auth.login.logout.pagegroup         = frontpage
-page.auth.login.pagegroup                = frontpage
-page.auth.login.title                    = Login error
-page.auth.loginerror.header              = Login failed
-page.auth.loginerror.pagegroup           = frontpage
-page.auth.logout.pagegroup               = frontpage
-page.auth.notauthorized.pagegroup        = frontpage
-page.auth.resetPassword.header           = Reset password
-page.bill.billSummary.header             = Summary of bills
-page.bill.edit.header                    = Edit bill
-page.bill.listAll.header                 = Bills
-page.bill.placemap.header                = Place map
-page.bill.show.header                    = Bill info
-page.checkout.cancel.header              = Payment cancelled!
-page.checkout.delayed.header             = Delayed payment
-page.checkout.reject.header              = Payment rejected!
-page.checkout.return.header              = Payment confirmed
-page.game.list.header                    = Insomnia Game
-page.game.start.header                   = Insomnia Game
-page.index.header                        = Frontpage
-page.index.pagegroup                     = frontpage
-page.permissionDenied.header             = Access denied
-page.place.edit.header                   = Edit place
-page.place.insertToken.header            = Insert place token
-page.place.mygroups.header               = My places
-page.place.placemap.header               = Reserve place
-page.poll.answer.header                  = Poll
-page.poll.answered.header                = Thank you for your answer
-page.poll.start.header                   = Poll
-page.product.create.pagegroup            = admin
-page.product.createBill.header           = Buy products
-page.product.createBill.pagegroup        = shop
-page.product.edit.pagegroup              = admin
-page.product.list.pagegroup              = admin
-page.product.validateBillProducts.header = Bill created
-page.role.create.pagegroup               = admin
-page.role.edit.pagegroup                 = admin
-page.role.list.pagegroup                 = admin
-page.shop.readerevents.header            = RFID shop
-page.svm.failure.header                  = Payment error
-page.svm.pending.header                  = Payment pending
-page.svm.success.header                  = Payment successfull
-page.tests.placemap.pagegroup            = shop
-page.user.create.header                  = New user
-page.user.create.pagegroup               = user
-page.user.edit.header                    = Edit user
-page.user.edit.pagegroup                 = user
-page.user.editself.header                = My preferences
-page.user.editself.pagegroup             = user
-page.user.list.header                    = Users
-page.user.list.pagegroup                 = user
-page.user.mygroups.header                = My places
-page.viewexpired                         = frontpage
-
-pagination.firstpage    = First
-pagination.lastpage     = Last
-pagination.nextpage     = Next
-pagination.pages        = Pages
-pagination.previouspage = Previous
-pagination.results      = Results
-
-passwordChanged.body   = You can now login with the new password.
-passwordChanged.header = Password changed successfully.
-
-passwordReset.errorChanging = Unexpected error whilst password reset. Contact your administrator.
-passwordReset.hashNotFound  = Password change token has expired. Please send the query again.
-
-passwordreset.mailBody     = You can change your password in address: {0}\n\nIf you have not requested password reset, ignore this message.\n\nStream intranet\nwww.streamparty.org\ninfo@streamparty.org
-passwordreset.mailSubject  = [STREAM] Password reset
-passwordreset.usernotfound = Username not found. Please note that username is case sensitive.
-
-permissiondenied.alreadyLoggedIn = You don't have enough rights
-permissiondenied.header          = Access denied
-permissiondenied.notLoggedIn     = You don't have enough rights to enter this site.
-
-place.buyable                     = Buyable
-place.code                        = Placecode
-place.commit                      = Save
-place.description                 = Description
-place.details                     = Details
-place.edit                        = Edit
-place.height                      = Height
-place.id                          = ID
-place.mapX                        = X
-place.mapY                        = Y
-place.membership                  = Associated user
-place.name                        = Name
-place.product                     = Product
-place.releasetime                 = Releasetime
-place.width                       = Width
-
-placeSelect.legend.blue      = My selected place
-placeSelect.legend.green     = My reserved place
-placeSelect.legend.grey      = Released if needed
-placeSelect.legend.red       = Reserved place
-placeSelect.legend.white     = Empty place
-placeSelect.placeName        = Place
-placeSelect.placePrice       = Price
-placeSelect.placeProductName = Place type
-placeSelect.placesleft       = Places left
-placeSelect.reservationPrice = Reservation price
-placeSelect.reservedPlaces   = Reserved places
-placeSelect.totalPlaces      = Places in total
-
-placegroup.created                = Created
-placegroup.creator                = Reserver
-placegroup.details                = Details
-placegroup.edit                   = Show
-placegroup.edited                 = Edited
-placegroup.name                   = Name
-placegroup.placename              = Place
-placegroup.places                 = Places
-placegroup.printPdf               = Print placecodes
-
-placegroupview.groupCreator       = Reserver
-placegroupview.header             = My places
-placegroupview.noMemberships      = No places
-placegroupview.placeReleaseFailed = Releasing of place failed!
-placegroupview.placeReleased      = Place {0} released 
-placegroupview.releasePlace       = Release
-placegroupview.reservationName    = Place
-placegroupview.reservationProduct = Product
-placegroupview.token              = Placecode / user
-
-placetoken.commit        = Associate token
-placetoken.pageHeader    = Add token
-placetoken.placelist     = My places
-placetoken.token         = Token
-placetoken.tokenNotFound = Token not found! Check token
-placetoken.topText       = You can associate a ticket bought by someone else to your account by inserting a token to the field below
-
-poll.answer      = Answer to poll
-poll.begin       = Open poll
-poll.create      = Create
-poll.description = Description
-poll.edit        = Edit
-poll.end         = Close poll
-poll.name        = Poll name
-poll.save        = Send answers
-
-product.barcode             = Barcode
-product.billed              = Billed
-product.boughtTotal         = Products billed
-product.buyInPrice          = Buy in price
-product.cart.count          = To shoppingcart
-product.cashed              = Cashpaid
-product.color               = Color in UI
-product.create              = Create product
-product.createDiscount      = Add volumediscount
-product.edit                = edit
-product.name                = Name of product
-product.paid                = Paid
-product.prepaid             = Prepaid
-product.prepaidInstant      = Created when prepaid is paid
-product.price               = Price of product
-product.providedRole        = Product defines role
-product.save                = Save
-product.shopInstant         = Create automatic cashpayment
-product.sort                = Sort nr
-product.totalPrice          = Total
-product.unitName            = Unit name
-product.vat                 = VAT
-
-productShopView.readBarcode = Read barcode
-
-products.save             = Save
-
-productshop.billCreated   = Bill created
-productshop.commit        = Buy
-productshop.limits        = Available
-productshop.minusOne      = -1
-productshop.minusTen      = -10
-productshop.noItemsInCart = There are no products in shopping cart
-productshop.plusOne       = +1
-productshop.plusTen       = +10
-productshop.total         = Total
-
-reader.assocToCard           = Associate to card
-reader.automaticProduct      = Default product
-reader.automaticProductCount = Amount
-reader.createNewCard         = Create new card
-reader.description           = Description
-reader.edit                  = Edit
-reader.identification        = Identification
-reader.name                  = Reader name
-reader.save                  = Save
-reader.select                = Select reader
-reader.tag                   = Tag
-reader.type                  = Type
-reader.user                  = User
-
-readerView.searchforuser = Search user
-
-readerevent.associateToUser = Associate to user
-readerevent.seenSince       = Last seen
-readerevent.shopToUser      = Buy to user
-readerevent.tagname         = Tag
-
-readerview.cards = Card ( printcount )
-
-resetMail.body     = You can change a forgotten password by inserting your username to the field below. A link where you can change the password will be sent to the email address associated to that.
-resetMail.header   = Reset lost password
-resetMail.send     = Send email
-resetMail.username = Username
-
-resetmailSent.body   = Email has been sent containing a link where you can change the password.
-resetmailSent.header = Email sent
-
-rfidevent.empty      = Empty
-rfidevent.reader     = Reader
-rfidevent.searchuser = Search user
-rfidevent.tag        = Tag
-
-role.cardtemplate     = Cardtemplate
-role.create           = Create role
-role.description      = Description
-role.edit             = Edit
-role.edit.save        = Save
-role.execute          = (X)
-role.name             = Name
-role.parents          = Parents
-role.permissionheader = Role permissions
-role.read             = (R)
-role.write            = (W)
-
-salespoint.edit          = Edit
-salespoint.name          = Name
-salespoint.noSalesPoints = Amount
-
-sendPicture.header = S
-
-shop.accountBalance = Account balance
-shop.cash           = Cash deposit
-shop.readBarcode    = Read barcode
-shop.totalPrice     = Price of products
-shop.user           = Selling to
-
-sidebar.bill.list           = My bills
-sidebar.bill.listAll        = All bills
-sidebar.bill.summary        = Summary of bills
-sidebar.bills               = Bills
-sidebar.cardTemplate.create = New card template
-sidebar.cardTemplate.list   = Show card templates
-sidebar.createuser          = Register a new account
-sidebar.eventorg.list       = My organisations
-sidebar.map.list            = Maps
-sidebar.map.placemap        = Placemap
-sidebar.maps                = Maps
-sidebar.other               = Other
-sidebar.product.create      = New product
-sidebar.product.createBill  = Create bill
-sidebar.product.list        = Products
-sidebar.products            = Products
-sidebar.role.create         = New role
-sidebar.role.list           = Roles
-sidebar.roles               = Roles
-sidebar.shop.readerEvents   = Reader events
-sidebar.shop.readerlist     = Show readers
-sidebar.user.create         = New user
-sidebar.user.editself       = My preferences
-sidebar.user.list           = Users
-sidebar.users               = Users
-sidebar.utils.flushCache    = Flush Cache
-sidebar.utils.testdata      = Testdata
-
-sitepage.addContent = Add content block
-sitepage.create     = Create
-sitepage.edit       = Edit
-sitepage.name       = Page name
-sitepage.roles      = Visible for roles
-sitepage.save       = Save
-
-sitepagelist.header = Site pages
-
-submenu.auth.login                   = Login
-submenu.auth.logoutResponse          = Logout successfull
-submenu.auth.sendResetMail           = Password reset
-submenu.bill.billSummary             = Bill summary
-submenu.bill.list                    = My bills
-submenu.bill.listAll                 = All bills
-submenu.foodadmin.createTemplate     = Create foodwave template
-submenu.foodadmin.listTemplates      = List foodwave templates
-submenu.foodmanager.listFoodwaves    = List active foodwaves
-submenu.foodwave.list                = Open foodwaves
-submenu.foodwave.listTemplates       = Food provides
-submenu.index                        = Frontpage
-submenu.map.create                   = Create map
-submenu.map.list                     = List maps
-submenu.orgrole.create               = Create organisationrole
-submenu.orgrole.list                 = Organisation roles
-submenu.pages.create                 = Create content
-submenu.pages.list                   = List pages
-submenu.place.insertToken            = Insert placecode
-submenu.place.myGroups               = Place reservations
-submenu.place.placemap               = Placemap
-submenu.poll.index                   = Polls
-submenu.product.create               = Create product
-submenu.product.list                 = List products
-submenu.role.create                  = Create role
-submenu.role.list                    = Roles
-submenu.shop.createBill              = Shop
-submenu.shop.listReaders             = List readers
-submenu.shop.showReaderEvents        = Reader events
-submenu.user.accountEvents           = Account events
-submenu.user.changePassword          = Change password
-submenu.user.create                  = Create new user
-submenu.user.edit                    = User information
-submenu.user.foodwave                = Food
-submenu.user.invite                  = Invite friends
-submenu.user.manageuserlinks         = Manage users
-submenu.user.other                   = Other
-submenu.user.rolelinks               = Manage roles
-submenu.user.sendPicture             = Send picture
-submenu.user.shop                    = Shop
-submenu.user.userlinks               = User information
-submenu.useradmin.create             = Create user
-submenu.useradmin.createCardTemplate = Create cardtemplate
-submenu.useradmin.list               = List users
-submenu.useradmin.listCardTemplates  = Card templates
-submenu.useradmin.showTakePicture    = Show webcam
-submenu.useradmin.validateUser       = Validate user
-submenu.voting.compolist             = Compos
-submenu.voting.create                = Create new compo
-submenu.voting.myEntries             = My entries
-
-supernavi.admin = Adminview
-supernavi.user  = Userview
-
-svm.failure.errorMessage   = Payment error.
-svm.failure.successMessage = Payment error successfull\u2026 ( Possibly already marked paid )
-svm.pending.errorMessage   = Unknown error! If payment was successfull email will be sent after verification.
-svm.pending.successMessage = Payment pending. You will receive email after payment verification.
-svm.success.errorMessage   = Payment could not be verified!
-svm.success.successMessage = Payment was successfull. You can now your credits in the system.
-
-template.loggedInAs = Logged in as:
-
-topnavi.adminshop = Adminshop
-topnavi.billing   = Billing
-topnavi.compos    = Compos
-topnavi.contents  = Site contents
-topnavi.foodwave  = Food
-topnavi.frontpage = Front page
-topnavi.log       = Log
-topnavi.maps      = Maps
-topnavi.placemap  = Map
-topnavi.poll      = Polls
-topnavi.products  = Products
-topnavi.shop      = Shop
-topnavi.user      = My properties
-topnavi.userinit  = User auth
-topnavi.usermgmt  = Users
-
-user.accountBalance             = Account balance
-user.accountEventHeader         = Account events
-user.accountevents              = Account events
-user.address                    = Address
-user.bank                       = Bank
-user.bankaccount                = Bank number
-user.birthday                   = Birthday
-user.cardPower                  = Usertype
-user.changePassword             = Change password
-user.changepassword.forUser     = For user
-user.changepassword.title       = Change password
-user.create                     = Create user
-user.createdmessage             = User has been created successfully. You can now login.
-user.defaultImage               = Default picture
-user.edit                       = Edit
-user.edit.title                 = My information
-user.email                      = Email
-user.firstNames                 = Firstname
-user.food.title                 = Choose Menu
-user.foodwave.products.title    = Choose Products
-user.foodwavelist.title         = Choose Foodwave
-user.hasImage                   = Image
-user.image                      = Image
-user.imagelist                  = Saved images
-user.imagesubmit                = Send image
-user.insertToken                = Insert token
-user.invalidLoginCredentials    = Invalid user credentials
-user.invite                     = Invite
-user.invite.header              = Accept invitation
-user.invitemail                 = Email address
-user.lastName                   = Lastname
-user.login                      = Login
-user.myGroups                   = My place reservations
-user.nick                       = Nick
-user.noAccountevents            = No account events
-user.noCurrentImage             = No image
-user.noImage                    = No image
-user.oldPassword                = Current password
-user.page.invite                = Invite friends
-user.password                   = Password
-user.passwordcheck              = Password ( again )
-user.passwordlengthMessage      = Password is too short! 
-user.phone                      = Tel
-user.realname                   = Name
-user.roles                      = Roles
-user.rolesave                   = Save roles
-user.save                       = Save
-user.saveFailed                 = Save failed, Not enough permissions!
-user.saveSuccessfull            = Changes saved successfully
-user.sendPicture                = Send image
-user.sex                        = Sex
-user.sex.FEMALE                 = Female
-user.sex.MALE                   = Male
-user.sex.UNDEFINED              = Undefined
-user.shop                       = Buy
-user.shop.title                 = Shop to user
-user.successfullySaved          = Changes saved successfully
-user.superadmin                 = Superadmin
-user.thisIsCurrentImage         = Current image
-user.town                       = City
-user.uploadimage                = Send image
-user.username                   = Username
-user.validate.notUniqueUsername = Username already exists. Please select another.
-user.validateUser.commit        = Send
-user.validateUser.header        = Please insert credentials
-user.wholeName                  = Name
-user.zipCode                    = Postal nr.
-
-userImport.commit = Commit
-
-userView.image = Image
-
-usercart.addSearchedUsers = Add searched users
-usercart.cartsize         = Size
-usercart.clear            = Clear Cart
-usercart.showCart         = Show usercart
-usercart.traverse         = Traverse
-
-userimage.webcam = Take picture with webcam
-
-userlist.header             = Users
-userlist.onlythisevent      = Limit to users of this event 
-userlist.placeassoc         = Assigned to place
-userlist.rolefilter         = Assigned roles
-userlist.saldofilter        = Saldo
-userlist.search             = Search
-userlist.showAdvancedSearch = Advanced search
-
-usertitle.managingUser = Shop
-
-userview.header             = Users
-userview.invalidEmail       = Invalid email address
-userview.loginstringFaulty  = Username has to be atleast 2 characters long!
-userview.oldPasswordError   = Invalid password!
-userview.passwordTooShort   = Password has to be atleast 5 characters long!
-userview.passwordsChanged   = Password changed
-userview.passwordsDontMatch = Passwords do not match! Please try again!
-userview.userExists         = Username already exists! please select another.
-
-viewexpired.body  = Please login again.
-viewexpired.title = Login expired. Please login again.
-
-voting.allcompos.curEntries        = # of entries
-voting.allcompos.descri            = Description
-voting.allcompos.description       = List of all compos and theirs information.
-voting.allcompos.endTime           = End time
-voting.allcompos.header            = All compos
-voting.allcompos.maxParts          = Max participants
-voting.allcompos.name              = Name
-voting.allcompos.startTime         = Start time
-voting.allcompos.submitEnd         = Submit end
-voting.allcompos.submitEntry       = Submit entry
-voting.allcompos.submitStart       = Submit start
-voting.allcompos.voteEnd           = Vote end
-voting.allcompos.voteStart         = Vote start
-voting.compo.submit                = Submit entry
-voting.compo.vote                  = Vote
-voting.compoentryadd.button        = Send
-voting.compoentryadd.description   = Add new entry to compo
-voting.compoentryadd.entryname     = Name
-voting.compoentryadd.file          = File
-voting.compoentryadd.notes         = Notes
-voting.compoentryadd.screenmessage = Screenmessage
-voting.compoentryadd.title         = Add entry
-voting.compoentryadd.uploadedFile  = File to 
-voting.compoentrysave.button       = Save
-voting.create.compoEnd             = End time
-voting.create.compoStart           = Start time
-voting.create.createButton         = Create
-voting.create.dateValidatorEndDate = End time before start time.
-voting.create.description          = Description
-voting.create.header               = Create compo
-voting.create.maxParticipants      = Max participants
-voting.create.name                 = Name
-voting.create.submitEnd            = Submit close
-voting.create.submitStart          = Submit start
-voting.create.voteEnd              = Voting close
-voting.create.voteStart            = Voting start
+
+acc_line.eventuser = Customer
+acc_line.nick      = Nick
+acc_line.product   = Product
+acc_line.quantity  = Quantity
+acc_line.time      = Transaction Date
+
+accountEvent.commit      = Save
+accountEvent.delivered   = Delivered
+accountEvent.edit        = Edit
+accountEvent.eventTime   = Time
+accountEvent.productname = Product
+accountEvent.quantity    = Count
+accountEvent.seller      = Sold by
+accountEvent.total       = Total
+accountEvent.unitPrice   = Unit price
+
+actionlog.create.header           = Create new actionmessage
+actionlog.create.message          = Message
+actionlog.create.role             = Target role
+actionlog.create.submitbutton     = Send
+actionlog.create.taskradio        = Task
+actionlog.crew                    = Crew
+actionlog.message                 = Event
+actionlog.messagelist.description = You can follow and create new action messages in this view
+actionlog.messagelist.header      = Messagelist
+actionlog.messagestate.DONE       = Done
+actionlog.messagestate.NEW        = New
+actionlog.messagestate.PENDING    = Pending
+actionlog.state                   = State
+actionlog.task                    = Task
+actionlog.tasklist.header         = Tasklist
+actionlog.time                    = Time
+actionlog.user                    = User
+
+adduser.newuser     = Create new user
+adduser.update      = Update picture
+adduser.welcome     = Welcome
+adduser.welcometext = You can easily add a new user or update your user image for your profile. Simply to start, wanted action to start.
+
+applicationPermission.description = description
+applicationPermission.name        = Rightsgroup
+
+barcodeReader.readBarcode = Read barcode
+
+bill.addr1                = Address 1
+bill.addr2                = Address 2
+bill.addr3                = Address 3
+bill.addr4                = Address 4
+bill.addr5                = Address 5
+bill.address              = Payers address
+bill.billAmount           = Bill amount
+bill.billIsPaid           = Bill is paid
+bill.billLines            = Products
+bill.billNumber           = Bill number
+bill.billPaidDate         = Paid date
+bill.deliveryTerms        = Delivery terms
+bill.edit                 = edit
+bill.isPaid               = Paid
+bill.markPaid             = Mark paid
+bill.markedPaid           = Bill marked paid
+bill.notes                = Notes
+bill.noticetime           = Notice time
+bill.ourReference         = Our reference
+bill.paidDate             = Paid date
+bill.payer                = Payer
+bill.paymentTime          = Payment time
+bill.paymentTime.now      = Now
+bill.printBill            = Print bill
+bill.receiverAddress      = Receiver address
+bill.referenceNumberBase  = Reference number base
+bill.referencenumber      = Reference nr.
+bill.sentDate             = Sent date
+bill.show                 = Show
+bill.theirReference       = Clients reference
+bill.totalPrice           = Total
+bill.totalprice           = Total
+
+billLine.eventuser = Customer
+billLine.nick      = Nick
+billLine.price     = Unit Price
+billLine.product   = Product
+billLine.quantity  = Quantity
+billLine.time      = Order Date
+
+billedit.billnotfound = Bill not found. Select again.
+
+billine.linePrice         = Total
+billine.name              = Product
+billine.quantity          = Quantity
+billine.referencedProduct = Referenced product
+billine.save              = Save
+billine.unitName          = Unit
+billine.unitPrice         = Unit price
+billine.vat               = VAT
+
+bills.noBills = No bills
+
+card.massprint.title     = Print all
+
+cardTemplate.create      = Create
+cardTemplate.edit        = Edit
+cardTemplate.id          = Id
+cardTemplate.imageheader = Current Template
+cardTemplate.name        = Card template
+cardTemplate.power       = Card power
+cardTemplate.roles       = Associated roles
+cardTemplate.save        = Save
+cardTemplate.sendImage   = Upload Image
+
+cart.item           = Item
+cart.item_quantity  = Quantity
+cart.item_total     = Total
+cart.item_unitprice = Price
+cart.total          = Total
+
+checkout.cancel.errorMessage   = Error confirming the cancel\u2026 Please report this to code@codecrew.fi
+checkout.cancel.successMessage = You can retry payment at your own bills.
+checkout.reject.errorMessage   = Error while processing rejected payment. Please report this error to code@codecrew.fi
+checkout.reject.successMessage = Payment rejected. You can retry payment from your own bills.
+checkout.return.errorDelayed   = Error confirming delayed payment. Please contact code@codecrew.fi
+checkout.return.errorMessage   = Error confirming the successfull return message. Please report this error to code@codecrew.fi 
+checkout.return.successDelayed = Delayed payment successfull. Payment will be confirmed at a later time, usually within a hour.
+checkout.return.successMessage = Payment confirmed. Your products have been paid.
+
+compo.edit                = Edit compo
+compo.savesort            = Save order
+compo.saveVotes           = Save votes
+compo.votesSaved          = Votes saved
+
+compofile.download        = Download
+compofile.download.header = Download file
+compofile.upload          = Upload file
+
+discount.active     = Active
+discount.amountMax  = Max amount
+discount.amountMin  = Min amount
+discount.code       = Discount code
+discount.create     = Create new
+discount.details    = Details
+discount.edit       = Edit
+discount.maxNum     = Max nr of discounts
+discount.perUser    = Discounts per user
+discount.percentage = Discount percent
+discount.products   = Products
+discount.role       = Role discount
+discount.save       = Save
+discount.shortdesc  = Description
+discount.validFrom  = Valid from
+discount.validTo    = Valid to
+
+editplace.header      = Edit place
+
+editplacegroup.header = Placegroup information
+
+entry.edit = Edit entry
+
+error.contact = If this happens again, contact Info with the following code:
+error.error   = You have encountered an error.
+
+event.defaultRole         = Default user role
+event.edit                = Edit
+event.endTime             = End time
+event.name                = Event name
+event.nextBillNumber      = Initial bill number
+event.referenceNumberBase = Reference number base
+event.save                = Save
+event.startTime           = Start time
+
+eventdomain.domainname = Domain
+eventdomain.remove     = Remove
+
+eventmap.active          = Active
+eventmap.buyable.like    = Place name match
+eventmap.buyable.lock    = Lock places
+eventmap.buyable.release = Release places
+eventmap.name            = Map name
+eventmap.notes           = Notes
+eventmap.save            = Save
+
+eventorg.bankName1     = Bank name 2
+eventorg.bankName2     = Bank name 2
+eventorg.bankNumber1   = Bank account nr. 1
+eventorg.bankNumber2   = Bank account nr. 2
+eventorg.billAddress1  = Billing address 1
+eventorg.billAddress2  = Billing address 2
+eventorg.billAddress3  = Billing address 3
+eventorg.billAddress4  = Billing address 4
+eventorg.bundleCountry = Country bundle
+eventorg.create        = Create
+eventorg.createEvent   = Create event
+eventorg.createevent   = Create new event
+eventorg.edit          = Edit
+eventorg.events        = Event of the organisation
+eventorg.organisation  = Organisation name
+eventorg.save          = Save
+
+eventorgView.eventname = Name of event
+
+eventorganiser.name = Eventorganiser
+feedback.canFeedback = Feedback
+feedback.submit      = Submit
+feedback.thanks      = Thanks
+
+
+food = Food
+foodWave.accountevents      = Accountevents
+foodWave.activeFoodWaves    = Active Foodwaves
+foodWave.billLines          = Pending Online Payments
+foodWave.deliveredFoodWaves = Delivered Foodwaves
+
+foodWave.list               = Active Foodwaves
+foodWave.name               = Foodwave
+foodWave.orders             = Amount of Orders
+foodWave.paid               = Paid
+foodWave.show               = Show
+foodWave.template.name      = Template
+foodWave.template.waves     = Foodwaves
+foodWave.templatename       = Choose Products
+foodWave.totalReserved      = Total
+foodWave.unconfirmedOrders  = Unconfirmed
+foodWave.template.name = Name
+foodadmin.editTemplate = Edit
+
+foodshop.buyAndPay       = Buy and Pay 
+foodWave.time          = Time
+
+foodshop.total           = Total
+foodshop.buyFromCounter  = Pay at info
+foodwave.buyInPrice                 = Buy In Price
+foodwave.foodwaveBuyInPrice         = Total buy in price
+foodwave.markPaid                   = Foodwave marked paid
+foodwave.orders                     = Foodwave Orders
+foodwave.price                      = Foodwave price
+foodwave.summaryView                = Foodwave Summary
+foodwave.template.basicinfo         = Template Information
+foodwave.template.description       = Description
+foodwave.template.edit.title        = Foodwave Template Editor
+foodwave.template.list.title        = Foodwave Templates
+foodwave.template.name              = Name
+foodwave.template.selectproducts    = Products
+foodwave.totalCount                 = Amount
+foodwave.totalPrice                 = Customer Price
+
+foodwaveTemplate.name = Name
+
+foodwavetemplate.actions            = Actions
+foodwavetemplate.addproduct         = Add
+foodwavetemplate.basicinfo          = Template
+foodwavetemplate.createFoodwave     = Create Foodwave
+foodwavetemplate.createwave         = Create foodwave
+foodwavetemplate.description        = Description
+foodwavetemplate.edit               = Edit foodwave template
+foodwavetemplate.editRow            = Edit
+foodwavetemplate.maxfoods           = Maximum orders
+foodwavetemplate.name               = Name
+foodwavetemplate.price              = Price
+foodwavetemplate.productdescription = Description
+foodwavetemplate.productname        = Name
+foodwavetemplate.removeFromList     = Remove
+foodwavetemplate.save               = Ok
+foodwavetemplate.savetemplate       = Submit
+foodwavetemplate.selectproducts     = Products
+foodwavetemplate.startTime          = Foodwave time
+foodwavetemplate.waveName           = Wave name
+
+foodshop.buyFromInternet = Pay at Internet
+
+game.gamepoints = Game points
+
+gamepoints = Gamepoints
+
+global.cancel               = Cancel
+global.copyright            = Codecrew Ry
+global.eventname            = Event name
+global.notAuthorizedExecute = You are not authorized to do that!!
+global.notauthorized        = You don't have enough rights to enter this site.
+global.save                 = Save
+
+httpsession.creationTime = Created
+httpsession.invalidate   = Invalidate
+
+imagefile.description = Description
+imagefile.file        = Imagefile
+
+importuser.file     = File
+importuser.template = Template
+
+infoview.back          = Back
+infoview.computerplace = Computer places
+infoview.shop          = Shop
+
+invite.emailexists           = User with that email address already exists in the system.
+invite.notFound              = Invite invalid or already used
+invite.successfull           = Invite sent successfully
+invite.userCreateSuccessfull = User successfully created. You can now login.
+
+javax.validation.constraints.AssertFalse.message = must be false
+javax.validation.constraints.AssertTrue.message  = must be true
+javax.validation.constraints.DecimalMax.message  = must be less than or equal to {value}
+javax.validation.constraints.DecimalMin.message  = must be greater than or equal to {value}
+javax.validation.constraints.Digits.message      = numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
+javax.validation.constraints.Future.message      = must be in the future
+javax.validation.constraints.Max.message         = must be less than or equal to {value}
+javax.validation.constraints.Min.message         = must be greater than or equal to {value}
+javax.validation.constraints.NotNull.message     = may not be null
+javax.validation.constraints.Null.message        = must be null
+javax.validation.constraints.Past.message        = must be in the past
+javax.validation.constraints.Pattern.message     = must match "{regexp}"
+javax.validation.constraints.Size.message        = size must be between {min} and {max}
+
+layout.editBottom  = Edit bottom content
+layout.editContent = Edit center
+layout.editTop     = Edit topcontent
+
+login.login              = Login
+login.logout             = Logout
+login.logoutmessage      = You have logged out of the system
+login.password           = Password
+login.submit             = Login
+login.username           = Username
+
+loginerror.header        = Login failed
+loginerror.message       = Username of password incorrect.
+loginerror.resetpassword = Reset password
+
+map.edit                          = Edit
+map.generate                      = Generate places
+map.height                        = Place height (px)
+map.id                            = #
+map.name                          = Name
+map.namebase                      = Semicolon separated table prefixes
+map.oneRowTable                   = One row tables
+map.placesInRow                   = Places in row
+map.product                       = Place product
+map.startX                        = Place start X-coordinate
+map.startY                        = Place start Y-coordinate\n
+map.submitMap                     = Send map image
+map.tableCount                    = Place count
+map.tableXdiff                    = Table X difference 
+map.tableYdiff                    = Table Y difference
+map.tablesHorizontal              = Generate horizontal tables
+map.width                         = Place width (px)
+
+mapEdit.removePlaces = Remove ALL places
+
+mapManage.lockedPlaces   = Locked {0} places.
+mapManage.releasedPlaces = Released {0} places 
+
+mapView.buyPlaces                 = Lock selected places
+mapView.errorWhenReleasingPlace   = Error when releasing place
+mapView.errorWhenReservingPlace   = Error when reserving place!
+mapView.errorWhileBuyingPlaces    = Error when buying places. Please try again. If error reoccurs please contact organizers.
+menu.item               = Item
+menu.name               = Name
+menu.select             = Select
+menu.sort               = Sort
+
+menuitem.navigation.key = Product flag
+
+mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve this place.
+
+nasty.user = Go away!
+
+org.hibernate.validator.constraints.Email.message    = not a well-formed email address
+org.hibernate.validator.constraints.Length.message   = length must be between {min} and {max}
+org.hibernate.validator.constraints.NotEmpty.message = may not be empty
+org.hibernate.validator.constraints.Range.message    = must be between {min} and {max}
+
+orgrole.create  = Create
+orgrole.name    = Name
+orgrole.parents = Parent
+
+page.account.edit.header                 = Edit account events
+page.account.list.header                 = Account events
+page.admin.sendimage.header              = Send image
+page.auth.login.header                   = Login error
+page.auth.login.loginerror.header        = Kirjautumisvirhe
+page.auth.login.loginerror.pagegroup     = frontpage
+page.auth.login.logout.header            = Uloskirjautuminen
+page.auth.login.logout.pagegroup         = frontpage
+page.auth.login.pagegroup                = frontpage
+page.auth.login.title                    = Login error
+page.auth.loginerror.header              = Login failed
+page.auth.loginerror.pagegroup           = frontpage
+page.auth.logout.pagegroup               = frontpage
+page.auth.notauthorized.pagegroup        = frontpage
+page.auth.resetPassword.header           = Reset password
+page.bill.billSummary.header             = Summary of bills
+page.bill.edit.header                    = Edit bill
+page.bill.listAll.header                 = Bills
+page.bill.placemap.header                = Place map
+page.bill.show.header                    = Bill info
+page.checkout.cancel.header              = Payment cancelled!
+page.checkout.delayed.header             = Delayed payment
+page.checkout.reject.header              = Payment rejected!
+page.checkout.return.header              = Payment confirmed
+page.game.list.header                    = Insomnia Game
+page.game.start.header                   = Insomnia Game
+page.index.header                        = Frontpage
+page.index.pagegroup                     = frontpage
+page.permissionDenied.header             = Access denied
+page.place.edit.header                   = Edit place
+page.place.insertToken.header            = Insert place token
+page.place.mygroups.header               = My places
+page.place.placemap.header               = Reserve place
+page.poll.answer.header                  = Poll
+page.poll.answered.header                = Thank you for your answer
+page.poll.start.header                   = Poll
+page.product.create.pagegroup            = admin
+page.product.createBill.header           = Buy products
+page.product.createBill.pagegroup        = shop
+page.product.edit.pagegroup              = admin
+page.product.list.pagegroup              = admin
+page.product.validateBillProducts.header = Bill created
+page.role.create.pagegroup               = admin
+page.role.edit.pagegroup                 = admin
+page.role.list.pagegroup                 = admin
+page.shop.readerevents.header            = RFID shop
+page.svm.failure.header                  = Payment error
+page.svm.pending.header                  = Payment pending
+page.svm.success.header                  = Payment successfull
+page.tests.placemap.pagegroup            = shop
+page.user.create.header                  = New user
+page.user.create.pagegroup               = user
+page.user.edit.header                    = Edit user
+page.user.edit.pagegroup                 = user
+page.user.editself.header                = My preferences
+page.user.editself.pagegroup             = user
+page.user.list.header                    = Users
+page.user.list.pagegroup                 = user
+page.user.mygroups.header                = My places
+page.viewexpired                         = frontpage
+
+pagination.firstpage    = First
+pagination.lastpage     = Last
+pagination.nextpage     = Next
+pagination.pages        = Pages
+pagination.previouspage = Previous
+pagination.results      = Results
+
+passwordChanged.body   = You can now login with the new password.
+passwordChanged.header = Password changed successfully.
+
+passwordReset.errorChanging = Unexpected error whilst password reset. Contact your administrator.
+passwordReset.hashNotFound  = Password change token has expired. Please send the query again.
+
+passwordreset.mailBody     = You can change your password in address: {0}\n\nIf you have not requested password reset, ignore this message.\n\nStream intranet\nwww.streamparty.org\ninfo@streamparty.org
+passwordreset.mailSubject  = [STREAM] Password reset
+passwordreset.usernotfound = Username not found. Please note that username is case sensitive.
+
+permissiondenied.alreadyLoggedIn = You don't have enough rights
+permissiondenied.header          = Access denied
+permissiondenied.notLoggedIn     = You don't have enough rights to enter this site.
+
+place.buyable                     = Buyable
+place.code                        = Placecode
+place.commit                      = Save
+place.description                 = Description
+place.details                     = Details
+place.edit                        = Edit
+place.height                      = Height
+place.id                          = ID
+place.mapX                        = X
+place.mapY                        = Y
+place.membership                  = Associated user
+place.name                        = Name
+place.product                     = Product
+place.releasetime                 = Releasetime
+place.width                       = Width
+
+placeSelect.legend.blue      = My selected place
+placeSelect.legend.green     = My reserved place
+placeSelect.legend.grey      = Released if needed
+placeSelect.legend.red       = Reserved place
+placeSelect.legend.white     = Empty place
+placeSelect.placeName        = Place
+placeSelect.placePrice       = Price
+placeSelect.placeProductName = Place type
+placeSelect.placesleft       = Places left
+placeSelect.reservationPrice = Reservation price
+placeSelect.reservedPlaces   = Reserved places
+placeSelect.totalPlaces      = Places in total
+
+placegroup.created                = Created
+placegroup.creator                = Reserver
+placegroup.details                = Details
+placegroup.edit                   = Show
+placegroup.edited                 = Edited
+placegroup.name                   = Name
+placegroup.placename              = Place
+placegroup.places                 = Places
+placegroup.printPdf               = Print placecodes
+
+placegroupview.groupCreator       = Reserver
+placegroupview.header             = My places
+placegroupview.noMemberships      = No places
+placegroupview.placeReleaseFailed = Releasing of place failed!
+placegroupview.placeReleased      = Place {0} released 
+placegroupview.releasePlace       = Release
+placegroupview.reservationName    = Place
+placegroupview.reservationProduct = Product
+placegroupview.token              = Placecode / user
+
+placetoken.commit        = Associate token
+placetoken.pageHeader    = Add token
+placetoken.placelist     = My places
+placetoken.token         = Token
+placetoken.tokenNotFound = Token not found! Check token
+placetoken.topText       = You can associate a ticket bought by someone else to your account by inserting a token to the field below
+
+poll.answer      = Answer to poll
+poll.begin       = Open poll
+poll.create      = Create
+poll.description = Description
+poll.edit        = Edit
+poll.end         = Close poll
+poll.name        = Poll name
+poll.save        = Send answers
+
+product.barcode              = Barcode
+product.buyInPrice          = Buy in price
+product.billed               = Billed
+product.boughtTotal          = Products billed
+product.cart.count           = To shoppingcart
+product.cashed               = Cashpaid
+product.color                = Color in UI
+product.create               = Create product
+product.createDiscount       = Add volumediscount
+product.edit                 = edit
+product.name                 = Name of product
+product.paid                 = Paid
+product.prepaid              = Prepaid
+product.prepaidInstant       = Created when prepaid is paid
+product.price                = Price of product
+product.providedRole         = Product defines role
+product.save                 = Save
+product.shopInstant          = Create automatic cashpayment
+product.sort                 = Sort nr
+product.totalPrice           = Total
+product.unitName             = Unit name
+product.vat                  = VAT
+
+products.save                = Save
+
+productsShopView.readBarcode = Read
+
+productshop.billCreated   = Bill created
+productshop.commit        = Buy
+productshop.limits        = Available
+productshop.minusOne      = -1
+productshop.minusTen      = -10
+productshop.noItemsInCart = There are no products in shopping cart
+productshop.plusOne       = +1
+productshop.plusTen       = +10
+productshop.total         = Total
+reader.automaticProduct      = Default product
+reader.automaticProductCount = Amount
+
+reader.assocToCard          = Associate to card
+reader.createNewCard        = Create new card
+reader.description          = Description
+reader.edit                 = Edit
+reader.save                  = Save
+reader.identification       = Identification
+reader.name                 = Reader name
+reader.select               = Select reader
+reader.tag                  = Tag
+reader.type                 = Type
+reader.user                 = User
+
+readerView.searchforuser = Search user
+
+readerevent.associateToUser = Associate to user
+readerevent.seenSince       = Last seen
+readerevent.shopToUser      = Buy to user
+readerevent.tagname         = Tag
+
+readerview.cards = Card ( printcount )
+
+resetMail.body     = You can change a forgotten password by inserting your username to the field below. A link where you can change the password will be sent to the email address associated to that.
+resetMail.header   = Reset lost password
+resetMail.send     = Send email
+resetMail.username = Username
+
+resetmailSent.body   = Email has been sent containing a link where you can change the password.
+resetmailSent.header = Email sent
+
+rfidevent.empty      = Empty
+rfidevent.reader     = Reader
+rfidevent.searchuser = Search user
+rfidevent.tag        = Tag
+
+role.cardtemplate     = Cardtemplate
+role.create           = Create role
+role.description      = Description
+role.edit             = Edit
+role.edit.save        = Save
+role.execute          = (X)
+role.name             = Name
+role.parents          = Parents
+role.permissionheader = Role permissions
+role.read             = (R)
+role.write            = (W)
+
+salespoint.edit          = Edit
+salespoint.name          = Name
+salespoint.noSalesPoints = Amount
+
+sendPicture.header = S
+
+shop.accountBalance   = Credits
+shop.actions          = Actions
+shop.barcode          = Barcode
+shop.buyCash          = Buy by Cash
+shop.buyCredit        = Buy Credit
+shop.calcsubtotal     = Calc Subtotal
+shop.cash             = Cash
+shop.cashBack         = Back
+shop.cashGiven        = Cash given
+shop.cashback         = Cashback
+shop.confirmCreditBuy = Are You sure ?
+shop.count            = Q
+shop.price            = price
+shop.product          = Product
+shop.readBarcode      = Read
+shop.shop             = Shop
+shop.totalPrice       = Total
+shop.user             = Selling to
+
+sidebar.bill.list           = My bills
+sidebar.bill.listAll        = All bills
+sidebar.bill.summary        = Summary of bills
+sidebar.bills               = Bills
+sidebar.cardTemplate.create = New card template
+sidebar.cardTemplate.list   = Show card templates
+sidebar.createuser          = Register a new account
+sidebar.eventorg.list       = My organisations
+sidebar.map.list            = Maps
+sidebar.map.placemap        = Placemap
+sidebar.maps                = Maps
+sidebar.other               = Other
+sidebar.product.create      = New product
+sidebar.product.createBill  = Create bill
+sidebar.product.list        = Products
+sidebar.products            = Products
+sidebar.role.create         = New role
+sidebar.role.list           = Roles
+sidebar.roles               = Roles
+sidebar.shop.readerEvents   = Reader events
+sidebar.shop.readerlist     = Show readers
+sidebar.user.create         = New user
+sidebar.user.editself       = My preferences
+sidebar.user.list           = Users
+sidebar.users               = Users
+sidebar.utils.flushCache    = Flush Cache
+sidebar.utils.testdata      = Testdata
+
+sitepage.addContent = Add content block
+sitepage.create     = Create
+sitepage.edit       = Edit
+sitepage.name       = Page name
+sitepage.roles      = Visible for roles
+sitepage.save       = Save
+
+sitepagelist.header = Site pages
+
+submenu.auth.login                   = Login
+submenu.auth.logoutResponse          = Logout successfull
+submenu.auth.sendResetMail           = Password reset
+submenu.bill.billSummary             = Bill summary
+submenu.foodadmin.createTemplate     = Create foodwave template
+submenu.foodadmin.listTemplates      = List foodwave templates
+submenu.foodmanager.listFoodwaves    = List active foodwaves
+submenu.foodwave.list                = Open foodwaves
+submenu.foodwave.listTemplates       = Food provides
+submenu.bill.list                    = My bills
+submenu.bill.listAll                 = All bills
+submenu.index                        = Frontpage
+submenu.map.create                   = Create map
+submenu.map.list                     = List maps
+submenu.orgrole.create               = Create organisationrole
+submenu.orgrole.list                 = Organisation roles
+submenu.pages.create                 = Create content
+submenu.pages.list                   = List pages
+submenu.place.insertToken            = Insert placecode
+submenu.place.myGroups               = Place reservations
+submenu.place.placemap               = Placemap
+submenu.poll.index                   = Polls
+submenu.product.create               = Create product
+submenu.product.list                 = List products
+submenu.role.create                  = Create role
+submenu.role.list                    = Roles
+submenu.shop.createBill              = Shop
+submenu.shop.listReaders             = List readers
+submenu.shop.showReaderEvents        = Reader events
+submenu.user.accountEvents           = Account events
+submenu.user.changePassword          = Change password
+submenu.user.foodwave                = Food
+submenu.user.create                  = Create new user
+submenu.user.edit                    = User information
+submenu.user.invite                  = Invite friends
+submenu.user.manageuserlinks         = Manage users
+submenu.user.other                   = Other
+submenu.user.rolelinks               = Manage roles
+submenu.user.sendPicture             = Send picture
+submenu.user.shop                    = Shop
+submenu.user.userlinks               = User information
+submenu.useradmin.create             = Create user
+submenu.useradmin.createCardTemplate = Create cardtemplate
+submenu.useradmin.list               = List users
+submenu.useradmin.listCardTemplates  = Card templates
+submenu.useradmin.showTakePicture    = Show webcam
+submenu.useradmin.validateUser       = Validate user
+submenu.voting.compolist             = Compos
+submenu.voting.create                = Create new compo
+submenu.voting.myEntries             = My entries
+
+supernavi.admin = Adminview
+supernavi.user  = Userview
+
+svm.failure.errorMessage   = Payment error.
+svm.failure.successMessage = Payment error successfull\u2026 ( Possibly already marked paid )
+svm.pending.errorMessage   = Unknown error! If payment was successfull email will be sent after verification.
+svm.pending.successMessage = Payment pending. You will receive email after payment verification.
+svm.success.errorMessage   = Payment could not be verified!
+svm.success.successMessage = Payment was successfull. You can now your credits in the system.
+
+template.loggedInAs = Logged in as
+
+topnavi.adminshop = Adminshop
+topnavi.billing   = Billing
+topnavi.compos    = Compos
+topnavi.contents  = Site contents
+topnavi.foodwave  = Food
+topnavi.frontpage = Front page
+topnavi.log       = Log
+topnavi.maps      = Maps
+topnavi.placemap  = Map
+topnavi.poll      = Polls
+topnavi.products  = Products
+topnavi.shop      = Shop
+topnavi.user      = My properties
+topnavi.userinit  = User auth
+topnavi.usermgmt  = Users
+
+user.accountBalance             = Account balance
+user.accountEventHeader         = Account events
+user.accountevents              = Account events
+user.address                    = Address
+user.bank                       = Bank
+user.bankaccount                = Bank number
+user.birthday                   = Birthday
+user.cardPower                  = Usertype
+user.changePassword             = Change password
+user.changepassword.forUser     = For user
+user.changepassword.title       = Change password
+user.create                     = Create user
+user.createdmessage             = User has been created successfully. You can now login.
+user.defaultImage               = Default picture
+user.edit                       = Edit
+user.edit.title                 = My information
+user.food.title                 = Choose Menu
+user.foodwave.products.title    = Choose Products
+user.foodwavelist.title         = Choose Foodwave
+user.email                      = Email
+user.firstNames                 = Firstname
+user.hasImage                   = Image
+user.image                      = Image
+user.imagelist                  = Saved images
+user.imagesubmit                = Send image
+user.insert                     = Insert
+user.insertToken                = Insert token
+user.invalidLoginCredentials    = Invalid user credentials
+user.invite                     = Invite
+user.invite.header              = Accept invitation
+user.invitemail                 = Email address
+user.lastName                   = Lastname
+user.login                      = Login
+user.myGroups                   = My place reservations
+user.nick                       = Nick
+user.noAccountevents            = No account events
+user.noCurrentImage             = No image
+user.noImage                    = No image
+user.oldPassword                = Current password
+user.page.invite                = Invite friends
+user.password                   = Password
+user.passwordcheck              = Password ( again )
+user.passwordlengthMessage      = Password is too short! 
+user.phone                      = Tel
+user.realname                   = Name
+user.roles                      = Roles
+user.rolesave                   = Save roles
+user.save                       = Save
+user.saveFailed                 = Save failed, Not enough permissions!
+user.saveSuccessfull            = Changes saved successfully
+user.sendPicture                = Send image
+user.sex                        = Sex
+user.sex.FEMALE                 = Female
+user.sex.MALE                   = Male
+user.sex.UNDEFINED              = Undefined
+user.shop                       = Buy
+user.shop.title                 = Shop to user
+user.successfullySaved          = Changes saved successfully
+user.superadmin                 = Superadmin
+user.thisIsCurrentImage         = Current image
+user.town                       = City
+user.uploadimage                = Send image
+user.username                   = Username
+user.validate.notUniqueUsername = Username already exists. Please select another.
+user.validateUser.commit        = Send
+user.validateUser.header        = Please insert credentials
+user.wholeName                  = Name
+user.zipCode                    = Postal nr.
+
+userImport.commit = Commit
+
+userView.image = Image
+
+usercart.clear            = Clear Cart
+usercart.addSearchedUsers = Add searched users
+usercart.cartsize         = Size
+usercart.showCart         = Show usercart
+usercart.traverse         = Traverse
+
+userimage.webcam = Take picture with webcam
+
+userlist.header             = Users
+userlist.onlythisevent      = Limit to users of this event 
+userlist.placeassoc         = Assigned to place
+userlist.rolefilter         = Assigned roles
+userlist.saldofilter        = Saldo
+userlist.search             = Search
+userlist.showAdvancedSearch = Advanced search
+
+usertitle.managingUser = Shop
+
+userview.header             = Users
+userview.invalidEmail       = Invalid email address
+userview.loginstringFaulty  = Username has to be atleast 2 characters long!
+userview.oldPasswordError   = Invalid password!
+userview.passwordTooShort   = Password has to be atleast 5 characters long!
+userview.passwordsChanged   = Password changed
+userview.passwordsDontMatch = Passwords do not match! Please try again!
+userview.userExists         = Username already exists! please select another.
+
+viewexpired.body  = Please login again.
+viewexpired.title = Login expired. Please login again.
+
+voting.allcompos.curEntries        = # of entries
+voting.allcompos.descri            = Description
+voting.allcompos.description       = List of all compos and theirs information.
+voting.allcompos.endTime           = End time
+voting.allcompos.header            = All compos
+voting.allcompos.maxParts          = Max participants
+voting.allcompos.name              = Name
+voting.allcompos.startTime         = Start time
+voting.allcompos.submitEnd         = Submit end
+voting.allcompos.submitEntry       = Submit entry
+voting.allcompos.submitStart       = Submit start
+voting.allcompos.voteEnd           = Vote end
+voting.allcompos.voteStart         = Vote start
+voting.compo.submit                = Submit entry
+voting.compo.vote                  = Vote
+voting.compoentryadd.button        = Send
+voting.compoentryadd.description   = Add new entry to compo
+voting.compoentryadd.entryname     = Name
+voting.compoentryadd.file          = File
+voting.compoentryadd.notes         = Notes
+voting.compoentryadd.screenmessage = Screenmessage
+voting.compoentryadd.title         = Add entry
+voting.compoentryadd.uploadedFile  = File to 
+voting.compoentrysave.button       = Save
+voting.create.compoEnd             = End time
+voting.create.compoStart           = Start time
+voting.create.createButton         = Create
+voting.create.dateValidatorEndDate = End time before start time.
+voting.create.description          = Description
+voting.create.header               = Create compo
+voting.create.maxParticipants      = Max participants
+voting.create.name                 = Name
+voting.create.submitEnd            = Submit close
+voting.create.submitStart          = Submit start
+voting.create.voteEnd              = Voting close
+voting.create.voteStart            = Voting start

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

-
-acc_line.eventuser = Asiakas
-acc_line.nick      = Nimimerkki
-acc_line.product   = Tuote
-acc_line.quantity  = M\u00E4\u00E4r\u00E4
-acc_line.time      = Ostoaika
-
-accountEvent.commit      = Tallenna
-accountEvent.delivered   = Toimitettu
-accountEvent.edit        = Muokkaa
-accountEvent.eventTime   = Aika
-accountEvent.productname = Tuote
-accountEvent.quantity    = Lkm
-accountEvent.seller      = Myyj\u00E4
-accountEvent.total       = Yhteens\u00E4
-accountEvent.unitPrice   = Yksikk\u00F6hinta
-
-actionlog.create.header           = Luo uusi ActionMessage
-actionlog.create.message          = Viesti
-actionlog.create.role             = Kohderooli
-actionlog.create.submitbutton     = L\u00E4het\u00E4
-actionlog.create.taskradio        = Teht\u00E4v\u00E4
-actionlog.crew                    = Crew
-actionlog.message                 = Tapahtuma
-actionlog.messagelist.description = Voit seurata sek\u00E4 luoda uusia ActionMessageja t\u00E4ss\u00E4 n\u00E4kym\u00E4ss\u00E4.
-actionlog.messagelist.header      = Viestilista
-actionlog.messagestate.DONE       = Tehty
-actionlog.messagestate.NEW        = Uusi
-actionlog.messagestate.PENDING    = Ty\u00F6n alla
-actionlog.state                   = Tila
-actionlog.task                    = Teht\u00E4v\u00E4
-actionlog.tasklist.header         = Teht\u00E4v\u00E4lista
-actionlog.time                    = Aika
-actionlog.user                    = Tekij\u00E4
-
-applicationPermission.description = kuvaus
-applicationPermission.name        = Oikeusryhm\u00E4
-
-barcodeReader.readBarcode = Lue viivakoodi
-
-bill.addr1                = Osoite 1
-bill.addr2                = Osoite 2
-bill.addr3                = Osoite 3
-bill.addr4                = Osoite 4
-bill.addr5                = Osoite 5
-bill.address              = Maksajan osoite
-bill.billAmount           = Laskun summa
-bill.billIsPaid           = Lasku on maksettu
-bill.billLines            = Tuotteet
-bill.billNumber           = Laskun numero
-bill.billPaidDate         = Maksup\u00E4iv\u00E4
-bill.deliveryTerms        = Toimitusehdot
-bill.edit                 = Muokkaa
-bill.isPaid               = Maksettu
-bill.markPaid             = Maksettu
-bill.markedPaid           = Lasku merkitty maksetuksi.
-bill.notes                = Huomioita
-bill.noticetime           = Huomautusaika
-bill.ourReference         = Myyj\u00E4n viite
-bill.paidDate             = Maksup\u00E4iv\u00E4
-bill.payer                = Maksaja
-bill.paymentTime          = Maksuehdot
-bill.paymentTime.now      = Heti
-bill.printBill            = Tulosta lasku
-bill.receiverAddress      = Kauppiaan osoite
-bill.referenceNumberBase  = Viitenumeropohja
-bill.referencenumber      = Viitenumero
-bill.sentDate             = P\u00E4iv\u00E4ys
-bill.show                 = N\u00E4yt\u00E4
-bill.theirReference       = Asiakkaan viite
-bill.totalPrice           = Laskun summa
-bill.totalprice           = Yhteens\u00E4
-
-billLine.eventuser = Asiakas
-billLine.nick      = Nimimerkki
-billLine.price     = Kappalehinta
-billLine.product   = Tuote
-billLine.quantity  = M\u00E4\u00E4r\u00E4
-billLine.time      = Tilausaika
-
-billine.linePrice         = Yhteens\u00E4
-billine.name              = Tuote
-billine.quantity          = Lukum\u00E4\u00E4r\u00E4
-billine.referencedProduct = Tuoteviittaus
-billine.save              = Tallenna
-billine.unitName          = Yksikk\u00F6
-billine.unitPrice         = Yksikk\u00F6hinta
-billine.vat               = ALV
-
-bills.noBills = Ei laskuja
-
-card.massprint.title     = Tulosta kaikki
-
-cardTemplate.create      = Luo
-cardTemplate.edit        = Muokkaa
-cardTemplate.id          = Id
-cardTemplate.imageheader = Nykyinen pohja
-cardTemplate.name        = Korttipohja
-cardTemplate.power       = Teho
-cardTemplate.roles       = Yhdistetyt roolit
-cardTemplate.save        = Tallenna
-cardTemplate.sendImage   = Lataa kuva
-
-cart.item           = Tuote
-cart.item_quantity  = M\u00E4\u00E4r\u00E4
-cart.item_total     = Yhteens\u00E4
-cart.item_unitprice = Hinta
-cart.total          = Yhteens\u00E4
-
-checkout.cancel.errorMessage   = Virhe peruutuksen vahvistuksessa\u2026 Ilmoita t\u00E4st\u00E4 osoitteeseen code@codecrew.fi
-checkout.cancel.successMessage = Voit yritt\u00E4\u00E4 maksua uudelleen omista laskuistasi.
-checkout.reject.errorMessage   = Virhe hyl\u00E4tyn maksun k\u00E4sittelyss\u00E4. Raportoi t\u00E4m\u00E4 virhe osoitteeseen: code@codecrew.fi
-checkout.reject.successMessage = Maksu hyl\u00E4tty. Voit yritt\u00E4\u00E4 maksua uudelleen omista laskuistasi.
-checkout.return.errorDelayed   = Virhe viiv\u00E4stetyn maksun vahvistuksessa. Ota yhteytt\u00E4 code@codecrew.fi
-checkout.return.errorMessage   = Virhe maksun onnistuneen maksun vahvistuksessa. Raportoi t\u00E4m\u00E4 virhe yll\u00E4pidolle: code@codecrew.fi
-checkout.return.successDelayed = Viiv\u00E4stetty maksu onnistunut. Maksu vahvistet\u00E4\u00E4n my\u00F6hemp\u00E4n\u00E4 ajankohtana, yleens\u00E4 noin tunnin sis\u00E4ll\u00E4.
-checkout.return.successMessage = Maksu vahvistettu. Tuotteet on maksettu. Voit siirty\u00E4 eteenp\u00E4in tilauksessasi.
-
-compo.edit                = Muokkaa compoa
-compo.saveVotes           = Tallenna \u00E4\u00E4net
-compo.savesort            = Tallenna j\u00E4rjestys
-compo.votesSaved          = \u00C4\u00E4net tallennettu
-
-compofile.download        = lataa
-compofile.download.header = Lataa tiedosto
-compofile.upload          = L\u00E4het\u00E4 tiedosto
-
-discount.active     = Aktiivinen
-discount.amountMax  = Enimm\u00E4ism\u00E4\u00E4r\u00E4
-discount.amountMin  = V\u00E4himm\u00E4ism\u00E4\u00E4r\u00E4
-discount.code       = Alennuskoodi
-discount.create     = Luo uusi
-discount.details    = Tiedot
-discount.edit       = Muokkaa
-discount.maxNum     = Alennusten enimm\u00E4islkm
-discount.perUser    = Alennuksia per k\u00E4ytt\u00E4j\u00E4
-discount.percentage = Alennusprosentti
-discount.products   = Tuotteet
-discount.role       = Roolialennus
-discount.save       = Tallenna
-discount.shortdesc  = Kuvaus
-discount.validFrom  = Voimassa alkaen
-discount.validTo    = Voimassa asti
-
-editplace.header      = Muokkaa paikkaa
-
-editplacegroup.header = Paikkaryhm\u00E4n tiedot
-
-entry.edit = Muokkaa
-
-error.contact = Jos t\u00E4m\u00E4 toistuu, ota seuraava koodi talteen ja ota yhteys Infoon:
-error.error   = Olet kohdannut virheen.
-
-event.defaultRole         = K\u00E4ytt\u00E4jien oletusrooli
-event.edit                = Muokkaa
-event.endTime             = Lopetusp\u00E4iv\u00E4
-event.name                = Tapahtuman nimi
-event.nextBillNumber      = Seuraavan laskun numero
-event.referenceNumberBase = Viitenumeron pohja
-event.save                = Tallenna
-event.startTime           = Aloitusp\u00E4iv\u00E4
-
-eventdomain.domainname = Domain
-eventdomain.remove     = Poista
-
-eventmap.active          = Aktiivinen\u0009
-eventmap.buyable.like    = Paikat
-eventmap.buyable.lock    = Lukitse paikat
-eventmap.buyable.release = Vapauta paikat
-eventmap.name            = Kartan nimi
-eventmap.notes           = Lis\u00E4tiedot
-eventmap.save            = Tallenna
-
-eventorg.bankName1     = Pankin nimi 1
-eventorg.bankName2     = Pankin nimi 2
-eventorg.bankNumber1   = Tilinumero 1
-eventorg.bankNumber2   = Tilinumero 2
-eventorg.billAddress1  = Laskutusosoite 1
-eventorg.billAddress2  = Laskutusosoite 2
-eventorg.billAddress3  = Laskutusosoite 3
-eventorg.billAddress4  = Laskutusosoite 4
-eventorg.bundleCountry = Kieli-bundle
-eventorg.create        = Luo
-eventorg.createEvent   = Luo tapahtuma
-eventorg.createevent   = Luo uusi tapahtuma
-eventorg.edit          = Muokkaa
-eventorg.events        = Organisaation tapahtumat
-eventorg.organisation  = Organisaation nimi
-eventorg.save          = Tallenna
-
-eventorgView.eventname = Tapahtuman nimi
-
-eventorganiser.name = Tapahtumaj\u00E4rjest\u00E4j\u00E4
-
-feedback.canFeedback = Vituttaako?
-feedback.submit      = L\u00E4het\u00E4
-feedback.thanks      = Kiiiiitooooos! :)
-
-food = Ruoka
-
-foodWave.accountevents      = Maksetut tilaukset
-foodWave.activeFoodWaves    = Aktiiviset Ruokatilaukset
-foodWave.billLines          = Maksamattomat Verkkomaksut
-foodWave.deliveredFoodWaves = Toimitetut Ruokatilaukset
-foodWave.description        = Kuvaus
-foodWave.list               = Ruokatilaukset
-foodWave.name               = Ruokatilaus
-foodWave.orders             = Tilausten M\u00E4\u00E4r\u00E4
-foodWave.paid               = Maksettuja
-foodWave.show               = N\u00E4yt\u00E4
-foodWave.template.name      = Tilauspohja
-foodWave.template.waves     = Ruokatilaus
-foodWave.templatename       = Valitse tuotteet
-foodWave.time               = Aika
-foodWave.totalReserved      = Yhteens\u00E4
-foodWave.unconfirmedOrders  = Vahvistamattomia
-
-foodadmin.editTemplate = Muokkaa
-
-foodshop.buyAndPay       = Varaa ja maksa
-foodshop.buyFromCounter  = Maksa infossa
-foodshop.buyFromInternet = Maksa Internetiss\u00E4
-foodshop.total           = Yhteens\u00E4
-
-foodwave.buyInPrice                 = Sis\u00E4\u00E4nostohinta
-foodwave.foodwaveBuyInPrice         = Sis\u00E4\u00E4nostohinta
-foodwave.markPaid                   = Merkitty maksetuksi
-foodwave.orders                     = Maksetut Tilaukset
-foodwave.price                      = Tilausten kokonaishinta
-foodwave.summaryView                = Ruokatilauksen Yhteenveto
-foodwave.template.basicinfo         = Template Infot
-foodwave.template.description       = Kuvaus
-foodwave.template.edit.title        = Foodwave Template Editori
-foodwave.template.list.title        = Ruokatilaus Templatet
-foodwave.template.name              = Nimi
-foodwave.template.selectproducts    = Tuotteet
-foodwave.totalCount                 = M\u00E4\u00E4r\u00E4
-foodwave.totalPrice                 = Asiakkaan Hinta
-
-foodwaveTemplate.name = Nimi
-
-foodwavetemplate.actions            = Toimet
-foodwavetemplate.addproduct         = Lis\u00E4\u00E4
-foodwavetemplate.basicinfo          = Tilauspohja
-foodwavetemplate.createFoodwave     = Luo ruokatilaus
-foodwavetemplate.createwave         = Luo tilauspohja
-foodwavetemplate.description        = Kuvaus
-foodwavetemplate.edit               = Muokkaa tilauspohjaa
-foodwavetemplate.editRow            = Muokkaa
-foodwavetemplate.maxfoods           = Tilausten enimm\u00E4ism\u00E4\u00E4r\u00E4
-foodwavetemplate.name               = Nimi
-foodwavetemplate.price              = Hinta
-foodwavetemplate.productdescription = Kuvaus
-foodwavetemplate.productname        = Nimi\n
-foodwavetemplate.removeFromList     = Poista
-foodwavetemplate.save               = Ok
-foodwavetemplate.savetemplate       = Tallenna
-foodwavetemplate.selectproducts     = Tuotteet
-foodwavetemplate.startTime          = Tilausaika
-foodwavetemplate.waveName           = Tilauksen nimi
-
-game.gamepoints = Insomnia Game pisteet:
-
-gamepoints = Pelipisteit\u00E4
-
-global.cancel               = Peruuta
-global.copyright            = Codecrew Ry
-global.eventname            = Tapahtumanimi
-global.notAuthorizedExecute = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia suorittaa t\u00E4t\u00E4 toimenpidett\u00E4!
-global.notauthorized        = Sinulla ei ole riitt\u00E4vi\u00E4 oikeuksia t\u00E4lle sivulle.
-global.save                 = Tallenna
-
-httpsession.creationTime          = Luotu
-httpsession.id                    = ID
-httpsession.invalidate            = Mit\u00E4t\u00F6i
-httpsession.invalidateSuccessfull = Sessio onnistuneesti mit\uFFFDt\uFFFDity
-httpsession.isSessionNew          = Uusi sessio
-httpsession.lastAccessedTime      = Viimeksi n\uFFFDhty
-httpsession.maxInactiveInterval   = Aikakatkaisu (s)
-httpsession.sessionHasExisted     = Ollut elossa (s)
-httpsession.user                  = Tunnus
-
-imagefile.description = Kuvaus
-imagefile.file        = Kuvatiedosto
-
-importuser.file     = Tiedosto
-importuser.template = Malli
-
-index.title = Etusivu
-
-invite.emailexists           = J\u00E4rjestelm\u00E4ss\u00E4 on jo k\u00E4ytt\u00E4j\u00E4tunnus samalla s\u00E4hk\u00F6postiosoitteella.
-invite.notFound              = Kutsu virheellinen tai jo k\u00E4ytetty.
-invite.successfull           = Kutsu l\u00E4hetetty
-invite.userCreateSuccessfull = K\u00E4ytt\u00E4j\u00E4tunnus luotu onnistuneesti. Voit nyt kirjautua sis\u00E4\u00E4n j\u00E4rjeselm\u00E4\u00E4n.
-
-javax.validation.constraints.AssertFalse.message = must be false
-javax.validation.constraints.AssertTrue.message  = must be true
-javax.validation.constraints.DecimalMax.message  = must be less than or equal to {value}
-javax.validation.constraints.DecimalMin.message  = must be greater than or equal to {value}
-javax.validation.constraints.Digits.message      = numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
-javax.validation.constraints.Future.message      = must be in the future
-javax.validation.constraints.Max.message         = must be less than or equal to {value}
-javax.validation.constraints.Min.message         = must be greater than or equal to {value}
-javax.validation.constraints.NotNull.message     = may not be null
-javax.validation.constraints.Null.message        = must be null
-javax.validation.constraints.Past.message        = must be in the past
-javax.validation.constraints.Pattern.message     = must match "{regexp}"
-javax.validation.constraints.Size.message        = size must be between {min} and {max}
-
-layout.editBottom  = Muokkaa alasis\u00E4lt\u00F6\u00E4
-layout.editContent = Muokkaa sis\u00E4lt\u00F6\u00E4
-layout.editTop     = Muokkaa yl\u00E4sis\u00E4lt\u00F6\u00E4
-
-login.login              = Kirjaudu sis\u00E4\u00E4n
-login.logout             = Kirjaudu ulos
-login.logoutmessage      = Olet kirjautunut ulos j\u00E4rjestelm\u00E4st\u00E4.
-login.password           = Salasana
-login.submit             = Kirjaudu sis\u00E4\u00E4n
-login.username           = K\u00E4ytt\u00E4j\u00E4tunnus
-
-loginerror.header        = Kirjautuminen ep\u00E4onnistui
-loginerror.message       = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana ei ollut oikein.
-loginerror.resetpassword = Salasana unohtunut?
-
-map.edit                          = Muokkaa
-map.generate                      = Generoi paikat
-map.height                        = Paikan korkeus (px)
-map.id                            = #
-map.name                          = Nimi
-map.namebase                      = Puolipisteell\u00E4 erotetut p\u00F6yt\u00E4-etuliitteet
-map.oneRowTable                   = Yhden rivin p\u00F6yd\u00E4t
-map.placesInRow                   = Paikkoja riviss\u00E4
-map.product                       = Paikkatuote
-map.startX                        = P\u00F6yd\u00E4n X-aloituskoord. 
-map.startY                        = P\u00F6yd\u00E4n Y-aloituskoord. 
-map.submitMap                     = L\u00E4het\u00E4 karttapohja
-map.tableCount                    = P\u00F6ytien lukum\u00E4\u00E4r\u00E4
-map.tableXdiff                    = P\u00F6ytien v\u00E4li ( X )
-map.tableYdiff                    = P\u00F6ytien v\u00E4li ( Y )
-map.tablesHorizontal              = P\u00F6yd\u00E4t vaakatasossa
-map.width                         = Leveys (px)
-
-mapEdit.removePlaces = Poista kaikki paikat
-
-mapManage.lockedPlaces   = Lukittu kartasta {0} paikkaa.
-mapManage.releasedPlaces = Vapautettu kartasta {0} paikkaa 
-
-mapView.buyPlaces                 = Lukitse valitut paikat
-mapView.errorWhenReleasingPlace   = Paikkaa vapauttassa tapahtui virhe.
-mapView.errorWhenReservingPlace   = Paikkaa varatessa tapahtui virhe.
-mapView.errorWhileBuyingPlaces    = Virhe paikkojen ostossa. Ole hyv\u00E4 ja yrit\u00E4 uudelleen. Jos virhe toistuu ota yhteytt\u00E4 j\u00E4rjest\u00E4jiin.
-mapView.notEnoughCreditsToReserve = Sinulla ei ole riitt\u00E4v\u00E4sti suoritettuja konepaikkamaksuja t\u00E4m\u00E4n paikan varaamiseen.
-
-menu.index           = Etusivu
-menu.name            = Nimi
-menu.place.placemap  = Paikkakartta
-menu.poll.index      = Kyselyt
-menu.select          = Valitse
-menu.shop.createBill = Kauppa
-menu.sort            = J\u00E4rjest\u00E4
-menu.user.edit       = Omat tiedot
-
-news.abstract        = Lyhennelm\u00E4
-news.expire          = Lopeta julkaisu
-news.publish         = Julkaise
-news.save            = Tallenna
-news.title           = Otsikko
-
-newsgroup.edit       = Muokkaa
-newsgroup.name       = Uutisryhm\u00E4n nimi
-newsgroup.priority   = J\u00E4rjestysnumero
-newsgroup.readerRole = Lukijoiden roolit
-newsgroup.writerRole = Kirjoittajaryhm\u00E4
-
-newslist.header = Uutisryhm\u00E4t
-
-org.hibernate.validator.constraints.Email.message    = not a well-formed email address
-org.hibernate.validator.constraints.Length.message   = length must be between {min} and {max}
-org.hibernate.validator.constraints.NotEmpty.message = may not be empty
-org.hibernate.validator.constraints.Range.message    = must be between {min} and {max}
-
-orgrole.create  = Luo
-orgrole.name    = Nimi
-orgrole.parents = Periytyy
-
-page.account.list.header                 = Tilitapahtumat
-page.auth.loginerror.header              = kirjautuminen ep\u00E4onnistui
-page.auth.logout.header                  = Uloskirjautuminen
-page.auth.logoutsuccess.header           = Logout
-page.auth.resetPassword.header           = Nollaa salasana
-page.bill.billSummary.header             = Laskujen yhteenveto
-page.bill.list.header                    = Laskut
-page.bill.show.header                    = Laskun tiedot
-page.checkout.cancel.header              = Maksu peruutettu.
-page.checkout.delayed.header             = Viiv\u00E4stetty maksu
-page.checkout.reject.header              = Maksu hyl\u00E4tty!
-page.checkout.return.header              = Maksu vahvistettu
-page.place.insertToken.header            = Sy\u00F6t\u00E4 paikkakoodi
-page.place.mygroups.header               = Paikkaryhm\u00E4t
-page.place.placemap.header               = Paikkakartta
-page.product.createBill.header           = Osta tuotteita
-page.product.validateBillProducts.header = Lasku luotu
-page.svm.failure.header                  = Verkkomaksuvirhe
-page.svm.pending.header                  = Maksukuittausta odotetaan
-page.svm.success.header                  = Verkkomaksu onnistui
-page.user.create.header                  = Luo uusi k\u00E4ytt\u00E4j\u00E4
-
-pagination.firstpage    = Ensimm\u00E4inen
-pagination.lastpage     = Viimeinen
-pagination.nextpage     = Seuraava
-pagination.pages        = Sivuja
-pagination.previouspage = Edellinen
-pagination.results      = Tuloksia
-
-passwordChanged.body   = Voit nyt kirjautua k\u00E4ytt\u00E4j\u00E4tunnuksella ja uudella salasanalla sis\u00E4\u00E4n j\u00E4rjestelm\u00E4\u00E4n.
-passwordChanged.header = Salasana vaihdettu onnistuneesti
-
-passwordReset.errorChanging = Odotamaton virhe. Ota yhteytt\u00E4 yll\u00E4pitoon.
-passwordReset.hashNotFound  = Salasanan vaihto on vanhentunut. Jos haluat vaihtaa salasanan l\u00E4het\u00E4 vaihtopyynt\u00F6 uudelleen.
-
-passwordreset.mailBody     = Voit vaihtaa salasanasi osoitteessa {0}\n\nJos et ole pyyt\u00E4nyt unohtuneen salasanan vaihtamista, ei t\u00E4h\u00E4n viestiin tarvitse reagoida.\n\nTerveisin,\nInsomnia lippupalvelu\nwww.insomnia.fi
-passwordreset.mailSubject  = [INSOMNIA] Salasanan vaihtaminen
-passwordreset.usernotfound = Annettua k\u00E4ytt\u00E4j\u00E4tunnusta ei l\u00F6ydy. Huomioi ett\u00E4 isot ja pienet kirjaimet ovat merkitsevi\u00E4.
-
-permissiondenied.alreadyLoggedIn = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia!
-permissiondenied.header          = P\u00E4\u00E4sy kielletty
-permissiondenied.notLoggedIn     = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia t\u00E4lle sivulle. 
-
-place.buyable                     = Ostettavissa
-place.code                        = Paikkakoodi
-place.commit                      = Tallenna
-place.description                 = Kuvaus
-place.details                     = Tiedot
-place.edit                        = Muokkaa
-place.groupremove                 = Poista paikka paikkaryhm\u00E4st\u00E4
-place.height                      = Korkeus
-place.id                          = ID
-place.mapX                        = X
-place.mapY                        = Y
-place.membership                  = Yhdistetty k\u00E4ytt\u00E4j\u00E4
-place.name                        = Nimi
-place.noReserver                  = Ei liitetty k\u00E4ytt\u00E4j\u00E4\u00E4n
-place.product                     = Tuote
-place.releasetime                 = Vapautusaika
-place.width                       = Leveys
-
-placeSelect.legend.blue      = Oma valittu paikka
-placeSelect.legend.green     = Oma ostettu paikka
-placeSelect.legend.grey      = Vapautetaan tarvittaessa
-placeSelect.legend.red       = Varattu paikka
-placeSelect.legend.white     = Vapaa paikka
-placeSelect.placeName        = Paikka
-placeSelect.placePrice       = Paikan hinta
-placeSelect.placeProductName = Paikan tyyppi
-placeSelect.placesleft       = Paikkoja j\u00E4ljell\u00E4
-placeSelect.reservationPrice = Tilauksen hinta
-placeSelect.reservedPlaces   = Valitut paikat
-placeSelect.totalPlaces      = Paikkoja yhteens\u00E4
-
-placegroup.created                = Luotu
-placegroup.creator                = Varaaja
-placegroup.details                = Tiedot
-placegroup.edit                   = N\u00E4yt\u00E4
-placegroup.edited                 = Muokattu
-placegroup.name                   = Nimi
-placegroup.placename              = Paikka
-placegroup.places                 = Paikat
-placegroup.printPdf               = Tulosta paikkakoodit
-
-placegroupview.groupCreator       = Varaaja
-placegroupview.header             = Omat paikat
-placegroupview.noMemberships      = Ei omia paikkoja
-placegroupview.placeReleaseFailed = Paikan vapauttaminen ep\u00E4onnistui!
-placegroupview.placeReleased      = Paikka {0} vapautettu 
-placegroupview.releasePlace       = Vapauta
-placegroupview.reservationName    = Paikka
-placegroupview.reservationProduct = Tuote
-placegroupview.token              = Paikkakoodi / k\u00E4ytt\u00E4j\u00E4
-
-placetoken.commit        = Liit\u00E4
-placetoken.pageHeader    = Lis\u00E4\u00E4 konepaikkakoodi
-placetoken.placelist     = Omat paikat
-placetoken.token         = Paikkakoodi
-placetoken.tokenNotFound = Paikkakoodia ei l\u00F6ytynyt! Tarkista koodi.
-placetoken.topText       = Voit yhdist\u00E4\u00E4 paikan omaan k\u00E4ytt\u00E4j\u00E4tunnukseesi sy\u00F6tt\u00E4m\u00E4ll\u00E4 paikkakoodin allaolevaan kentt\u00E4\u00E4n.
-
-poll.answer      = Vastaa kyselyyn
-poll.begin       = Avaa kysely
-poll.create      = Luo
-poll.description = Kuvaus
-poll.edit        = Muokkaa
-poll.end         = Sulje kysely
-poll.name        = Kyselyn nimi
-poll.save        = L\u00E4het\u00E4 vastauksesi
-
-product.barcode             = Viivakoodi
-product.billed              = Laskutettu
-product.boughtTotal         = Tuotteita laskutettu
-product.cart.count          = Ostoskoriin
-product.cashed              = Ostettu k\u00E4teisell\u00E4
-product.color               = V\u00E4ri k\u00E4ytt\u00F6liittym\u00E4ss\u00E4
-product.create              = Luo tuote
-product.createDiscount      = Lis\u00E4\u00E4 m\u00E4\u00E4r\u00E4alennus
-product.edit                = Muokkaa
-product.name                = Tuotteen nimi
-product.paid                = Maksettu
-product.prepaid             = Prepaid
-product.prepaidInstant      = Luodaan kun prepaid maksetaan
-product.price               = Tuotteen hinta
-product.providedRole        = Tuote m\u00E4\u00E4ritt\u00E4\u00E4 roolin
-product.save                = Tallenna
-product.shopInstant         = Luo k\u00E4teismaksu tuotteille
-product.sort                = J\u00E4rjestys luku
-product.totalPrice          = Summa
-product.unitName            = Tuoteyksikk\u00F6
-product.vat                 = ALV
-
-productShopView.readBarcode = Lue viivakoodi
-
-products.save             = Tallenna
-
-productshop.billCreated   = Lasku luotu
-productshop.commit        = Osta
-productshop.limits        = Vapaana
-productshop.minusOne      = -1
-productshop.minusTen      = -10
-productshop.noItemsInCart = Ostoskorissa ei ole tuotteita
-productshop.plusOne       = +1
-productshop.plusTen       = +10
-productshop.total         = Yhteens\u00E4
-
-reader.assocToCard           = Yhdist\u00E4 korttiin
-reader.automaticProduct      = Oletustuote
-reader.automaticProductCount = M\u00E4\u00E4r\u00E4
-reader.createNewCard         = Luo uusi kortti
-reader.description           = Kuvaus
-reader.edit                  = Muokkaa
-reader.identification        = Tunniste
-reader.name                  = Lukijan nimi
-reader.save                  = Tallenna
-reader.select                = Valitse lukija
-reader.tag                   = Tag
-reader.type                  = Tyyppi
-reader.user                  = K\u00E4ytt\u00E4j\u00E4
-
-readerView.searchforuser = Etsi k\u00E4ytt\u00E4j\u00E4\u00E4
-
-readerevent.associateToUser = Yhdist\u00E4 k\u00E4ytt\u00E4j\u00E4\u00E4n
-readerevent.seenSince       = N\u00E4hty viimeksi
-readerevent.shopToUser      = Osta k\u00E4ytt\u00E4j\u00E4lle
-readerevent.tagname         = Tagi
-
-readerview.cards = Kortit ( tulostuslkm )
-
-resetMail.body     = Voit vaihtaa unohtuneen salasanan sy\u00F6tt\u00E4m\u00E4ll\u00E4 k\u00E4ytt\u00E4j\u00E4tunnuksesi allaolevaan kentt\u00E4\u00E4n. Tunnukseen liitettyyn s\u00E4hk\u00F6postiosoitteeseen l\u00E4hetet\u00E4\u00E4n kertak\u00E4ytt\u00F6inen osoite jossa voit vaihtaa sy\u00F6tt\u00E4m\u00E4si k\u00E4ytt\u00E4j\u00E4tunnuksen salasanan.
-resetMail.header   = Salasana unohtunut?
-resetMail.send     = L\u00E4het\u00E4 s\u00E4hk\u00F6posti
-resetMail.username = K\u00E4ytt\u00E4j\u00E4tunnus
-
-resetmailSent.body   = Antamasi k\u00E4ytt\u00E4j\u00E4tunnuksen s\u00E4hk\u00F6postiosoitteeseen on l\u00E4hetetty osoite jossa voit vaihtaa tunnuksen salasanan.
-resetmailSent.header = S\u00E4hk\u00F6posti l\u00E4hetetty
-
-rfidevent.empty      = Tyhj\u00E4
-rfidevent.reader     = Lukija
-rfidevent.searchuser = Hae k\u00E4ytt\u00E4j\u00E4\u00E4
-rfidevent.tag        = T\u00E4gi
-
-role.cardtemplate    = Korttipohja
-role.create          = Luo rooli
-role.description     = Kuvaus
-role.edit            = Muokkaa
-role.edit.save       = Tallenna
-role.name            = Nimi
-role.parents         = Periytyy
-role.savePermissions = Tallenna oikeudet
-
-salespoint.edit          = Muokkaa
-salespoint.name          = Nimi
-salespoint.noSalesPoints = M\u00E4\u00E4r\u00E4
-
-sendPicture.header = L\u00E4het\u00E4 kuva
-
-shop.accountBalance = Tilin saldo
-shop.cash           = K\u00E4teispano
-shop.readBarcode    = Lue viivakoodi
-shop.totalPrice     = Tuotteiden hinta
-shop.user           = Myyd\u00E4\u00E4n
-
-sidebar.bill.list           = Omat laskut
-sidebar.bill.listAll        = Kaikki laskut
-sidebar.bill.summary        = Laskujen yhteenveto
-sidebar.bills               = Laskut
-sidebar.cardTemplate.create = Uusi korttipohja
-sidebar.cardTemplate.list   = N\u00E4yt\u00E4 korttipohjat
-sidebar.createuser          = Rekister\u00F6idy uudeksi k\u00E4ytt\u00E4j\u00E4ksi
-sidebar.eventorg.list       = Omat organisaatiot
-sidebar.map.list            = Kartat
-sidebar.map.placemap        = Paikkakartta
-sidebar.maps                = Kartat
-sidebar.other               = Muuta
-sidebar.product.create      = Uusi tuote
-sidebar.product.createBill  = Luo lasku
-sidebar.product.list        = Tuotteet
-sidebar.products            = Tuotteet
-sidebar.role.create         = Uusi rooli
-sidebar.role.list           = Roolit
-sidebar.roles               = Roolit
-sidebar.shop.readerEvents   = Lukijan tapahtumat
-sidebar.shop.readerlist     = N\u00E4yt\u00E4 lukijat
-sidebar.user.create         = Uusi k\u00E4ytt\u00E4j\u00E4
-sidebar.user.list           = K\u00E4ytt\u00E4j\u00E4t
-sidebar.users               = K\u00E4ytt\u00E4j\u00E4t
-sidebar.utils.flushCache    = Flush Cache
-sidebar.utils.testdata      = Testdata
-
-sitepage.addContent = Lis\u00E4\u00E4 sis\u00E4lt\u00F6laatikko
-sitepage.create     = Luo uusi
-sitepage.edit       = Muokkaa
-sitepage.name       = Sivun nimi
-sitepage.roles      = N\u00E4ytet\u00E4\u00E4n rooleille
-sitepage.save       = Tallenna
-
-sitepagelist.header = Sivuston sis\u00E4ll\u00F6t
-
-submenu.auth.login                   = Kirjaudu
-submenu.auth.logoutResponse          = Uloskirjautuminen onnistui
-submenu.auth.sendResetMail           = Salasanan palautus
-submenu.bill.billSummary             = Laskujen yhteenveto
-submenu.bill.list                    = N\u00E4yt\u00E4 omat laskut
-submenu.bill.listAll                 = Kaikki laskut
-submenu.foodadmin.createTemplate     = Luo tilauspohja 
-submenu.foodadmin.listTemplates      = Muokkaa tilauspohjia
-submenu.foodmanager.listFoodwaves    = Aktiiviset ruokatilaukset
-submenu.foodwave.list                = Avoimet tilaukset
-submenu.index                        = Etusivu
-submenu.map.create                   = Uusi kartta
-submenu.map.list                     = N\u00E4yt\u00E4 kartat
-submenu.orgrole.create               = Luo j\u00E4rjest\u00E4j\u00E4rooli
-submenu.orgrole.list                 = J\u00E4rjest\u00E4j\u00E4roolit
-submenu.pages.create                 = Luo sis\u00E4lt\u00F6\u00E4
-submenu.pages.list                   = N\u00E4yt\u00E4 sis\u00E4ll\u00F6t
-submenu.place.insertToken            = Sy\u00F6t\u00E4 paikkakoodi
-submenu.place.myGroups               = Omat paikkavaraukset
-submenu.place.placemap               = Paikkakartta
-submenu.poll.index                   = Kyselyt
-submenu.product.create               = Uusi tuote
-submenu.product.list                 = Listaa tuotteet
-submenu.role.create                  = Luo rooli
-submenu.role.list                    = Roolit
-submenu.shop.createBill              = Luo lasku
-submenu.shop.listReaders             = N\u00E4yt\u00E4 lukijat
-submenu.shop.showReaderEvents        = Lukijan tapahtumat
-submenu.user.accountEvents           = Tilitapahtumat
-submenu.user.changePassword          = Vaihda salasana
-submenu.user.create                  = Luo k\u00E4ytt\u00E4j\u00E4
-submenu.user.createCardTemplate      = Luo korttiryhm\u00E4
-submenu.user.edit                    = K\u00E4ytt\u00E4j\u00E4n tiedot
-submenu.user.foodwave                = Ruoka
-submenu.user.invite                  = Kutsu yst\u00E4vi\u00E4
-submenu.user.list                    = Kaikki k\u00E4ytt\u00E4j\u00E4t
-submenu.user.listCardTemplates       = Korttiryhm\u00E4t
-submenu.user.manageuserlinks         = Hallitse k\u00E4ytt\u00E4ji\u00E4
-submenu.user.other                   = Muuta
-submenu.user.rolelinks               = Hallitse rooleja
-submenu.user.sendPicture             = L\u00E4het\u00E4 kuva
-submenu.user.shop                    = Kauppaan
-submenu.user.userlinks               = Muokkaa tietoja
-submenu.useradmin.create             = Luo uusi k\u00E4ytt\u00E4j\u00E4
-submenu.useradmin.createCardTemplate = Luo uusi korttipohja
-submenu.useradmin.list               = Listaa k\u00E4ytt\u00E4j\u00E4t
-submenu.useradmin.listCardTemplates  = Listaa korttipohjat
-submenu.useradmin.showTakePicture    = N\u00E4yt\u00E4 webcam
-submenu.useradmin.validateUser       = Validoi k\u00E4ytt\u00E4j\u00E4
-submenu.voting.compolist             = Kilpailut
-submenu.voting.create                = Uusi kilpailu
-submenu.voting.myEntries             = Omat entryt
-
-supernavi.admin = Yll\u00E4piton\u00E4kym\u00E4
-supernavi.user  = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
-
-svm.failure.errorMessage   = Verkkomaksuvirhe.
-svm.failure.successMessage = Maksuvirhe onnistunut. ( Maksu mahdollisesti merkitty jo maksetuksi )
-svm.pending.errorMessage   = Maksukuittausta odotetaan. Kuittauksesta l\u00E4hetet\u00E4\u00E4n ilmoitus s\u00E4hk\u00F6postitse.
-svm.pending.successMessage = Maksukuittausta odotetaan. Kuittauksesta l\u00E4hetet\u00E4\u00E4n ilmoitus s\u00E4hk\u00F6postitse.
-svm.success.errorMessage   = Verkkomaksua ei voitu verifioida! Virheest\u00E4 on raportoitu eteenp\u00E4in.
-svm.success.successMessage = Verkkomaksu onnistui. 
-
-template.loggedInAs = Kirjautunut tunnuksella:
-
-topnavi.adminshop = Kauppa
-topnavi.billing   = Laskutus
-topnavi.compos    = Kilpailut
-topnavi.contents  = Sivuston sis\u00E4lt\u00F6
-topnavi.foodwave  = Ruokatilaus
-topnavi.frontpage = Etusivu
-topnavi.log       = Logi
-topnavi.maps      = Kartat
-topnavi.placemap  = Paikkakartta
-topnavi.poll      = Kyselyt
-topnavi.products  = Tuotteet
-topnavi.shop      = Kauppa
-topnavi.user      = Omat tiedot
-topnavi.userinit  = K\u00E4ytt\u00E4j\u00E4n tunnistus
-topnavi.usermgmt  = K\u00E4ytt\u00E4j\u00E4t
-
-user.accountBalance             = Tilin saldo
-user.accountEventHeader         = Tilitapahtumat
-user.accountevents              = Tilitapahtumat
-user.address                    = Osoite
-user.bank                       = Pankki
-user.bankaccount                = Pankkitili
-user.birthday                   = Syntym\u00E4p\u00E4iv\u00E4
-user.cardPower                  = K\u00E4ytt\u00E4j\u00E4tyyppi
-user.changePassword             = Vaihda salasana
-user.changepassword.forUser     = K\u00E4ytt\u00E4j\u00E4lle
-user.changepassword.title       = Vaihda salasana
-user.create                     = Luo k\u00E4ytt\u00E4j\u00E4
-user.createdmessage             = K\u00E4ytt\u00E4j\u00E4tunnus on luotu onnistuneesti. Voit nyt kirjautua sis\u00E4\u00E4n.
-user.defaultImage               = Oletukuva
-user.edit                       = Muokkaa
-user.edit.title                 = Omat tiedot
-user.email                      = S\u00E4hk\u00F6posti
-user.firstNames                 = Etunimi
-user.food.title                 = Valitse Menu
-user.foodwave.products.title    = Valitse tuotteet
-user.foodwavelist.title         = Valitse Ruokatilaus
-user.hasImage                   = Kuva
-user.imageUploaded              = Kuva l\u00E4hetetty.
-user.imagelist                  = Tallennetut kuvat
-user.imagesubmit                = L\u00E4het\u00E4 kuva
-user.insert                     = Sy\u00F6t\u00E4 arvo
-user.invalidLoginCredentials    = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana v\u00E4\u00E4rin.
-user.invite                     = Kutsu
-user.invite.header              = Luo k\u00E4ytt\u00E4j\u00E4 kutsusta
-user.invitemail                 = S\u00E4hk\u00F6postiosoite
-user.lastName                   = Sukunimi
-user.login                      = K\u00E4ytt\u00E4j\u00E4tunnus
-user.nick                       = Nick
-user.noAccountevents            = Ei tilitapahtumia
-user.noCurrentImage             = Ei kuvaa
-user.noImage                    = EI kuvaa
-user.oldPassword                = Nykyinen salasana
-user.page.invite                = Kutsu yst\u00E4vi\u00E4
-user.password                   = Salasana
-user.passwordcheck              = Salasana ( uudelleen )
-user.passwordlengthMessage      = Salasana liian lyhyt 
-user.phone                      = Puhelin
-user.placegroups                = Omat paikkaryhm\u00E4t
-user.realname                   = Nimi
-user.roles                      = Roolit
-user.rolesave                   = Tallenna roolit
-user.save                       = Tallenna
-user.sendPicture                = Kuvan l\u00E4hetys
-user.sex                        = Sukupuoli
-user.sex.FEMALE                 = Nainen
-user.sex.MALE                   = Mies
-user.sex.UNDEFINED              = M\u00E4\u00E4rittelem\u00E4tt\u00E4
-user.shop                       = Osta
-user.shop.title                 = Osta k\u00E4ytt\u00E4j\u00E4lle
-user.successfullySaved          = Tiedot tallennettu onnistuneesti
-user.superadmin                 = Superadmin
-user.thisIsCurrentImage         = Nykyinen kuva
-user.town                       = Kaupunki
-user.uploadimage                = L\u00E4het\u00E4 kuva
-user.username                   = K\u00E4ytt\u00E4j\u00E4tunnus
-user.validate.notUniqueUsername = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole hyv\u00E4 ja valitse toinen tunnus
-user.validateUser.commit        = L\u00E4het\u00E4
-user.validateUser.header        = Ole hyv\u00E4 ja sy\u00F6t\u00E4 kirjautumistiedot
-user.wholeName                  = Nimi
-user.zipCode                    = Postinumero
-
-userImport.commit = Hyv\u00E4ksy
-
-userView.image = Kuva
-
-usercart.addSearchedUsers = Lis\u00E4\u00E4 haetut k\u00E4ytt\u00E4j\u00E4t
-usercart.cartsize         = Koko
-usercart.clear            = Tyhjenn\u00E4 k\u00E4ytt\u00E4j\u00E4kori
-usercart.showCart         = K\u00E4ytt\u00E4j\u00E4kori
-usercart.traverse         = K\u00E4y l\u00E4pi
-
-userimage.webcam = Ota kuva webkameralla
-
-userlist.header             = Etsi k\u00E4ytt\u00E4ji\u00E4
-userlist.onlythisevent      = Vain t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E4j\u00E4t
-userlist.placeassoc         = Liitetty paikkaan
-userlist.rolefilter         = Annetut roolit
-userlist.saldofilter        = Tilin saldo
-userlist.search             = Etsi
-userlist.showAdvancedSearch = Tarkennettu haku
-
-usertitle.managingUser = Kauppa
-
-userview.invalidEmail       = Virheeliinen s\u00E4hk\u00F6postiosoite
-userview.loginstringFaulty  = K\u00E4ytt\u00E4j\u00E4tunnus virheellinen. Pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n kaksi merkki\u00E4 pitk\u00E4.
-userview.oldPasswordError   = V\u00E4\u00E4r\u00E4 salasana!
-userview.passwordTooShort   = Salasana liian lyhyt. Pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n {0} merkki\u00E4 pitk\u00E4.
-userview.passwordsChanged   = Salasana vaihdettu
-userview.passwordsDontMatch = Salasanat eiv\u00E4t ole samat! Ole hyv\u00E4 ja sy\u00F6t\u00E4 salasanat uudelleen.
-userview.userExists         = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole hyv\u00E4 ja valitse toinen tunnus.
-
-viewexpired.body  = Ole hyv\u00E4 ja kirjaudu sis\u00E4\u00E4n uudelleen.
-viewexpired.title = N\u00E4kym\u00E4 on vanhentunut
-
-voting.allcompos.curEntries        = Entryja
-voting.allcompos.descri            = Kuvaus
-voting.allcompos.description       = Compojen informaatiot.
-voting.allcompos.endTime           = Lopetusaika
-voting.allcompos.header            = Kaikki compot
-voting.allcompos.maxParts          = Max osallistujam\u00E4\u00E4r\u00E4
-voting.allcompos.name              = Nimi
-voting.allcompos.startTime         = Aloitusaika
-voting.allcompos.submitEnd         = Lis\u00E4ys kiinni
-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.vote                  = \u00C4\u00E4nest\u00E4
-voting.compoentryadd.button        = L\u00E4het\u00E4
-voting.compoentryadd.description   = Lis\u00E4\u00E4 uusi entry compoon
-voting.compoentryadd.entryname     = Nimi
-voting.compoentryadd.file          = Tiedosto
-voting.compoentryadd.notes         = Huomatuksia
-voting.compoentryadd.screenmessage = Screenmessage
-voting.compoentryadd.title         = Lis\u00E4\u00E4 entry
-voting.compoentryadd.uploadedFile  = asdsda
-voting.compoentrysave.button       = Tallenna
-voting.create.compoEnd             = Lopetusaika
-voting.create.compoStart           = Aloitusaika
-voting.create.createButton         = Luo
-voting.create.dateValidatorEndDate = Loppumisaika ennen alkua.
-voting.create.description          = Kuvaus
-voting.create.header               = Compon luonti
-voting.create.maxParticipants      = Max osallistujat
-voting.create.name                 = Nimi
-voting.create.submitEnd            = Submit kiinni
-voting.create.submitStart          = Submit auki
-voting.create.voteEnd              = \u00C4\u00E4nestys kiinni
-voting.create.voteStart            = \u00C4\u00E4nestys auki
+
+acc_line.eventuser = Asiakas
+acc_line.nick      = Nimimerkki
+acc_line.product   = Tuote
+acc_line.quantity  = M\u00E4\u00E4r\u00E4
+acc_line.time      = Ostoaika
+
+accountEvent.commit      = Tallenna
+accountEvent.delivered   = Toimitettu
+accountEvent.edit        = Muokkaa
+accountEvent.eventTime   = Aika
+accountEvent.productname = Tuote
+accountEvent.quantity    = Lkm
+accountEvent.seller      = Myyj\u00E4
+accountEvent.total       = Yhteens\u00E4
+accountEvent.unitPrice   = Yksikk\u00F6hinta
+
+actionlog.create.header           = Luo uusi ActionMessage
+actionlog.create.message          = Viesti
+actionlog.create.role             = Kohderooli
+actionlog.create.submitbutton     = L\u00E4het\u00E4
+actionlog.create.taskradio        = Teht\u00E4v\u00E4
+actionlog.crew                    = Crew
+actionlog.message                 = Tapahtuma
+actionlog.messagelist.description = Voit seurata sek\u00E4 luoda uusia ActionMessageja t\u00E4ss\u00E4 n\u00E4kym\u00E4ss\u00E4.
+actionlog.messagelist.header      = Viestilista
+actionlog.messagestate.DONE       = Tehty
+actionlog.messagestate.NEW        = Uusi
+actionlog.messagestate.PENDING    = Ty\u00F6n alla
+actionlog.state                   = Tila
+actionlog.task                    = Teht\u00E4v\u00E4
+actionlog.tasklist.header         = Teht\u00E4v\u00E4lista
+actionlog.time                    = Aika
+actionlog.user                    = Tekij\u00E4
+
+adduser.newuser     = Luo uusi k\u00E4ytt\u00E4j\u00E4
+adduser.update      = P\u00E4ivit\u00E4 k\u00E4vij\u00E4kuva
+adduser.welcome     = Tervetuloa
+adduser.welcometext = Voit helposti ja k\u00E4tev\u00E4sti luoda tai p\u00E4ivitt\u00E4\u00E4 k\u00E4ytt\u00E4j\u00E4profiilisi kuvan t\u00E4ss\u00E4. Valitse toiminto allaolevista valinnoista.
+
+applicationPermission.description = kuvaus
+applicationPermission.name        = Oikeusryhm\u00E4
+
+barcodeReader.readBarcode = Lue viivakoodi
+
+bill.addr1                = Osoite 1
+bill.addr2                = Osoite 2
+bill.addr3                = Osoite 3
+bill.addr4                = Osoite 4
+bill.addr5                = Osoite 5
+bill.address              = Maksajan osoite
+bill.billAmount           = Laskun summa
+bill.billIsPaid           = Lasku on maksettu
+bill.billLines            = Tuotteet
+bill.billNumber           = Laskun numero
+bill.billPaidDate         = Maksup\u00E4iv\u00E4
+bill.deliveryTerms        = Toimitusehdot
+bill.edit                 = Muokkaa
+bill.isPaid               = Maksettu
+bill.markPaid             = Maksettu
+bill.markedPaid           = Lasku merkitty maksetuksi.
+bill.notes                = Huomioita
+bill.noticetime           = Huomautusaika
+bill.ourReference         = Myyj\u00E4n viite
+bill.paidDate             = Maksup\u00E4iv\u00E4
+bill.payer                = Maksaja
+bill.paymentTime          = Maksuehdot
+bill.paymentTime.now      = Heti
+bill.printBill            = Tulosta lasku
+bill.receiverAddress      = Kauppiaan osoite
+bill.referenceNumberBase  = Viitenumeropohja
+bill.referencenumber      = Viitenumero
+bill.sentDate             = P\u00E4iv\u00E4ys
+bill.show                 = N\u00E4yt\u00E4
+bill.theirReference       = Asiakkaan viite
+bill.totalPrice           = Laskun summa
+bill.totalprice           = Yhteens\u00E4
+
+billLine.eventuser = Asiakas
+billLine.nick      = Nimimerkki
+billLine.price     = Kappalehinta
+billLine.product   = Tuote
+billLine.quantity  = M\u00E4\u00E4r\u00E4
+billLine.time      = Tilausaika
+
+billine.linePrice         = Yhteens\u00E4
+billine.name              = Tuote
+billine.quantity          = Lukum\u00E4\u00E4r\u00E4
+billine.referencedProduct = Tuoteviittaus
+billine.save              = Tallenna
+billine.unitName          = Yksikk\u00F6
+billine.unitPrice         = Yksikk\u00F6hinta
+billine.vat               = ALV
+
+bills.noBills = Ei laskuja
+
+card.massprint.title     = Tulosta kaikki
+
+cardTemplate.create      = Luo
+cardTemplate.edit        = Muokkaa
+cardTemplate.id          = Id
+cardTemplate.imageheader = Nykyinen pohja
+cardTemplate.name        = Korttipohja
+cardTemplate.power       = Teho
+cardTemplate.roles       = Yhdistetyt roolit
+cardTemplate.save        = Tallenna
+cardTemplate.sendImage   = Lataa kuva
+
+cart.item           = Tuote
+cart.item_quantity  = M\u00E4\u00E4r\u00E4
+cart.item_total     = Yhteens\u00E4
+cart.item_unitprice = Hinta
+cart.total          = Yhteens\u00E4
+
+checkout.cancel.errorMessage   = Virhe peruutuksen vahvistuksessa\u2026 Ilmoita t\u00E4st\u00E4 osoitteeseen code@codecrew.fi
+checkout.cancel.successMessage = Voit yritt\u00E4\u00E4 maksua uudelleen omista laskuistasi.
+checkout.reject.errorMessage   = Virhe hyl\u00E4tyn maksun k\u00E4sittelyss\u00E4. Raportoi t\u00E4m\u00E4 virhe osoitteeseen: code@codecrew.fi
+checkout.reject.successMessage = Maksu hyl\u00E4tty. Voit yritt\u00E4\u00E4 maksua uudelleen omista laskuistasi.
+checkout.return.errorDelayed   = Virhe viiv\u00E4stetyn maksun vahvistuksessa. Ota yhteytt\u00E4 code@codecrew.fi
+checkout.return.errorMessage   = Virhe maksun onnistuneen maksun vahvistuksessa. Raportoi t\u00E4m\u00E4 virhe yll\u00E4pidolle: code@codecrew.fi
+checkout.return.successDelayed = Viiv\u00E4stetty maksu onnistunut. Maksu vahvistet\u00E4\u00E4n my\u00F6hemp\u00E4n\u00E4 ajankohtana, yleens\u00E4 noin tunnin sis\u00E4ll\u00E4.
+checkout.return.successMessage = Maksu vahvistettu. Tuotteet on maksettu. Voit siirty\u00E4 eteenp\u00E4in tilauksessasi.
+
+compo.edit                = Muokkaa compoa
+compo.savesort            = Tallenna j\u00E4rjestys
+compo.saveVotes           = Tallenna \u00E4\u00E4net
+compo.votesSaved          = \u00C4\u00E4net tallennettu
+
+compofile.download        = lataa
+compofile.download.header = Lataa tiedosto
+compofile.upload          = L\u00E4het\u00E4 tiedosto
+
+discount.active     = Aktiivinen
+discount.amountMax  = Enimm\u00E4ism\u00E4\u00E4r\u00E4
+discount.amountMin  = V\u00E4himm\u00E4ism\u00E4\u00E4r\u00E4
+discount.code       = Alennuskoodi
+discount.create     = Luo uusi
+discount.details    = Tiedot
+discount.edit       = Muokkaa
+discount.maxNum     = Alennusten enimm\u00E4islkm
+discount.perUser    = Alennuksia per k\u00E4ytt\u00E4j\u00E4
+discount.percentage = Alennusprosentti
+discount.products   = Tuotteet
+discount.role       = Roolialennus
+discount.save       = Tallenna
+discount.shortdesc  = Kuvaus
+discount.validFrom  = Voimassa alkaen
+discount.validTo    = Voimassa asti
+
+editplace.header      = Muokkaa paikkaa
+
+editplacegroup.header = Paikkaryhm\u00E4n tiedot
+
+entry.edit = Muokkaa
+
+error.contact = Jos t\u00E4m\u00E4 toistuu, ota seuraava koodi talteen ja ota yhteys Infoon:
+error.error   = Olet kohdannut virheen.
+
+event.defaultRole         = K\u00E4ytt\u00E4jien oletusrooli
+event.edit                = Muokkaa
+event.endTime             = Lopetusp\u00E4iv\u00E4
+event.name                = Tapahtuman nimi
+event.nextBillNumber      = Seuraavan laskun numero
+event.referenceNumberBase = Viitenumeron pohja
+event.save                = Tallenna
+event.startTime           = Aloitusp\u00E4iv\u00E4
+
+eventdomain.domainname = Domain
+eventdomain.remove     = Poista
+
+eventmap.active          = Aktiivinen\u0009
+eventmap.buyable.like    = Paikat
+eventmap.buyable.lock    = Lukitse paikat
+eventmap.buyable.release = Vapauta paikat
+eventmap.name            = Kartan nimi
+eventmap.notes           = Lis\u00E4tiedot
+eventmap.save            = Tallenna
+
+eventorg.bankName1     = Pankin nimi 1
+eventorg.bankName2     = Pankin nimi 2
+eventorg.bankNumber1   = Tilinumero 1
+eventorg.bankNumber2   = Tilinumero 2
+eventorg.billAddress1  = Laskutusosoite 1
+eventorg.billAddress2  = Laskutusosoite 2
+eventorg.billAddress3  = Laskutusosoite 3
+eventorg.billAddress4  = Laskutusosoite 4
+eventorg.bundleCountry = Kieli-bundle
+eventorg.create        = Luo
+eventorg.createEvent   = Luo tapahtuma
+eventorg.createevent   = Luo uusi tapahtuma
+eventorg.edit          = Muokkaa
+eventorg.events        = Organisaation tapahtumat
+eventorg.organisation  = Organisaation nimi
+eventorg.save          = Tallenna
+
+eventorgView.eventname = Tapahtuman nimi
+
+eventorganiser.name = Tapahtumaj\u00E4rjest\u00E4j\u00E4
+feedback.canFeedback = Vituttaako?
+feedback.submit      = L\u00E4het\u00E4
+feedback.thanks      = Kiiiiitooooos! :)
+
+
+food = Ruoka
+foodWave.accountevents      = Maksetut tilaukset
+foodWave.activeFoodWaves    = Aktiiviset Ruokatilaukset
+foodWave.billLines          = Maksamattomat Verkkomaksut
+foodWave.deliveredFoodWaves = Toimitetut Ruokatilaukset
+
+foodWave.list               = Ruokatilaukset
+foodWave.name               = Ruokatilaus
+foodWave.orders             = Tilausten M\u00E4\u00E4r\u00E4
+foodWave.paid               = Maksettuja
+foodWave.show               = N\u00E4yt\u00E4
+foodWave.template.name      = Tilauspohja
+foodWave.template.waves     = Ruokatilaus
+foodWave.templatename       = Valitse tuotteet
+foodWave.totalReserved      = Yhteens\u00E4
+foodWave.unconfirmedOrders  = Vahvistamattomia
+foodWave.template.name = Nimi
+foodadmin.editTemplate = Muokkaa
+
+foodshop.buyAndPay       = Varaa ja maksa
+foodWave.time          = Aika
+
+foodshop.total           = Yhteens\u00E4
+foodshop.buyFromCounter  = Maksa infossa
+foodwave.buyInPrice                 = Sis\u00E4\u00E4nostohinta
+foodwave.foodwaveBuyInPrice         = Sis\u00E4\u00E4nostohinta
+foodwave.markPaid                   = Merkitty maksetuksi
+foodwave.orders                     = Maksetut Tilaukset
+foodwave.price                      = Tilausten kokonaishinta
+foodwave.summaryView                = Ruokatilauksen Yhteenveto
+foodwave.template.basicinfo         = Template Infot
+foodwave.template.description       = Kuvaus
+foodwave.template.edit.title        = Foodwave Template Editori
+foodwave.template.list.title        = Ruokatilaus Templatet
+foodwave.template.name              = Nimi
+foodwave.template.selectproducts    = Tuotteet
+foodwave.totalCount                 = M\u00E4\u00E4r\u00E4
+foodwave.totalPrice                 = Asiakkaan Hinta
+
+foodwaveTemplate.name = Nimi
+
+foodwavetemplate.actions            = Toimet
+foodwavetemplate.addproduct         = Lis\u00E4\u00E4
+foodwavetemplate.basicinfo          = Tilauspohja
+foodwavetemplate.createFoodwave     = Luo ruokatilaus
+foodwavetemplate.createwave         = Luo tilauspohja
+foodwavetemplate.description        = Kuvaus
+foodwavetemplate.edit               = Muokkaa tilauspohjaa
+foodwavetemplate.editRow            = Muokkaa
+foodwavetemplate.maxfoods           = Tilausten enimm\u00E4ism\u00E4\u00E4r\u00E4
+foodwavetemplate.name               = Nimi
+foodwavetemplate.price              = Hinta
+foodwavetemplate.productdescription = Kuvaus
+foodwavetemplate.productname        = Nimi\n
+foodwavetemplate.removeFromList     = Poista
+foodwavetemplate.save               = Ok
+foodwavetemplate.savetemplate       = Tallenna
+foodwavetemplate.selectproducts     = Tuotteet
+foodwavetemplate.startTime          = Tilausaika
+foodwavetemplate.waveName           = Tilauksen nimi
+
+foodshop.buyFromInternet = Maksa Internetiss\u00E4
+
+game.gamepoints = Insomnia Game pisteet:
+
+gamepoints = Pelipisteit\u00E4
+
+global.cancel               = Peruuta
+global.copyright            = Codecrew Ry
+global.eventname            = Tapahtumanimi
+global.notAuthorizedExecute = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia suorittaa t\u00E4t\u00E4 toimenpidett\u00E4!
+global.notauthorized        = Sinulla ei ole riitt\u00E4vi\u00E4 oikeuksia t\u00E4lle sivulle.
+global.save                 = Tallenna
+
+httpsession.creationTime          = Luotu
+httpsession.id                    = ID
+httpsession.invalidate            = Mit\u00E4t\u00F6i
+httpsession.invalidateSuccessfull = Sessio onnistuneesti mit\uFFFDt\uFFFDity
+httpsession.isSessionNew          = Uusi sessio
+httpsession.lastAccessedTime      = Viimeksi n\uFFFDhty
+httpsession.maxInactiveInterval   = Aikakatkaisu (s)
+httpsession.sessionHasExisted     = Ollut elossa (s)
+httpsession.user                  = Tunnus
+
+imagefile.description = Kuvaus
+imagefile.file        = Kuvatiedosto
+
+importuser.file     = Tiedosto
+importuser.template = Malli
+
+index.title = Etusivu
+
+infoview.back          = Takaisin
+infoview.computerplace = Tietokonepaikat
+infoview.shop          = Kauppa
+
+invite.emailexists           = J\u00E4rjestelm\u00E4ss\u00E4 on jo k\u00E4ytt\u00E4j\u00E4tunnus samalla s\u00E4hk\u00F6postiosoitteella.
+invite.notFound              = Kutsu virheellinen tai jo k\u00E4ytetty.
+invite.successfull           = Kutsu l\u00E4hetetty
+invite.userCreateSuccessfull = K\u00E4ytt\u00E4j\u00E4tunnus luotu onnistuneesti. Voit nyt kirjautua sis\u00E4\u00E4n j\u00E4rjeselm\u00E4\u00E4n.
+
+javax.validation.constraints.AssertFalse.message = must be false
+javax.validation.constraints.AssertTrue.message  = must be true
+javax.validation.constraints.DecimalMax.message  = must be less than or equal to {value}
+javax.validation.constraints.DecimalMin.message  = must be greater than or equal to {value}
+javax.validation.constraints.Digits.message      = numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
+javax.validation.constraints.Future.message      = must be in the future
+javax.validation.constraints.Max.message         = must be less than or equal to {value}
+javax.validation.constraints.Min.message         = must be greater than or equal to {value}
+javax.validation.constraints.NotNull.message     = may not be null
+javax.validation.constraints.Null.message        = must be null
+javax.validation.constraints.Past.message        = must be in the past
+javax.validation.constraints.Pattern.message     = must match "{regexp}"
+javax.validation.constraints.Size.message        = size must be between {min} and {max}
+
+layout.editBottom  = Muokkaa alasis\u00E4lt\u00F6\u00E4
+layout.editContent = Muokkaa sis\u00E4lt\u00F6\u00E4
+layout.editTop     = Muokkaa yl\u00E4sis\u00E4lt\u00F6\u00E4
+
+login.login              = Kirjaudu sis\u00E4\u00E4n
+login.logout             = Kirjaudu ulos
+login.logoutmessage      = Olet kirjautunut ulos j\u00E4rjestelm\u00E4st\u00E4.
+login.password           = Salasana
+login.submit             = Kirjaudu sis\u00E4\u00E4n
+login.username           = K\u00E4ytt\u00E4j\u00E4tunnus
+
+loginerror.header        = Kirjautuminen ep\u00E4onnistui
+loginerror.message       = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana ei ollut oikein.
+loginerror.resetpassword = Salasana unohtunut?
+
+map.edit                          = Muokkaa
+map.generate                      = Generoi paikat
+map.height                        = Paikan korkeus (px)
+map.id                            = #
+map.name                          = Nimi
+map.namebase                      = Puolipisteell\u00E4 erotetut p\u00F6yt\u00E4-etuliitteet
+map.oneRowTable                   = Yhden rivin p\u00F6yd\u00E4t
+map.placesInRow                   = Paikkoja riviss\u00E4
+map.product                       = Paikkatuote
+map.startX                        = P\u00F6yd\u00E4n X-aloituskoord. 
+map.startY                        = P\u00F6yd\u00E4n Y-aloituskoord. 
+map.submitMap                     = L\u00E4het\u00E4 karttapohja
+map.tableCount                    = P\u00F6ytien lukum\u00E4\u00E4r\u00E4
+map.tableXdiff                    = P\u00F6ytien v\u00E4li ( X )
+map.tableYdiff                    = P\u00F6ytien v\u00E4li ( Y )
+map.tablesHorizontal              = P\u00F6yd\u00E4t vaakatasossa
+map.width                         = Leveys (px)
+
+mapEdit.removePlaces = Poista kaikki paikat
+
+mapManage.lockedPlaces   = Lukittu kartasta {0} paikkaa.
+mapManage.releasedPlaces = Vapautettu kartasta {0} paikkaa 
+
+mapView.buyPlaces                 = Lukitse valitut paikat
+mapView.errorWhenReleasingPlace   = Paikkaa vapauttassa tapahtui virhe.
+mapView.errorWhenReservingPlace   = Paikkaa varatessa tapahtui virhe.
+mapView.errorWhileBuyingPlaces    = Virhe paikkojen ostossa. Ole hyv\u00E4 ja yrit\u00E4 uudelleen. Jos virhe toistuu ota yhteytt\u00E4 j\u00E4rjest\u00E4jiin.
+mapView.notEnoughCreditsToReserve = Sinulla ei ole riitt\u00E4v\u00E4sti suoritettuja konepaikkamaksuja t\u00E4m\u00E4n paikan varaamiseen.
+menu.name            = Nimi
+
+menu.index           = Etusivu
+menu.select          = Valitse
+menu.place.placemap  = Paikkakartta
+menu.sort            = J\u00E4rjest\u00E4
+menu.poll.index      = Kyselyt
+menu.shop.createBill = Kauppa
+menu.user.edit       = Omat tiedot
+
+news.abstract        = Lyhennelm\u00E4
+news.expire          = Lopeta julkaisu
+news.publish         = Julkaise
+news.save            = Tallenna
+news.title           = Otsikko
+
+newsgroup.edit       = Muokkaa
+newsgroup.name       = Uutisryhm\u00E4n nimi
+newsgroup.priority   = J\u00E4rjestysnumero
+newsgroup.readerRole = Lukijoiden roolit
+newsgroup.writerRole = Kirjoittajaryhm\u00E4
+
+newslist.header = Uutisryhm\u00E4t
+
+org.hibernate.validator.constraints.Email.message    = not a well-formed email address
+org.hibernate.validator.constraints.Length.message   = length must be between {min} and {max}
+org.hibernate.validator.constraints.NotEmpty.message = may not be empty
+org.hibernate.validator.constraints.Range.message    = must be between {min} and {max}
+
+orgrole.create  = Luo
+orgrole.name    = Nimi
+orgrole.parents = Periytyy
+
+page.account.list.header                 = Tilitapahtumat
+page.auth.loginerror.header              = kirjautuminen ep\u00E4onnistui
+page.auth.logout.header                  = Uloskirjautuminen
+page.auth.logoutsuccess.header           = Logout
+page.auth.resetPassword.header           = Nollaa salasana
+page.bill.billSummary.header             = Laskujen yhteenveto
+page.bill.list.header                    = Laskut
+page.bill.show.header                    = Laskun tiedot
+page.checkout.cancel.header              = Maksu peruutettu.
+page.checkout.delayed.header             = Viiv\u00E4stetty maksu
+page.checkout.reject.header              = Maksu hyl\u00E4tty!
+page.checkout.return.header              = Maksu vahvistettu
+page.place.insertToken.header            = Sy\u00F6t\u00E4 paikkakoodi
+page.place.mygroups.header               = Paikkaryhm\u00E4t
+page.place.placemap.header               = Paikkakartta
+page.product.createBill.header           = Osta tuotteita
+page.product.validateBillProducts.header = Lasku luotu
+page.svm.failure.header                  = Verkkomaksuvirhe
+page.svm.pending.header                  = Maksukuittausta odotetaan
+page.svm.success.header                  = Verkkomaksu onnistui
+page.user.create.header                  = Luo uusi k\u00E4ytt\u00E4j\u00E4
+
+pagination.firstpage    = Ensimm\u00E4inen
+pagination.lastpage     = Viimeinen
+pagination.nextpage     = Seuraava
+pagination.pages        = Sivuja
+pagination.previouspage = Edellinen
+pagination.results      = Tuloksia
+
+passwordChanged.body   = Voit nyt kirjautua k\u00E4ytt\u00E4j\u00E4tunnuksella ja uudella salasanalla sis\u00E4\u00E4n j\u00E4rjestelm\u00E4\u00E4n.
+passwordChanged.header = Salasana vaihdettu onnistuneesti
+
+passwordReset.errorChanging = Odotamaton virhe. Ota yhteytt\u00E4 yll\u00E4pitoon.
+passwordReset.hashNotFound  = Salasanan vaihto on vanhentunut. Jos haluat vaihtaa salasanan l\u00E4het\u00E4 vaihtopyynt\u00F6 uudelleen.
+
+passwordreset.mailBody     = Voit vaihtaa salasanasi osoitteessa {0}\n\nJos et ole pyyt\u00E4nyt unohtuneen salasanan vaihtamista, ei t\u00E4h\u00E4n viestiin tarvitse reagoida.\n\nTerveisin,\nInsomnia lippupalvelu\nwww.insomnia.fi
+passwordreset.mailSubject  = [INSOMNIA] Salasanan vaihtaminen
+passwordreset.usernotfound = Annettua k\u00E4ytt\u00E4j\u00E4tunnusta ei l\u00F6ydy. Huomioi ett\u00E4 isot ja pienet kirjaimet ovat merkitsevi\u00E4.
+
+permissiondenied.alreadyLoggedIn = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia!
+permissiondenied.header          = P\u00E4\u00E4sy kielletty
+permissiondenied.notLoggedIn     = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia t\u00E4lle sivulle. 
+
+place.buyable                     = Ostettavissa
+place.code                        = Paikkakoodi
+place.commit                      = Tallenna
+place.description                 = Kuvaus
+place.details                     = Tiedot
+place.edit                        = Muokkaa
+place.groupremove                 = Poista paikka paikkaryhm\u00E4st\u00E4
+place.height                      = Korkeus
+place.id                          = ID
+place.mapX                        = X
+place.mapY                        = Y
+place.membership                  = Yhdistetty k\u00E4ytt\u00E4j\u00E4
+place.name                        = Nimi
+place.noReserver                  = Ei liitetty k\u00E4ytt\u00E4j\u00E4\u00E4n
+place.product                     = Tuote
+place.releasetime                 = Vapautusaika
+place.width                       = Leveys
+
+placeSelect.legend.blue      = Oma valittu paikka
+placeSelect.legend.green     = Oma ostettu paikka
+placeSelect.legend.grey      = Vapautetaan tarvittaessa
+placeSelect.legend.red       = Varattu paikka
+placeSelect.legend.white     = Vapaa paikka
+placeSelect.placeName        = Paikka
+placeSelect.placePrice       = Paikan hinta
+placeSelect.placeProductName = Paikan tyyppi
+placeSelect.placesleft       = Paikkoja j\u00E4ljell\u00E4
+placeSelect.reservationPrice = Tilauksen hinta
+placeSelect.reservedPlaces   = Valitut paikat
+placeSelect.totalPlaces      = Paikkoja yhteens\u00E4
+
+placegroup.created                = Luotu
+placegroup.creator                = Varaaja
+placegroup.details                = Tiedot
+placegroup.edit                   = N\u00E4yt\u00E4
+placegroup.edited                 = Muokattu
+placegroup.name                   = Nimi
+placegroup.placename              = Paikka
+placegroup.places                 = Paikat
+placegroup.printPdf               = Tulosta paikkakoodit
+
+placegroupview.groupCreator       = Varaaja
+placegroupview.header             = Omat paikat
+placegroupview.noMemberships      = Ei omia paikkoja
+placegroupview.placeReleaseFailed = Paikan vapauttaminen ep\u00E4onnistui!
+placegroupview.placeReleased      = Paikka {0} vapautettu 
+placegroupview.releasePlace       = Vapauta
+placegroupview.reservationName    = Paikka
+placegroupview.reservationProduct = Tuote
+placegroupview.token              = Paikkakoodi / k\u00E4ytt\u00E4j\u00E4
+
+placetoken.commit        = Liit\u00E4
+placetoken.pageHeader    = Lis\u00E4\u00E4 konepaikkakoodi
+placetoken.placelist     = Omat paikat
+placetoken.token         = Paikkakoodi
+placetoken.tokenNotFound = Paikkakoodia ei l\u00F6ytynyt! Tarkista koodi.
+placetoken.topText       = Voit yhdist\u00E4\u00E4 paikan omaan k\u00E4ytt\u00E4j\u00E4tunnukseesi sy\u00F6tt\u00E4m\u00E4ll\u00E4 paikkakoodin allaolevaan kentt\u00E4\u00E4n.
+
+poll.answer      = Vastaa kyselyyn
+poll.begin       = Avaa kysely
+poll.create      = Luo
+poll.description = Kuvaus
+poll.edit        = Muokkaa
+poll.end         = Sulje kysely
+poll.name        = Kyselyn nimi
+poll.save        = L\u00E4het\u00E4 vastauksesi
+
+product.barcode              = Viivakoodi
+product.billed               = Laskutettu
+product.boughtTotal          = Tuotteita laskutettu
+product.cart.count           = Ostoskoriin
+product.cashed               = Ostettu k\u00E4teisell\u00E4
+product.color                = V\u00E4ri k\u00E4ytt\u00F6liittym\u00E4ss\u00E4
+product.create               = Luo tuote
+product.createDiscount       = Lis\u00E4\u00E4 m\u00E4\u00E4r\u00E4alennus
+product.edit                 = Muokkaa
+product.name                 = Tuotteen nimi
+product.paid                 = Maksettu
+product.prepaid              = Prepaid
+product.prepaidInstant       = Luodaan kun prepaid maksetaan
+product.price                = Tuotteen hinta
+product.save                 = Tallenna
+product.shopInstant          = Luo k\u00E4teismaksu tuotteille
+product.sort                 = J\u00E4rjestys luku
+product.totalPrice           = Summa
+product.unitName             = Tuoteyksikk\u00F6
+product.vat                  = ALV
+
+productShopView.readBarcode = Lue viivakoodi
+
+products.save                = Tallenna
+
+productsShopView.readBarcode = Lue
+
+productshop.billCreated   = Lasku luotu
+productshop.commit        = Osta
+productshop.limits        = Vapaana
+productshop.minusOne      = -1
+productshop.minusTen      = -10
+productshop.noItemsInCart = Ostoskorissa ei ole tuotteita
+productshop.plusOne       = +1
+productshop.plusTen       = +10
+productshop.total         = Yhteens\u00E4
+reader.automaticProduct      = Oletustuote
+reader.automaticProductCount = M\u00E4\u00E4r\u00E4
+
+reader.assocToCard          = Yhdist\u00E4 korttiin
+reader.createNewCard        = Luo uusi kortti
+reader.description          = Kuvaus
+reader.edit                 = Muokkaa
+reader.save                  = Tallenna
+reader.identification       = Tunniste
+reader.name                 = Lukijan nimi
+reader.select               = Valitse lukija
+reader.tag                  = Tag
+reader.type                 = Tyyppi
+reader.user                 = K\u00E4ytt\u00E4j\u00E4
+
+readerView.searchforuser = Etsi k\u00E4ytt\u00E4j\u00E4\u00E4
+
+readerevent.associateToUser = Yhdist\u00E4 k\u00E4ytt\u00E4j\u00E4\u00E4n
+readerevent.seenSince       = N\u00E4hty viimeksi
+readerevent.shopToUser      = Osta k\u00E4ytt\u00E4j\u00E4lle
+readerevent.tagname         = Tagi
+
+readerview.cards = Kortit ( tulostuslkm )
+
+resetMail.body     = Voit vaihtaa unohtuneen salasanan sy\u00F6tt\u00E4m\u00E4ll\u00E4 k\u00E4ytt\u00E4j\u00E4tunnuksesi allaolevaan kentt\u00E4\u00E4n. Tunnukseen liitettyyn s\u00E4hk\u00F6postiosoitteeseen l\u00E4hetet\u00E4\u00E4n kertak\u00E4ytt\u00F6inen osoite jossa voit vaihtaa sy\u00F6tt\u00E4m\u00E4si k\u00E4ytt\u00E4j\u00E4tunnuksen salasanan.
+resetMail.header   = Salasana unohtunut?
+resetMail.send     = L\u00E4het\u00E4 s\u00E4hk\u00F6posti
+resetMail.username = K\u00E4ytt\u00E4j\u00E4tunnus
+
+resetmailSent.body   = Antamasi k\u00E4ytt\u00E4j\u00E4tunnuksen s\u00E4hk\u00F6postiosoitteeseen on l\u00E4hetetty osoite jossa voit vaihtaa tunnuksen salasanan.
+resetmailSent.header = S\u00E4hk\u00F6posti l\u00E4hetetty
+
+rfidevent.empty      = Tyhj\u00E4
+rfidevent.reader     = Lukija
+rfidevent.searchuser = Hae k\u00E4ytt\u00E4j\u00E4\u00E4
+rfidevent.tag        = T\u00E4gi
+
+role.cardtemplate    = Korttipohja
+role.create          = Luo rooli
+role.description     = Kuvaus
+role.edit            = Muokkaa
+role.edit.save       = Tallenna
+role.name            = Nimi
+role.parents         = Periytyy
+role.savePermissions = Tallenna oikeudet
+
+salespoint.edit          = Muokkaa
+salespoint.name          = Nimi
+salespoint.noSalesPoints = M\u00E4\u00E4r\u00E4
+
+sendPicture.header = L\u00E4het\u00E4 kuva
+
+shop.accountBalance   = Credits
+shop.actions          = Hallinta
+shop.barcode          = Viivakoodi
+shop.buyCash          = K\u00E4teismaksu
+shop.buyCredit        = Credit
+shop.calcsubtotal     = Laske v\u00E4lisumma
+shop.cash             = K\u00E4teinen
+shop.cashGiven        = K\u00E4teist\u00E4 saatu
+shop.cashback         = Takaisin
+shop.confirmCreditBuy = Varmastikko ?
+shop.count            = Lkm
+shop.price            = Hinta
+shop.product          = Tuote
+shop.readBarcode      = Lue
+shop.toAccountValue   = Tilille
+shop.totalPrice       = Yhteens\u00E4
+shop.user             = Myyd\u00E4\u00E4n
+
+sidebar.bill.list           = Omat laskut
+sidebar.bill.listAll        = Kaikki laskut
+sidebar.bill.summary        = Laskujen yhteenveto
+sidebar.bills               = Laskut
+sidebar.cardTemplate.create = Uusi korttipohja
+sidebar.cardTemplate.list   = N\u00E4yt\u00E4 korttipohjat
+sidebar.createuser          = Rekister\u00F6idy uudeksi k\u00E4ytt\u00E4j\u00E4ksi
+sidebar.eventorg.list       = Omat organisaatiot
+sidebar.map.list            = Kartat
+sidebar.map.placemap        = Paikkakartta
+sidebar.maps                = Kartat
+sidebar.other               = Muuta
+sidebar.product.create      = Uusi tuote
+sidebar.product.createBill  = Luo lasku
+sidebar.product.list        = Tuotteet
+sidebar.products            = Tuotteet
+sidebar.role.create         = Uusi rooli
+sidebar.role.list           = Roolit
+sidebar.roles               = Roolit
+sidebar.shop.readerEvents   = Lukijan tapahtumat
+sidebar.shop.readerlist     = N\u00E4yt\u00E4 lukijat
+sidebar.user.create         = Uusi k\u00E4ytt\u00E4j\u00E4
+sidebar.user.list           = K\u00E4ytt\u00E4j\u00E4t
+sidebar.users               = K\u00E4ytt\u00E4j\u00E4t
+sidebar.utils.flushCache    = Flush Cache
+sidebar.utils.testdata      = Testdata
+
+sitepage.addContent = Lis\u00E4\u00E4 sis\u00E4lt\u00F6laatikko
+sitepage.create     = Luo uusi
+sitepage.edit       = Muokkaa
+sitepage.name       = Sivun nimi
+sitepage.roles      = N\u00E4ytet\u00E4\u00E4n rooleille
+sitepage.save       = Tallenna
+
+sitepagelist.header = Sivuston sis\u00E4ll\u00F6t
+
+submenu.auth.login                   = Kirjaudu
+submenu.auth.logoutResponse          = Uloskirjautuminen onnistui
+submenu.auth.sendResetMail           = Salasanan palautus
+submenu.bill.billSummary             = Laskujen yhteenveto
+submenu.foodadmin.createTemplate     = Luo tilauspohja 
+submenu.foodadmin.listTemplates      = Muokkaa tilauspohjia
+submenu.foodmanager.listFoodwaves    = Aktiiviset ruokatilaukset
+submenu.foodwave.list                = Avoimet tilaukset
+submenu.bill.list                    = N\u00E4yt\u00E4 omat laskut
+submenu.bill.listAll                 = Kaikki laskut
+submenu.index                        = Etusivu
+submenu.map.create                   = Uusi kartta
+submenu.map.list                     = N\u00E4yt\u00E4 kartat
+submenu.orgrole.create               = Luo j\u00E4rjest\u00E4j\u00E4rooli
+submenu.orgrole.list                 = J\u00E4rjest\u00E4j\u00E4roolit
+submenu.pages.create                 = Luo sis\u00E4lt\u00F6\u00E4
+submenu.pages.list                   = N\u00E4yt\u00E4 sis\u00E4ll\u00F6t
+submenu.place.insertToken            = Sy\u00F6t\u00E4 paikkakoodi
+submenu.place.myGroups               = Omat paikkavaraukset
+submenu.place.placemap               = Paikkakartta
+submenu.poll.index                   = Kyselyt
+submenu.product.create               = Uusi tuote
+submenu.product.list                 = Listaa tuotteet
+submenu.role.create                  = Luo rooli
+submenu.role.list                    = Roolit
+submenu.shop.createBill              = Luo lasku
+submenu.shop.listReaders             = N\u00E4yt\u00E4 lukijat
+submenu.shop.showReaderEvents        = Lukijan tapahtumat
+submenu.user.accountEvents           = Tilitapahtumat
+submenu.user.changePassword          = Vaihda salasana
+submenu.user.create                  = Luo k\u00E4ytt\u00E4j\u00E4
+submenu.user.foodwave                = Ruoka
+submenu.user.createCardTemplate      = Luo korttiryhm\u00E4
+submenu.user.edit                    = K\u00E4ytt\u00E4j\u00E4n tiedot
+submenu.user.invite                  = Kutsu yst\u00E4vi\u00E4
+submenu.user.list                    = Kaikki k\u00E4ytt\u00E4j\u00E4t
+submenu.user.listCardTemplates       = Korttiryhm\u00E4t
+submenu.user.manageuserlinks         = Hallitse k\u00E4ytt\u00E4ji\u00E4
+submenu.user.other                   = Muuta
+submenu.user.rolelinks               = Hallitse rooleja
+submenu.user.sendPicture             = L\u00E4het\u00E4 kuva
+submenu.user.shop                    = Kauppaan
+submenu.user.userlinks               = Muokkaa tietoja
+submenu.useradmin.create             = Luo uusi k\u00E4ytt\u00E4j\u00E4
+submenu.useradmin.createCardTemplate = Luo uusi korttipohja
+submenu.useradmin.list               = Listaa k\u00E4ytt\u00E4j\u00E4t
+submenu.useradmin.listCardTemplates  = Listaa korttipohjat
+submenu.useradmin.showTakePicture    = N\u00E4yt\u00E4 webcam
+submenu.useradmin.validateUser       = Validoi k\u00E4ytt\u00E4j\u00E4
+submenu.voting.compolist             = Kilpailut
+submenu.voting.create                = Uusi kilpailu
+submenu.voting.myEntries             = Omat entryt
+
+supernavi.admin = Yll\u00E4piton\u00E4kym\u00E4
+supernavi.user  = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
+
+svm.failure.errorMessage   = Verkkomaksuvirhe.
+svm.failure.successMessage = Maksuvirhe onnistunut. ( Maksu mahdollisesti merkitty jo maksetuksi )
+svm.pending.errorMessage   = Maksukuittausta odotetaan. Kuittauksesta l\u00E4hetet\u00E4\u00E4n ilmoitus s\u00E4hk\u00F6postitse.
+svm.pending.successMessage = Maksukuittausta odotetaan. Kuittauksesta l\u00E4hetet\u00E4\u00E4n ilmoitus s\u00E4hk\u00F6postitse.
+svm.success.errorMessage   = Verkkomaksua ei voitu verifioida! Virheest\u00E4 on raportoitu eteenp\u00E4in.
+svm.success.successMessage = Verkkomaksu onnistui. 
+
+template.loggedInAs = Kirjautunut tunnuksella
+
+topnavi.adminshop = Kauppa
+topnavi.billing   = Laskutus
+topnavi.compos    = Kilpailut
+topnavi.contents  = Sivuston sis\u00E4lt\u00F6
+topnavi.foodwave  = Ruokatilaus
+topnavi.frontpage = Etusivu
+topnavi.log       = Logi
+topnavi.maps      = Kartat
+topnavi.placemap  = Paikkakartta
+topnavi.poll      = Kyselyt
+topnavi.products  = Tuotteet
+topnavi.shop      = Kauppa
+topnavi.user      = Omat tiedot
+topnavi.userinit  = K\u00E4ytt\u00E4j\u00E4n tunnistus
+topnavi.usermgmt  = K\u00E4ytt\u00E4j\u00E4t
+
+user.accountBalance             = Tilin saldo
+user.accountEventHeader         = Tilitapahtumat
+user.accountevents              = Tilitapahtumat
+user.address                    = Osoite
+user.bank                       = Pankki
+user.bankaccount                = Pankkitili
+user.birthday                   = Syntym\u00E4p\u00E4iv\u00E4
+user.cardPower                  = K\u00E4ytt\u00E4j\u00E4tyyppi
+user.changePassword             = Vaihda salasana
+user.changepassword.forUser     = K\u00E4ytt\u00E4j\u00E4lle
+user.changepassword.title       = Vaihda salasana
+user.create                     = Luo k\u00E4ytt\u00E4j\u00E4
+user.createdmessage             = K\u00E4ytt\u00E4j\u00E4tunnus on luotu onnistuneesti. Voit nyt kirjautua sis\u00E4\u00E4n.
+user.defaultImage               = Oletukuva
+user.edit                       = Muokkaa
+user.edit.title                 = Omat tiedot
+user.food.title                 = Valitse Menu
+user.foodwave.products.title    = Valitse tuotteet
+user.foodwavelist.title         = Valitse Ruokatilaus
+user.email                      = S\u00E4hk\u00F6posti
+user.firstNames                 = Etunimi
+user.hasImage                   = Kuva
+user.imageUploaded              = Kuva l\u00E4hetetty.
+user.imagelist                  = Tallennetut kuvat
+user.imagesubmit                = L\u00E4het\u00E4 kuva
+user.insert                     = Sy\u00F6t\u00E4 arvo
+user.invalidLoginCredentials    = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana v\u00E4\u00E4rin.
+user.invite                     = Kutsu
+user.invite.header              = Luo k\u00E4ytt\u00E4j\u00E4 kutsusta
+user.invitemail                 = S\u00E4hk\u00F6postiosoite
+user.lastName                   = Sukunimi
+user.login                      = K\u00E4ytt\u00E4j\u00E4tunnus
+user.nick                       = Nick
+user.noAccountevents            = Ei tilitapahtumia
+user.noCurrentImage             = Ei kuvaa
+user.noImage                    = EI kuvaa
+user.oldPassword                = Nykyinen salasana
+user.page.invite                = Kutsu yst\u00E4vi\u00E4
+user.password                   = Salasana
+user.passwordcheck              = Salasana ( uudelleen )
+user.passwordlengthMessage      = Salasana liian lyhyt 
+user.phone                      = Puhelin
+user.placegroups                = Omat paikkaryhm\u00E4t
+user.realname                   = Nimi
+user.roles                      = Roolit
+user.rolesave                   = Tallenna roolit
+user.save                       = Tallenna
+user.sendPicture                = Kuvan l\u00E4hetys
+user.sex                        = Sukupuoli
+user.sex.FEMALE                 = Nainen
+user.sex.MALE                   = Mies
+user.sex.UNDEFINED              = M\u00E4\u00E4rittelem\u00E4tt\u00E4
+user.shop                       = Osta
+user.shop.title                 = Osta k\u00E4ytt\u00E4j\u00E4lle
+user.successfullySaved          = Tiedot tallennettu onnistuneesti
+user.superadmin                 = Superadmin
+user.thisIsCurrentImage         = Nykyinen kuva
+user.town                       = Kaupunki
+user.uploadimage                = L\u00E4het\u00E4 kuva
+user.username                   = K\u00E4ytt\u00E4j\u00E4tunnus
+user.validate.notUniqueUsername = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole hyv\u00E4 ja valitse toinen tunnus
+user.validateUser.commit        = L\u00E4het\u00E4
+user.validateUser.header        = Ole hyv\u00E4 ja sy\u00F6t\u00E4 kirjautumistiedot
+user.wholeName                  = Nimi
+user.zipCode                    = Postinumero
+
+userImport.commit = Hyv\u00E4ksy
+
+userView.image = Kuva
+
+usercart.clear            = Tyhjenn\u00E4 k\u00E4ytt\u00E4j\u00E4kori
+usercart.addSearchedUsers = Lis\u00E4\u00E4 haetut k\u00E4ytt\u00E4j\u00E4t
+usercart.cartsize         = Koko
+usercart.showCart         = K\u00E4ytt\u00E4j\u00E4kori
+usercart.traverse         = K\u00E4y l\u00E4pi
+
+userimage.webcam = Ota kuva webkameralla
+
+userlist.header             = Etsi k\u00E4ytt\u00E4ji\u00E4
+userlist.onlythisevent      = Vain t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E4j\u00E4t
+userlist.placeassoc         = Liitetty paikkaan
+userlist.rolefilter         = Annetut roolit
+userlist.saldofilter        = Tilin saldo
+userlist.search             = Etsi
+userlist.showAdvancedSearch = Tarkennettu haku
+
+usertitle.managingUser = Kauppa
+
+userview.invalidEmail       = Virheeliinen s\u00E4hk\u00F6postiosoite
+userview.loginstringFaulty  = K\u00E4ytt\u00E4j\u00E4tunnus virheellinen. Pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n kaksi merkki\u00E4 pitk\u00E4.
+userview.oldPasswordError   = V\u00E4\u00E4r\u00E4 salasana!
+userview.passwordTooShort   = Salasana liian lyhyt. Pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n {0} merkki\u00E4 pitk\u00E4.
+userview.passwordsChanged   = Salasana vaihdettu
+userview.passwordsDontMatch = Salasanat eiv\u00E4t ole samat! Ole hyv\u00E4 ja sy\u00F6t\u00E4 salasanat uudelleen.
+userview.userExists         = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole hyv\u00E4 ja valitse toinen tunnus.
+
+viewexpired.body  = Ole hyv\u00E4 ja kirjaudu sis\u00E4\u00E4n uudelleen.
+viewexpired.title = N\u00E4kym\u00E4 on vanhentunut
+
+voting.allcompos.curEntries        = Entryja
+voting.allcompos.descri            = Kuvaus
+voting.allcompos.description       = Compojen informaatiot.
+voting.allcompos.endTime           = Lopetusaika
+voting.allcompos.header            = Kaikki compot
+voting.allcompos.maxParts          = Max osallistujam\u00E4\u00E4r\u00E4
+voting.allcompos.name              = Nimi
+voting.allcompos.startTime         = Aloitusaika
+voting.allcompos.submitEnd         = Lis\u00E4ys kiinni
+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.vote                  = \u00C4\u00E4nest\u00E4
+voting.compoentryadd.button        = L\u00E4het\u00E4
+voting.compoentryadd.description   = Lis\u00E4\u00E4 uusi entry compoon
+voting.compoentryadd.entryname     = Nimi
+voting.compoentryadd.file          = Tiedosto
+voting.compoentryadd.notes         = Huomatuksia
+voting.compoentryadd.screenmessage = Screenmessage
+voting.compoentryadd.title         = Lis\u00E4\u00E4 entry
+voting.compoentryadd.uploadedFile  = asdsda
+voting.compoentrysave.button       = Tallenna
+voting.create.compoEnd             = Lopetusaika
+voting.create.compoStart           = Aloitusaika
+voting.create.createButton         = Luo
+voting.create.dateValidatorEndDate = Loppumisaika ennen alkua.
+voting.create.description          = Kuvaus
+voting.create.header               = Compon luonti
+voting.create.maxParticipants      = Max osallistujat
+voting.create.name                 = Nimi
+voting.create.submitEnd            = Submit kiinni
+voting.create.submitStart          = Submit auki
+voting.create.voteEnd              = \u00C4\u00E4nestys kiinni
+voting.create.voteStart            = \u00C4\u00E4nestys auki

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/GenericCDIView.java

@@ -84,13 +84,13 @@ public abstract class GenericCDIView implements Serializable {
 			navihandler.saveDestination(viewidbuilder.toString());
 			navihandler.saveDestination(viewidbuilder.toString());
 			logger.debug("Permission denied. Saving navi {} for later use", viewidbuilder.toString());
 			logger.debug("Permission denied. Saving navi {} for later use", viewidbuilder.toString());
 			// navihandler.navigateTo("/permissionDenied");
 			// navihandler.navigateTo("/permissionDenied");
-			fcont.getApplication().getNavigationHandler().handleNavigation(fcont, null, "/permissionDenied");
+			fcont.getApplication().getNavigationHandler().handleNavigation(fcont, null, "/permissionDenied?faces-redirect=true");
 		}
 		}
 		return ret;
 		return ret;
 	}
 	}
 
 
 	protected void addFaceMessage(String string, Object... params) {
 	protected void addFaceMessage(String string, Object... params) {
-		
+
 		FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(I18n.get(string, params)));
 		FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(I18n.get(string, params)));
 
 
 	}
 	}

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/PaginationView.java

@@ -19,6 +19,7 @@ public abstract class PaginationView<T extends ModelInterface> extends GenericCD
 	private SearchQuery searchQuery = new SearchQuery();
 	private SearchQuery searchQuery = new SearchQuery();
 	protected Long resultcount = 0L;
 	protected Long resultcount = 0L;
 	private Long pagecount = 0L;
 	private Long pagecount = 0L;
+
 	// protected String sort;
 	// protected String sort;
 	// protected String search;
 	// protected String search;
 	private List<T> results;
 	private List<T> results;
@@ -148,4 +149,12 @@ public abstract class PaginationView<T extends ModelInterface> extends GenericCD
 		this.searchQuery = searchQuery;
 		this.searchQuery = searchQuery;
 	}
 	}
 
 
+	public Boolean isDirection() {
+		return searchQuery.isDirection();
+	}
+
+	public void setDirection(Boolean direction) {
+		searchQuery.setDirection(direction);
+	}
+
 }
 }

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlaceView.java

@@ -158,7 +158,7 @@ public class PlaceView extends GenericCDIView {
 
 
 	public String searchUser() {
 	public String searchUser() {
 		super.beginConversation();
 		super.beginConversation();
-		userlist = new ListDataModel<User>(userbean.getUsers(new SearchQuery(0, 0, null, searchuser)).getResults());
+		userlist = new ListDataModel<User>(userbean.getUsers(new SearchQuery(0, 0, null, searchuser, false)).getResults());
 		return null;
 		return null;
 	}
 	}
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/menu/PrimeMenuView.java

+package fi.insomnia.bortal.web.cdiview.menu;
+
+import java.util.List;
+
+import javax.ejb.EJB;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+import org.primefaces.component.menuitem.MenuItem;
+import org.primefaces.component.separator.Separator;
+import org.primefaces.component.submenu.Submenu;
+import org.primefaces.model.DefaultMenuModel;
+import org.primefaces.model.MenuModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import fi.insomnia.bortal.beans.MenuBeanLocal;
+import fi.insomnia.bortal.model.MenuNavigation;
+import fi.insomnia.bortal.utilities.I18n;
+import fi.insomnia.bortal.web.cdiview.GenericCDIView;
+
+@Named
+@RequestScoped
+public class PrimeMenuView extends GenericCDIView {
+
+	private static final long serialVersionUID = -5720164797157054213L;
+
+	// private String pagename;
+
+	// // @Inject
+	// // private transient LayoutView layoutview;
+	//
+	@EJB
+	private transient MenuBeanLocal menubean;
+
+	// private LinkedList<List<JsfMenuitem>> menus;
+
+	// private HashSet<MenuNavigation> navis;
+
+	// private Map<String, List<PageContent>> contents = new HashMap<String,
+	// List<PageContent>>();
+
+	// @EJB
+	// private transient SitePageBeanLocal pagebean;
+
+	private DefaultMenuModel menuModel;
+
+	private static final Logger logger = LoggerFactory.getLogger(PrimeMenuView.class);
+
+	public MenuModel getMenuModel()
+	{
+		if (menuModel == null)
+		{
+			menuModel = new DefaultMenuModel();
+			// menubean.findNavigation(layoutview.getPagepath());
+			List<MenuNavigation> tops = menubean.getTopmenus();
+			for (MenuNavigation m : tops)
+			{
+				if (m.getItem() != null && m.getChildren().isEmpty())
+				{
+					MenuItem menuitem = mkMenuitem(m);
+					if (menuitem != null)
+					{
+
+						menuModel.addMenuItem(menuitem);
+					}
+				} else {
+
+					Submenu subm = addSubmenu(m);
+
+					if (subm != null)
+					{
+						menuModel.addSubmenu(subm);
+					}
+				}
+			}
+		}
+		return menuModel;
+	}
+
+	private Submenu addSubmenu(MenuNavigation m) {
+		Submenu ret = null;
+
+		if (m.isVisible() && (m.getPermission() == null || super.hasPermission(m.getPermission())))
+		{
+			ret = new Submenu();
+			ret.setLabel(I18n.get(m.getKey()));
+			for (MenuNavigation child : m.getChildren())
+			{
+				if (child.getChildren().isEmpty()) {
+
+					if (child.getItem() != null)
+					{
+						MenuItem item = mkMenuitem(child);
+						if (item != null)
+						{
+							item.setValue(I18n.get(child.getKey()));
+							ret.getChildren().add(item);
+						}
+					} else if (ret.getChildCount() > 0) {
+						ret.getChildren().add(new Separator());
+					}
+
+				} else {
+					Submenu subm = addSubmenu(child);
+					if (subm != null)
+					{
+						subm.setLabel(I18n.get(child.getKey()));
+						ret.getChildren().add(subm);
+					}
+
+				}
+			}
+
+			if (ret.getChildCount() == 0)
+			{
+				ret = null;
+			}
+
+		}
+		return ret;
+	}
+
+	private MenuItem mkMenuitem(MenuNavigation m) {
+		MenuItem item = null;
+		if (m.isVisible() && (m.getPermission() == null || super.hasPermission(m.getPermission())))
+		{
+			item = new MenuItem();
+			String outcome;
+			if (m.getSitepage() != null)
+			{
+				outcome = new StringBuilder("/pages/index?id=").append(m.getSitepage().getId()).toString();
+
+			} else {
+				outcome = m.getItem().getUrl();
+			}
+			String key = I18n.get(m.getKey());
+			item.setValue(key);
+			item.setOutcome(outcome);
+		}
+		return item;
+	}
+
+}

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/ProductShopView.java

@@ -101,16 +101,10 @@ public class ProductShopView extends GenericCDIView {
 		}
 		}
 	}
 	}
 
 
-	long logtime;
-
 	public String add(Integer count) {
 	public String add(Integer count) {
-		logtime = Calendar.getInstance().getTimeInMillis();
 		ProductShopItem item = shoppingcart.getRowData();
 		ProductShopItem item = shoppingcart.getRowData();
 		item.setCount(item.getCount().add(BigDecimal.valueOf(count)));
 		item.setCount(item.getCount().add(BigDecimal.valueOf(count)));
-		logger.debug("product add count {}", Calendar.getInstance().getTimeInMillis() - logtime);
-
 		updateCartLimits(item);
 		updateCartLimits(item);
-		logger.debug("Updated cartLimits count {}", Calendar.getInstance().getTimeInMillis() - logtime);
 
 
 		return null;
 		return null;
 	}
 	}
@@ -143,28 +137,23 @@ public class ProductShopView extends GenericCDIView {
 		if (item != null && !listdata.contains(item)) {
 		if (item != null && !listdata.contains(item)) {
 			listdata.add(item);
 			listdata.add(item);
 		}
 		}
-		logger.debug("update 1 {}", Calendar.getInstance().getTimeInMillis() - logtime);
 
 
 		Map<Integer, BigDecimal> prodCounts = new HashMap<Integer, BigDecimal>();
 		Map<Integer, BigDecimal> prodCounts = new HashMap<Integer, BigDecimal>();
 		for (ProductShopItem sc : shoppingcart) {
 		for (ProductShopItem sc : shoppingcart) {
 			prodCounts.put(sc.getProduct().getId(), sc.getCount());
 			prodCounts.put(sc.getProduct().getId(), sc.getCount());
 		}
 		}
-		logger.debug("update 2 {}", Calendar.getInstance().getTimeInMillis() - logtime);
 
 
-		HashMap<Integer, BigDecimal> limits = productBean.getProductLimit(prodCounts, user);
-		logger.debug("update 4 {}", Calendar.getInstance().getTimeInMillis() - logtime);
+		HashMap<Integer, BigDecimal> limits = productBean.getProductLimit(
+				prodCounts, user);
 
 
 		// Update the updated cart first
 		// Update the updated cart first
-		if (item != null)
-		{
+		if (item != null) {
 			BigDecimal l = limits.get(item.getProduct().getId());
 			BigDecimal l = limits.get(item.getProduct().getId());
-			if (item.updateLimit(l))
-			{
+			if (item.updateLimit(l)) {
 				updateCartLimits(null);
 				updateCartLimits(null);
 				return;
 				return;
 			}
 			}
 		}
 		}
-		logger.debug("update 5 {}", Calendar.getInstance().getTimeInMillis() - logtime);
 
 
 		for (ProductShopItem n : shoppingcart) {
 		for (ProductShopItem n : shoppingcart) {
 			BigDecimal l = limits.get(n.getProduct().getId());
 			BigDecimal l = limits.get(n.getProduct().getId());
@@ -176,21 +165,56 @@ public class ProductShopView extends GenericCDIView {
 
 
 	}
 	}
 
 
+	public String removeBought() {
+		ProductShopItem row = boughtItems.getRowData();
+		row.setCount(row.getCount().subtract(BigDecimal.ONE));
+		updateCartLimits(row);
+		return null;
+
+	}
+
+	// public ListDataModel<ProductShopItem> getProducts() {
+	// List<ProductShopItem> prods = new ArrayList<ProductShopItem>();
+	// for (ProductShopItem sc : shoppingcart) {
+	// if (sc.getCount() != null && sc.getCount().compareTo(BigDecimal.ONE) !=
+	// -1) {
+	// prods.add(sc);
+	// }
+	// }
+	// return prods;
+	//
+	// }
+
 	public void updateAllCartLimits() {
 	public void updateAllCartLimits() {
 		updateCartLimits(null);
 		updateCartLimits(null);
 	}
 	}
 
 
-	public BigDecimal getAccountBalance() {
+	public BigDecimal getTransactionTotal()
+	{
+		BigDecimal ret = getCartPrice().subtract(getAccountCredits());
+		if (BigDecimal.ZERO.compareTo(ret) > 0)
+		{
+			ret = BigDecimal.ZERO;
+		}
+		return ret;
+	}
+
+	public BigDecimal getBalanceAfterTransaction() {
 		BigDecimal ret = user.getAccountBalance();
 		BigDecimal ret = user.getAccountBalance();
 		ret = ret.add(getCash());
 		ret = ret.add(getCash());
-		ret = ret.subtract(getTotalPrice());
+		ret = ret.subtract(getCartPrice());
 		logger.info("User accountbalance {}, cash{}, total {}. retBalance {}",
 		logger.info("User accountbalance {}, cash{}, total {}. retBalance {}",
 				new Object[] { user.getAccountBalance(), getCash(),
 				new Object[] { user.getAccountBalance(), getCash(),
-						getTotalPrice(), ret });
+						getCartPrice(), ret });
+		return ret;
+	}
+
+	public BigDecimal getAccountCredits() {
+		BigDecimal ret = user.getAccountBalance();
 		return ret;
 		return ret;
 	}
 	}
 
 
-	public BigDecimal getTotalPrice() {
+	public BigDecimal getCartPrice() {
 		BigDecimal ret = BigDecimal.ZERO;
 		BigDecimal ret = BigDecimal.ZERO;
 		for (ProductShopItem cart : shoppingcart) {
 		for (ProductShopItem cart : shoppingcart) {
 			ret = ret.add(cart.getPrice());
 			ret = ret.add(cart.getPrice());
@@ -241,13 +265,15 @@ public class ProductShopView extends GenericCDIView {
 		EventUser retuser = null;
 		EventUser retuser = null;
 		for (ProductShopItem shopitem : shoppingcart) {
 		for (ProductShopItem shopitem : shoppingcart) {
 			if (shopitem.getCount().compareTo(BigDecimal.ZERO) > 0) {
 			if (shopitem.getCount().compareTo(BigDecimal.ZERO) > 0) {
-				retuser = productBean.createAccountEvent(shopitem.getProduct(), shopitem.getCount(), user).getUser();
+				retuser = productBean.createAccountEvent(shopitem.getProduct(),
+						shopitem.getCount(), user).getUser();
 
 
 			}
 			}
 		}
 		}
 		if (cash != null && cash.compareTo(BigDecimal.ZERO) != 0) {
 		if (cash != null && cash.compareTo(BigDecimal.ZERO) != 0) {
 			Product credProd = productBean.findCreditProduct();
 			Product credProd = productBean.findCreditProduct();
-			retuser = productBean.createAccountEvent(credProd, cash, user).getUser();
+			retuser = productBean.createAccountEvent(credProd, cash, user)
+					.getUser();
 		}
 		}
 		if (retuser != null) {
 		if (retuser != null) {
 			user = retuser;
 			user = retuser;
@@ -304,7 +330,7 @@ public class ProductShopView extends GenericCDIView {
 
 
 	public BigDecimal getCash() {
 	public BigDecimal getCash() {
 		if (payInstant) {
 		if (payInstant) {
-			cash = getTotalPrice();
+			cash = getCartPrice();
 			logger.info("Getting instantcash as {}", cash);
 			logger.info("Getting instantcash as {}", cash);
 		}
 		}
 		if (cash == null) {
 		if (cash == null) {

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/ReaderView.java

@@ -14,14 +14,17 @@ import org.slf4j.LoggerFactory;
 
 
 import fi.insomnia.bortal.beans.ProductBeanLocal;
 import fi.insomnia.bortal.beans.ProductBeanLocal;
 import fi.insomnia.bortal.beans.ReaderBeanLocal;
 import fi.insomnia.bortal.beans.ReaderBeanLocal;
+import fi.insomnia.bortal.beans.RoleBeanLocal;
 import fi.insomnia.bortal.beans.UserBeanLocal;
 import fi.insomnia.bortal.beans.UserBeanLocal;
 import fi.insomnia.bortal.enums.apps.ShopPermission;
 import fi.insomnia.bortal.enums.apps.ShopPermission;
 import fi.insomnia.bortal.enums.apps.UserPermission;
 import fi.insomnia.bortal.enums.apps.UserPermission;
+import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.PrintedCard;
 import fi.insomnia.bortal.model.PrintedCard;
 import fi.insomnia.bortal.model.Product;
 import fi.insomnia.bortal.model.Product;
 import fi.insomnia.bortal.model.Reader;
 import fi.insomnia.bortal.model.Reader;
 import fi.insomnia.bortal.model.ReaderEvent;
 import fi.insomnia.bortal.model.ReaderEvent;
 import fi.insomnia.bortal.model.ReaderType;
 import fi.insomnia.bortal.model.ReaderType;
+import fi.insomnia.bortal.model.Role;
 import fi.insomnia.bortal.model.User;
 import fi.insomnia.bortal.model.User;
 import fi.insomnia.bortal.utilities.SearchQuery;
 import fi.insomnia.bortal.utilities.SearchQuery;
 import fi.insomnia.bortal.web.cdiview.GenericCDIView;
 import fi.insomnia.bortal.web.cdiview.GenericCDIView;
@@ -43,7 +46,7 @@ public class ReaderView extends GenericCDIView {
 
 
 	@Inject
 	@Inject
 	private ReaderNameContainer namecontainer;
 	private ReaderNameContainer namecontainer;
-
+	
 	@EJB
 	@EJB
 	private transient ReaderBeanLocal readerbean;
 	private transient ReaderBeanLocal readerbean;
 
 
@@ -78,7 +81,10 @@ public class ReaderView extends GenericCDIView {
 		// card.getPrintedCard());
 		// card.getPrintedCard());
 		return null;
 		return null;
 	}
 	}
-
+	public List<Role> getUserRoles(EventUser user) {
+		return userbean.findUsersRoles(user);
+	}
+	
 	public void initUserassocView() {
 	public void initUserassocView() {
 		if (super.requirePermissions(UserPermission.CREATE_NEW) && event == null) {
 		if (super.requirePermissions(UserPermission.CREATE_NEW) && event == null) {
 			event = readerbean.getEvent(eventid);
 			event = readerbean.getEvent(eventid);
@@ -89,7 +95,9 @@ public class ReaderView extends GenericCDIView {
 			super.beginConversation();
 			super.beginConversation();
 		}
 		}
 	}
 	}
-
+	public boolean isReaderSelected() {
+		return this.readerid != null;	
+	}
 	public String assocToCard()
 	public String assocToCard()
 	{
 	{
 
 
@@ -107,7 +115,7 @@ public class ReaderView extends GenericCDIView {
 		if (usersearch == null || usersearch.length() < 2) {
 		if (usersearch == null || usersearch.length() < 2) {
 			super.addFaceMessage("user.tooShortSearch");
 			super.addFaceMessage("user.tooShortSearch");
 		} else {
 		} else {
-			userlist = UserCardWrapper.initWrapper(userbean.getUsers(new SearchQuery(0, 0, null, usersearch)).getResults(), userbean);
+			userlist = UserCardWrapper.initWrapper(userbean.getUsers(new SearchQuery(0, 0, null, usersearch, false)).getResults(), userbean);
 		}
 		}
 
 
 		return null;
 		return null;
@@ -115,10 +123,10 @@ public class ReaderView extends GenericCDIView {
 
 
 	public void initReaderList() {
 	public void initReaderList() {
 		if (super.requirePermissions(ShopPermission.SHOP_TO_OTHERS)) {
 		if (super.requirePermissions(ShopPermission.SHOP_TO_OTHERS)) {
-
+			
 		}
 		}
 	}
 	}
-
+	
 	public List<Product> getAutoProducts() {
 	public List<Product> getAutoProducts() {
 
 
 		List<Product> ret = new ArrayList<Product>();
 		List<Product> ret = new ArrayList<Product>();
@@ -208,6 +216,13 @@ public class ReaderView extends GenericCDIView {
 		this.readerid = readerid;
 		this.readerid = readerid;
 	}
 	}
 
 
+	public String setReaderToId(Integer readerid) {
+		this.readerid = readerid;
+		this.namecontainer.setReaderId(readerid);
+		reader = readerbean.getReader(readerid);
+		return "/admin/info/index";
+	}
+
 	public Reader getReader() {
 	public Reader getReader() {
 		return reader;
 		return reader;
 	}
 	}

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserValidator.java

@@ -73,10 +73,10 @@ public class UserValidator implements Serializable {
 				return;
 				return;
 			}
 			}
 
 
-			logger.info("Checking length");
-			if (!firstpwd.equals(object)) {
-				message(context, ui, "userview.passwordsDontMatch");
-			}
+		logger.info("Checking length");
+		if (!firstpwd.equals(object)) {
+			message(context, ui, "userview.passwordsDontMatch");
+		}
 		}
 		}
 		logger.info("Done pwd");
 		logger.info("Done pwd");
 	}
 	}

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserView.java

@@ -111,6 +111,7 @@ public class UserView extends GenericCDIView {
 			} else {
 			} else {
 				user = getCurrentUser();
 				user = getCurrentUser();
 			}
 			}
+			canSave = getCurrentUser().equals(user) || permbean.hasPermission(UserPermission.MODIFY);
 		}
 		}
 		return user;
 		return user;
 	}
 	}

code/LanBortalWeb/src/fi/insomnia/bortal/web/helpers/ProductShopItem.java

@@ -24,6 +24,24 @@ public class ProductShopItem {
 	private BigDecimal price;
 	private BigDecimal price;
 	private BigDecimal limit;
 	private BigDecimal limit;
 
 
+	public BigDecimal getCreditPrice()
+	{
+		if (BigDecimal.ZERO.compareTo(price) < 0)
+		{
+			return price;
+		}
+		return BigDecimal.ZERO;
+	}
+
+	public BigDecimal getDebitPrice()
+	{
+		if (BigDecimal.ZERO.compareTo(price) > 0)
+		{
+			return price;
+		}
+		return BigDecimal.ZERO;
+	}
+
 	public ProductShopItem(Product prod) {
 	public ProductShopItem(Product prod) {
 		super();
 		super();
 		this.product = prod;
 		this.product = prod;