Merge branch 'devel' into gameCodes

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

+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-27T16:07:46.034+0300")
+@StaticMetamodel(AccountEvent.class)
+public class AccountEvent_ extends GenericEntity_ {
+	public static volatile SingularAttribute<AccountEvent, Boolean> cash;
+	public static volatile SingularAttribute<AccountEvent, BigDecimal> unitPrice;
+	public static volatile SingularAttribute<AccountEvent, BigDecimal> quantity;
+	public static volatile SingularAttribute<AccountEvent, Calendar> eventTime;
+	public static volatile SingularAttribute<AccountEvent, Calendar> delivered;
+	public static volatile SingularAttribute<AccountEvent, BigDecimal> deliveredCount;
+	public static volatile SingularAttribute<AccountEvent, FoodWave> foodWave;
+	public static volatile SingularAttribute<AccountEvent, Product> product;
+	public static volatile SingularAttribute<AccountEvent, EventUser> user;
+	public static volatile SingularAttribute<AccountEvent, EventUser> seller;
+	public static volatile ListAttribute<AccountEvent, DiscountInstance> discountInstances;
+	public static volatile SingularAttribute<AccountEvent, Bill> bill;
+	public static volatile SingularAttribute<AccountEvent, String> description;
+}

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

+package fi.insomnia.bortal.model;
+
+import fi.insomnia.bortal.enums.ActionLogMessageState;
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.826+0300")
+@StaticMetamodel(ActionLogMessageResponse.class)
+public class ActionLogMessageResponse_ extends GenericEntity_ {
+	public static volatile SingularAttribute<ActionLogMessageResponse, Date> time;
+	public static volatile SingularAttribute<ActionLogMessageResponse, EventUser> user;
+	public static volatile SingularAttribute<ActionLogMessageResponse, String> message;
+	public static volatile SingularAttribute<ActionLogMessageResponse, ActionLogMessageState> stateChange;
+	public static volatile SingularAttribute<ActionLogMessageResponse, ActionLogMessage> actionLogMessage;
+}

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

+package fi.insomnia.bortal.model;
+
+import fi.insomnia.bortal.enums.ActionLogMessageState;
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.819+0300")
+@StaticMetamodel(ActionLogMessage.class)
+public class ActionLogMessage_ extends GenericEntity_ {
+	public static volatile SingularAttribute<ActionLogMessage, Date> time;
+	public static volatile SingularAttribute<ActionLogMessage, User> user;
+	public static volatile SingularAttribute<ActionLogMessage, Role> crew;
+	public static volatile SingularAttribute<ActionLogMessage, String> message;
+	public static volatile ListAttribute<ActionLogMessage, ActionLogMessageResponse> actionLogMessageResponses;
+	public static volatile SingularAttribute<ActionLogMessage, ActionLogMessageState> state;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.830+0300")
+@StaticMetamodel(ApplicationPermission.class)
+public class ApplicationPermission_ extends GenericEntity_ {
+	public static volatile SingularAttribute<ApplicationPermission, String> application;
+	public static volatile SingularAttribute<ApplicationPermission, Role> role;
+	public static volatile SingularAttribute<ApplicationPermission, String> permission;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-26T02:39:28.679+0300")
+@StaticMetamodel(BillLine.class)
+public class BillLine_ extends GenericEntity_ {
+	public static volatile SingularAttribute<BillLine, Bill> bill;
+	public static volatile SingularAttribute<BillLine, String> name;
+	public static volatile SingularAttribute<BillLine, BigDecimal> quantity;
+	public static volatile SingularAttribute<BillLine, BigDecimal> unitPrice;
+	public static volatile SingularAttribute<BillLine, String> unitName;
+	public static volatile SingularAttribute<BillLine, BigDecimal> vat;
+	public static volatile SingularAttribute<BillLine, Product> lineProduct;
+	public static volatile SingularAttribute<BillLine, FoodWave> foodwave;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.834+0300")
+@StaticMetamodel(Bill.class)
+public class Bill_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Bill, LanEvent> event;
+	public static volatile SingularAttribute<Bill, Date> paidDate;
+	public static volatile SingularAttribute<Bill, Integer> billNumber;
+	public static volatile SingularAttribute<Bill, String> addr1;
+	public static volatile SingularAttribute<Bill, String> addr2;
+	public static volatile SingularAttribute<Bill, String> addr3;
+	public static volatile SingularAttribute<Bill, String> addr4;
+	public static volatile SingularAttribute<Bill, String> addr5;
+	public static volatile SingularAttribute<Bill, Calendar> sentDate;
+	public static volatile SingularAttribute<Bill, Integer> paymentTime;
+	public static volatile SingularAttribute<Bill, String> noticetime;
+	public static volatile SingularAttribute<Bill, String> theirReference;
+	public static volatile SingularAttribute<Bill, String> ourReference;
+	public static volatile SingularAttribute<Bill, String> deliveryTerms;
+	public static volatile SingularAttribute<Bill, Integer> delayIntrest;
+	public static volatile SingularAttribute<Bill, String> notes;
+	public static volatile ListAttribute<Bill, BillLine> billLines;
+	public static volatile SingularAttribute<Bill, AccountEvent> accountEvent;
+	public static volatile SingularAttribute<Bill, EventUser> user;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-11-18T00:45:55.945+0200")
+@StaticMetamodel(CardBarcode.class)
+public class CardBarcode_ extends GenericEntity_ {
+	public static volatile SingularAttribute<CardBarcode, PrintedCard> printedCard;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.843+0300")
+@StaticMetamodel(CardTemplate.class)
+public class CardTemplate_ extends GenericEntity_ {
+	public static volatile SingularAttribute<CardTemplate, LanEvent> event;
+	public static volatile SingularAttribute<CardTemplate, byte[]> image;
+	public static volatile SingularAttribute<CardTemplate, String> name;
+	public static volatile SingularAttribute<CardTemplate, Integer> power;
+	public static volatile ListAttribute<CardTemplate, Role> roles;
+	public static volatile ListAttribute<CardTemplate, PrintedCard> cards;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.856+0300")
+@StaticMetamodel(CompoEntryFile.class)
+public class CompoEntryFile_ extends GenericEntity_ {
+	public static volatile SingularAttribute<CompoEntryFile, String> mimeType;
+	public static volatile SingularAttribute<CompoEntryFile, String> fileName;
+	public static volatile SingularAttribute<CompoEntryFile, String> description;
+	public static volatile SingularAttribute<CompoEntryFile, String> hash;
+	public static volatile SingularAttribute<CompoEntryFile, byte[]> fileData;
+	public static volatile SingularAttribute<CompoEntryFile, Calendar> uploaded;
+	public static volatile SingularAttribute<CompoEntryFile, CompoEntry> entry;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.860+0300")
+@StaticMetamodel(CompoEntryParticipant.class)
+public class CompoEntryParticipant_ extends GenericEntity_ {
+	public static volatile SingularAttribute<CompoEntryParticipant, CompoEntry> entry;
+	public static volatile SingularAttribute<CompoEntryParticipant, String> role;
+	public static volatile SingularAttribute<CompoEntryParticipant, String> nick;
+	public static volatile SingularAttribute<CompoEntryParticipant, Calendar> confirmed;
+	public static volatile SingularAttribute<CompoEntryParticipant, EventUser> user;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.852+0300")
+@StaticMetamodel(CompoEntry.class)
+public class CompoEntry_ extends GenericEntity_ {
+	public static volatile SingularAttribute<CompoEntry, Compo> compo;
+	public static volatile SingularAttribute<CompoEntry, Calendar> created;
+	public static volatile SingularAttribute<CompoEntry, String> title;
+	public static volatile SingularAttribute<CompoEntry, String> author;
+	public static volatile SingularAttribute<CompoEntry, String> notes;
+	public static volatile SingularAttribute<CompoEntry, String> screenMessage;
+	public static volatile SingularAttribute<CompoEntry, Integer> sort;
+	public static volatile SingularAttribute<CompoEntry, Integer> finalPosition;
+	public static volatile SingularAttribute<CompoEntry, CompoEntryFile> currentFile;
+	public static volatile ListAttribute<CompoEntry, Vote> votes;
+	public static volatile ListAttribute<CompoEntry, CompoEntryFile> files;
+	public static volatile ListAttribute<CompoEntry, CompoEntryParticipant> participants;
+	public static volatile SingularAttribute<CompoEntry, EventUser> creator;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.847+0300")
+@StaticMetamodel(Compo.class)
+public class Compo_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Compo, String> name;
+	public static volatile SingularAttribute<Compo, LanEvent> event;
+	public static volatile SingularAttribute<Compo, Calendar> startTime;
+	public static volatile SingularAttribute<Compo, Calendar> endTime;
+	public static volatile SingularAttribute<Compo, Calendar> voteStart;
+	public static volatile SingularAttribute<Compo, Calendar> voteEnd;
+	public static volatile SingularAttribute<Compo, Calendar> submitStart;
+	public static volatile SingularAttribute<Compo, Calendar> submitEnd;
+	public static volatile SingularAttribute<Compo, String> description;
+	public static volatile SingularAttribute<Compo, Integer> maxParticipantCount;
+	public static volatile SingularAttribute<Compo, Boolean> holdVoting;
+	public static volatile ListAttribute<Compo, CompoEntry> compoEntries;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.868+0300")
+@StaticMetamodel(DiscountInstance.class)
+public class DiscountInstance_ extends GenericEntity_ {
+	public static volatile SingularAttribute<DiscountInstance, AccountEvent> accountEvent;
+	public static volatile SingularAttribute<DiscountInstance, Discount> discount;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.864+0300")
+@StaticMetamodel(Discount.class)
+public class Discount_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Discount, LanEvent> event;
+	public static volatile SingularAttribute<Discount, BigDecimal> percentage;
+	public static volatile SingularAttribute<Discount, String> code;
+	public static volatile SingularAttribute<Discount, Calendar> validFrom;
+	public static volatile SingularAttribute<Discount, Calendar> validTo;
+	public static volatile SingularAttribute<Discount, String> details;
+	public static volatile SingularAttribute<Discount, String> shortdesc;
+	public static volatile SingularAttribute<Discount, BigDecimal> amountMin;
+	public static volatile SingularAttribute<Discount, BigDecimal> amountMax;
+	public static volatile SingularAttribute<Discount, Boolean> active;
+	public static volatile SingularAttribute<Discount, BigDecimal> maxNum;
+	public static volatile SingularAttribute<Discount, BigDecimal> perUser;
+	public static volatile SingularAttribute<Discount, BigDecimal> totalCount;
+	public static volatile ListAttribute<Discount, DiscountInstance> discountInstances;
+	public static volatile SingularAttribute<Discount, Role> role;
+	public static volatile ListAttribute<Discount, Product> products;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.872+0300")
+@StaticMetamodel(EntityEquals.class)
+public class EntityEquals_ {
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.875+0300")
+@StaticMetamodel(EventMap.class)
+public class EventMap_ extends GenericEntity_ {
+	public static volatile SingularAttribute<EventMap, LanEvent> event;
+	public static volatile SingularAttribute<EventMap, byte[]> mapData;
+	public static volatile SingularAttribute<EventMap, String> name;
+	public static volatile ListAttribute<EventMap, Place> places;
+	public static volatile ListAttribute<EventMap, Reader> readers;
+	public static volatile SingularAttribute<EventMap, Boolean> active;
+	public static volatile SingularAttribute<EventMap, String> notes;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.880+0300")
+@StaticMetamodel(EventOrganiser.class)
+public class EventOrganiser_ extends GenericEntity_ {
+	public static volatile SingularAttribute<EventOrganiser, String> organisation;
+	public static volatile SingularAttribute<EventOrganiser, String> bundleCountry;
+	public static volatile ListAttribute<EventOrganiser, LanEvent> events;
+	public static volatile SingularAttribute<EventOrganiser, String> billAddress1;
+	public static volatile SingularAttribute<EventOrganiser, String> billAddress2;
+	public static volatile SingularAttribute<EventOrganiser, String> billAddress3;
+	public static volatile SingularAttribute<EventOrganiser, String> billAddress4;
+	public static volatile SingularAttribute<EventOrganiser, String> bankNumber1;
+	public static volatile SingularAttribute<EventOrganiser, String> bankNumber2;
+	public static volatile SingularAttribute<EventOrganiser, String> bankName1;
+	public static volatile SingularAttribute<EventOrganiser, String> bankName2;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.885+0300")
+@StaticMetamodel(EventUser.class)
+public class EventUser_ extends GenericEntity_ {
+	public static volatile SingularAttribute<EventUser, User> user;
+	public static volatile SingularAttribute<EventUser, LanEvent> event;
+	public static volatile ListAttribute<EventUser, Vote> votes;
+	public static volatile ListAttribute<EventUser, UserNote> notes;
+	public static volatile ListAttribute<EventUser, Role> roles;
+	public static volatile ListAttribute<EventUser, CompoEntryParticipant> compoEntryParticipants;
+	public static volatile ListAttribute<EventUser, CompoEntry> compoEntries;
+	public static volatile ListAttribute<EventUser, PlaceGroup> placeGroups;
+	public static volatile ListAttribute<EventUser, GroupMembership> groupMemberships;
+	public static volatile ListAttribute<EventUser, Place> currentPlaces;
+	public static volatile ListAttribute<EventUser, PrintedCard> printedCards;
+	public static volatile ListAttribute<EventUser, AccountEvent> accountEvents;
+	public static volatile ListAttribute<EventUser, Bill> bills;
+	public static volatile ListAttribute<EventUser, AccountEvent> soldItems;
+	public static volatile ListAttribute<EventUser, PollAnswer> pollAnswers;
+	public static volatile SingularAttribute<EventUser, EventUser> creator;
+	public static volatile SingularAttribute<EventUser, Date> eventuserCreated;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-11-01T13:46:40.118+0200")
+@StaticMetamodel(Feedback.class)
+public class Feedback_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Feedback, EventUser> sender;
+	public static volatile SingularAttribute<Feedback, LanEvent> event;
+	public static volatile SingularAttribute<Feedback, Calendar> timestamp;
+	public static volatile SingularAttribute<Feedback, String> message;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-11-01T13:46:29.082+0200")
+@StaticMetamodel(FoodWaveTemplate.class)
+public class FoodWaveTemplate_ extends GenericEntity_ {
+	public static volatile SingularAttribute<FoodWaveTemplate, LanEvent> event;
+	public static volatile SingularAttribute<FoodWaveTemplate, String> name;
+	public static volatile SingularAttribute<FoodWaveTemplate, String> description;
+	public static volatile ListAttribute<FoodWaveTemplate, Product> products;
+	public static volatile ListAttribute<FoodWaveTemplate, FoodWave> foodwaves;
+	public static volatile SingularAttribute<FoodWaveTemplate, Integer> maximumFoods;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-11-18T00:45:52.230+0200")
+@StaticMetamodel(FoodWave.class)
+public class FoodWave_ extends GenericEntity_ {
+	public static volatile SingularAttribute<FoodWave, String> name;
+	public static volatile SingularAttribute<FoodWave, String> description;
+	public static volatile SingularAttribute<FoodWave, Date> time;
+	public static volatile SingularAttribute<FoodWave, Integer> maximumFoods;
+	public static volatile SingularAttribute<FoodWave, Boolean> closed;
+	public static volatile ListAttribute<FoodWave, AccountEvent> accountEvents;
+	public static volatile ListAttribute<FoodWave, BillLine> billLines;
+	public static volatile SingularAttribute<FoodWave, FoodWaveTemplate> template;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.897+0300")
+@StaticMetamodel(GenericEntity.class)
+public class GenericEntity_ extends EntityEquals_ {
+	public static volatile SingularAttribute<GenericEntity, Integer> id;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.901+0300")
+@StaticMetamodel(GroupMembership.class)
+public class GroupMembership_ extends GenericEntity_ {
+	public static volatile SingularAttribute<GroupMembership, String> inviteToken;
+	public static volatile SingularAttribute<GroupMembership, Calendar> inviteAccepted;
+	public static volatile SingularAttribute<GroupMembership, String> inviteEmail;
+	public static volatile SingularAttribute<GroupMembership, String> inviteName;
+	public static volatile SingularAttribute<GroupMembership, PlaceGroup> placeGroup;
+	public static volatile SingularAttribute<GroupMembership, Place> placeReservation;
+	public static volatile SingularAttribute<GroupMembership, EventUser> user;
+	public static volatile SingularAttribute<GroupMembership, Calendar> enteredEvent;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-11-18T00:45:52.284+0200")
+@StaticMetamodel(InventoryEvent.class)
+public class InventoryEvent_ extends GenericEntity_ {
+	public static volatile SingularAttribute<InventoryEvent, Date> created;
+	public static volatile SingularAttribute<InventoryEvent, User> user;
+	public static volatile SingularAttribute<InventoryEvent, Product> product;
+	public static volatile SingularAttribute<InventoryEvent, String> info;
+	public static volatile SingularAttribute<InventoryEvent, BigDecimal> quantity;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.910+0300")
+@StaticMetamodel(LanEventDomain.class)
+public class LanEventDomain_ extends GenericEntity_ {
+	public static volatile SingularAttribute<LanEventDomain, String> domain;
+	public static volatile SingularAttribute<LanEventDomain, String> description;
+	public static volatile SingularAttribute<LanEventDomain, LanEvent> event;
+	public static volatile SingularAttribute<LanEventDomain, Integer> overridePriority;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.914+0300")
+@StaticMetamodel(LanEventPrivateProperty.class)
+public class LanEventPrivateProperty_ extends GenericEntity_ {
+	public static volatile SingularAttribute<LanEventPrivateProperty, EventOrganiser> eventorg;
+	public static volatile SingularAttribute<LanEventPrivateProperty, LanEvent> event;
+	public static volatile SingularAttribute<LanEventPrivateProperty, LanEventPrivatePropertyKey> key;
+	public static volatile SingularAttribute<LanEventPrivateProperty, String> description;
+	public static volatile SingularAttribute<LanEventPrivateProperty, Boolean> booleanValue;
+	public static volatile SingularAttribute<LanEventPrivateProperty, String> textvalue;
+	public static volatile SingularAttribute<LanEventPrivateProperty, BigDecimal> decimalValue;
+	public static volatile SingularAttribute<LanEventPrivateProperty, Long> longValue;
+	public static volatile SingularAttribute<LanEventPrivateProperty, String> byteMime;
+	public static volatile SingularAttribute<LanEventPrivateProperty, byte[]> byteValue;
+	public static volatile SingularAttribute<LanEventPrivateProperty, Date> dateValue;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.918+0300")
+@StaticMetamodel(LanEventProperty.class)
+public class LanEventProperty_ extends GenericEntity_ {
+	public static volatile SingularAttribute<LanEventProperty, EventOrganiser> eventorg;
+	public static volatile SingularAttribute<LanEventProperty, LanEvent> event;
+	public static volatile SingularAttribute<LanEventProperty, LanEventPropertyKey> key;
+	public static volatile SingularAttribute<LanEventProperty, String> description;
+	public static volatile SingularAttribute<LanEventProperty, Boolean> booleanValue;
+	public static volatile SingularAttribute<LanEventProperty, String> textvalue;
+	public static volatile SingularAttribute<LanEventProperty, BigDecimal> decimalValue;
+	public static volatile SingularAttribute<LanEventProperty, Long> longValue;
+	public static volatile SingularAttribute<LanEventProperty, String> byteMime;
+	public static volatile SingularAttribute<LanEventProperty, byte[]> byteValue;
+	public static volatile SingularAttribute<LanEventProperty, Date> dateValue;
+}

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

+package fi.insomnia.bortal.model;
+
+import fi.insomnia.bortal.enums.EventStatus;
+import fi.insomnia.bortal.model.salespoint.Salespoint;
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.905+0300")
+@StaticMetamodel(LanEvent.class)
+public class LanEvent_ extends GenericEntity_ {
+	public static volatile SingularAttribute<LanEvent, Calendar> startTime;
+	public static volatile SingularAttribute<LanEvent, Calendar> endTime;
+	public static volatile SingularAttribute<LanEvent, String> name;
+	public static volatile SingularAttribute<LanEvent, Boolean> eventEnabled;
+	public static volatile SingularAttribute<LanEvent, Integer> referenceNumberBase;
+	public static volatile SingularAttribute<LanEvent, Integer> nextBillNumber;
+	public static volatile SingularAttribute<LanEvent, EventOrganiser> organiser;
+	public static volatile SingularAttribute<LanEvent, EventStatus> status;
+	public static volatile ListAttribute<LanEvent, LogEntry> logEntries;
+	public static volatile SingularAttribute<LanEvent, Role> defaultRole;
+	public static volatile ListAttribute<LanEvent, Compo> compos;
+	public static volatile ListAttribute<LanEvent, CardTemplate> cardTemplates;
+	public static volatile ListAttribute<LanEvent, EventMap> eventMaps;
+	public static volatile ListAttribute<LanEvent, Role> roles;
+	public static volatile ListAttribute<LanEvent, Bill> bills;
+	public static volatile ListAttribute<LanEvent, Reader> readers;
+	public static volatile ListAttribute<LanEvent, Poll> polls;
+	public static volatile ListAttribute<LanEvent, Salespoint> salespoints;
+	public static volatile ListAttribute<LanEvent, LanEventDomain> domains;
+	public static volatile ListAttribute<LanEvent, LanEventProperty> properties;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.923+0300")
+@StaticMetamodel(Location.class)
+public class Location_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Location, LanEvent> event;
+	public static volatile SingularAttribute<Location, String> name;
+	public static volatile ListAttribute<Location, Reader> readers;
+	public static volatile ListAttribute<Location, PrintedCard> printedCardsAtLocation;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.930+0300")
+@StaticMetamodel(LogEntryType.class)
+public class LogEntryType_ extends GenericEntity_ {
+	public static volatile SingularAttribute<LogEntryType, String> name;
+	public static volatile SingularAttribute<LogEntryType, String> description;
+	public static volatile ListAttribute<LogEntryType, LogEntry> logEntries;
+	public static volatile SingularAttribute<LogEntryType, Integer> logLevel;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.927+0300")
+@StaticMetamodel(LogEntry.class)
+public class LogEntry_ extends GenericEntity_ {
+	public static volatile SingularAttribute<LogEntry, LanEvent> parentEvent;
+	public static volatile SingularAttribute<LogEntry, Calendar> time;
+	public static volatile SingularAttribute<LogEntry, String> description;
+	public static volatile SingularAttribute<LogEntry, LogEntryType> type;
+	public static volatile SingularAttribute<LogEntry, User> user;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-25T01:54:09.095+0300")
+@StaticMetamodel(MenuNavigation.class)
+public class MenuNavigation_ extends GenericEntity_ {
+	public static volatile SingularAttribute<MenuNavigation, LanEvent> event;
+	public static volatile SingularAttribute<MenuNavigation, String> key;
+	public static volatile SingularAttribute<MenuNavigation, String> header;
+	public static volatile SingularAttribute<MenuNavigation, String> footer;
+	public static volatile SingularAttribute<MenuNavigation, Integer> sort;
+	public static volatile SingularAttribute<MenuNavigation, Boolean> visible;
+	public static volatile SingularAttribute<MenuNavigation, Menuitem> item;
+	public static volatile SingularAttribute<MenuNavigation, SitePage> sitepage;
+	public static volatile SingularAttribute<MenuNavigation, MenuNavigation> parent;
+	public static volatile ListAttribute<MenuNavigation, MenuNavigation> children;
+	public static volatile SingularAttribute<MenuNavigation, String> application;
+	public static volatile SingularAttribute<MenuNavigation, String> permission;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.934+0300")
+@StaticMetamodel(Menuitem.class)
+public class Menuitem_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Menuitem, String> url;
+	public static volatile SingularAttribute<Menuitem, String> description;
+	public static volatile ListAttribute<Menuitem, MenuNavigation> navigations;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.947+0300")
+@StaticMetamodel(NewsGroup.class)
+public class NewsGroup_ extends GenericEntity_ {
+	public static volatile SingularAttribute<NewsGroup, LanEvent> event;
+	public static volatile SingularAttribute<NewsGroup, String> name;
+	public static volatile SingularAttribute<NewsGroup, String> description;
+	public static volatile SingularAttribute<NewsGroup, Integer> priority;
+	public static volatile SingularAttribute<NewsGroup, Role> writerRole;
+	public static volatile ListAttribute<NewsGroup, News> news;
+	public static volatile ListAttribute<NewsGroup, Role> readerRoles;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.943+0300")
+@StaticMetamodel(News.class)
+public class News_ extends GenericEntity_ {
+	public static volatile SingularAttribute<News, String> title;
+	public static volatile SingularAttribute<News, String> body;
+	public static volatile SingularAttribute<News, String> bodyAbstract;
+	public static volatile SingularAttribute<News, Date> publish;
+	public static volatile SingularAttribute<News, Date> expire;
+	public static volatile SingularAttribute<News, EventUser> creator;
+	public static volatile SingularAttribute<News, Integer> priority;
+	public static volatile SingularAttribute<News, NewsGroup> group;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.952+0300")
+@StaticMetamodel(OrgRole.class)
+public class OrgRole_ extends GenericEntity_ {
+	public static volatile SingularAttribute<OrgRole, String> name;
+	public static volatile ListAttribute<OrgRole, User> users;
+	public static volatile ListAttribute<OrgRole, OrgRole> parents;
+	public static volatile ListAttribute<OrgRole, OrgRole> children;
+	public static volatile SingularAttribute<OrgRole, EventOrganiser> eventOrganisation;
+	public static volatile SingularAttribute<OrgRole, Boolean> manageOrganisation;
+	public static volatile ListAttribute<OrgRole, Role> eventRoles;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.956+0300")
+@StaticMetamodel(PageContent.class)
+public class PageContent_ extends GenericEntity_ {
+	public static volatile SingularAttribute<PageContent, SitePage> sitepage;
+	public static volatile SingularAttribute<PageContent, Integer> sort;
+	public static volatile SingularAttribute<PageContent, String> content;
+	public static volatile SingularAttribute<PageContent, Date> publish;
+	public static volatile SingularAttribute<PageContent, Date> expire;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.964+0300")
+@StaticMetamodel(PlaceGroup.class)
+public class PlaceGroup_ extends GenericEntity_ {
+	public static volatile SingularAttribute<PlaceGroup, Calendar> created;
+	public static volatile SingularAttribute<PlaceGroup, LanEvent> event;
+	public static volatile SingularAttribute<PlaceGroup, Calendar> edited;
+	public static volatile SingularAttribute<PlaceGroup, String> code;
+	public static volatile SingularAttribute<PlaceGroup, String> name;
+	public static volatile SingularAttribute<PlaceGroup, Boolean> active;
+	public static volatile SingularAttribute<PlaceGroup, String> details;
+	public static volatile SingularAttribute<PlaceGroup, EventUser> creator;
+	public static volatile ListAttribute<PlaceGroup, GroupMembership> members;
+	public static volatile ListAttribute<PlaceGroup, Place> places;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.960+0300")
+@StaticMetamodel(Place.class)
+public class Place_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Place, String> description;
+	public static volatile SingularAttribute<Place, String> name;
+	public static volatile SingularAttribute<Place, Integer> mapX;
+	public static volatile SingularAttribute<Place, Integer> mapY;
+	public static volatile SingularAttribute<Place, Integer> width;
+	public static volatile SingularAttribute<Place, Integer> height;
+	public static volatile SingularAttribute<Place, Calendar> releaseTime;
+	public static volatile SingularAttribute<Place, String> details;
+	public static volatile SingularAttribute<Place, String> code;
+	public static volatile SingularAttribute<Place, GroupMembership> placeReserver;
+	public static volatile SingularAttribute<Place, Boolean> buyable;
+	public static volatile SingularAttribute<Place, Boolean> disabled;
+	public static volatile SingularAttribute<Place, PlaceGroup> group;
+	public static volatile SingularAttribute<Place, Role> providesRole;
+	public static volatile SingularAttribute<Place, EventMap> map;
+	public static volatile SingularAttribute<Place, Product> product;
+	public static volatile SingularAttribute<Place, EventUser> currentUser;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.973+0300")
+@StaticMetamodel(PollAnswer.class)
+public class PollAnswer_ extends GenericEntity_ {
+	public static volatile SingularAttribute<PollAnswer, String> answerText;
+	public static volatile SingularAttribute<PollAnswer, Boolean> answerBoolean;
+	public static volatile SingularAttribute<PollAnswer, PossibleAnswer> choice;
+	public static volatile SingularAttribute<PollAnswer, EventUser> user;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.976+0300")
+@StaticMetamodel(PollQuestion.class)
+public class PollQuestion_ extends GenericEntity_ {
+	public static volatile SingularAttribute<PollQuestion, Integer> characters;
+	public static volatile SingularAttribute<PollQuestion, Poll> poll;
+	public static volatile ListAttribute<PollQuestion, PossibleAnswer> answers;
+	public static volatile SingularAttribute<PollQuestion, String> question;
+	public static volatile SingularAttribute<PollQuestion, Integer> choices;
+	public static volatile SingularAttribute<PollQuestion, Integer> sort;
+	public static volatile SingularAttribute<PollQuestion, Integer> page;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.968+0300")
+@StaticMetamodel(Poll.class)
+public class Poll_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Poll, LanEvent> event;
+	public static volatile SingularAttribute<Poll, Date> begin;
+	public static volatile SingularAttribute<Poll, Date> end;
+	public static volatile SingularAttribute<Poll, String> name;
+	public static volatile SingularAttribute<Poll, String> description;
+	public static volatile ListAttribute<Poll, PollQuestion> questions;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.980+0300")
+@StaticMetamodel(PossibleAnswer.class)
+public class PossibleAnswer_ extends GenericEntity_ {
+	public static volatile SingularAttribute<PossibleAnswer, String> answer;
+	public static volatile SingularAttribute<PossibleAnswer, Integer> sort;
+	public static volatile SingularAttribute<PossibleAnswer, Boolean> textanswer;
+	public static volatile SingularAttribute<PossibleAnswer, String> description;
+	public static volatile SingularAttribute<PossibleAnswer, PollQuestion> question;
+	public static volatile ListAttribute<PossibleAnswer, PollAnswer> answers;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.985+0300")
+@StaticMetamodel(PrintedCard.class)
+public class PrintedCard_ extends GenericEntity_ {
+	public static volatile SingularAttribute<PrintedCard, LanEvent> event;
+	public static volatile SingularAttribute<PrintedCard, Calendar> printTime;
+	public static volatile SingularAttribute<PrintedCard, String> barcode;
+	public static volatile SingularAttribute<PrintedCard, Boolean> enabled;
+	public static volatile SingularAttribute<PrintedCard, String> rfidUid;
+	public static volatile ListAttribute<PrintedCard, ReaderEvent> readerEvents;
+	public static volatile SingularAttribute<PrintedCard, Integer> printCount;
+	public static volatile SingularAttribute<PrintedCard, Location> currentLocation;
+	public static volatile SingularAttribute<PrintedCard, EventUser> user;
+	public static volatile SingularAttribute<PrintedCard, CardTemplate> template;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.995+0300")
+@StaticMetamodel(ProductLimitation.class)
+public class ProductLimitation_ extends GenericEntity_ {
+	public static volatile SingularAttribute<ProductLimitation, ProductLimitationType> type;
+	public static volatile SingularAttribute<ProductLimitation, Boolean> last;
+	public static volatile SingularAttribute<ProductLimitation, String> name;
+	public static volatile SingularAttribute<ProductLimitation, String> description;
+	public static volatile SingularAttribute<ProductLimitation, Integer> sort;
+	public static volatile ListAttribute<ProductLimitation, Product> products;
+	public static volatile SingularAttribute<ProductLimitation, BigDecimal> upperLimit;
+	public static volatile SingularAttribute<ProductLimitation, BigDecimal> lowerLimit;
+	public static volatile ListAttribute<ProductLimitation, Role> matchingRoles;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.math.BigDecimal;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-11-18T00:45:52.346+0200")
+@StaticMetamodel(Product.class)
+public class Product_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Product, LanEvent> event;
+	public static volatile SingularAttribute<Product, String> color;
+	public static volatile SingularAttribute<Product, String> name;
+	public static volatile SingularAttribute<Product, String> description;
+	public static volatile SingularAttribute<Product, BigDecimal> price;
+	public static volatile SingularAttribute<Product, BigDecimal> buyInPrice;
+	public static volatile SingularAttribute<Product, Integer> sort;
+	public static volatile SingularAttribute<Product, String> barcode;
+	public static volatile SetAttribute<Product, ProductFlag> productFlags;
+	public static volatile SingularAttribute<Product, Role> provides;
+	public static volatile ListAttribute<Product, Place> places;
+	public static volatile ListAttribute<Product, ProductLimitation> productLimits;
+	public static volatile ListAttribute<Product, AccountEvent> accountEvents;
+	public static volatile ListAttribute<Product, InventoryEvent> inventoryEvents;
+	public static volatile ListAttribute<Product, Discount> discounts;
+	public static volatile SingularAttribute<Product, BigDecimal> vat;
+	public static volatile SingularAttribute<Product, String> unitName;
+	public static volatile ListAttribute<Product, FoodWaveTemplate> foodWaveTemplates;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-11-01T13:46:40.201+0200")
+@StaticMetamodel(ReaderEvent.class)
+public class ReaderEvent_ extends GenericEntity_ {
+	public static volatile SingularAttribute<ReaderEvent, Date> time;
+	public static volatile SingularAttribute<ReaderEvent, Date> updatetime;
+	public static volatile SingularAttribute<ReaderEvent, String> value;
+	public static volatile SingularAttribute<ReaderEvent, String> notes;
+	public static volatile SingularAttribute<ReaderEvent, Integer> gamePoint;
+	public static volatile SingularAttribute<ReaderEvent, PrintedCard> printedCard;
+	public static volatile SingularAttribute<ReaderEvent, Reader> reader;
+}

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

+package fi.insomnia.bortal.model;
+
+import fi.insomnia.bortal.model.salespoint.SalesEntity;
+import java.math.BigDecimal;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:46.999+0300")
+@StaticMetamodel(Reader.class)
+public class Reader_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Reader, ReaderType> type;
+	public static volatile SingularAttribute<Reader, LanEvent> event;
+	public static volatile SingularAttribute<Reader, Integer> gamepoints;
+	public static volatile SingularAttribute<Reader, Integer> maxEvents;
+	public static volatile SingularAttribute<Reader, SalesEntity> salesEntity;
+	public static volatile SingularAttribute<Reader, Product> automaticProduct;
+	public static volatile SingularAttribute<Reader, BigDecimal> automaticProductCount;
+	public static volatile SingularAttribute<Reader, String> identification;
+	public static volatile SingularAttribute<Reader, String> description;
+	public static volatile SingularAttribute<Reader, Location> location;
+	public static volatile SingularAttribute<Reader, EventMap> eventMap;
+	public static volatile SingularAttribute<Reader, Integer> mapX;
+	public static volatile SingularAttribute<Reader, Integer> mapY;
+	public static volatile ListAttribute<Reader, ReaderEvent> events;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:47.008+0300")
+@StaticMetamodel(Role.class)
+public class Role_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Role, String> name;
+	public static volatile ListAttribute<Role, EventUser> users;
+	public static volatile ListAttribute<Role, Role> children;
+	public static volatile ListAttribute<Role, Product> productsProvide;
+	public static volatile ListAttribute<Role, Place> placesProvide;
+	public static volatile ListAttribute<Role, Role> parents;
+	public static volatile ListAttribute<Role, ApplicationPermission> permissions;
+	public static volatile SingularAttribute<Role, CardTemplate> cardTemplate;
+	public static volatile ListAttribute<Role, Discount> discounts;
+	public static volatile ListAttribute<Role, NewsGroup> writeNews;
+	public static volatile ListAttribute<Role, NewsGroup> newsGroups;
+	public static volatile SingularAttribute<Role, LanEvent> event;
+	public static volatile ListAttribute<Role, OrgRole> orgRoles;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:47.021+0300")
+@StaticMetamodel(SitePage.class)
+public class SitePage_ extends GenericEntity_ {
+	public static volatile SingularAttribute<SitePage, LanEvent> event;
+	public static volatile SingularAttribute<SitePage, String> name;
+	public static volatile SingularAttribute<SitePage, SitePage> parent;
+	public static volatile ListAttribute<SitePage, Role> allowedRoles;
+	public static volatile ListAttribute<SitePage, SitePage> children;
+	public static volatile ListAttribute<SitePage, PageContent> contents;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:47.031+0300")
+@StaticMetamodel(UserImage.class)
+public class UserImage_ extends GenericEntity_ {
+	public static volatile SingularAttribute<UserImage, Calendar> uploaded;
+	public static volatile SingularAttribute<UserImage, String> name;
+	public static volatile SingularAttribute<UserImage, String> description;
+	public static volatile SingularAttribute<UserImage, String> mimeType;
+	public static volatile SingularAttribute<UserImage, byte[]> imageData;
+	public static volatile SingularAttribute<UserImage, User> user;
+	public static volatile SingularAttribute<UserImage, User> defaultImage;
+}

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:47.035+0300")
+@StaticMetamodel(UserNote.class)
+public class UserNote_ extends GenericEntity_ {
+	public static volatile SingularAttribute<UserNote, EventUser> user;
+	public static volatile SingularAttribute<UserNote, String> content;
+	public static volatile SingularAttribute<UserNote, UserNoteType> notetype;
+}

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

+package fi.insomnia.bortal.model;
+
+import fi.insomnia.bortal.enums.Gender;
+import java.util.Calendar;
+import java.util.Date;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:47.025+0300")
+@StaticMetamodel(User.class)
+public class User_ extends GenericEntity_ {
+	public static volatile SingularAttribute<User, Calendar> created;
+	public static volatile SingularAttribute<User, String> login;
+	public static volatile SingularAttribute<User, Boolean> active;
+	public static volatile SingularAttribute<User, String> password;
+	public static volatile SingularAttribute<User, String> lastname;
+	public static volatile SingularAttribute<User, String> firstnames;
+	public static volatile SingularAttribute<User, Date> birthday;
+	public static volatile SingularAttribute<User, String> nick;
+	public static volatile SingularAttribute<User, String> email;
+	public static volatile SingularAttribute<User, String> address;
+	public static volatile SingularAttribute<User, String> zip;
+	public static volatile SingularAttribute<User, String> postalTown;
+	public static volatile SingularAttribute<User, String> town;
+	public static volatile SingularAttribute<User, String> phone;
+	public static volatile SingularAttribute<User, UserImage> currentImage;
+	public static volatile SingularAttribute<User, Gender> gender;
+	public static volatile SingularAttribute<User, String> confirmHash;
+	public static volatile SingularAttribute<User, Calendar> confirmTime;
+	public static volatile SingularAttribute<User, Boolean> superadmin;
+	public static volatile ListAttribute<User, UserImage> userImageList;
+}

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

+package fi.insomnia.bortal.model;
+
+import java.util.Calendar;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:47.039+0300")
+@StaticMetamodel(Vote.class)
+public class Vote_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Vote, Integer> score;
+	public static volatile SingularAttribute<Vote, String> message;
+	public static volatile SingularAttribute<Vote, Calendar> time;
+	public static volatile SingularAttribute<Vote, CompoEntry> compoEntry;
+	public static volatile SingularAttribute<Vote, EventUser> voter;
+}

code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/SalesEntity_.java

+package fi.insomnia.bortal.model.salespoint;
+
+import fi.insomnia.bortal.model.GenericEntity_;
+import fi.insomnia.bortal.model.Reader;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:47.012+0300")
+@StaticMetamodel(SalesEntity.class)
+public class SalesEntity_ extends GenericEntity_ {
+	public static volatile SingularAttribute<SalesEntity, String> certificate;
+	public static volatile SingularAttribute<SalesEntity, String> name;
+	public static volatile SingularAttribute<SalesEntity, String> secret;
+	public static volatile SingularAttribute<SalesEntity, SalesEntityType> type;
+	public static volatile SingularAttribute<SalesEntity, Reader> reader;
+	public static volatile SingularAttribute<SalesEntity, Salespoint> point;
+}

code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/Salespoint_.java

+package fi.insomnia.bortal.model.salespoint;
+
+import fi.insomnia.bortal.model.GenericEntity_;
+import fi.insomnia.bortal.model.LanEvent;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.ListAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-24T19:52:47.017+0300")
+@StaticMetamodel(Salespoint.class)
+public class Salespoint_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Salespoint, LanEvent> event;
+	public static volatile SingularAttribute<Salespoint, String> name;
+	public static volatile SingularAttribute<Salespoint, String> description;
+	public static volatile ListAttribute<Salespoint, SalesEntity> entities;
+}

code/LanBortalWeb/WebContent/useradmin/export.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: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>
+		<f:metadata>
+			<f:event type="preRenderView" listener="#{placeGroupView.}" />
+		</f:metadata>
+Etunimi;Sukunimi;Nick;Osoite;Kaupunki;Email;Puhelin;Konepaikat<br/>
+	<ui:repeat var="usr" value="#{userSearchView.eventUserResults}">#{usr.firstnames};#{usr.lastname};#{usr.nick};#{usr.address};#{usr.postalTown};#{usr.email};#{usr.phone};<ui:repeat var="places" value="#{usr.currentPlaces}">#{#places.name},</ui:repeat><br/></ui:repeat>
+	</h:body>
+</html>
\ No newline at end of file

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

@@ -66,7 +66,7 @@ public class MenuBean implements MenuBeanLocal {
 		initializeOldMenu();
 	}
 
-	private synchronized void initializeMenu() {
+	private synchronized void initializeMenu_skynett() {
 
 		int menusort = 100;
 		logger.info("Initializing menu");
@@ -228,6 +228,166 @@ public class MenuBean implements MenuBeanLocal {
 
 	}
 
+	private synchronized void initializeMenu() {
+
+		int menusort = 100;
+		logger.info("Initializing new default menu");
+		LanEvent ev = eventbean.getCurrentEvent();
+
+		MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.usernavi", menusort = +10);
+
+		usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.ANYUSER);
+		usermenu.addPage(menuitemfacade.findOrCreate("/permissionDenied"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/login"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/loginError"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/logout"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/logoutResponse"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/resetPassword"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/resetmailSent"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/passwordChanged"), null).setVisible(false);
+		usermenu.addPage(menuitemfacade.findOrCreate("/auth/notauthorized"), null).setVisible(false);
+		
+		MenuNavigation userEvent = usermenu.addPage(null, null);
+		userEvent.setKey("topnavi.userevent");
+		userEvent.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
+		userEvent.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER);
+		userEvent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.ANYUSER);
+		userEvent.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.ANYUSER);
+		
+		MenuNavigation userkauppa = usermenu.addPage(null, null);
+		userkauppa.setKey("topnavi.usershop");
+		userkauppa.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL);
+		userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE);
+		userkauppa.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN);		
+
+		MenuNavigation usercompetitions = usermenu.addPage(null, null);
+		usercompetitions.setKey("topnavi.competitions");
+
+		usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/compolist"), CompoPermission.VIEW_COMPOS);
+		usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/myEntries"), CompoPermission.VIEW_COMPOS);		
+		usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/submitEntry"), null).setVisible(false);
+		usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/details"), null).setVisible(false);
+
+		/* MenuNavigation createuser = usermenu.addPage(null, null);
+		createuser.setKey("topnavi.createuser");
+		createuser.addPage(menuitemfacade.findOrCreate("/user/create"), UserPermission.CREATE_NEW); */
+
+		navifacade.create(usermenu);
+
+		MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminnavi", menusort = +10);
+		MenuNavigation adminuser = adminmenu.addPage(null, null);
+		adminuser.setKey("topnavi.usermgmt");
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/list"), UserPermission.VIEW_ALL);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/edit"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/changePassword"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/accountEvents"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/place/adminGroups"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/place/adminInsertToken"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/foodwaveshop"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/foodwaveProducts"), UserPermission.VIEW_ALL).setVisible(false);
+		adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/showTakePicture"), UserPermission.VIEW_ALL).setVisible(false);
+
+		MenuNavigation adminroles = adminuser.addPage(null, null);
+		adminroles.setKey("subnavi.roles");
+		adminroles.addPage(menuitemfacade.findOrCreate("/role/list"), UserPermission.READ_ROLES);
+		adminroles.addPage(menuitemfacade.findOrCreate("/role/create"), UserPermission.WRITE_ROLES);
+		adminroles.addPage(menuitemfacade.findOrCreate("/role/edit"), null).setVisible(false);
+
+		MenuNavigation adminshop = adminmenu.addPage(null, null);
+		adminshop.setKey("topnavi.adminshop");
+		MenuNavigation adminShopProducts = adminshop.addPage(null, null);
+		adminShopProducts.setKey("subnavi.products");
+		adminShopProducts.addPage(menuitemfacade.findOrCreate("/product/create"), ShopPermission.MANAGE_PRODUCTS);
+		adminShopProducts.addPage(menuitemfacade.findOrCreate("/product/list"), ShopPermission.LIST_ALL_PRODUCTS);
+
+		MenuNavigation adminShopReaders = adminshop.addPage(null, null);
+		adminShopReaders.setKey("subnavi.readers");
+		adminShopReaders.addPage(menuitemfacade.findOrCreate("/shop/showReaderEvents"), ShopPermission.SHOP_TO_OTHERS);
+		adminShopReaders.addPage(menuitemfacade.findOrCreate("/shop/listReaders"), ShopPermission.SHOP_TO_OTHERS);
+
+		MenuNavigation adminShopBilling = adminshop.addPage(null, null);
+		adminShopBilling.setKey("subnavi.billing");
+		adminShopBilling.addPage(menuitemfacade.findOrCreate("/bill/billSummary"), BillPermission.READ_ALL);
+		adminShopBilling.addPage(menuitemfacade.findOrCreate("/bill/listAll"), BillPermission.WRITE_ALL);
+
+		MenuNavigation adminevent = adminmenu.addPage(null, null);
+		adminevent.setKey("topnavi.event");
+		MenuNavigation adminEventCards = adminevent.addPage(null, null);
+		adminEventCards.setKey("subnavi.cards");
+		adminEventCards.addPage(menuitemfacade.findOrCreate("/useradmin/listCardTemplates"), UserPermission.READ_ROLES);
+		adminEventCards.addPage(menuitemfacade.findOrCreate("/useradmin/createCardTemplate"), UserPermission.WRITE_ROLES);
+		adminEventCards.addPage(menuitemfacade.findOrCreate("/useradmin/editCardTemplate"), null).setVisible(false);
+		adminEventCards.addPage(menuitemfacade.findOrCreate("/shop/shopToUser"), null).setVisible(false);
+		adminEventCards.addPage(menuitemfacade.findOrCreate("/shop/assocToUser"), null).setVisible(false);
+
+		navifacade.create(adminmenu);
+
+		MenuNavigation shopmenu = new MenuNavigation(ev, "topnavi.shopnavi", menusort = +10);
+		// shopnavi.addPage(menuitemfacade.findOrCreate("/index3"),
+		// UserPermission.ANYUSER);
+		navifacade.create(shopmenu);
+
+		/*
+		 * 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();

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/UserBean.java

@@ -159,14 +159,16 @@ public class UserBean implements UserBeanLocal {
 		// currentEventuser, currentEventuserRoles);
 		// return currentEventuserRoles;
 		// }
+		LanEvent event = eventBean.getCurrentEvent();
+
 		Set<Role> checkedRoles = new HashSet<Role>();
+		addRecursive(checkedRoles, event.getDefaultRole());
 		if (u != null)
 		{
 			addRecursive(checkedRoles, rolefacade.findForUser(u));
 
 			if (permbean.isLoggedIn()) {
 
-				LanEvent event = eventBean.getCurrentEvent();
 				// add roles from events default role.
 				addRecursive(checkedRoles, event.getDefaultRole());
 

code/MoyaDatabase/.settings/org.eclipse.jpt.core.prefs

 eclipse.preferences.version=1
 org.eclipse.jpt.core.discoverAnnotatedClasses=true
 org.eclipse.jpt.core.platform=eclipselink2_3
+org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=true
 org.eclipse.jpt.jpa.core.metamodelSourceFolderName=src

code/MoyaDatabase/src/fi/codecrew/moya/model/LanEventPropertyKey.java

@@ -2,16 +2,18 @@ package fi.codecrew.moya.model;
 
 public enum LanEventPropertyKey {
     EVENT_LOGO(Type.DATA, null),
-    INVITEMAIL_SUBJECT(Type.TEXT, "Invitation to Stream demoparty"),
-    INVITEMAIL_CONTENT(Type.TEXT, "You have been invited to Stream demoparty by {1}.\n\nYou can register to stream demparty intranet at: {0}\n\nAfter registering to the intranet you can buy a ticket to Stream demoparty reduced price and invite your friends to join the party with you. More information can be found in the intranet. Remember also to visit our website at http://www.streamparty.org and join us at #streamparty in IRCNet. If you have any questions about this mail, registering to intranet, or anything else regarding Stream demoparty, please send us email to info@streamparty.org\n\n-- \nStream organizing\ninfo@streamparty.org"),
-    PORTAL_EMAIL_ADDRESS(Type.TEXT, "intra@streamparty.org"),
-    PORTAL_EMAIL_NAME(Type.TEXT, "Streamparty intranet"),
-    ADMIN_MAIL(Type.TEXT, "intra@streamparty.org"),
+    INVITEMAIL_SUBJECT(Type.TEXT, "Invitation to Moya Online Youth Accumulator"),
+    INVITEMAIL_CONTENT(Type.TEXT, "You have been invited to an event by {1}.\n\nYou can register to intranet at: {0}\n\nAfter registering to the intranet you can buy a ticket to Stream demoparty reduced price and invite your friends to join the party with you. More information can be found in the intranet. Remember also to visit our website at http://www.streamparty.org and join us at #streamparty in IRCNet. If you have any questions about this mail, registering to intranet, or anything else regarding Stream demoparty, please send us email to info@streamparty.org\n\n-- \nStream organizing\ninfo@streamparty.org"),
+    PORTAL_EMAIL_ADDRESS(Type.TEXT, "moya@codecrew.fi"),
+    PORTAL_EMAIL_NAME(Type.TEXT, "Moya Online Youth Accumulator"),
+    ADMIN_MAIL(Type.TEXT, "moya@codecrew.fi"),
     EVENT_LAYOUT(Type.TEXT, "template1"),
     SHOP_DEFAULT_CASH(Type.BOOL, null),
     PLACECODE_FROM_USER(Type.BOOL, null),
     PLACECODE_PRINT_ONLY_OWN(Type.BOOL, null),
-    ;
+    CHECK_BILL_STATS_PERMISSION(Type.BOOL, null),
+    GATHER_OTHER_BILL_INFO(Type.BOOL, null), ;
+
     private enum Type {
         TEXT, DATE, DATA, BOOL
     };
@@ -39,7 +41,7 @@ public enum LanEventPropertyKey {
     {
         this.type = t;
         defaultvalue = def;
-    }   
+    }
 
     public String getDefaultvalue() {
         return defaultvalue;

code/MoyaWeb/.project

@@ -21,6 +21,11 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
+			<name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
@@ -32,5 +37,7 @@
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+		<nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+		<nature>org.jboss.tools.jsf.jsfnature</nature>
 	</natures>
 </projectDescription>

code/MoyaWeb/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding//WebContent/resources/templates/template1/css/style.css=UTF-8

code/MoyaWeb/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

+XDOCLETBUILDERACTIVE=true
+XDOCLETHOME=
+XDOCLETUSEGLOBAL=true
+XDOCLETVERSION=1.2.1
+eclipse.preferences.version=1

code/MoyaWeb/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml

+<root>
+  <facet id="jst.jsf">
+    <node name="libprov">
+      <attribute name="provider-id" value="jsf-no-op-library-provider"/>
+    </node>
+  </facet>
+</root>

code/MoyaWeb/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -8,4 +8,5 @@
   <installed facet="sun.facet" version="9"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="java" version="1.7"/>
+  <installed facet="jst.jsf" version="2.1"/>
 </faceted-project>

code/MoyaWeb/WebContent/actionlog/messagelist.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<!-- f:event type="preRenderView" listener="#{newsListView.initView}" /-->
 		</f:metadata>

code/MoyaWeb/WebContent/actionlog/taskview.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="id" value="#{taskModificationView.id}"></f:viewParam>
 			<f:event type="preRenderView" listener="#{taskModificationView.initView}" />

code/MoyaWeb/WebContent/admin/adduser/update.xhtml

@@ -8,6 +8,7 @@
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />
+			<f:event type="preRenderView" listener="#{userView.setCaptureForwardUrl('/admin/adduser/capturesuccess')}" />
 		</f:metadata>
 
 		<ui:define name="topbar">

code/MoyaWeb/WebContent/admin/port/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">
+		<h:form>
+				<h:inputText name="barcode" value="#{barcodeView.barcode}" />
+				<h:commandButton action="#{barcodeView.readPortBarcode}" value="#{i18n['barcodeReader.readBarcode']}"/>
+		</h:form>
+		</ui:define>
+
+		<ui:define name="sidebar">
+		
+			
+		</ui:define>
+		
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/auth/login.xhtml

@@ -9,7 +9,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{authView.executeLogin}" />
 		</f:metadata>

code/MoyaWeb/WebContent/auth/loginError.xhtml

@@ -8,7 +8,7 @@ xmlns:f="http://java.sun.com/jsf/core"
 xmlns:login="http://java.sun.com/jsf/composite/cditools/login" 
 xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 			<h1>#{i18n['loginerror.header']}</h1>
 

code/MoyaWeb/WebContent/auth/loginSuccessRedirect.xhtml

@@ -9,7 +9,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{authView.executeLogin}" />
 		</f:metadata>

code/MoyaWeb/WebContent/auth/logout.xhtml

@@ -6,7 +6,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{authView.executeLogout}" />
 		</f:metadata>

code/MoyaWeb/WebContent/auth/logoutResponse.xhtml

@@ -6,7 +6,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<ui:define name="content">
 			<h:outputText value="#{i18n['login.logoutmessage']}" />

code/MoyaWeb/WebContent/auth/passwordChanged.xhtml

@@ -8,7 +8,7 @@ xmlns:f="http://java.sun.com/jsf/core"
 xmlns:login="http://java.sun.com/jsf/composite/tools/login" 
 xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 			<h1>#{i18n['passwordChanged.header']}</h1>
 

code/MoyaWeb/WebContent/auth/resetmailSent.xhtml

@@ -8,7 +8,7 @@ xmlns:f="http://java.sun.com/jsf/core"
 xmlns:login="http://java.sun.com/jsf/composite/tools/login" 
 xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 			<h1>#{i18n['resetmailSent.header']}</h1>
 

code/MoyaWeb/WebContent/auth/userSessionList.xhtml

@@ -6,7 +6,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{userSessionView.initView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/bill/billSummary.xhtml

@@ -4,7 +4,7 @@
 <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:bills="http://java.sun.com/jsf/composite/tools/bills"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{billListView.initSummaryView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/bill/edit.xhtml

@@ -3,7 +3,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:p="http://primefaces.org/ui"  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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="billid" value="#{billEditView.billid}" />
 			<f:event type="preRenderView" listener="#{billEditView.initView}" />

code/MoyaWeb/WebContent/bill/list.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{billListView.initUsersBills}" />

code/MoyaWeb/WebContent/bill/listAll.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{billListView.initAllBills}" />
 		</f:metadata>

code/MoyaWeb/WebContent/bill/showBill.xhtml

@@ -6,7 +6,7 @@
 
 <h:body>
 
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="billid" value="#{billEditView.billid}" />
 			<f:event type="preRenderView" listener="#{billEditView.initView}" />

code/MoyaWeb/WebContent/card/massprint.xhtml

@@ -5,7 +5,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core"
 	xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{cardMassPrintView.initView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/checkout/cancel.xhtml

@@ -5,7 +5,7 @@
 <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:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />

code/MoyaWeb/WebContent/checkout/delayed.xhtml

@@ -5,7 +5,7 @@
 <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:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />

code/MoyaWeb/WebContent/checkout/reject.xhtml

@@ -5,7 +5,7 @@
 <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:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />

code/MoyaWeb/WebContent/checkout/return.xhtml

@@ -5,7 +5,7 @@
 <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:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />

code/MoyaWeb/WebContent/eventorg/create.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.eventorg.create" />
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{eventorgView.initCreate}" />

code/MoyaWeb/WebContent/eventorg/edit.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.eventorg.edit" />
 		<f:metadata>
 			<f:viewParam name="id" value="#{eventorgView.orgId}" />

code/MoyaWeb/WebContent/eventorg/editEvent.xhtml

@@ -4,7 +4,7 @@
 <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:p="http://primefaces.org/ui"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="eventid" value="#{eventorgView.eventid}" />
 			<f:event type="preRenderView" listener="#{eventorgView.initEditEvent}" />

code/MoyaWeb/WebContent/eventorg/list.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{eventorgView.initListView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/feedback/index.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:p="http://primefaces.org/ui" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.eventorg.create" />
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{feedbackView.initFeedback}" />

code/MoyaWeb/WebContent/food/foodShop.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/food/shop.xhtml

@@ -4,7 +4,7 @@
 <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/food" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
  			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/foodadmin/createTemplate.xhtml

@@ -11,7 +11,7 @@
 	xmlns:p="http://primefaces.org/ui">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView"
 				listener="#{foodWaveView.initCreateTemplate()}" />

code/MoyaWeb/WebContent/foodadmin/editTemplate.xhtml

@@ -11,7 +11,7 @@
 	xmlns:p="http://primefaces.org/ui">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="id" value="#{foodWaveView.templateId}" />
 			<f:event type="preRenderView"

code/MoyaWeb/WebContent/foodadmin/listTemplates.xhtml

@@ -10,7 +10,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="id" value="#{foodWaveView.templateId}" />
 			<f:event type="preRenderView"

code/MoyaWeb/WebContent/foodmanager/listFoodwaves.xhtml

@@ -3,7 +3,7 @@
     "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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{foodWaveView.initFoodwaveManagerList}" />
 		</f:metadata>

code/MoyaWeb/WebContent/foodmanager/listOrders.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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="foodwaveid" value="#{foodWaveView.foodWaveId}" />
 			<f:event type="preRenderView" listener="#{foodWaveView.initFoodWaveOrderList}" />

code/MoyaWeb/WebContent/foodwave/ThanksForOrderingFromCounter.xhtml

@@ -10,7 +10,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView"

code/MoyaWeb/WebContent/foodwave/create.xhtml

@@ -6,7 +6,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:products="http://java.sun.com/jsf/composite/tools/products"
 	xmlns:foodwave="http://java.sun.com/jsf/composite/tools">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.product.create" />
 		<ui:define name="content">
 			<foodwave:modify />

code/MoyaWeb/WebContent/foodwave/list.xhtml

@@ -11,7 +11,7 @@
 	xmlns:p="http://primefaces.org/ui">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:viewParam name="templateid" value="#{foodWaveView.templateId}" />

code/MoyaWeb/WebContent/foodwave/listProducts.xhtml

@@ -11,7 +11,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="foodwaveid" value="#{foodWaveFoodView.foodwaveid}" />
 			<f:event type="preRenderView" listener="#{foodWaveFoodView.initFoodWaveFoods}" />

code/MoyaWeb/WebContent/foodwave/listTemplates.xhtml

@@ -4,7 +4,7 @@
 <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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
  			<f:viewParam name="userid" value="#{userView.userid}" />
  			<f:event type="preRenderView" listener="#{foodWaveView.initTemplateList}" />

code/MoyaWeb/WebContent/game/index.xhtml

@@ -6,7 +6,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.game.list" />
 		<ui:define name="content">
 

code/MoyaWeb/WebContent/game/list.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:products="http://java.sun.com/jsf/composite/tools/products"
 	xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.game.list" />
 		<ui:define name="content">
 		

code/MoyaWeb/WebContent/game/start.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:products="http://java.sun.com/jsf/composite/tools/products"
 	xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.game.start" />
 		<ui:define name="content">
 			<h1>Insomnia Game</h1>

code/MoyaWeb/WebContent/index.insomnia.xhtml

@@ -6,7 +6,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<ui:define name="content">
 		

code/MoyaWeb/WebContent/index.xhtml

@@ -4,7 +4,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{pageOutputView.initIndexView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/layout/template1/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/template1/css/style.css" />
-		<link rel="stylesheet" type="text/css"
-			href="#{request.contextPath}/resources/style/template1/css/general.css" />
-		<ui:insert name="headerdata" />
-
-	</h:head>
-
-
-	<h:body>
-		<div id="page-container">
-			<div id="logo">
-				<h:link outcome="/index">
-					<c:choose>
-						<c:when test="#{sessionHandler.isInDevelopmentMode()}">
-							<img
-								src="#{request.contextPath}/resources/style/insomnia2/img/devel_logo.png" />
-						</c:when>
-						<c:otherwise>
-							<p:graphicImage rendered="#{!empty layoutView.headerimage}"
-								value="#{layoutView.headerimage}" />
-							<ui:fragment rendered="#{empty layoutView.headerimage}">
-								<h1>
-									<h:outputText value="#{layoutView.headertext}" />
-								</h1>
-							</ui:fragment>
-						</c:otherwise>
-					</c:choose>
-				</h:link>
-
-
-			</div>
-			<div id="page-header">
-
-
-				<div id="login">
-					<h:outputText rendered="#{sessionHandler.loggedIn}"
-						value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" />
-					<div>
-						<tools:loginLogout />
-					</div>
-				</div>
-
-			</div>
-
-			<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 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>
-				<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>
-
-		<!-- 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/MoyaWeb/WebContent/map/create.xhtml

@@ -4,7 +4,7 @@
 <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:map="http://java.sun.com/jsf/composite/cditools/map" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{mapManageView.initCreate}" />
 		</f:metadata>

code/MoyaWeb/WebContent/map/edit.xhtml

@@ -4,7 +4,7 @@
 <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:map="http://java.sun.com/jsf/composite/cditools/map" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="mapid" value="#{mapManageView.mapId}" />
 			<f:event type="preRenderView" listener="#{mapManageView.initView}" />

code/MoyaWeb/WebContent/map/list.xhtml

@@ -7,7 +7,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.role.list" />
 		<ui:define name="content">
 			<map:list />

code/MoyaWeb/WebContent/menu/list.xhtml

@@ -4,7 +4,7 @@
 <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" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{menuListView.initList}" />
 		</f:metadata>

code/MoyaWeb/WebContent/menu/menulist.xhtml

@@ -4,7 +4,7 @@
 <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">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{menuListView.initList}" />
 		</f:metadata>

code/MoyaWeb/WebContent/news/create.xhtml

@@ -6,7 +6,7 @@
 	xmlns:news="http://java.sun.com/jsf/composite/cditools/news" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{newsgroupView.initCreate}" />
 		</f:metadata>

code/MoyaWeb/WebContent/news/edit.xhtml

@@ -6,7 +6,7 @@
 	xmlns:news="http://java.sun.com/jsf/composite/cditools/news" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="newsgroupid" value="#{newsgroupView.newsgroupid}" />
 			<f:event type="preRenderView" listener="#{newsgroupView.initView}" />

code/MoyaWeb/WebContent/news/editNews.xhtml

@@ -7,7 +7,7 @@
 	xmlns:p="http://primefaces.org/ui"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="newsid" value="#{newsgroupView.newsid}" />
 			<f:viewParam name="newsgroupid" value="#{newsgroupView.newsgroupid}" />

code/MoyaWeb/WebContent/news/listAll.xhtml

@@ -6,7 +6,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{newsListView.initView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/orgrole/create.xhtml

@@ -9,7 +9,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 
 <ui:composition
-	template="/layout/#{sessionHandler.layout}/template.xhtml">
+	template="#{sessionHandler.template}">
 
 	<ui:param name="thispage" value="page.orgRole.create" />
 

code/MoyaWeb/WebContent/orgrole/list.xhtml

@@ -10,7 +10,7 @@
 	>
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.orgrole.list" />
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{orgRoleView.permissionList()}" />

code/MoyaWeb/WebContent/pages/create.xhtml

@@ -6,7 +6,7 @@
 	xmlns:pages="http://java.sun.com/jsf/composite/cditools/pages" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{sitePageView.initCreate}" />
 		</f:metadata>

code/MoyaWeb/WebContent/pages/edit.xhtml

@@ -6,7 +6,7 @@
 	xmlns:pages="http://java.sun.com/jsf/composite/cditools/pages" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="id" value="#{sitePageView.id}" />
 			<f:event type="preRenderView" listener="#{sitePageView.initEdit}" />

code/MoyaWeb/WebContent/pages/index.xhtml

@@ -4,7 +4,7 @@
 <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">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="id" value="#{pageOutputView.id}" />
 			<f:event type="preRenderView" listener="#{pageOutputView.initView}" />

code/MoyaWeb/WebContent/pages/list.xhtml

@@ -4,7 +4,7 @@
 <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">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{sitePageView.initListView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/pages/manage.xhtml

@@ -6,7 +6,7 @@
 	xmlns:pages="http://java.sun.com/jsf/composite/cditools/pages" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="pagename" value="#{sitePageView.managedPage}" />
 			<f:event type="preRenderView" listener="#{sitePageView.initManage}" />

code/MoyaWeb/WebContent/permissionDenied.xhtml

@@ -7,7 +7,7 @@
       xmlns:p="http://primefaces.org/ui" >
    
  <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 			<h1>#{i18n['permissiondenied.header']}</h1>
 			<p>

code/MoyaWeb/WebContent/pic.xhtml

@@ -5,7 +5,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.viewexpired" />
 		<ui:define name="content">
 			<param name="foo" width="640" height="480"

code/MoyaWeb/WebContent/place/adminGroups.xhtml

@@ -6,7 +6,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.place.mygroups" />
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />

code/MoyaWeb/WebContent/place/edit.xhtml

@@ -7,7 +7,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="placeid" value="#{placeView.placeId}" />
 			<f:event type="preRenderView" listener="#{placeView.initView}" />

code/MoyaWeb/WebContent/place/editGroup.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jsp/jstl/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.place.edit" />
 		<ui:define name="content">
 			<h1>#{i18n['editplacegroup.header']}</h1>

code/MoyaWeb/WebContent/place/myGroups.xhtml

@@ -4,7 +4,7 @@
 <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:c="http://java.sun.com/jsp/jstl/core"
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.place.mygroups" />
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />

code/MoyaWeb/WebContent/place/placeManagement.xhtml

@@ -7,7 +7,7 @@
 
 <h:body>
 
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.place.placemap" />
 		<ui:define name="content">
 

code/MoyaWeb/WebContent/place/placemap.xhtml

@@ -8,7 +8,7 @@
 
 <h:body>
 
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{mapView.initViewMap()}" />
 			<f:viewParam name="userid" value="#{userView.userid}" />

code/MoyaWeb/WebContent/poll/answerToPoll.xhtml

@@ -6,7 +6,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="pollid" value="#{pollView.pollId}" />
 			<f:event type="preRenderView" listener="#{pollView.initPoll}" />

code/MoyaWeb/WebContent/poll/create.xhtml

@@ -7,7 +7,7 @@
 	xmlns:p="http://primefaces.org/ui"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{pollView.initCreate}" />
 		</f:metadata>

code/MoyaWeb/WebContent/poll/edit.xhtml

@@ -4,7 +4,7 @@
 <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:poll="http://java.sun.com/jsf/composite/cditools/poll" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="pollid" value="#{pollView.pollId}" />
 			<f:event type="preRenderView" listener="#{pollView.initPoll}" />

code/MoyaWeb/WebContent/poll/index.xhtml

@@ -6,7 +6,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{pollView.initPollList()}" />

code/MoyaWeb/WebContent/poll/show.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="pollid" value="#{pollView.pollId}" />
 			<f:event type="preRenderView" listener="#{pollView.initPoll}" />

code/MoyaWeb/WebContent/poll/thankYou.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.poll.answered" />
 	
 	

code/MoyaWeb/WebContent/product/addInventory.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{addInventoryView.initCreateInventory}" />
 		</f:metadata>

code/MoyaWeb/WebContent/product/create.xhtml

@@ -6,7 +6,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:products="http://java.sun.com/jsf/composite/cditools/products"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{productView.initCreateView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/product/createDiscount.xhtml

@@ -9,7 +9,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<ui:define name="content">
 				

code/MoyaWeb/WebContent/product/edit.xhtml

@@ -10,7 +10,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="productid" value="#{productView.productId}" />
 			<f:event type="preRenderView" listener="#{productView.initEditView}" />

code/MoyaWeb/WebContent/product/editDiscount.xhtml

@@ -8,7 +8,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<ui:define name="content">
 			<products:manageDiscount commitaction="#{productView.saveProduct()}" commitvalue="#{i18n['discount.save']}" />

code/MoyaWeb/WebContent/product/list.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{productListView.initView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/resources/cditools/products/shop.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">
+<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>
@@ -15,10 +14,7 @@
 	<!-- 	<h:outputScript target="head" library="script" name="jquery.min.js" /> -->
 	<!-- 	<h:outputScript target="head" library="script" name="shopscript.js" /> -->
 	<h:outputScript library="primefaces" name="jquery/jquery.js" />
-	<div style="margin-top: 5px;">
-		<h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-top" value="#{cc.attrs.commitValue}" />
-	</div>
-	
+
 	<h:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" id="billcart" value="#{cc.attrs.items}" var="cart">
 		<h:column>
 			<f:facet name="header">
@@ -26,7 +22,7 @@
 			</f:facet>
 			<h:outputText value="#{cart.product.name}" />
 		</h:column>
-		<h:column >
+		<h:column>
 			<f:facet name="header">
 				<h:outputText value="${i18n['product.price']}" />
 			</f:facet>
@@ -46,25 +42,25 @@
 			<f:facet name="header">
 				<h:outputText id="count" value="${i18n['product.cart.count']}" />
 			</f:facet>
-			
+
 			<h:commandButton action="#{productShopView.addMinusOne}" value="#{i18n['productshop.minusOne']}">
 				<f:ajax render="@form" />
 			</h:commandButton>
 			<h:inputText size="4" id="cartcount" value="#{cart.count}">
-				<f:convertNumber  maxIntegerDigits="2" minFractionDigits="0"/>
-				<f:ajax render="@form" event="valueChange" listener="#{productShopView.updateAllCartLimits()}"/>
+				<f:convertNumber maxIntegerDigits="2" minFractionDigits="0" />
+				<f:ajax render="@form" event="valueChange" listener="#{productShopView.updateAllCartLimits()}" />
 			</h:inputText>
 			<h:commandButton action="#{productShopView.addOne}" value="#{i18n['productshop.plusOne']}">
 				<f:ajax render="@form" />
 			</h:commandButton>
-			
+
 		</h:column>
 		<h:column rendered="#{productShopView.hasLimits}">
 			<f:facet name="header">
 				<h:outputText value="#{i18n['productshop.limits']}" />
 			</f:facet>
-			<h:outputText value="#{cart.limit}" >
-				<f:convertNumber  maxIntegerDigits="2" minFractionDigits="0"/>
+			<h:outputText value="#{cart.limit}">
+				<f:convertNumber maxIntegerDigits="2" minFractionDigits="0" />
 			</h:outputText>
 		</h:column>
 		<h:column>
@@ -82,16 +78,15 @@
 		</h:column>
 
 	</h:dataTable>
+	<hr />
 	<div>
 		<h:outputText value="#{i18n['productshop.total']} " />
 		<h:outputText value="#{productShopView.cartPrice}">
 			<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
 		</h:outputText>
-	</div>
+	</div>	
 	<h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-botton" value="#{cc.attrs.commitValue}" />
 
-
-
 </composite:implementation>
 </html>
 

code/MoyaWeb/WebContent/resources/cditools/user/edit.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">
+<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:attribute name="creating" required="false" default="false" />
-
-	<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:implementation>
-	<h:outputScript library="primefaces" name="jquery/jquery.js"
-		target="head" />
+	<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
+
+
 
 	<h:panelGrid columns="2">
+		<h:form id="userform" enctype="multipart/form-data">
+			<h:panelGroup>
 
-		<h:panelGroup>
-			<h:form id="userform" enctype="multipart/form-data">
 				<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 id="chartPanel" for="webcamButton" dynamic="true">
+						<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']}" />
+					<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" />
+						<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" />
+					<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: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}" ajax="false"
-						value="#{i18n['user.imagesubmit']}" />
+					<p:commandButton action="#{userView.sendImage}" ajax="false" value="#{i18n['user.imagesubmit']}" />
 				</ui:fragment>
-			</h:form>
-			<ui:fragment rendered="#{cc.attrs.creating}">
-				<h:outputLabel value="#{i18n['user.login']}" for="mklogin" />
+
+				<ui:fragment rendered="#{cc.attrs.creating}">
+					<h:outputLabel value="#{i18n['user.login']}" for="mklogin" />
+					<br />
+					<p:inplace emptyLabel="#{i18n['user.insert']}">
+						<p:inputText size="25" id="mklogin" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.login}" />
+					</p:inplace>
+					<p:message for="login" />
+					<br />
+
+				</ui:fragment>
+				<br />
+
+				<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.password']}" for="password" />
+				<br />
+				<p:inplace rendered="#{cc.attrs.creating}" emptyLabel="#{i18n['user.insert']}">
+					<p:password validator="#{userValidator.password}" id="password" value="#{userView.password}" />
+				</p:inplace>
+				<p:message rendered="#{cc.attrs.creating}" for="password" />
+				<br />
+				<p:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.passwordcheck']}" for="passwordcheck" />
 				<br />
-				<p:inplace emptyLabel="#{i18n['user.insert']}">
-					<p:inputText size="25" id="mklogin"
-						disabled="#{!cc.attrs.creating and !userView.canSave}"
-						value="#{userView.selectedUser.login}" />
+				<p:inplace rendered="#{cc.attrs.creating}" emptyLabel="#{i18n['user.insert']}">
+					<p:password validator="#{userValidator.password}" id="passwordcheck" value="#{userView.passwordcheck}" />
 				</p:inplace>
-				<p:message for="login" />
+				<p:message rendered="#{cc.attrs.creating}" for="passwordcheck" />
 				<br />
 
-			</ui:fragment>
-			<br />
-
-			<h:outputLabel rendered="#{cc.attrs.creating}"
-				value="#{i18n['user.password']}" for="password" />
-			<br />
-			<p:inplace rendered="#{cc.attrs.creating}"
-				emptyLabel="#{i18n['user.insert']}">
-				<p:password validator="#{userValidator.password}" id="password"
-					value="#{userView.password}" />
-			</p:inplace>
-			<p:message rendered="#{cc.attrs.creating}" for="password" />
-			<br />
-			<p:outputLabel rendered="#{cc.attrs.creating}"
-				value="#{i18n['user.passwordcheck']}" for="passwordcheck" />
-			<br />
-			<p:inplace rendered="#{cc.attrs.creating}"
-				emptyLabel="#{i18n['user.insert']}">
-				<p:password validator="#{userValidator.password}" id="passwordcheck"
-					value="#{userView.passwordcheck}" />
-			</p:inplace>
-			<p:message rendered="#{cc.attrs.creating}" for="passwordcheck" />
-			<br />
-
-		</h:panelGroup>
+			</h:panelGroup>
+		</h:form>
 
 		<h:form>
 
@@ -103,114 +75,64 @@
 				<table>
 					<ui:fragment rendered="#{!cc.attrs.creating}">
 						<tr>
-							<td colspan="2"><h:outputLabel for="login"
-									value="#{i18n['user.login']}" /><br /> <h:outputText
-									value="#{userView.selectedUser.login}" id="login" /></td>
+							<td colspan="2"><h:outputLabel for="login" value="#{i18n['user.login']}" /><br /> <h:outputText value="#{userView.selectedUser.login}" id="login" /></td>
 						</tr>
 					</ui:fragment>
 					<tr>
-						<td colspan="2"><h:outputLabel value="#{i18n['user.nick']}"
-								for="nick" /> <br /> <p:inplace
-								emptyLabel="#{i18n['user.insert']}">
-								<p:inputText size="45" id="nick"
-									disabled="#{!cc.attrs.creating and !userView.canSave}"
-									value="#{userView.selectedUser.nick}" />
+						<td colspan="2"><h:outputLabel value="#{i18n['user.nick']}" for="nick" /> <br /> <p:inplace emptyLabel="#{i18n['user.insert']}">
+								<p:inputText size="45" id="nick" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.nick}" />
 							</p:inplace></td>
 					</tr>
 					<tr>
-						<td><h:outputLabel value="#{i18n['user.firstNames']}"
-								for="firstnames" /><br /> <p:inplace
-								emptyLabel="#{i18n['user.insert']}">
-								<p:inputText size="22" id="firstnames"
-									disabled="#{!cc.attrs.creating and !userView.canSave}"
-									value="#{userView.selectedUser.firstnames}" />
+						<td><h:outputLabel value="#{i18n['user.firstNames']}" for="firstnames" /><br /> <p:inplace emptyLabel="#{i18n['user.insert']}">
+								<p:inputText size="22" id="firstnames" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.firstnames}" />
 							</p:inplace></td>
-						<td><h:outputLabel value="#{i18n['user.lastName']}"
-								for="lastname" /><br /> <p:inplace
-								emptyLabel="#{i18n['user.insert']}">
-								<p:inputText size="30" id="lastname"
-									disabled="#{!cc.attrs.creating and !userView.canSave}"
-									value="#{userView.selectedUser.lastname}" />
+						<td><h:outputLabel value="#{i18n['user.lastName']}" for="lastname" /><br /> <p:inplace emptyLabel="#{i18n['user.insert']}">
+								<p:inputText size="30" id="lastname" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.lastname}" />
 							</p:inplace></td>
 					</tr>
 					<tr>
-						<td><h:outputLabel for="birthday"
-								value="#{i18n['user.birthday']}" /><br />
-								
-								<p:inplace  emptyLabel="#{i18n['user.insert']}">
-								<p:calendar id="birthday" navigator="true" yearRange="c-80:c-0" 
-									value="#{userView.selectedUser.birthday}"
-									>
-									<f:convertDateTime 	pattern="#{sessionHandler.dateFormat}"
-									timeZone="#{sessionHandler.timezone}" />
+						<td><h:outputLabel for="birthday" value="#{i18n['user.birthday']}" /><br /> <p:inplace emptyLabel="#{i18n['user.insert']}">
+								<p:calendar id="birthday" navigator="true" yearRange="c-80:c-0" value="#{userView.selectedUser.birthday}">
+									<f:convertDateTime pattern="#{sessionHandler.dateFormat}" timeZone="#{sessionHandler.timezone}" />
 								</p:calendar>
-								</p:inplace> 
-								<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:inplace> <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:inplace
-								emptyLabel="#{i18n['user.insert']}">
-								<p:inputText size="45" id="address"
-									disabled="#{!cc.attrs.creating and !userView.canSave}"
-									value="#{userView.selectedUser.address}" />
+						<td colspan="2"><p:outputLabel value="#{i18n['user.address']}" for="address" /><br /> <p:inplace emptyLabel="#{i18n['user.insert']}">
+								<p:inputText size="45" id="address" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.address}" />
 							</p:inplace></td>
 					</tr>
 					<tr>
-						<td><p:outputLabel value="#{i18n['user.zipCode']}" for="zip" /><br />
-							<p:inplace emptyLabel="#{i18n['user.insert']}">
-								<p:inputText styleClass="ui-input" size="7" id="zip"
-									disabled="#{!cc.attrs.creating and !userView.canSave}"
-									value="#{userView.selectedUser.zip}" />
+						<td><p:outputLabel value="#{i18n['user.zipCode']}" for="zip" /><br /> <p:inplace emptyLabel="#{i18n['user.insert']}">
+								<p:inputText styleClass="ui-input" size="7" id="zip" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.zip}" />
 							</p:inplace> <p:message for="zip" /></td>
-						<td><p:outputLabel value="#{i18n['user.town']}" for="town" /><br />
-							<p:inplace emptyLabel="#{i18n['user.insert']}">
-								<p:inputText styleClass="ui-input" size="25" id="town"
-									disabled="#{!cc.attrs.creating and !userView.canSave}"
-									value="#{userView.selectedUser.town}" />
+						<td><p:outputLabel value="#{i18n['user.town']}" for="town" /><br /> <p:inplace emptyLabel="#{i18n['user.insert']}">
+								<p:inputText styleClass="ui-input" size="25" id="town" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.town}" />
 							</p:inplace> <p:message for="town" /></td>
 					</tr>
 					<tr>
-						<td colspan="2"><h:outputLabel value="#{i18n['user.email']}"
-								for="email" /> <br /> <p:inplace
-								emptyLabel="#{i18n['user.insert']}">
-								<p:inputText validator="#{userValidator.validateEmail}"
-									size="45" id="email"
-									disabled="#{!cc.attrs.creating and !userView.canSave}"
-									value="#{userView.selectedUser.email}" />
+						<td colspan="2"><h:outputLabel value="#{i18n['user.email']}" for="email" /> <br /> <p:inplace emptyLabel="#{i18n['user.insert']}">
+								<p:inputText validator="#{userValidator.validateEmail}" size="45" id="email" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.email}" />
 							</p:inplace></td>
 					</tr>
 					<tr>
-					<td><p:outputLabel value="#{i18n['user.phone']}" for="phone" /><br />
-							<p:inplace emptyLabel="#{i18n['user.insert']}">
-								<p:inputText styleClass="ui-input" size="7" id="phone"
-									disabled="#{!cc.attrs.creating and !userView.canSave}"
-									value="#{userView.selectedUser.phone}" />
+						<td><p:outputLabel value="#{i18n['user.phone']}" for="phone" /><br /> <p:inplace emptyLabel="#{i18n['user.insert']}">
+								<p:inputText styleClass="ui-input" size="7" id="phone" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.phone}" />
 							</p:inplace> <p:message for="phone" /></td>
 					</tr>
 
 				</table>
 
-				<p:commandButton rendered="#{cc.attrs.creating or userView.canSave}"
-					id="commitbtn" action="#{cc.attrs.commitaction}" ajax="false"
-					value="#{cc.attrs.commitvalue}" />
+				<p:commandButton rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" ajax="false" value="#{cc.attrs.commitvalue}" />
 
 			</h:panelGroup>
 		</h:form>

code/MoyaWeb/WebContent/resources/cditools/user/usertabs.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">
+<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:attribute name="tabId" type="java.lang.String" required="true" />
 </composite:interface>
 
 <composite:implementation>
-	
-	<h:outputStylesheet library="style/#{sessionHandler.getLayout()}/css" name="tabnav.css" />
-	<div class="userstatus" style="float: right; margin-right: 10px; color: #7DAC0C; font-size: 16px;">
+	<h:outputStylesheet library="templates/#{sessionHandler.templateName}/css" name="tabnav.css" />
+
+
+	<h2>
+		<h:outputText value="#{i18n['usertitle.managingUser']}: #{userView.user.nick} / #{userView.user.wholeName} " />
+	</h2>
+	<h2>
 		<h:outputText value="#{i18n['user.cardPower']}: #{userView.usersCardtemplate.name}" />
-	</div>
-	<ui:fragment rendered="#{!userView.currentUser}">
-		<h2>
-			<h:outputText value="#{i18n['usertitle.managingUser']}: #{userView.user.nick} / #{userView.user.wholeName} " />
-		</h2>
-	</ui:fragment>
-	
+	</h2>
+
 	<div id="#{cc.attrs.tabId}">
 		<ul id="usertabnav">
 			<li class="edit"><h:link outcome="/useradmin/edit" value="#{i18n['user.edit']}">
@@ -42,13 +40,10 @@
 
 			<li class="picture"><h:link outcome="/useradmin/sendPicture" value="#{i18n['submenu.user.sendPicture']}">
 					<f:param name="userid" value="#{userView.user.user.id}" />
-				</h:link>
-			</li>
-			<li class="foodwave">
-				<h:link outcome="/useradmin/foodwaveshop" value="#{i18n['submenu.user.foodwave']}">
+				</h:link></li>
+			<li class="foodwave"><h:link outcome="/useradmin/foodwaveshop" value="#{i18n['submenu.user.foodwave']}">
 					<f:param name="userid" value="#{userView.user.user.id}" />
-				</h:link>
-			</li>
+				</h:link></li>
 
 		</ul>
 	</div>

code/MoyaWeb/WebContent/resources/style/template1/css/jquery-ui-1.8.24.custom.css

-/*!
- * jQuery UI CSS Framework 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
-.ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-/*!
- * jQuery UI CSS Framework 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
-.ui-widget-content a { color: #222222; }
-.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
-.ui-widget-header a { color: #222222; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*!
- * jQuery UI Resizable 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizable#theming
- */
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*!
- * jQuery UI Selectable 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectable#theming
- */
-.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-/*!
- * jQuery UI Accordion 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Accordion#theming
- */
-/* IE/Win - Fix animation bug - #4615 */
-.ui-accordion { width: 100%; }
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
-.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }
-/*!
- * jQuery UI Autocomplete 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete#theming
- */
-.ui-autocomplete { position: absolute; cursor: default; }	
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-
-/*
- * jQuery UI Menu 1.8.24
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Menu#theming
- */
-.ui-menu {
-	list-style:none;
-	padding: 2px;
-	margin: 0;
-	display:block;
-	float: left;
-}
-.ui-menu .ui-menu {
-	margin-top: -3px;
-}
-.ui-menu .ui-menu-item {
-	margin:0;
-	padding: 0;
-	zoom: 1;
-	float: left;
-	clear: left;
-	width: 100%;
-}
-.ui-menu .ui-menu-item a {
-	text-decoration:none;
-	display:block;
-	padding:.2em .4em;
-	line-height:1.5;
-	zoom:1;
-}
-.ui-menu .ui-menu-item a.ui-state-hover,
-.ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
-}
-/*!
- * jQuery UI Button 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button#theming
- */
-.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; } 
-button.ui-button-icons-only { width: 3.7em; } 
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4;  }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
-.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-
-/*button sets*/
-.ui-buttonset { margin-right: 7px; }
-.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
-
-/* workarounds */
-button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-/*!
- * jQuery UI Dialog 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog#theming
- */
-.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
-.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/*!
- * jQuery UI Slider 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider#theming
- */
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/*!
- * jQuery UI Tabs 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs#theming
- */
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }
-/*!
- * jQuery UI Datepicker 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}/*!
- * jQuery UI Progressbar 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar#theming
- */
-.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file

code/MoyaWeb/WebContent/resources/style/template1/css/style.css

-* {padding:0; margin:0;}
-body {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;
-}
-
-.container.top a, .container.bottom a {
-	font-size: 90%;
-	color: #aaa;
-	text-decoration: none;
-}
-
-#right {display:inline /*Fix IE floating margin bug*/; float:right; width:200px; overflow:visible !important /*Firefox*/; overflow:hidden /*IE6*/;}
-#right {width: 200px;}
-#right ul {list-style:none; margin:0em 0 0em 0px;}
-#right ul li {margin:0px 0 0.2em 0px; padding:0px 0px 0 0px; line-height:1.2em; font-size:110%;}
-#right a { color: black}
-
-#right li a, #right li a:visited {display:block; min-height:1.7em /*Non-IE6*/; height:auto !important; height:1.7em /*IE6*/; line-height:1.7em; padding-left: 5px; border:none; font-weight:normal; text-decoration:none; color:rgb(70,122,167); font-size:120%; }
-#right li a:hover {background-color:rgba(0,130,250,0.1); text-decoration:none; }
-#right h1 {clear:both; padding:4px 20px 3px 10px; background:rgba(0,130,250,0.5); font-family:"trebuchet ms",arial,sans-serif; color:rgb(255,255,255); font-weight:bold; font-size:160%;}
-#right h2 {clear:both; margin:20px 10px 10px 20px; font-family:"trebuchet ms",arial,sans-serif; color:rgb(100,100,100); font-weight:bold; font-size:150%;}
-#right h3 {clear:both; margin:10px 10px 5px 20px; color:rgb(80,80,80); font-weight:bold; font-size:110%;} 
-#right li .active {  background:rgba(0,130,250,0.1); padding-left: 20px; }
-#right li a.active { font-weight: bold; }
-
-
-
-
-#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 {
-
-	}
-
-.expired {
-	color: #c0c0c0;
-}
-
-/* input {
-border: 1px solid #ccc;
-padding: 3px 6px;
-border-radius: 6px;
-background:rgba(0,130,250,0.1);
-margin-right: 1em;
-}
-
-input:focus{
-border: 1px solid black;
-background:rgba(0,130,250,0.2);
-}
-
-input[type=submit] { 
-padding: 4px 16px;
-border-radius: 8px;
-border: 1px solid black;
-background: skyblue;
-}
-
-input[type=submit]:hover { 
-padding: 4px 16px;
-border-radius: 8px;
-border: 1px solid black;
-background: lightblue;
-}
-
-*/

code/MoyaWeb/WebContent/resources/style/template1/css/tabnav.css

-#edit { float: left; width:100%; border-bottom: 1px solid black; }
-ul#usertabnav { float:left; width: 100%; border:1px solid rgba(200,200,200,0); background:rgba(200,200,200,0); border-radius: 16px 16px 0 0; }
-ul#usertabnav li {display:inline; list-style:none; }
-ul#usertabnav 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.3); color: rgba(0,0,0,1); border-radius: 12px 12px 0 0; border: 1px solid rgba(0,0,0,0.1); border-bottom: none;}
-ul#usertabnava:hover {text-decoration:none; color:rgb(50,50,50);}
-ul#usertabnav 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 }
-#edit {
-clear: both;
-}
\ No newline at end of file

code/MoyaWeb/WebContent/resources/style/tone/blue.css

-body
-{ background: #636363;
-  color: #5A6370;
-}
-
-blockquote{border-color: #767676;}
-
-#main
-{ background: #FFF url(main.png) repeat-y;
-  color: #5A6370;
-}
-
-#links, #footer, #menu, #menu li a
-{ background: #FFF url(menu.png);
-  color: #D1D3D7;
-  border-color: #D7D7D7;
-}
-
-#links a, #footer a, #links a:hover, #footer a:hover
-{ background: transparent;
-  color: #D1D3D7;
-}
-
-#logo
-{ background: #FFF url(site_logo.jpg) no-repeat;
-  color: #5A6370;
-}
-
-h1
-{ background: transparent;
-  color: #1775D5;
-  border-color: #89A9C7;
-}
-
-#menu li a:hover, #menu li a#selected, #menu li a#selected:hover
-{ background: #FFF url(blue_menu.png);
-  color: #484E56;
-} 
-
-#content, #column2 a, #column2 a:hover
-{ background: transparent;
-  color: #5A6370;
-}
-
-.sidebaritem, .sidebaritem a, .sidebaritem a:hover
-{ background: transparent;
-  color: #D1D3D7;
-}
-
-.sbihead
-{ background: #FFF url(blue_sbi.png);
-  color: #484E56;
-}
-
-.sbihead h1
-{ background: transparent;
-  color: #484E56;
-}
-
-.sbilinks li a
-{ background: #FFF url(link.png);
-  color: #D1D3D7;
-} 
-
-.sbilinks li a:hover
-{ background: #B7B7B7;
-  color: #1775D5;
-} 

code/MoyaWeb/WebContent/resources/style/tone/css/tabnav.css

-/* begin css tabs */
-
-ul#usertabnav { /* general settings */
-text-align: left; /* set to left, right or center */
-margin: 1em 0 1em 0; /* set margins as desired */
-font: bold 11px verdana, arial, sans-serif; /* set font as desired */
-border-bottom: 1px solid #7DAC0C; /* set border COLOR as desired */
-list-style-type: none;
-padding: 3px 10px 4px 10px; /* THIRD number must change with respect to padding-top (X) below */
-}
-
-ul#usertabnav li { /* do not change */
-display: inline;
-}
-
-div#edit li.edit, 
-div#chpass li.chpass, 
-div#accountevents li.accountevents, 
-div#groups li.groups, 
-div#token li.token,
-div#picture li.picture
- { /* settings for selected tab */
-border-bottom: 1px solid #fff; /* set border color to page background color */
-background-color: #fff; /* set background color to match above border color */
-}
-
-div#edit li.edit a, 
-div#chpass li.chpass a, 
-div#accountevents li.accountevents a, 
-div#groups li.groups a, 
-div#token li.token a,
-div#picture li.picture a{ /* settings for selected tab link */
-background-color: #FFF; /* set selected tab background color as desired */
-color: #000; /* set selected tab link color as desired */
-position: relative;
-top: 1px;
-padding-top: 4px; /* must change with respect to padding (X) above and below */
-}
-
-ul#usertabnav li a { /* settings for all tab links */
-padding: 4px 5px; /* set padding (tab size) as desired; FIRST number must change with respect to padding-top (X) above */
-border: 1px solid #7DAC0C; /* set border COLOR as desired; usually matches border color specified in #usertabnav */
-background-color: #37bce6; /* set unselected tab background color as desired */
-color: #0f3541; /* set unselected tab link color as desired */
-margin-right: 0px; /* set additional spacing between tabs as desired */
-text-decoration: none;
-border-bottom: none;
-border-top-right-radius: 7px;
-border-top-left-radius: 7px;
-}
-
-ul#usertabnav a:hover { /* settings for hover effect */
-background: #b8f7ff; /* set desired hover color */
-}
-
-/* end css tabs */
\ No newline at end of file

code/MoyaWeb/WebContent/resources/style/tone/green.css

-body
-{ background: #636363;
-  color: #67705A;
-}
-
-blockquote{border-color: #D7D7D7;}
-
-#main
-{ background: #FFF url(main.png) repeat-y;
-  color: #67705A;
-}
-
-#links, #footer, #menu, #menu li a
-{ background: #FFF url(menu.png);
-  color: #DBE1D1;
-  border-color: #D7D7D7;
-}
-
-#links a, #footer a, #links a:hover, #footer a:hover
-{ background: transparent;
-  color: #DBE1D1;
-}
-
-#logo
-{ background: #FFF url(site_logo.jpg) no-repeat;
-  color: #67705A;
-}
-
-h1
-{ background: transparent;
-  color: #7C9D49;
-  border-color: #B5CA91;
-}
-
-#menu li a:hover, #menu li a#selected, #menu li a#selected:hover
-{ background: #FFF url(green_menu.png);
-  color: #67705A;
-} 
-
-#content, #column2 a, #column2 a:hover
-{ background: transparent;
-  color: #67705A;
-}
-
-.sidebaritem, .sidebaritem a, .sidebaritem a:hover
-{ background: transparent;
-  color: #DBD7DB;
-} 
-
-.sbihead
-{ background: #FFF url(green_sbi.png);
-  color: #67705A;
-}
-
-.sbihead h1
-{ background: transparent;
-  color: #67705A;
-}
-
-.sbilinks li a
-{ background: #FFF url(link.png);
-  color: #DBD7DB;
-} 
-
-.sbilinks li a:hover
-{ background: #B7B7B7;
-  color: #5B7236;
-} 

code/MoyaWeb/WebContent/resources/style/tone/orange.css

-body
-{ background: #636363;
-  color: #70695A;
-}
-
-blockquote{border-color: #767676;}
-
-#main
-{ background: #FFF url(main.png) repeat-y;
-  color: #70695A;
-}
-
-#links, #footer, #menu, #menu li a
-{ background: #FFF url(menu.png);
-  color: #DBD7D1;
-  border-color: #D7D7D7;
-}
-
-#links a, #footer a, #links a:hover, #footer a:hover
-{ background: transparent;
-  color: #DBD7D1;
-}
-
-#logo
-{ background: #FFF url(site_logo.jpg) no-repeat;
-  color: #70695A;
-}
-
-h1
-{ background: transparent;
-  color: #EA8916;
-  border-color: #CAAE90;
-}
-
-#menu li a:hover, #menu li a#selected, #menu li a#selected:hover
-{ background: #FFF url(orange_menu.png);
-  color: #70695A;
-} 
-
-#content, #column2 a, #column2 a:hover
-{ background: transparent;
-  color: #70695A;
-}
-
-.sidebaritem, .sidebaritem a, .sidebaritem a:hover
-{ background: transparent;
-  color: #DBD7D1;
-}
-
-.sbihead
-{ background: #FFF url(orange_sbi.png);
-  color: #70695A;
-}
-
-.sbihead h1
-{ background: transparent;
-  color: #70695A;
-}
-
-.sbilinks li a
-{ background: #FFF url(link.png);
-  color: #DBD7D1;
-} 
-
-.sbilinks li a:hover
-{ background: #B7B7B7;
-  color: #EA8916;
-} 

code/MoyaWeb/WebContent/resources/style/tone/purple.css

-body
-{ background: #636363;
-  color: #6D5A70;
-}
-
-blockquote{border-color: #767676;}
-
-#main
-{ background: #FFF url(main.png) repeat-y;
-  color: #6D5A70;
-}
-
-#links, #footer, #menu, #menu li a
-{ background: #FFF url(menu.png);
-  color: #DBD7DB;
-  border-color: #D7D7D7;
-}
-
-#links a, #footer a, #links a:hover, #footer a:hover
-{ background: transparent;
-  color: #DBD7DB;
-}
-
-#logo
-{ background: #FFF url(site_logo.jpg) no-repeat;
-  color: #DBD7DB;
-}
-
-h1
-{ background: transparent;
-  color: #CF5AE8;
-  border-color: #B383BF;
-}
-
-#menu li a:hover, #menu li a#selected, #menu li a#selected:hover
-{ background: #FFF url(purple_menu.png);
-  color: #524A54;
-} 
-
-#content, #column2 a, #column2 a:hover
-{ background: transparent;
-  color: #6D5A70;
-}
-
-.sidebaritem, .sidebaritem a, .sidebaritem a:hover
-{ background: transparent;
-  color: #DBD7DB;
-}
-
-.sbihead
-{ background: #FFF url(purple_sbi.png);
-  color: #524A54;
-}
-
-.sbihead h1
-{ background: transparent;
-  color: #524A54;
-}
-
-.sbilinks li a
-{ background: #FFF url(link.png);
-  color: #DBD7DB;
-} 
-
-.sbilinks li a:hover
-{ background: #B7B7B7;
-  color: #B61EC8;
-} 

code/MoyaWeb/WebContent/resources/style/tone/style.css

-/* global */
-html{height: 100%;}
-
-body
-{ font-family: verdana, arial, sans-serif;
-  padding: 0px;
-  margin: 0px;
-  font-size: .68em;
-}
-
-p
-{ margin: 0px;
-  padding: 0px 0px 16px 0px;
-  line-height: 1.7em;
-}
-
-h1
-{ font-family: arial, sans-serif;
-  letter-spacing: .1em;
-}
-
-h2
-{ margin: 0px;
-  padding: 0px 0px 4px 0px;
-  font-size: 100%;
-}
-
-img{border: 0px;}
-
-a{outline: none;}
-
-/* image positioning - left, right and center */
-.left
-{ float: left; 
-  padding: 0px 8px 0px 0px;
-}
-
-.right
-{ float: right; 
-  padding: 0px 0px 0px 8px;
-}
-
-.center
-{ display: block;
-  text-align: center;
-  margin: 0 auto;
-}
-
-/* block quote */
-blockquote
-{ margin: 20px 0px 20px 0px; 
-  padding: 10px 20px 0px 20px;
-  border-left: 8px solid;
-}
-
-/* unordered list */
-ul
-{ margin: 8px 0px 0px 16px;
-  padding: 0px;
-}
-
-ul li
-{ list-style-type: square;
-  margin: 0px 0px 11px 0px; 
-  padding: 0px;
-}
-
-/* ordered list */
-ol
-{ margin: 8px 0px 0px 24px;
-  padding: 0px;
-}
-
-ol li
-{ margin: 0px 0px 11px 0px; 
-  padding: 0px;
-}
-
-/* margin lefts / margin rights - to centre content */
-#main, #links, #footer, #logo, #menu, #content
-{ margin-left: auto; 
-  margin-right: auto;
-}
-
-/* main container */
-#main{width: 780px;}
-
-/* links above the logo / footer */
-#links, #footer
-{ padding: 10px 21px 0px 19px;
-  width: 720px;
-  height: 26px;
-  font-size: 94%;
-  text-transform: uppercase;
-}
-
-#links{text-align: right;}
-
-#footer{text-align: center;}
-
-#links a, #footer a{text-decoration: none;}
-
-#links a:hover, #footer a:hover{text-decoration: underline;}
-
-/* logo */
-#logo
-{ width: 760px;
-  height: 100px;
-  text-align: left;
-}
-
-#logo h1
-{ margin: 0px;
-  padding: 0px 0px 0px 19px;
-  font-size: 500%;
-  letter-spacing: 0;
-}
-#logo h1 span
-{
-  font-size: 40%;
-  letter-spacing: 0;
-}
-
-
-/* navigation menu */
-#menu
-{ height: 42px;
-  width: 760px;
-}
-
-#menu ul{margin: 0px auto;} 
-
-#menu li
-{ float: left; 
-  margin: 0px; 
-  padding: 0px;
-  list-style: none;
-} 
-
-#menu li a 
-{ display: block; 
-  float: left; 
-  height: 37px;
-  text-decoration: none; 
-  padding: 3px 19px 2px 19px;
-  text-transform: uppercase;
-} 
-
-/* main content */
-#content
-{ width: 760px;
-  height: auto;
-  padding: 0px;
-  overflow: hidden;
-} 
-
-/* column 1 - contains sidebar items */
-#column1
-{ width: 207px;
-  float: right;
-  padding: 16px 0px 15px 0px;
-}
-
-.sidebaritem
-{ text-align: left;
-  width: 188px;
-  float: left;
-  margin: 0px 0px 25px 0px;
-}
-
-.sbihead
-{ height: 14px;
-  width: 188px;
-  padding: 5px 0px 5px 19px;
-  text-transform: uppercase;
-}
-
-.sbihead h1
-{ padding: 0px; 
-  margin: 0px; 
-  font-weight: bold;
-  font-size: 112%;
-}
-
-.sbicontent{padding: 14px 8px 8px 19px;}
-
-.sbicontent p
-{ line-height: 14px; 
-  padding: 0px 0px 8px 0px;
-}
-
-.sbilinks{padding: 0px;}
-
-.sbilinks ul{margin: 0px auto;} 
-
-.sbilinks li 
-{ margin: 0px; 
-  float: left; 
-  list-style: none; 
-} 
-
-.sbilinks li a , .sbilinks li a:hover
-{ float: left; 
-  height: 16px;
-  text-decoration: none; 
-  padding: 5px 0px 4px 19px;
-  width: 188px;
-  border: 0px;
-} 
-
-/* column 2 - page content */
-#column2
-{ text-align: justify;
-  width: 512px;
-  float: left;
-  padding: 12px 3px 15px 19px;
-}
-
-#column2 h1
-{ padding: 6px 0px 4px 0px; 
-  margin: 0px 0px 12px 0px; 
-  border-bottom: 1px solid;
-  font-size: 150%;
-  text-transform: uppercase;
-  font-weight: normal;
-}
-
-.sidebaritem a, #column2 a, .sidebaritem a:hover, #column2 a:hover
-{ padding: 0px;
-  text-decoration: none;
-  padding-bottom: 2px;
-  border-bottom: 1px dashed;
-}
-
-.sidebaritem a:hover, #column2 a:hover{border-bottom: 1px solid;}
-
-/* additional colour scheme selections */
-#colour{margin: 0px 0px 20px 0px;}
-
-#colour a, #colour a:hover{border: 0px;}
-
-.blue
-{ background: #FFFFFF url(blue.png) no-repeat left center;
-  color: #109CEF;
-  padding: 0px 40px 0px 20px;
-}
-
-.green
-{ background: #FFFFFF url(green.png) no-repeat left center;
-  color: #94C65A;
-  padding: 0px 40px 0px 20px;
-}
-
-.purple
-{ background: #FFFFFF url(purple.png) no-repeat left center;
-  color: #CE5AEF;
-  padding: 0px 40px 0px 20px;
-}
-
-.orange
-{ background: #FFFFFF url(orange.png) no-repeat left center;
-  color: #FF9C21;
-  padding: 0px 40px 0px 20px;
-}

code/MoyaWeb/WebContent/layout/adduser/template.xhtml → code/MoyaWeb/WebContent/resources/templates/adduser/template.xhtml

@@ -19,9 +19,9 @@
 		<meta http-equiv="Content-Language" content="fi" />
 
 		<link rel="stylesheet" type="text/css"
-			href="#{request.contextPath}/resources/style/adduser/css/style.css" />
+			href="#{request.contextPath}/resources/templates/adduser/css/style.css" />
 		<link rel="stylesheet" type="text/css"
-			href="#{request.contextPath}/resources/style/adduser/css/general.css" />
+			href="#{request.contextPath}/resources/templates/adduser/css/general.css" />
 		<ui:insert name="headerdata" />
 
 	</h:head>

code/MoyaWeb/WebContent/layout/blipview/template.xhtml → code/MoyaWeb/WebContent/resources/templates/blipview/template.xhtml

@@ -19,9 +19,9 @@
 		<meta http-equiv="Content-Language" content="fi" />
 
 		<link rel="stylesheet" type="text/css"
-			href="#{request.contextPath}/resources/style/blipview/css/style.css" />
+			href="#{request.contextPath}/resources/templates/blipview/css/style.css" />
 		<link rel="stylesheet" type="text/css"
-			href="#{request.contextPath}/resources/style/blipview/css/general.css" />
+			href="#{request.contextPath}/resources/templates/blipview/css/general.css" />
 		<ui:insert name="headerdata" />
 
 	</h:head>

code/MoyaWeb/WebContent/resources/style/insomnia1/style.css → code/MoyaWeb/WebContent/resources/templates/insomnia1/style.css

-.linka a:link {
-	color: #133E51;
-	text-decoration: none;
-}
-
-.linka a:active {
-	color: #133E51;
-	text-decoration: none;
-}
-
-.linka a:visited {
-	color: #133E51;
-	text-decoration: none;
-}
-
-.linka a:hover {
-	color: #133E51;
-	text-decoration: underline;
-}
-
-.link a:link {
-	color: #FFF;
-	text-decoration: none;
-}
-
-.link a:active {
-	color: #FFF;
-	text-decoration: none;
-}
-
-.link a:visited {
-	color: #FFF;
-	text-decoration: none;
-}
-
-.link a:hover {
-	color: #FFF;
-	text-decoration: underline;
-}
-
-.placeSelectInfotable tr td {
-	padding-left: 20px;
-}
-
-.rightalign {
-	text-align: right;
-}
-
-.placeSelectInfotable tr {
-	vertical-align: top;
-}
-
-h3 {
-	font-size: 18px;
-	color: #01202e;
-	font-family: trebuchet ms, lucida grande, helvetica, arial;
-}
-
-body {
-	background-color: #133e51;
-	margin: 0 auto 0 auto;
-	font-family: helvetica, arial;
-	font-size: 10pt;
-}
-
-#wrapper {
-	margin: 0 auto 0 auto;
-	width: 900px;
-	height: auto;
-}
-
-#navigation {
-	width: 900px;
-	height: 80px;
-}
-
-#mainmenu {
-	margin-left: 10px;
-}
-
-#content {
-	width: 100%;
-	background-image: url('img/top.gif');
-	background-repeat: no-repeat;
-	background-color: #FFF;
-	padding-top: 10px 20px;
-}
-
-#headerbox {
-	height: 33px;
-	text-align: right;
-	margin: 15px 30px 5px 30px;
-	color: #FFFFFF;
-	width: 425px;
-}
-
-#headerbox a {
-	color: #FFFFFF;
-}
-
-#headerbox input {
-	margin: 0; padding 0;
-	border-style: solid;
-	border-width: 1px;
-}
-
-#sidebar {
-	float: right;
-	border: 1px solid #023952;
-	background: #62a5c3;
-	margin: 10px 15px;
-	padding: 0 1em 0 0;
-}
-
-#sidebar a:link {
-	color: #023952;
-	text-decoration: none;
-}
-
-#sidebar a:active {
-	color: #023952;
-	text-decoration: none;
-}
-
-#sidebar a:visited {
-	color: #023952;
-	text-decoration: none;
-}
-
-#sidebar a:hover {
-	color: #023952;
-	text-decoration: underline;
-}
-
-.linka {
-	background-image: url('img/linka2.gif');
-	width: 117px;
-	height: 27px;
-	color: #133E51;
-	float: left;
-	vertical-align: bottom;
-	line-height: 30px;
-	text-align: center;
-	font-weight: bold;
-	margin-right: 3px;
-}
-
-.link {
-	background-image: url('img/link2.gif');
-	width: 117px;
-	height: 27px;
-	color: #FFF;
-	float: left;
-	vertical-align: bottom;
-	line-height: 30px;
-	text-align: center;
-	font-weight: bold;
-	margin-right: 3px;
-}
-
-#head {
-	padding-top: 5px;
-	margin-right: 10px;
-	float: left;
-}
-
-#cwrap {
-	padding: 10px;
-	min-height: 100px;
-}
-
-#footer {
-	background-image: url('img/bottom.gif');
-	height: 21px;
-	text-align: center;
-}
-
-.imgcenter {
-	display: block;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-h1 {
-	font-size: 20px;
-}
-
-#sidebar ul {
-	padding-left: 10px;
-	list-style-type: none;
-}
-
-#sidebar ul li ul {
-	list-style-type: circle;
-	padding-left: 15px;
-}
-
-#sidebar .sidebartitle {
-	font-weight: bold;
-}
-
-.placegroupPadding {
-	padding-right: 50px;
-}
-
-#pollresultsubform tr td {
-	text-align: top; margin-bottom : 10px;
-	border-style: solid;
-	border-color: #000;
-	border-width: 0 0 1px 0;
-	margin-bottom: 10px;
-}
-
-#pollresultstable {
-	border-style: solid;
-	border-color: #000;
-	border-width: 1px;
-}
-
-#pollresultstable tr td
-{
-	vertical-align:top;
-}
-
-.expired {
-	color: #c0c0c0;
-}
+.linka a:link {
+	color: #133E51;
+	text-decoration: none;
+}
+
+.linka a:active {
+	color: #133E51;
+	text-decoration: none;
+}
+
+.linka a:visited {
+	color: #133E51;
+	text-decoration: none;
+}
+
+.linka a:hover {
+	color: #133E51;
+	text-decoration: underline;
+}
+
+.link a:link {
+	color: #FFF;
+	text-decoration: none;
+}
+
+.link a:active {
+	color: #FFF;
+	text-decoration: none;
+}
+
+.link a:visited {
+	color: #FFF;
+	text-decoration: none;
+}
+
+.link a:hover {
+	color: #FFF;
+	text-decoration: underline;
+}
+
+.placeSelectInfotable tr td {
+	padding-left: 20px;
+}
+
+.rightalign {
+	text-align: right;
+}
+
+.placeSelectInfotable tr {
+	vertical-align: top;
+}
+
+h3 {
+	font-size: 18px;
+	color: #01202e;
+	font-family: trebuchet ms, lucida grande, helvetica, arial;
+}
+
+body {
+	background-color: #133e51;
+	margin: 0 auto 0 auto;
+	font-family: helvetica, arial;
+	font-size: 10pt;
+}
+
+#wrapper {
+	margin: 0 auto 0 auto;
+	width: 900px;
+	height: auto;
+}
+
+#navigation {
+	width: 900px;
+	height: 80px;
+}
+
+#mainmenu {
+	margin-left: 10px;
+}
+
+#content {
+	width: 100%;
+	background-image: url('img/top.gif');
+	background-repeat: no-repeat;
+	background-color: #FFF;
+	padding-top: 10px 20px;
+}
+
+#headerbox {
+	height: 33px;
+	text-align: right;
+	margin: 15px 30px 5px 30px;
+	color: #FFFFFF;
+	width: 425px;
+}
+
+#headerbox a {
+	color: #FFFFFF;
+}
+
+#headerbox input {
+	margin: 0; padding 0;
+	border-style: solid;
+	border-width: 1px;
+}
+
+#sidebar {
+	float: right;
+	border: 1px solid #023952;
+	background: #62a5c3;
+	margin: 10px 15px;
+	padding: 0 1em 0 0;
+}
+
+#sidebar a:link {
+	color: #023952;
+	text-decoration: none;
+}
+
+#sidebar a:active {
+	color: #023952;
+	text-decoration: none;
+}
+
+#sidebar a:visited {
+	color: #023952;
+	text-decoration: none;
+}
+
+#sidebar a:hover {
+	color: #023952;
+	text-decoration: underline;
+}
+
+.linka {
+	background-image: url('img/linka2.gif');
+	width: 117px;
+	height: 27px;
+	color: #133E51;
+	float: left;
+	vertical-align: bottom;
+	line-height: 30px;
+	text-align: center;
+	font-weight: bold;
+	margin-right: 3px;
+}
+
+.link {
+	background-image: url('img/link2.gif');
+	width: 117px;
+	height: 27px;
+	color: #FFF;
+	float: left;
+	vertical-align: bottom;
+	line-height: 30px;
+	text-align: center;
+	font-weight: bold;
+	margin-right: 3px;
+}
+
+#head {
+	padding-top: 5px;
+	margin-right: 10px;
+	float: left;
+}
+
+#cwrap {
+	padding: 10px;
+	min-height: 100px;
+}
+
+#footer {
+	background-image: url('img/bottom.gif');
+	height: 21px;
+	text-align: center;
+}
+
+.imgcenter {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+h1 {
+	font-size: 20px;
+}
+
+#sidebar ul {
+	padding-left: 10px;
+	list-style-type: none;
+}
+
+#sidebar ul li ul {
+	list-style-type: circle;
+	padding-left: 15px;
+}
+
+#sidebar .sidebartitle {
+	font-weight: bold;
+}
+
+.placegroupPadding {
+	padding-right: 50px;
+}
+
+#pollresultsubform tr td {
+	text-align: top; margin-bottom : 10px;
+	border-style: solid;
+	border-color: #000;
+	border-width: 0 0 1px 0;
+	margin-bottom: 10px;
+}
+
+#pollresultstable {
+	border-style: solid;
+	border-color: #000;
+	border-width: 1px;
+}
+
+#pollresultstable tr td
+{
+	vertical-align:top;
+}
+
+.expired {
+	color: #c0c0c0;
+}

code/MoyaWeb/WebContent/layout/insomnia1/template.xhtml → code/MoyaWeb/WebContent/resources/templates/insomnia1/template.xhtml

@@ -14,7 +14,7 @@
 				value="#{i18n[util.concat(thispage,'.header') ] }"
 			/>
 		</title>
-		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia1/style.css" />
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/insomnia1/style.css" />
 		<ui:insert name="headerdata" />
 	</h:head>
 	<h:body >

code/MoyaWeb/WebContent/resources/style/insomnia2/css/actionlog.css → code/MoyaWeb/WebContent/resources/templates/insomnia2/css/actionlog.css

-@CHARSET "utf-8";
-
-#actionlog_create .row {
-	display: block;
-	clear: both;
-}
-
-#actionlog_create div, #actionlog_create h3 {
-	display: block;
-	float: left;
-}
-
-#actionlog_create h3 {
-	margin-bottom: 2px;
-}
-
-#actionlog_create .header {
-	font-weight: bold;
-}
-
-#actionlog_create .actionlog_create_role {
-	width: 100px;
-}
-
-#actionlog_create .actionlog_create_role select {
-	width: 100%;
-	margin: 0;
-	padding: 0;
-	border: 1px solid #aaa;
-}
-
-#actionlog_create .actionlog_create_message {
-	margin-left: 10px;
-	width: 420px;
-}
-
-#actionlog_create .actionlog_create_message input {
-	width: 100%;
-	margin: 0;
-	border: 1px solid #aaa;
-}
-
-#actionlog_create .actionlog_create_istask {
-	margin-left: 10px;
-	width: 60px;
-}
-
-#actionlog_create .actionlog_create_istask input {
-	display: block;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#actionlog_create input.sendbutton {
-	border: 1px solid #aaa;
-	margin-left: 10px;
-}
-
-#actionlog {
-	
-}
-
-#actionlog table {
-	width: 100%;
-	border-collapse:collapse;
-}
-
-#actionlog tr {
-}
-
-#actionlog td {
-}
-
-#actionlog tr.roweven {
-	background-color: #aeaeae;
-}
-
-#actionlog tr.rowodd {
-	background-color: #9a9a9a;
-}
-
-.taskHeader {
-	color: #7DAC0C;
-	font-size: 120%;
-	font-weight: bold;
-}
-
-.sendbutton2 {
-	border: 1px solid #aaa;
-	margin-left: 10px;
+@CHARSET "utf-8";
+
+#actionlog_create .row {
+	display: block;
+	clear: both;
+}
+
+#actionlog_create div, #actionlog_create h3 {
+	display: block;
+	float: left;
+}
+
+#actionlog_create h3 {
+	margin-bottom: 2px;
+}
+
+#actionlog_create .header {
+	font-weight: bold;
+}
+
+#actionlog_create .actionlog_create_role {
+	width: 100px;
+}
+
+#actionlog_create .actionlog_create_role select {
+	width: 100%;
+	margin: 0;
+	padding: 0;
+	border: 1px solid #aaa;
+}
+
+#actionlog_create .actionlog_create_message {
+	margin-left: 10px;
+	width: 420px;
+}
+
+#actionlog_create .actionlog_create_message input {
+	width: 100%;
+	margin: 0;
+	border: 1px solid #aaa;
+}
+
+#actionlog_create .actionlog_create_istask {
+	margin-left: 10px;
+	width: 60px;
+}
+
+#actionlog_create .actionlog_create_istask input {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+#actionlog_create input.sendbutton {
+	border: 1px solid #aaa;
+	margin-left: 10px;
+}
+
+#actionlog {
+	
+}
+
+#actionlog table {
+	width: 100%;
+	border-collapse:collapse;
+}
+
+#actionlog tr {
+}
+
+#actionlog td {
+}
+
+#actionlog tr.roweven {
+	background-color: #aeaeae;
+}
+
+#actionlog tr.rowodd {
+	background-color: #9a9a9a;
+}
+
+.taskHeader {
+	color: #7DAC0C;
+	font-size: 120%;
+	font-weight: bold;
+}
+
+.sendbutton2 {
+	border: 1px solid #aaa;
+	margin-left: 10px;
 }
\ No newline at end of file

code/MoyaWeb/WebContent/resources/style/insomnia2/css/tyyli.css → code/MoyaWeb/WebContent/resources/templates/insomnia2/css/tyyli.css

-body,html {
-	width: 100%;
-	height: 100%;
-	color: #343434;
-	font-family: trebuchet ms;
-	background: url('../img/tausta.png') repeat-x #fff;
-	margin: 0px;
-}
-
-#header {
-	width: 970px;
-	height: 52px;
-	margin: 0 auto;
-}
-
-td span span div.rating-cancel {
-	display: none;
-}
-
-#voteform div.rating-cancel {
-	display: none;
-}
-
-#logo {
-	width: 255px;
-	height: 52px;
-	float: left;
-}
-
-#logo h1 {
-	margin: 5px;
-	color: white:
-}
-
-#logo a {
-	text-decoration: none;
-	color: white;
-}
-
-#login {
-	width: 388px;
-	height: 23px;
-	float: right;
-	margin-top: 10px;
-	color: #fff;
-	font-size: 14px;
-	text-align: right;
-}
-
-#login a {
-	color: white;
-}
-
-.form {
-	background: url('../img/input.png') no-repeat;
-	width: 130px;
-	height: 23px;
-	color: #fff;
-	border: 0px;
-	padding: 0 0 0 10px;
-}
-
-#header #login .ui-state-default
-{
-	/*color:	#4f4f4f;*/
-}
-#header #login input
-{
-	
-	-webkit-box-shadow: none;
-}
-
-#header #login button
-{
-	border-radius: 14px;
-	-webkit-border-radius: 14px; 
-}
-#header #login span	
-{
-	padding: .4em .5em;
-	line-height: 1;
-	font-size: 12px;
-}
-.button {
-/* 	background: url('../img/button.png') no-repeat; 
-	width: 100px;
-	text-align: center;
-	border: 0px;
-	height: 23px;
-	color: #fff;
-	padding: 0px;*/
-}
-
-.button:hover {
-	/*background: url('../img/button2.png') no-repeat;
-	cursor: pointer;
-*/
-}
-
-#wrapper {
-	width: 970px;
-	margin: 0 auto;
-}
-
-#navigation {
-	margin: 15px 0px;
-	height: 33px;
-	width: 100%;
-}
-
-#navigation ul {
-	list-style-type: none;
-	margin: 0px;
-	padding: 0px;
-}
-
-#navigation ul li {
-	float: left;
-	margin-right: 10px;
-}
-
-#navigation ul li a {
-	display: block;
-	height: 33px;
-	padding: 0px 10px;
-	line-height: 33px;
-	text-decoration: none;
-	font-weight: bold;
-	color: #0073bc;
-}
-
-#navigation ul li a:hover,#navigation ul li .active {
-	background: #fff;
-	border-radius: 5px;
-	border: 1px solid #c0c0c0;
-	color: #7dac0c !important;
-}
-
-a {
-	color: #0037bc;
-}
-
-a:hover {
-	color: #7dac0c;
-}
-
-.container {
-	width: 100%;
-	background: url(../img/container.png) repeat-y;
-	font-size: 13px;
-}
-
-.container #left {
-	padding: 10px 20px;
-}
-
-#left {
-	width: 700px;
-}
-
-#left h1 {
-	color: #7dac0c;
-	font-size: 24px;
-	padding-top: 0px;
-	margin-top: 0px;
-}
-
-#left h2 {
-	color: #7dac0c;
-	font-size: 18px;
-}
-
-#left h3 {
-	color: #7dac0c;
-	font-size: 16px;
-}
-
-#right {
-	float: right;
-	border-left: 1px dotted #c0c0c0;
-	padding: 10px 20px;
-	width: 200px;
-}
-
-#right h1,#right h1 a {
-	color: #7dac0c;
-	font-size: 18px;
-	padding-top: 0px;
-	margin-top: 0px;
-	text-decoration: none;
-}
-
-.container.top {
-	width: 100%;
-	background: url(../img/container-top.png) no-repeat;
-	height: 15px;
-	padding-left: 1em;
-}
-
-.container.bottom {
-	width: 100%;
-	background: url(../img/container-bottom.png) no-repeat;
-	height: 16px;
-}
-
-.clearfix:after {
-	content: ".";
-	display: block;
-	clear: both;
-	visibility: hidden;
-	line-height: 0;
-	height: 0;
-}
-
-#topmenu {
-	font-size: 0.8em;
-	float: right;
-	list-style-type: none;
-	margin: 5px 15px 0 0;
-	padding: 0px;
-}
-
-#topmenu a {
-	color: #fff;
-	text-decoration: none;
-	display: block;
-}
-
-#topmenu  li {
-	margin: 0 7px;
-	color: #fff;
-	float: left;
-}
-
-td ul {
-	margin: 0;
-}
-
-.topalign {
-	vertical-align: top;
-}
-
-.numalign {
-	text-align: right;
-}
-
-.editorlink {
-	font-size: 9px;
-	float: left;
-	margin: 4px;
-}
-
-#right ul {
-	color: #7dac0c;
-	list-style-type: square;
-	list-style-position: inside;
-}
-
-#right ul li {
-	border-bottom: 1px solid white;
-}
-
-#right ul li a {
-	color: #0073bc;
-	text-decoration: none;
-}
-
-#right ul li a:hover {
-	color: #7dac0c;
-	text-decoration: none;
-}
-
-table {
-	border-collapse: collapse;
-}
-
-table.border td,table.border th {
-	padding: 1px 4px;
-}
-
-.nowrap {
-	white-space: nowrap;
-}
-
-.shopProductbuttons
-{
-	width: 320px;
-	vertical-align: top;
-		
-}
-
-button.ui-button span
-{
-	line-height: 1;
-	padding: .4em .5em;
-	
-}
-
-
-.expired {
-	color: #c0c0c0;
-}
-
-.paid {
-	color: #006600;
-}
+body,html {
+	width: 100%;
+	height: 100%;
+	color: #343434;
+	font-family: trebuchet ms;
+	background: url('../img/tausta.png') repeat-x #fff;
+	margin: 0px;
+}
+
+#header {
+	width: 970px;
+	height: 52px;
+	margin: 0 auto;
+}
+
+td span span div.rating-cancel {
+	display: none;
+}
+
+#voteform div.rating-cancel {
+	display: none;
+}
+
+#logo {
+	width: 255px;
+	height: 52px;
+	float: left;
+}
+
+#logo h1 {
+	margin: 5px;
+	color: white:
+}
+
+#logo a {
+	text-decoration: none;
+	color: white;
+}
+
+#login {
+	width: 388px;
+	height: 23px;
+	float: right;
+	margin-top: 10px;
+	color: #fff;
+	font-size: 14px;
+	text-align: right;
+}
+
+#login a {
+	color: white;
+}
+
+.form {
+	background: url('../img/input.png') no-repeat;
+	width: 130px;
+	height: 23px;
+	color: #fff;
+	border: 0px;
+	padding: 0 0 0 10px;
+}
+
+#header #login .ui-state-default
+{
+	/*color:	#4f4f4f;*/
+}
+#header #login input
+{
+	
+	-webkit-box-shadow: none;
+}
+
+#header #login button
+{
+	border-radius: 14px;
+	-webkit-border-radius: 14px; 
+}
+#header #login span	
+{
+	padding: .4em .5em;
+	line-height: 1;
+	font-size: 12px;
+}
+.button {
+/* 	background: url('../img/button.png') no-repeat; 
+	width: 100px;
+	text-align: center;
+	border: 0px;
+	height: 23px;
+	color: #fff;
+	padding: 0px;*/
+}
+
+.button:hover {
+	/*background: url('../img/button2.png') no-repeat;
+	cursor: pointer;
+*/
+}
+
+#wrapper {
+	width: 970px;
+	margin: 0 auto;
+}
+
+#navigation {
+	margin: 15px 0px;
+	height: 33px;
+	width: 100%;
+}
+
+#navigation ul {
+	list-style-type: none;
+	margin: 0px;
+	padding: 0px;
+}
+
+#navigation ul li {
+	float: left;
+	margin-right: 10px;
+}
+
+#navigation ul li a {
+	display: block;
+	height: 33px;
+	padding: 0px 10px;
+	line-height: 33px;
+	text-decoration: none;
+	font-weight: bold;
+	color: #0073bc;
+}
+
+#navigation ul li a:hover,#navigation ul li .active {
+	background: #fff;
+	border-radius: 5px;
+	border: 1px solid #c0c0c0;
+	color: #7dac0c !important;
+}
+
+a {
+	color: #0037bc;
+}
+
+a:hover {
+	color: #7dac0c;
+}
+
+.container {
+	width: 100%;
+	background: url(../img/container.png) repeat-y;
+	font-size: 13px;
+}
+
+.container #left {
+	padding: 10px 20px;
+}
+
+#left {
+	width: 700px;
+}
+
+#left h1 {
+	color: #7dac0c;
+	font-size: 24px;
+	padding-top: 0px;
+	margin-top: 0px;
+}
+
+#left h2 {
+	color: #7dac0c;
+	font-size: 18px;
+}
+
+#left h3 {
+	color: #7dac0c;
+	font-size: 16px;
+}
+
+#right {
+	float: right;
+	border-left: 1px dotted #c0c0c0;
+	padding: 10px 20px;
+	width: 200px;
+}
+
+#right h1,#right h1 a {
+	color: #7dac0c;
+	font-size: 18px;
+	padding-top: 0px;
+	margin-top: 0px;
+	text-decoration: none;
+}
+
+.container.top {
+	width: 100%;
+	background: url(../img/container-top.png) no-repeat;
+	height: 15px;
+	padding-left: 1em;
+}
+
+.container.bottom {
+	width: 100%;
+	background: url(../img/container-bottom.png) no-repeat;
+	height: 16px;
+}
+
+.clearfix:after {
+	content: ".";
+	display: block;
+	clear: both;
+	visibility: hidden;
+	line-height: 0;
+	height: 0;
+}
+
+#topmenu {
+	font-size: 0.8em;
+	float: right;
+	list-style-type: none;
+	margin: 5px 15px 0 0;
+	padding: 0px;
+}
+
+#topmenu a {
+	color: #fff;
+	text-decoration: none;
+	display: block;
+}
+
+#topmenu  li {
+	margin: 0 7px;
+	color: #fff;
+	float: left;
+}
+
+td ul {
+	margin: 0;
+}
+
+.topalign {
+	vertical-align: top;
+}
+
+.numalign {
+	text-align: right;
+}
+
+.editorlink {
+	font-size: 9px;
+	float: left;
+	margin: 4px;
+}
+
+#right ul {
+	color: #7dac0c;
+	list-style-type: square;
+	list-style-position: inside;
+}
+
+#right ul li {
+	border-bottom: 1px solid white;
+}
+
+#right ul li a {
+	color: #0073bc;
+	text-decoration: none;
+}
+
+#right ul li a:hover {
+	color: #7dac0c;
+	text-decoration: none;
+}
+
+table {
+	border-collapse: collapse;
+}
+
+table.border td,table.border th {
+	padding: 1px 4px;
+}
+
+.nowrap {
+	white-space: nowrap;
+}
+
+.shopProductbuttons
+{
+	width: 320px;
+	vertical-align: top;
+		
+}
+
+button.ui-button span
+{
+	line-height: 1;
+	padding: .4em .5em;
+	
+}
+
+
+.expired {
+	color: #c0c0c0;
+}
+
+.paid {
+	color: #006600;
+}

code/MoyaWeb/WebContent/layout/insomnia2/template.xhtml → code/MoyaWeb/WebContent/resources/templates/insomnia2/template.xhtml

@@ -10,9 +10,9 @@
 		<meta name="description" content="#{layoutView.getHeader()}" />
 		<meta http-equiv="Content-Language" content="fi" />
 
-		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia2/css/tyyli.css" />
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/insomnia2/css/tyyli.css" />
 		<!-- general style for nonlayout elements -->
-		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia2/css/general.css" />
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/insomnia2/css/general.css" />
 		<ui:insert name="headerdata" />
 		<h:outputScript name="prime_calendar.js" library="script" />
 	</h:head>
@@ -22,7 +22,7 @@
 				<h:link outcome="/index">
 					<c:choose>
 						<c:when test="#{sessionHandler.isInDevelopmentMode()}">
-							<img src="#{request.contextPath}/resources/style/insomnia2/img/devel_logo.png" />
+							<img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
 						</c:when>
 						<c:otherwise>
 							<p:graphicImage rendered="#{!empty layoutView.headerimage}" value="#{layoutView.headerimage}" />
@@ -69,6 +69,8 @@
 			<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 class="container top" />
 			<div class="container clearfix">
 				<ui:fragment rendered="#{menuView.getMenu(2).size() > 1}">

code/MoyaWeb/WebContent/layout/originalToneTemplate.xhtml → code/MoyaWeb/WebContent/resources/templates/originalToneTemplate.xhtml

@@ -17,13 +17,13 @@
 		<link
 			rel="stylesheet"
 			type="text/css"
-			href="#{request.contextPath}/resources/style/style.css" />
+			href="#{request.contextPath}/resources/templates/style.css" />
 
 		<!-- **** colour scheme stylesheet **** -->
 		<link
 			rel="stylesheet"
 			type="text/css"
-			href="#{request.contextPath}/resources/style/green.css" />
+			href="#{request.contextPath}/resources/templates/green.css" />
 	</h:head>
 	<h:body>
 		<div id="main">

code/MoyaWeb/WebContent/layout/skynett17/template.xhtml → code/MoyaWeb/WebContent/resources/templates/skynett17/template.xhtml

@@ -11,8 +11,8 @@
 		<meta name="author" content="CodeCrew ry" />
 		<meta http-equiv="Content-Language" content="fi" />
 
-		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/skynett17/css/style.css" />
-		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/skynett17/css/general.css" />
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/skynett17/css/style.css" />
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/skynett17/css/general.css" />
 		<ui:insert name="headerdata" />
 
 	</h:head>

code/MoyaWeb/WebContent/layout/stream1/template.xhtml → code/MoyaWeb/WebContent/resources/templates/stream1/template.xhtml

@@ -10,7 +10,7 @@
 	</f:metadata>
 	<ui:insert name="metadata" />
 	<h:head>
-		<link href="#{request.contextPath}/resources/style/stream10/intra_style.css" rel="stylesheet" type="text/css" />
+		<link href="#{request.contextPath}/resources/templates/stream10/intra_style.css" rel="stylesheet" type="text/css" />
 		<meta http-equiv="CACHE-CONTROL" content="NO-CACHE" />
 		<meta http-equiv="PRAGMA" content="NO-CACHE" />
 		<meta http-equiv="expires" content="0" />

code/MoyaWeb/WebContent/resources/style/stream10/login_style.css → code/MoyaWeb/WebContent/resources/templates/stream10/login_style.css

-body
-{
-	background-color: #ffffff;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-style: normal;
-	font-weight: normal;
-	text-decoration: none;
-	padding: 0px;
-	margin: 0px;
-}
-
-a
-{
-	color: #ffffff;
-}
-
-#loginBox
-{
-	position: absolute; 
-	top: 50%;
-	width: 300px;
-	height: 260px; 
-	margin-top: -130px;
-	left: 50%;
-	margin-left: -150px;
-	background-color: #444444;
-	background-image: url('login_background.png');
-	text-align: left;
-	color: #ffffff;
-}
-
-#loginContent
-{
-	padding-top: 80px;
-	padding-left: 30px;
-	color: #ffffff;
-}
-
-label
-{
-	font-size: 14px;
-	color: #ffffff;
-	display: block;
-	width: 70px;
-}
-
-input
-{
-	background: #eeeeee;
-	color: #000000;
-	border-style: solid;
-	border: 1px inset #222222;
-}
+body
+{
+	background-color: #ffffff;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	font-style: normal;
+	font-weight: normal;
+	text-decoration: none;
+	padding: 0px;
+	margin: 0px;
+}
+
+a
+{
+	color: #ffffff;
+}
+
+#loginBox
+{
+	position: absolute; 
+	top: 50%;
+	width: 300px;
+	height: 260px; 
+	margin-top: -130px;
+	left: 50%;
+	margin-left: -150px;
+	background-color: #444444;
+	background-image: url('login_background.png');
+	text-align: left;
+	color: #ffffff;
+}
+
+#loginContent
+{
+	padding-top: 80px;
+	padding-left: 30px;
+	color: #ffffff;
+}
+
+label
+{
+	font-size: 14px;
+	color: #ffffff;
+	display: block;
+	width: 70px;
+}
+
+input
+{
+	background: #eeeeee;
+	color: #000000;
+	border-style: solid;
+	border: 1px inset #222222;
+}

code/MoyaWeb/WebContent/resources/templates/template1/css/style.css

+/* Left column content*/
+.left h1 {
+    font-family: Oxygen, Calibri;
+    font-size: 11pt;
+    display: block;
+    border-bottom: 1px solid #B1B7AF;
+    color: #101D27;
+    font-style: italic;
+    font-weight: lighter;
+
+}
+
+.center h1 {
+    font-family: Oxygen, Calibri;
+    font-size: 14pt;
+    border-bottom: 1px solid #B1B7AF;
+    color: #101D27;
+    font-weight: lighter;
+    padding-left: 0.5em;
+}
+
+.center h2 {
+    
+    font-family: Oxygen, Calibri;
+    font-size: 12pt;
+    border-bottom: 1px solid #B1B7AF;
+    color: #101D27;
+    font-weight: lighter;
+    padding-left: 0.5em; 
+}
+
+.center {
+      font-family: Oxygen, Calibri;
+      font-size: 10pt;
+    
+}
+
+
+.center p {
+    padding-left: 5em;
+    
+}
+
+.right {
+    font-family: Oxygen !important;
+    font-weight: 100;
+    font-size: 10pt;
+}
+
+.center form {
+    padding: 2em;
+    background: #eaeaea;
+    border: 1px solid #bbb;
+}
+
+.center form label {
+
+}
+
+.center form input {
+    
+}
+
+.ui-widget,
+.ui-widget .ui-widget
+{
+    font-size: 90% !important;
+}
+
+label {
+     text-shadow:  rgba(0,0,0,0.3) 3px 2px 4px;
+     color: #999;
+     
+     font-weight: 100;
+     font-family: Oxygen;
+     font-size: 10pt;
+}
+input, textarea { 
+    padding: 3px;
+    border: solid 1px #E5E5E5;
+    outline: 0;
+    font: normal 13px/100% Verdana, Tahoma, sans-serif;
+
+    margin: 0.25em 0;
+    background: -webkit-gradient(linear, left top, left 25, from(#FFFFFF), color-stop(4%, #EEEEEE), to(#FFFFFF));
+    background: -moz-linear-gradient(top, #FFFFFF, #EEEEEE 1px, #FFFFFF 25px);
+    box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px;
+    -moz-box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px;
+    -webkit-box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px;
+}
+
+textarea { 
+    width: 400px;
+    max-width: 400px;
+    height: 150px;
+    line-height: 150%;
+}
+
+input:hover, textarea:hover,
+input:focus, textarea:focus { 
+    border-color: #C9C9C9; 
+    -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 8px;
+}
+
+/* reset5 � 2011 opensource.736cs.com MIT */
+/*
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,audio,canvas,details,figcaption,figure,footer,header,hgroup,mark,menu,meter,nav,output,progress,section,summary,time,video{border:0;outline:0;font-size:100%;vertical-align:baseline;background:transparent;margin:0;padding:0;}body{line-height:1;}article,aside,dialog,figure,footer,header,hgroup,nav,section,blockquote{display:block;}nav ul{list-style:none;}ol{list-style:decimal;}ul{list-style:disc;}ul ul{list-style:circle;}blockquote,q{quotes:none;}blockquote:before,blockquote:after,q:before,q:after{content:none;}ins{text-decoration:underline;}del{text-decoration:line-through;}mark{background:none;}abbr[title],dfn[title]{border-bottom:1px dotted #000;cursor:help;}table{border-collapse:collapse;border-spacing:0;}hr{display:block;height:1px;border:0;border-top:1px solid #ccc;margin:1em 0;padding:0;}input[type=submit],input[type=button],button{margin:0!important;padding:0!important;}input,select,a img{vertical-align:middle;}
+*/
+@font-face { font-family: Oxygen; src: url('Oxygen-Regular.ttf'); } 
+
+body, html{
+    margin: 0;
+    padding: 0;
+    background: url("../img/bg.png");
+}
+
+h1 {
+    font-family: Oxygen, Calibri;
+    font-size: 18pt;
+}
+
+#nav_right {
+    float: right; 
+    padding-top: 1em;
+    padding-right: 2em;
+}
+
+#nav_left {
+    float: left;
+    padding-left: 3em;
+}
+#nav_left img {
+    padding-top: 1em;
+}
+
+.right {
+    width: 180px !important; 
+
+}
+
+.right input[type="text"], .right input[type="password"]  {
+    width: 140px;
+    
+}
+.right a {
+    font-family: sans-serif, Calibri;
+    font-size: 10pt;
+    
+}
+
+
+
+.colleft {
+    padding-top: 1em;
+
+}
+.colleft ul {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+
+}
+.colleft a {
+    color: black;
+    text-decoration: none;   
+}
+
+.colleft a:hover {
+    color: black;
+    text-decoration: underline;
+}
+.clear {
+    clear: both;
+}
+
+
+
+#footer {
+    border-top: 1px solid black;
+    border-bottom: 1px solid black;
+    border-right: 1px solid black;    
+    width: 80%;
+    padding: 0.25em 0;
+}
+
+
+#header {
+    clear:both;
+    float:left;
+    width:100%;
+    border-bottom: 4px solid #333;    
+}
+
+
+/* column container */
+.colmask {
+    position:relative;	/* This fixes the IE7 overflow hidden bug */
+    clear:both;
+    float:left;
+    width:100%;			/* width of whole page */
+    overflow:hidden;		/* This chops off any overhanging divs */
+}
+/* common column settings */
+.colright,
+.colmid,
+.colleft {
+    float:left;
+    width:100%;			/* width of page */
+    position:relative;
+}
+.col1,
+.col2,
+.col3 {
+    float:left;
+    position:relative;
+    padding:0 0 0 0;	/* no left and right padding on columns, we just make them narrower instead 
+                                    only padding top and bottom is included here, make it whatever value you need */
+    overflow:hidden;
+}
+/* 3 Column settings */
+.threecol { /* right */
+
+}
+.threecol .colmid {
+    right:25%;			/* width of the right column */
+    background-color: white;
+    border-right: 1px solid black;
+    min-height: 500px;
+}
+.threecol .colleft {
+    right:60%;			/* width of the middle column */
+    background-color: white;
+    min-height: 500px;
+    border-right: 1px dashed #ddd;
+}
+.threecol .col1 {
+    width:56%;			/* width of center column content (column width minus padding on either side) */
+    left:102%;			/* 100% plus left padding of center column */
+}
+.threecol .col2 {
+    width:12%;			/* Width of left column content (column width minus padding on either side) */
+    left:31%;			/* width of (right column) plus (center column left and right padding) plus (left column left padding) */
+}
+.threecol .col3 {
+    width:21%;			/* Width of right column content (column width minus padding on either side) */
+    left:95%;			/* Please make note of the brackets here:
+                                    (100% - left column width) plus (center column left and right padding) plus (left column left and right padding) plus (right column left padding) */
+}
+/* Footer styles */
+#footer {
+    clear:both;
+    float:left;
+    width:75%;
+    border-top:1px solid #000;
+    color: white;
+    font-size: 9pt;
+    text-align: center;
+}
+
+#menu h3 {
+    font-size: 10pt !important;
+    margin: 0;
+    margin-top: 0.5em;
+}
+
+#menu div {
+    padding: 0.5em;
+    font-size: 10pt;
+}
+
+#tournamentMenu ul {
+    margin-left: 2em;
+    list-style-type: square !important;
+    
+}
+#main h1 {
+   color: black; 
+}
+#main a {
+   color: #2694e8;
+}
+.bgColor1 {
+    background-color: #68A3C2;
+}
+
+#header a {
+    color: white;
+    text-decoration: none;
+}
+
+#header_right {
+	text-align: right;	
+}

code/MoyaWeb/WebContent/resources/templates/template1/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/templates/template1/css/style.css" />
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template1/css/general.css" />
+		<ui:insert name="headerdata" />
+
+	</h:head>
+
+
+	<h:body>
+		<div id="header" class="bgColor1">
+
+			<div id="header_left">
+				<h:link outcome="/index">
+					<c:choose>
+						<c:when test="#{sessionHandler.isInDevelopmentMode()}">
+							<img src="#{request.contextPath}/resources/style/insomnia2/img/devel_logo.png" />
+						</c:when>
+						<c:otherwise>
+							<p:graphicImage rendered="#{!empty layoutView.headerimage}" value="#{layoutView.headerimage}" />
+							<ui:fragment rendered="#{empty layoutView.headerimage}">
+								<h1>
+									<h:outputText value="#{layoutView.headertext}" />
+								</h1>
+							</ui:fragment>
+						</c:otherwise>
+					</c:choose>
+				</h:link>
+			</div>
+			<div id="header_right">
+				<img src="#{request.contextPath}/resources/templates/template1/img/moya_logo.png" />
+			</div>
+		</div>
+
+		<div class="colmask threecol">
+			<div class="colmid">
+				<div class="colleft">
+					<div id="main" class="col1 center">
+						<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>
+						<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>
+						<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 id="menu" class="col2 left">
+
+						<p:panelMenu model="#{primeMenuView.menuModel}" />
+
+						<!--  <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>
+					<div class="col3">
+
+						<div class="right">
+
+							<div class="ui-widget-header">Login</div>
+							<div class="ui-widget-content" style="text-align: center">
+
+								<h:outputText rendered="#{sessionHandler.loggedIn}" value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" />
+								<div>
+									<tools:loginLogout />
+								</div>
+							</div>
+
+							<div class="ui-widget-header">Select Mode</div>
+							<div class="ui-widget-content" style="text-align: center">
+								<select>
+									<option jsfc="ui:repeat" var="menuitem" value="#{menuView.getMenu(0)}">
+										<h:link outcome="#{menuitem.outcome}" value="#{i18n[menuitem.navigation.key]}" styleClass="#{menuitem.selected?'active':''}" />
+									</option>
+								</select>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+
+		</div>
+
+		<div id="footer" class="bgColor1"></div>
+	</h:body>
+
+</f:view>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/role/create.xhtml

@@ -7,7 +7,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 
-<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+<ui:composition template="#{sessionHandler.template}">
 	<ui:param name="thispage" value="page.role.create" />
 	<f:metadata>
 		<f:event type="preRenderView" listener="#{roleView.initForCreate()}" />

code/MoyaWeb/WebContent/role/edit.xhtml

@@ -6,7 +6,7 @@
 	xmlns:role="http://java.sun.com/jsf/composite/cditools/role" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="roleid" value="#{roleView.roleid}" />
 			<f:event type="preRenderView" listener="#{roleView.initViewFromId()}" />

code/MoyaWeb/WebContent/role/list.xhtml

@@ -6,7 +6,7 @@
 	xmlns:role="http://java.sun.com/jsf/composite/cditools/role" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.role.list" />
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{roleView.permissionRead()}" />

code/MoyaWeb/WebContent/salespoint/list.xhtml

@@ -8,7 +8,7 @@
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{salespointListView.init}" />

code/MoyaWeb/WebContent/shop/assocToUser.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="eventid" value="#{readerView.eventid}" />
 			<f:event type="preRenderView" listener="#{readerView.initUserassocView}" />

code/MoyaWeb/WebContent/shop/createBill.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:tools="http://java.sun.com/jsf/composite/tools"
-	xmlns:products="http://java.sun.com/jsf/composite/cditools/products" 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:tools="http://java.sun.com/jsf/composite/tools"
+	xmlns:products="http://java.sun.com/jsf/composite/cditools/products" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
 	
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{productShopView.initBillView}" />
@@ -18,9 +16,15 @@
 		</ui:define>
 		<ui:define name="content">
 			<h:form id="billshopform">
-				<products:shop commitaction="#{productShopView.commitBillCart()}" items="#{productShopView.shoppingcart}"
-					commitValue="#{i18n['productshop.commit']}"
-				/>
+				<products:shop commitaction="#{productShopView.commitBillCart()}" items="#{productShopView.shoppingcart}" commitValue="#{i18n['productshop.commit']}" />
+				<h:panelGrid columns="3" rendered="#{productShopView.checkAllowStats}">
+					<h:outputText for="allowStats" value="#{i18n['bill.allowStatistics']}" />
+					<h:selectBooleanCheckbox id="allowStats" value="#{productShopView.allowStatistics}" />
+					<h:message for="allowStats" />
+
+				</h:panelGrid>
+				<p:inputTextarea rendered="#{productShopView.gatherBillInfo}" value="#{productShopView.otherInfo}" label="#{i18n['otherInfo']}"/>
+
 			</h:form>
 		</ui:define>
 	</ui:composition>

code/MoyaWeb/WebContent/shop/createReader.xhtml

@@ -7,7 +7,7 @@ xmlns:h="http://java.sun.com/jsf/html"
 xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 
 			<f:event type="preRenderView" listener="#{readerView.initCreateReader}" />

code/MoyaWeb/WebContent/shop/editGame.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 			<h:form id="editform">
 				<h:panelGrid columns="2">

code/MoyaWeb/WebContent/shop/editReader.xhtml

@@ -5,7 +5,7 @@
 	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">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 	<f:metadata>
 			<f:viewParam name="readerId" value="#{readerView.readerid}" />
 			<f:event type="preRenderView" listener="#{readerView.initEditReader}" />

code/MoyaWeb/WebContent/shop/foodToUser.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
  			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/shop/listReaders.xhtml

@@ -6,7 +6,7 @@
 	xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
 	>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 
 			<f:event type="preRenderView" listener="#{readerListDataView.initView}" />

code/MoyaWeb/WebContent/shop/rfidListener.xhtml

@@ -7,7 +7,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="metadata">
 			<f:metadata>
 				<f:viewParam name="reader" value="#{rfidView.reader}" />

code/MoyaWeb/WebContent/shop/shopToUser.xhtml

@@ -7,7 +7,7 @@
 	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"
 	>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{productShopView.initShopView}" />

code/MoyaWeb/WebContent/shop/showCreatedBill.xhtml

@@ -7,7 +7,7 @@
 
 <h:body>
 
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="title">
 			<h1>#{i18n['page.product.validateBillProducts.header']}</h1>
 		</ui:define>

code/MoyaWeb/WebContent/shop/showReaderEvents.xhtml

@@ -7,7 +7,7 @@
 	xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
 	>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="readerId" value="#{readerNameContainer.readerId}" />
 			<f:event type="preRenderView" listener="#{readerView.initReaderList}" />

code/MoyaWeb/WebContent/svm/failure.xhtml

@@ -5,7 +5,7 @@
 <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:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="ORDER_NUMBER" value="#{svmView.orderNumber}" />
 			<f:viewParam name="TIMESTAMP" value="#{svmView.timestamp}" />

code/MoyaWeb/WebContent/svm/notification.xhtml

@@ -5,7 +5,7 @@
 <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:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="ORDER_NUMBER" value="#{svmView.orderNumber}" />
 			<f:viewParam name="TIMESTAMP" value="#{svmView.timestamp}" />

code/MoyaWeb/WebContent/svm/pending.xhtml

@@ -5,7 +5,7 @@
 <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:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="ORDER_NUMBER" value="#{svmView.orderNumber}" />
 			<f:viewParam name="TIMESTAMP" value="#{svmView.timestamp}" />

code/MoyaWeb/WebContent/svm/success.xhtml

@@ -5,7 +5,7 @@
 <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:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="ORDER_NUMBER" value="#{svmView.orderNumber}" />
 			<f:viewParam name="TIMESTAMP" value="#{svmView.timestamp}" />

code/MoyaWeb/WebContent/user/acceptInvite.xhtml

@@ -4,7 +4,7 @@
 <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:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{inviteAcceptView.initView}" />
 			<f:viewParam name="token" value="#{inviteAcceptView.token}" />

code/MoyaWeb/WebContent/user/accountEvents.xhtml

@@ -4,7 +4,7 @@
 <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:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/user/adminSendImage.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.admin.sendimage" />
 		<ui:define name="content">
 

code/MoyaWeb/WebContent/user/assocToUser.xhtml

@@ -4,7 +4,7 @@
 <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:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/user/changePassword.xhtml

@@ -6,7 +6,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/user/commitImport.xhtml

@@ -4,7 +4,7 @@
 <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:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 
 			<h:form id="wrapform">

code/MoyaWeb/WebContent/user/create.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{userView.initCreateView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/user/created.xhtml

@@ -7,7 +7,7 @@
 	xmlns:login="http://java.sun.com/jsf/composite/tools/login"
       xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.user.create" />
 		<ui:define name="content">
 			<p>#{i18n['user.createdmessage']}</p> 		

code/MoyaWeb/WebContent/user/edit.xhtml

@@ -4,7 +4,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:account="http://java.sun.com/jsf/composite/cditools/account"
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/user/import.xhtml

@@ -4,7 +4,7 @@
 <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:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{importView.initImport}" />
 		</f:metadata>

code/MoyaWeb/WebContent/user/invite.xhtml

@@ -4,7 +4,7 @@
 <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/tools/user"
 	xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<ui:define name="title">
 			<h1>#{i18n['user.page.invite']}</h1>

code/MoyaWeb/WebContent/user/sendPicture.xhtml

@@ -5,7 +5,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.user.create" />
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />

code/MoyaWeb/WebContent/useradmin/accountEvents.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/useradmin/adminSendImage.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.admin.sendimage" />
 		<ui:define name="content">
 

code/MoyaWeb/WebContent/useradmin/assocToUser.xhtml

@@ -4,7 +4,7 @@
 <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:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/useradmin/changePassword.xhtml

@@ -6,7 +6,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/useradmin/create.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{userView.initCreateView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/useradmin/createCardTemplate.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{cardView.initCardCreate}" />
 		</f:metadata>

code/MoyaWeb/WebContent/useradmin/created.xhtml

@@ -7,7 +7,7 @@
 	xmlns:login="http://java.sun.com/jsf/composite/tools/login"
       xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.user.create" />
 		<ui:define name="content">
 			<p>#{i18n['user.createdmessage']}</p> 		

code/MoyaWeb/WebContent/useradmin/edit.xhtml

@@ -4,10 +4,11 @@
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:account="http://java.sun.com/jsf/composite/cditools/account"
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<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="#{userView.setCaptureForwardUrl('')}" />			
 		</f:metadata>
 
 		<ui:define name="title">

code/MoyaWeb/WebContent/useradmin/editAccountevent.xhtml

@@ -4,7 +4,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:account="http://java.sun.com/jsf/composite/cditools/account"
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="id" value="#{accountEventView.accountid}" />
 			<f:event type="preRenderView" listener="#{accountEventView.initView}" />

code/MoyaWeb/WebContent/useradmin/editCardTemplate.xhtml

@@ -4,7 +4,7 @@
 <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/tools/user"
 	xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="templateid" value="#{cardView.templateId}" />
 			<f:event type="preRenderView" listener="#{cardView.initCardTemplate}" />

code/MoyaWeb/WebContent/useradmin/foodwaveProducts.xhtml

@@ -11,7 +11,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />			
 			<f:viewParam name="foodwaveid" value="#{foodWaveFoodView.foodwaveid}" />

code/MoyaWeb/WebContent/useradmin/foodwaveshop.xhtml

@@ -11,7 +11,7 @@
 	xmlns:p="http://primefaces.org/ui">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:viewParam name="templateid" value="#{foodWaveView.templateId}" />			

code/MoyaWeb/WebContent/useradmin/list.xhtml

@@ -4,7 +4,7 @@
 <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>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="page" value="#{userSearchView.page}" />
 			<f:viewParam name="pagesize" value="#{userSearchView.pagesize}" />
@@ -54,6 +54,7 @@
 							<br />
 							<h:commandButton actionListener="#{userSearchView.addToCart}" value="#{i18n['usercart.addSearchedUsers']}" />
 							<h:commandButton action="#{userCartView.traverse}" value="#{i18n['usercart.traverse']}" />
+							<h:commandButton action="#{userCartView.showOverview}" value="#{i18n['usercart.showoverview']}" />
 							<h:commandButton value="#{i18n['usercart.downloadCsv']}">
 								<p:fileDownload value="#{userCartView.downloadCsv}" />
 							</h:commandButton>

code/MoyaWeb/WebContent/useradmin/listCardTemplates.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/useradmin/overview.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: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>
+	<ui:composition template="#{sessionHandler.template}">
+	
+	    <ui:define name="content">
+            <p:dataTable value="#{userCartView.usercart}" var="cartItem">
+				<p:column headerText="kuva">
+				    <ui:fragment rendered="#{!empty cartItem.currentImage}">
+				        <img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{cartItem.currentImage.id}.img" alt="image" />
+				    </ui:fragment>
+				    <ui:fragment rendered="#{empty cartItem.currentImage}">
+                        <h:outputText value="#{i18n['overview.noimage']}" />
+                    </ui:fragment>
+				</p:column>
+				<p:column headerText="nimi">
+				    <h:outputText value="#{cartItem.firstnames} #{cartItem.lastname}" />
+				</p:column>
+            </p:dataTable>
+	    </ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/useradmin/searchUser.xhtml

@@ -8,7 +8,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.user.search" />
 		
 		<ui:define name="content">

code/MoyaWeb/WebContent/useradmin/sendPicture.xhtml

@@ -7,7 +7,7 @@
 	xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
 	>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.user.create" />
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />

code/MoyaWeb/WebContent/useradmin/showTakePicture.xhtml

@@ -5,7 +5,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.user.create" />
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />

code/MoyaWeb/WebContent/useradmin/userCards.xhtml

@@ -4,7 +4,7 @@
 <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:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/useradmin/userCartShow.xhtml

@@ -4,7 +4,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:account="http://java.sun.com/jsf/composite/cditools/account"
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<!-- f:event type="preRenderView" listener="#{userCartView.initView}" />
 			 -->

code/MoyaWeb/WebContent/useradmin/validateUser.xhtml

@@ -4,7 +4,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:account="http://java.sun.com/jsf/composite/cditools/account"
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{userView.initValidateView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/utils/flushCache.xhtml

@@ -3,7 +3,7 @@
 <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">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 		
 		 	#{sessionHandler.flushCache()}

code/MoyaWeb/WebContent/utils/index.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.eventorg.edit" />
 		<ui:define name="content">
 		

code/MoyaWeb/WebContent/utils/reindexCompass.xhtml

@@ -8,7 +8,7 @@
       xmlns:users="http://java.sun.com/jsf/composite/tools/user"
       xmlns:c="http://java.sun.com/jsp/jstl/core">
  <h:body>
-<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+<ui:composition template="#{sessionHandler.template}">
 	<ui:param name="thispage" value="page.eventorg.edit" />
 		<ui:define name="content">
 		 	#{sessionHandler.reindexCompass()}

code/MoyaWeb/WebContent/viewExpired.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 >
 
-<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+<ui:composition template="#{sessionHandler.template}">
 	<ui:param name="thispage" value="page.viewexpired" />
 	<ui:define name="content">
 		<h1>#{i18n['viewexpired.title']}</h1>

code/MoyaWeb/WebContent/voting/addentry.xhtml

@@ -7,7 +7,7 @@
 	xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="compoId" value="#{votingCompoAddEntryView.compoId}"></f:viewParam>
 			<f:event type="preRenderView" listener="#{votingCompoAddEntryView.initView()}" />

code/MoyaWeb/WebContent/voting/compolist.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{compoView.initListView()}" />
 		</f:metadata>

code/MoyaWeb/WebContent/voting/create.xhtml

@@ -7,7 +7,7 @@
 	xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{votingCreateView.initCreate}" />
 		</f:metadata>

code/MoyaWeb/WebContent/voting/details.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="compoId" value="#{votingDetailsView.compoId}" />
 			<!-- <f:viewParam name="compoId" value="#{votingDetailsView.compoId2}" /> -->

code/MoyaWeb/WebContent/voting/myEntries.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{userView.initView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/voting/submitEntry.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="compoId" value="#{compoView.compoId}" />
 			<f:viewParam name="entryId" value="#{compoView.entryId}" />

code/MoyaWeb/WebContent/voting/vote.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<ui:define name="content">
 			<!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> -->

code/MoyaWeb/src/fi/codecrew/moya/handler/SessionHandler.java

@@ -71,16 +71,29 @@ public class SessionHandler {
 		return template;
 	}
 
-	public String getLayout() {
+	public String getTemplateName()
+	{
 		if (template == null) {
 			template = eventbean.getPropertyString(LanEventPropertyKey.EVENT_LAYOUT);
 		}
 		if (template == null) {
-			template = "template1";
+			template = "insomnia2";
+
 		}
 		return template;
 	}
 
+	public String getTemplatePath()
+	{
+
+		return "/resources/templates/" + getTemplateName();
+
+	}
+
+	public String getTemplate() {
+		return getTemplatePath() + "/template.xhtml";
+	}
+
 	// public boolean hasPermission(String target, String permission) {
 	// RolePermission perm = RolePermission.valueOf(permission.toUpperCase());
 	// // RolePermission perm = null;

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties

@@ -710,10 +710,11 @@ submenu.auth.sendResetMail           = Password reset
 submenu.bill.billSummary             = Bill summary
 submenu.bill.list                    = My bills
 submenu.bill.listAll                 = All bills
+submenu.feedback.index               = Feedback
 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.list                = Foodwaves
 submenu.foodwave.listTemplates       = Food provides
 submenu.index                        = Frontpage
 submenu.map.create                   = Create map
@@ -730,7 +731,7 @@ 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.createBill              = Purchase
 submenu.shop.listReaders             = List readers
 submenu.shop.showReaderEvents        = Reader events
 submenu.user.accountEvents           = Account events
@@ -845,6 +846,7 @@ user.password                   = Password
 user.passwordcheck              = Password ( again )
 user.passwordlengthMessage      = Password is too short! 
 user.phone                      = Tel
+user.profile                    = Profile
 user.realname                   = Name
 user.roles                      = Roles
 user.rolesave                   = Save roles

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties

@@ -693,10 +693,11 @@ submenu.auth.sendResetMail           = Salasanan palautus
 submenu.bill.billSummary             = Laskujen yhteenveto
 submenu.bill.list                    = N\u00E4yt\u00E4 omat laskut
 submenu.bill.listAll                 = Kaikki laskut
+submenu.feedback.index               = Palaute
 submenu.foodadmin.createTemplate     = Luo tilauspohja 
 submenu.foodadmin.listTemplates      = Muokkaa tilauspohjia
 submenu.foodmanager.listFoodwaves    = Aktiiviset ruokatilaukset
-submenu.foodwave.list                = Avoimet tilaukset
+submenu.foodwave.list                = Ruokailu
 submenu.index                        = Etusivu
 submenu.map.create                   = Uusi kartta
 submenu.map.list                     = N\u00E4yt\u00E4 kartat
@@ -712,7 +713,7 @@ 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.createBill              = Osta tuotteita
 submenu.shop.listReaders             = N\u00E4yt\u00E4 lukijat
 submenu.shop.showReaderEvents        = Lukijan tapahtumat
 submenu.user.accountEvents           = Tilitapahtumat
@@ -829,6 +830,7 @@ user.passwordcheck              = Salasana ( uudelleen )
 user.passwordlengthMessage      = Salasana liian lyhyt 
 user.phone                      = Puhelin
 user.placegroups                = Omat paikkaryhm\u00E4t
+user.profile                    = Profiili
 user.realname                   = Nimi
 user.roles                      = Roolit
 user.rolesave                   = Tallenna roolit

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/PrimeMenuView.java

@@ -113,8 +113,8 @@ public class PrimeMenuView extends GenericCDIView {
 				Submenu nameSub = new Submenu();
 				nameSub.setId("nameSubmenu");
 				nameSub.setStyle("float:right;");
-				nameSub.setLabel(user.getWholeName());
-
+				nameSub.setLabel(I18n.get("user.profile"));				
+				
 				MenuItem myprop = new MenuItem();
 				myprop.setOutcome("/user/edit");
 				myprop.setValue(I18n.get("user.myProperties"));

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/shop/ProductShopView.java

@@ -62,7 +62,6 @@ public class ProductShopView extends GenericCDIView {
 	private boolean payInstant = true;
 
 	private BigDecimal cash = BigDecimal.ZERO;
-	
 
 	private transient ListDataModel<ProductShopItem> shoppingcart;
 	@Inject
@@ -70,15 +69,17 @@ public class ProductShopView extends GenericCDIView {
 
 	@Inject
 	private ReaderView readerView;
-	
+
 	@Inject
 	private UserView userView;
-	
+
 	@Inject
 	private BillEditView billEditView;
 	private boolean hasLimits = false;
 	private boolean blip = false;
 	private ListDataModel<ProductShopItem> boughtItems;
+	private boolean allowStatistics = true;
+	private String otherInfo;
 
 	public void initBillView() {
 		if (requirePermissions(ShopPermission.LIST_USERPRODUCTS)
@@ -93,6 +94,38 @@ public class ProductShopView extends GenericCDIView {
 
 	}
 
+	private Boolean checkAllowStats;
+
+	public boolean isCheckAllowStats()
+	{
+		if (checkAllowStats == null)
+		{
+			LanEventProperty re = eventbean.getProperty(LanEventPropertyKey.CHECK_BILL_STATS_PERMISSION);
+			if (re != null) {
+				checkAllowStats = re.isBooleanValue();
+			} else {
+				checkAllowStats = false;
+			}
+		}
+		return checkAllowStats;
+	}
+
+	private Boolean gatherBillInfo;
+
+	public boolean isGatherBillInfo()
+	{
+		if (gatherBillInfo == null)
+		{
+			LanEventProperty re = eventbean.getProperty(LanEventPropertyKey.GATHER_OTHER_BILL_INFO);
+			if (re != null) {
+				gatherBillInfo = re.isBooleanValue();
+			} else {
+				gatherBillInfo = false;
+			}
+		}
+		return gatherBillInfo;
+	}
+
 	public void initShopView() {
 
 		if (requirePermissions(ShopPermission.SHOP_TO_OTHERS) && shoppingcart == null) {
@@ -148,7 +181,7 @@ public class ProductShopView extends GenericCDIView {
 
 		Map<Integer, BigDecimal> prodCounts = new HashMap<Integer, BigDecimal>();
 		for (ProductShopItem sc : shoppingcart) {
-				prodCounts.put(sc.getProduct().getId(), sc.getCount());
+			prodCounts.put(sc.getProduct().getId(), sc.getCount());
 		}
 
 		HashMap<Integer, BigDecimal> limits = productBean.getProductLimit(
@@ -362,36 +395,35 @@ public class ProductShopView extends GenericCDIView {
 		this.hasLimits = hasLimits;
 	}
 
-	
-
 	public String readBarcode() {
-		
+
 		PrintedCard card = readerView.getPrintedCard();
-		
-		if(readerView.getBarcode() == null || readerView.getBarcode().trim() == "") {
+
+		if (readerView.getBarcode() == null || readerView.getBarcode().trim() == "") {
 			return null;
 		}
-		
-		if(card != null) {
-			if(card.getUser() != null) {
+
+		if (card != null) {
+			if (card.getUser() != null) {
 				userView.setUser(card.getUser());
 				this.user = card.getUser();
 				initShopView();
 				return null;
 			}
 		}
-		
+
 		Product product = productBean.findByBarcode(readerView.getBarcode());
 		this.blip = false;
-		
+
 		// find product index, set index and add one
-		// I don't know why this does not work if you just loop over and change the product count
+		// I don't know why this does not work if you just loop over and change
+		// the product count
 		int n = 0;
 		for (ProductShopItem a : shoppingcart) {
-			if (a.getProduct().equals(product)) 
+			if (a.getProduct().equals(product))
 			{
-				//a.setCount(a.getCount().add(BigDecimal.ONE));
-				//updateCartLimits(null);
+				// a.setCount(a.getCount().add(BigDecimal.ONE));
+				// updateCartLimits(null);
 				shoppingcart.setRowIndex(n);
 				this.addOne();
 				setBlip(true);
@@ -419,7 +451,21 @@ public class ProductShopView extends GenericCDIView {
 	public void setBoughtItems(ListDataModel<ProductShopItem> boughtItems) {
 		this.boughtItems = boughtItems;
 	}
-	
-	
+
+	public String getOtherInfo() {
+		return otherInfo;
+	}
+
+	public void setOtherInfo(String otherInfo) {
+		this.otherInfo = otherInfo;
+	}
+
+	public boolean isAllowStatistics() {
+		return allowStatistics;
+	}
+
+	public void setAllowStatistics(boolean allowStatistics) {
+		this.allowStatistics = allowStatistics;
+	}
 
 }

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserCartView.java

@@ -117,6 +117,10 @@ public class UserCartView extends GenericCDIView {
 			return "/useradmin/list";
 	}
 
+	public String showOverview() {
+		return "/useradmin/overview";
+	}
+	
 	public String saveUser() {
 		userview.saveUser();
 		return null;

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserView.java

@@ -104,7 +104,8 @@ public class UserView extends GenericCDIView {
 
 	private MassPrintResult mpr = null;
 	private boolean waitForAcceptance = false;
-
+	private String captureForwardUrl = "";
+	
 	@Produces
 	@LoggedIn
 	public EventUser getCurrentUser() {
@@ -116,7 +117,9 @@ public class UserView extends GenericCDIView {
 		byte[] data = captureEvent.getData();
 		UserImage img = userbean.uploadImage(user, "image/png", data, "userimage.png", "Uploaded image");
 		user = userbean.getEventUser(img.getUser());
-		super.navihandler.forward("/admin/adduser/capturesuccess");
+	//	super.navihandler.forward("/admin/adduser/capturesuccess");
+		if (getCaptureForwardUrl().equals(""))
+			super.navihandler.forward(getCaptureForwardUrl());
 	}
 
 	@Produces
@@ -431,4 +434,12 @@ public class UserView extends GenericCDIView {
 	public void setStreamedFile(StreamedContent streamedFile) {
 		this.streamedFile = streamedFile;
 	}
+
+	public String getCaptureForwardUrl() {
+		return captureForwardUrl;
+	}
+
+	public void setCaptureForwardUrl(String captureForwardUrl) {
+		this.captureForwardUrl = captureForwardUrl;
+	}
 }