Merge remote-tracking branch 'origin/master' into infomap

Conflicts:
	code/moya-beans/ejbModule/fi/codecrew/moya/beans/MenuBean.java

code/moya-beans/ejbModule/fi/codecrew/moya/beans/MenuBean.java

@@ -359,6 +359,7 @@ public class MenuBean implements MenuBeanLocal {
 		infonavi.addPage(menuitemfacade.findOrCreate("/info/shop"), TerminalPermission.INFO);
 		infonavi.addPage(menuitemfacade.findOrCreate("/info/shop"), TerminalPermission.INFO);
 		infonavi.addPage(menuitemfacade.findOrCreate("/info/foodwave/foodwaveshop"), TerminalPermission.INFO);
 		infonavi.addPage(menuitemfacade.findOrCreate("/info/foodwave/foodwaveshop"), TerminalPermission.INFO);
 		infonavi.addPage(menuitemfacade.findOrCreate("/info/usermapsearch"), TerminalPermission.INFO);
 		infonavi.addPage(menuitemfacade.findOrCreate("/info/usermapsearch"), TerminalPermission.INFO);
+		infonavi.addPage(menuitemfacade.findOrCreate("/info/viplist"), TerminalPermission.INFO);
 		infonavi.addPage(menuitemfacade.findOrCreate("/info/foodwave/foodwaveProducts"), TerminalPermission.INFO).setVisible(false);
 		infonavi.addPage(menuitemfacade.findOrCreate("/info/foodwave/foodwaveProducts"), TerminalPermission.INFO).setVisible(false);
 
 
 		navifacade.create(adminmenu);
 		navifacade.create(adminmenu);

code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/map/v1/MapPojo.java

@@ -12,17 +12,17 @@ public class MapPojo {
 		super();
 		super();
 	}
 	}
 
 
-	@XmlElement(name = "name")
+	@XmlElement()
 	public String getName() {
 	public String getName() {
 		return name;
 		return name;
 	}
 	}
 
 
-	@XmlElement(name = "id")
+	@XmlElement()
 	public Integer getId() {
 	public Integer getId() {
 		return id;
 		return id;
 	}
 	}
 
 
-	@XmlElement(name = "active")
+	@XmlElement()
 	public boolean isActive() {
 	public boolean isActive() {
 		return active;
 		return active;
 	}
 	}

code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/userinfo/v1/EventUserRestPojo.java

@@ -40,40 +40,40 @@ public class EventUserRestPojo {
 
 
 	
 	
 
 
-	@XmlElement(name = "nick")
+	@XmlElement()
 	@ApiModelProperty("Nickname")
 	@ApiModelProperty("Nickname")
 	public String getNick() {
 	public String getNick() {
 		return nick;
 		return nick;
 	}
 	}
 
 
-	@XmlElement(name = "login")
+	@XmlElement()
 	@ApiModelProperty("Login name")
 	@ApiModelProperty("Login name")
 	public String getLogin()
 	public String getLogin()
 	{
 	{
 		return login;
 		return login;
 	}
 	}
 
 
-	@XmlElement(name = "eventuserId")
+	@XmlElement()
 	@ApiModelProperty("EventUser entity ID")
 	@ApiModelProperty("EventUser entity ID")
 	public Integer getEventuserId()
 	public Integer getEventuserId()
 	{
 	{
 		return eventuserId;
 		return eventuserId;
 	}
 	}
 
 
-	@XmlElement(name = "userId")
+	@XmlElement()
 	@ApiModelProperty("User entity ID")
 	@ApiModelProperty("User entity ID")
 	public Integer getuserId()
 	public Integer getuserId()
 	{
 	{
 		return getUserId();
 		return getUserId();
 	}
 	}
 
 
-	@XmlElement(name = "firstname")
+	@XmlElement()
 	@ApiModelProperty("First name")
 	@ApiModelProperty("First name")
 	public String getFirstname() {
 	public String getFirstname() {
 		return firstname;
 		return firstname;
 	}
 	}
 
 
-	@XmlElement(name = "lastname")
+	@XmlElement()
 	@ApiModelProperty("Last name")
 	@ApiModelProperty("Last name")
 	public String getLastname() {
 	public String getLastname() {
 		return lastname;
 		return lastname;

code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/userinfo/v1/PrintedCardRestPojo.java

@@ -39,29 +39,29 @@ public class PrintedCardRestPojo {
 		super();
 		super();
 	}
 	}
 
 
-	@XmlElement(name = "eventuserId")
+	@XmlElement()
 	public Integer getEventuserId() {
 	public Integer getEventuserId() {
 		return eventuserId;
 		return eventuserId;
 	}
 	}
 
 
-	@XmlElement(name = "cardId")
+	@XmlElement()
 	public Integer getId() {
 	public Integer getId() {
 		return id;
 		return id;
 	}
 	}
 
 
-	@XmlElement(name = "cardTemplate")
+	@XmlElement()
 	public String getTemplate() {
 	public String getTemplate() {
 		return template;
 		return template;
 	}
 	}
 
 
-	@XmlElement(name = "username")
+	@XmlElement()
 	public String getUsername()
 	public String getUsername()
 	{
 	{
 		return username;
 		return username;
 
 
 	}
 	}
 
 
-	@XmlElement(name = "wholeName")
+	@XmlElement()
 	public String getWholeName() {
 	public String getWholeName() {
 		return wholeName;
 		return wholeName;
 	}
 	}
@@ -79,12 +79,12 @@ public class PrintedCardRestPojo {
 	 * <li>DELIVERED;
 	 * <li>DELIVERED;
 	 * </ul>
 	 * </ul>
 	 */
 	 */
-	@XmlElement(name = "state")
+	@XmlElement()
 	public String getState() {
 	public String getState() {
 		return state;
 		return state;
 	}
 	}
 
 
-	@XmlElement(name = "printTime")
+	@XmlElement()
 	public Date getPrintTime() {
 	public Date getPrintTime() {
 		return printTime;
 		return printTime;
 	}
 	}

code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/userinfo/v1/UserPermissionRestPojo.java

@@ -53,9 +53,9 @@ public class UserPermissionRestPojo {
 		this.user = user;
 		this.user = user;
 	}
 	}
 
 
-	@XmlElement(name = "user")
+	@XmlElement()
 	private EventUserRestPojo user;
 	private EventUserRestPojo user;
-	@XmlElement(name = "accessGranted")
+	@XmlElement()
 	private boolean accessGranted = false;
 	private boolean accessGranted = false;
 
 
 }
 }

code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/userinfo/v1/UserReservationPlacePojo.java

@@ -4,15 +4,15 @@ import javax.xml.bind.annotation.XmlElement;
 
 
 public class UserReservationPlacePojo {
 public class UserReservationPlacePojo {
 
 
-	@XmlElement(name = "placeid")
+	@XmlElement()
 	private Integer placeid;
 	private Integer placeid;
-	@XmlElement(name = "placename")
+	@XmlElement()
 	private String placename;
 	private String placename;
-	@XmlElement(name = "placegiven")
+	@XmlElement()
 	private boolean placegiven;
 	private boolean placegiven;
-	@XmlElement(name = "productId")
+	@XmlElement()
 	private Integer productId;
 	private Integer productId;
-	@XmlElement(name = "productName")
+	@XmlElement()
 	private String productName;
 	private String productName;
 
 
 	public String getPlacename() {
 	public String getPlacename() {

code/moya-web/WebContent/resources/templates/infoview/css/style.css

@@ -282,7 +282,7 @@ label {
 
 
 #header_left {
 #header_left {
 	float: left;
 	float: left;
-	width: 400px;
+	width: 600px;
 }
 }
 #header_center {
 #header_center {
 	float: left;
 	float: left;

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties

@@ -509,3 +509,4 @@ vipProduct.quantity = Lukum\u00E4\u00E4r\u00E4
 
 
 yes = Kyll\u00E4
 yes = Kyll\u00E4
 vip.backToList=Takaisin listaukseen
 vip.backToList=Takaisin listaukseen
+submenu.info.viplist=Vippilista

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties

@@ -1726,3 +1726,4 @@ voting.create.voteStart     = Voting start
 
 
 yes = Yes
 yes = Yes
 vip.backToList=Back to viplist list
 vip.backToList=Back to viplist list
+submenu.info.viplist=Viplist

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties

@@ -1709,3 +1709,4 @@ voting.create.voteStart     = \u00C4\u00E4nestys auki
 
 
 yes = Kyll\u00E4
 yes = Kyll\u00E4
 vip.backToList=Takaisin listaukseen
 vip.backToList=Takaisin listaukseen
+submenu.info.viplist=Vippilista