Skip to content

Max Mecklin / Moya

Go to a project
Commit 7e2e16f8 by Tuomas Riihimäki
Options

Skynett leiskaa ja uutta menua

1 parent 73931ba3
Inline Side-by-side
Showing with 223 additions and 122 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MenuBean.java
...@@ -71,62 +71,75 @@ public class MenuBean implements MenuBeanLocal { ...@@ -71,62 +71,75 @@ public class MenuBean implements MenuBeanLocal {
logger.info("Initializing menu"); logger.info("Initializing menu");
LanEvent ev = eventbean.getCurrentEvent(); LanEvent ev = eventbean.getCurrentEvent();
MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.frontpage", menusort = +10); MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.usernavi", menusort = +10);
// usernavi.addPage(menuitemfacade.findOrCreate("/index"), usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.ANYUSER);
// UserPermission.ANYUSER); MenuNavigation userkauppa = usermenu.addPage(null, null);
navifacade.create(usermenu); userkauppa.setKey("topnavi.usershop");
userkauppa.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL);
userkauppa.addPage(null, null);
userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE);
userkauppa.addPage(null, null);
userkauppa.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN);
MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminpage", menusort = +10); MenuNavigation userevent = usermenu.addPage(null, null);
// adminnavi.addPage(menuitemfacade.findOrCreate("/index2"), userevent.setKey("topnavi.userevent");
// UserPermission.ANYUSER);
navifacade.create(adminmenu);
MenuNavigation shopmenu = new MenuNavigation(ev, "topnavi.shopnavi", menusort = +10); userevent.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
// shopnavi.addPage(menuitemfacade.findOrCreate("/index3"), userevent.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER);
// UserPermission.ANYUSER);
navifacade.create(shopmenu);
// Index MenuNavigation usercompetitions = usermenu.addPage(null, null);
usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.VIEW_ALL); usercompetitions.setKey("topnavi.competitions");
// kuppa usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/compolist"), CompoPermission.VIEW_COMPOS);
MenuNavigation usershop = usermenu.addPage(null, null); usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/myEntries"), CompoPermission.VIEW_COMPOS);
usermenu.setKey("topnavi.shop.products"); usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/create"), CompoPermission.MANAGE);
usermenu.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
usershop.addPage(menuitemfacade.findOrCreate("/place/myGroups"), UserPermission.VIEW_SELF); MenuNavigation createuser = usermenu.addPage(null, null);
usershop.addPage(null, null); createuser.setKey("topnavi.createuser");
usershop.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL); createuser.addPage(menuitemfacade.findOrCreate("/user/create"), UserPermission.CREATE_NEW);
usershop.addPage(menuitemfacade.findOrCreate("/user/accountEvents"), UserPermission.VIEW_SELF);
usershop.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN);
MenuNavigation prodsubmenu = usermenu.addPage(null, null); navifacade.create(usermenu);
prodsubmenu.setKey("topnavi.shop.products");
prodsubmenu.addPage(menuitemfacade.findOrCreate("/product/list"), ShopPermission.LIST_ALL_PRODUCTS);
prodsubmenu.addPage(menuitemfacade.findOrCreate("/product/create"), ShopPermission.MANAGE_PRODUCTS);
MenuNavigation adminshop = usermenu.addPage(null, null); MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminnavi", menusort = +10);
adminshop.setKey("topnavi.shop.adminshop"); MenuNavigation adminuser = adminmenu.addPage(null, null);
adminshop.addPage(menuitemfacade.findOrCreate("/shop/showReaderEvents"), ShopPermission.SHOP_TO_OTHERS); adminuser.setKey("topnavi.usermgmt");
adminshop.addPage(menuitemfacade.findOrCreate("/shop/listReaders"), ShopPermission.SHOP_TO_OTHERS); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL);
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/list"), UserPermission.VIEW_ALL);
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);
MenuNavigation adminshop = adminmenu.addPage(null, null);
adminshop.setKey("topnavi.adminshop");
MenuNavigation adminShopProducts = adminshop.addPage(null, null);
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);
adminShopReaders.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);
MenuNavigation billnavi = usermenu.addPage(null, null); navifacade.create(adminmenu);
billnavi.setKey("topnavi.shop.bill");
billnavi.addPage(menuitemfacade.findOrCreate("/bill/billSummary"), BillPermission.READ_ALL);
billnavi.addPage(menuitemfacade.findOrCreate("/bill/listAll"), BillPermission.WRITE_ALL);
navifacade.create(usermenu);
MenuNavigation eventTopmenu = new MenuNavigation(ev, "topnavi.event", menusort = +10); MenuNavigation shopmenu = new MenuNavigation(ev, "topnavi.shopnavi", menusort = +10);
eventTopmenu.addPage(menuitemfacade.findOrCreate("/map/list"), MapPermission.MANAGE_MAPS); // shopnavi.addPage(menuitemfacade.findOrCreate("/index3"),
eventTopmenu.addPage(menuitemfacade.findOrCreate("/map/create"), MapPermission.MANAGE_MAPS); // UserPermission.ANYUSER);
eventTopmenu.addPage(null, null); navifacade.create(shopmenu);
eventTopmenu.addPage(menuitemfacade.findOrCreate("/voting/compolist"), CompoPermission.VIEW_COMPOS);
eventTopmenu.addPage(menuitemfacade.findOrCreate("/voting/myEntries"), CompoPermission.VIEW_COMPOS);
eventTopmenu.addPage(menuitemfacade.findOrCreate("/voting/create"), CompoPermission.MANAGE);
eventTopmenu.addPage(null, null);
eventTopmenu.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER);
navifacade.create(eventTopmenu);
/* /*
* MenuNavigation profileTopmenu = new MenuNavigation(ev, * MenuNavigation profileTopmenu = new MenuNavigation(ev,
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
...@@ -298,9 +298,10 @@ public class UserBean implements UserBeanLocal { ...@@ -298,9 +298,10 @@ public class UserBean implements UserBeanLocal {
} }
String path = MessageFormat.format(url, new Object[] { user.getId().toString(), hash }); String path = MessageFormat.format(url, new Object[] { user.getId().toString(), hash });
LanEvent event = eventBean.getCurrentEvent();
MailMessage msg = new MailMessage(); MailMessage msg = new MailMessage();
msg.setTo(user); msg.setTo(user);
msg.setSubject(I18n.get("passwordreset.mailSubject")); msg.setSubject(I18n.get("passwordreset.mailSubject", event.getName()));
msg.setMessage(I18n.get("passwordreset.mailBody", path)); msg.setMessage(I18n.get("passwordreset.mailBody", path));
logger.info("sending mail! user {} hash {} path {}", new Object[] { user, hash, path }); logger.info("sending mail! user {} hash {} path {}", new Object[] { user, hash, path });
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/LanEventDomainFacade.java
...@@ -21,6 +21,10 @@ public class LanEventDomainFacade extends IntegerPkGenericFacade<LanEventDomain> ...@@ -21,6 +21,10 @@ public class LanEventDomainFacade extends IntegerPkGenericFacade<LanEventDomain>
} }
public LanEventDomain findByDomain(String hostname) { public LanEventDomain findByDomain(String hostname) {
if (hostname == null)
{
return null;
}
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<LanEventDomain> cq = cb.createQuery(LanEventDomain.class); CriteriaQuery<LanEventDomain> cq = cb.createQuery(LanEventDomain.class);
......
code/LanBortalWeb/WebContent/layout/skynett17/template.xhtml
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
</div> </div>
<div id="menu"> <div id="menu">
<p:menubar model="#{primeMenuView.menuModel}" /> <p:menubar model="#{primeMenuView.menuModel}" />
</div> </div>
<div id="content"> <div id="content">
<div id="primarycontainer"> <div id="primarycontainer">
...@@ -57,28 +58,7 @@ ...@@ -57,28 +58,7 @@
</div> </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>
<h:outputScript library="primefaces" name="jquery/jquery.js" />
<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> </h:body>
</f:view> </f:view>
......
code/LanBortalWeb/WebContent/resources/cditools/user/create.xhtml
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</h2> </h2>
--> -->
<h:form id="userform" enctype="multipart/form-data"> <h:form id="userform" enctype="#{cc.attrs.creating?'':'multipart/form-data'}" >
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<h:panelGroup> <h:panelGroup>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<h:outputLabel value="#{i18n['user.login']}" for="login" /> <h:outputLabel value="#{i18n['user.login']}" for="login" />
<br /> <br />
<p:inputText size="25" id="login" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.login}" /> <p:inputText size="25" id="login" validator="#{userValidator.login}" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.login}" />
<p:message for="login" /> <p:message for="login" />
<br /> <br />
......
code/LanBortalWeb/WebContent/resources/style/skynett17/css/style.css
...@@ -256,3 +256,9 @@ text-decoration: none; ...@@ -256,3 +256,9 @@ text-decoration: none;
.ui-widget-content a { .ui-widget-content a {
color: #eee !important; color: #eee !important;
} }
.nameMenuItem
{
float: right;
}
\ No newline at end of file
code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java
...@@ -155,6 +155,7 @@ public class SessionHandler { ...@@ -155,6 +155,7 @@ public class SessionHandler {
return eventbean.flushCache(); return eventbean.flushCache();
} }
public String navigateTo(String url) { public String navigateTo(String url) {
return url; return url;
} }
...@@ -182,4 +183,5 @@ public class SessionHandler { ...@@ -182,4 +183,5 @@ public class SessionHandler {
public boolean isInDevelopmentMode() { public boolean isInDevelopmentMode() {
return BortalLocalContextHolder.isInDevelopmentMode(); return BortalLocalContextHolder.isInDevelopmentMode();
} }
} }
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
...@@ -124,8 +124,8 @@ checkout.return.successDelayed = Delayed payment successfull. Payment will be co ...@@ -124,8 +124,8 @@ checkout.return.successDelayed = Delayed payment successfull. Payment will be co
checkout.return.successMessage = Payment confirmed. Your products have been paid. checkout.return.successMessage = Payment confirmed. Your products have been paid.
compo.edit = Edit compo compo.edit = Edit compo
compo.savesort = Save order
compo.saveVotes = Save votes compo.saveVotes = Save votes
compo.savesort = Save order
compo.votesSaved = Votes saved compo.votesSaved = Votes saved
compofile.download = Download compofile.download = Download
...@@ -198,35 +198,36 @@ eventorg.save = Save ...@@ -198,35 +198,36 @@ eventorg.save = Save
eventorgView.eventname = Name of event eventorgView.eventname = Name of event
eventorganiser.name = Eventorganiser eventorganiser.name = Eventorganiser
feedback.canFeedback = Feedback feedback.canFeedback = Feedback
feedback.submit = Submit feedback.submit = Submit
feedback.thanks = Thanks feedback.thanks = Thanks
food = Food food = Food
foodWave.accountevents = Accountevents foodWave.accountevents = Accountevents
foodWave.activeFoodWaves = Active Foodwaves foodWave.activeFoodWaves = Active Foodwaves
foodWave.billLines = Pending Online Payments foodWave.billLines = Pending Online Payments
foodWave.deliveredFoodWaves = Delivered Foodwaves foodWave.deliveredFoodWaves = Delivered Foodwaves
foodWave.list = Active Foodwaves foodWave.list = Active Foodwaves
foodWave.name = Foodwave foodWave.name = Foodwave
foodWave.orders = Amount of Orders foodWave.orders = Amount of Orders
foodWave.paid = Paid foodWave.paid = Paid
foodWave.show = Show foodWave.show = Show
foodWave.template.name = Template foodWave.template.name = Name
foodWave.template.waves = Foodwaves foodWave.template.waves = Foodwaves
foodWave.templatename = Choose Products foodWave.templatename = Choose Products
foodWave.time = Time
foodWave.totalReserved = Total foodWave.totalReserved = Total
foodWave.unconfirmedOrders = Unconfirmed foodWave.unconfirmedOrders = Unconfirmed
foodWave.template.name = Name
foodadmin.editTemplate = Edit foodadmin.editTemplate = Edit
foodshop.buyAndPay = Buy and Pay foodshop.buyAndPay = Buy and Pay
foodWave.time = Time
foodshop.total = Total
foodshop.buyFromCounter = Pay at info foodshop.buyFromCounter = Pay at info
foodshop.buyFromInternet = Pay at Internet
foodshop.total = Total
foodwave.buyInPrice = Buy In Price foodwave.buyInPrice = Buy In Price
foodwave.foodwaveBuyInPrice = Total buy in price foodwave.foodwaveBuyInPrice = Total buy in price
foodwave.markPaid = Foodwave marked paid foodwave.markPaid = Foodwave marked paid
...@@ -264,8 +265,6 @@ foodwavetemplate.selectproducts = Products ...@@ -264,8 +265,6 @@ foodwavetemplate.selectproducts = Products
foodwavetemplate.startTime = Foodwave time foodwavetemplate.startTime = Foodwave time
foodwavetemplate.waveName = Wave name foodwavetemplate.waveName = Wave name
foodshop.buyFromInternet = Pay at Internet
game.gamepoints = Game points game.gamepoints = Game points
gamepoints = Gamepoints gamepoints = Gamepoints
...@@ -351,6 +350,8 @@ mapView.buyPlaces = Lock selected places ...@@ -351,6 +350,8 @@ mapView.buyPlaces = Lock selected places
mapView.errorWhenReleasingPlace = Error when releasing place mapView.errorWhenReleasingPlace = Error when releasing place
mapView.errorWhenReservingPlace = Error when reserving place! mapView.errorWhenReservingPlace = Error when reserving place!
mapView.errorWhileBuyingPlaces = Error when buying places. Please try again. If error reoccurs please contact organizers. mapView.errorWhileBuyingPlaces = Error when buying places. Please try again. If error reoccurs please contact organizers.
mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve this place.
menu.item = Item menu.item = Item
menu.name = Name menu.name = Name
menu.select = Select menu.select = Select
...@@ -358,8 +359,6 @@ menu.sort = Sort ...@@ -358,8 +359,6 @@ menu.sort = Sort
menuitem.navigation.key = Product flag menuitem.navigation.key = Product flag
mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve this place.
nasty.user = Go away! nasty.user = Go away!
org.hibernate.validator.constraints.Email.message = not a well-formed email address org.hibernate.validator.constraints.Email.message = not a well-formed email address
...@@ -519,9 +518,9 @@ poll.name = Poll name ...@@ -519,9 +518,9 @@ poll.name = Poll name
poll.save = Send answers poll.save = Send answers
product.barcode = Barcode product.barcode = Barcode
product.buyInPrice = Buy in price
product.billed = Billed product.billed = Billed
product.boughtTotal = Products billed product.boughtTotal = Products billed
product.buyInPrice = Buy in price
product.cart.count = To shoppingcart product.cart.count = To shoppingcart
product.cashed = Cashpaid product.cashed = Cashpaid
product.color = Color in UI product.color = Color in UI
...@@ -554,16 +553,16 @@ productshop.noItemsInCart = There are no products in shopping cart ...@@ -554,16 +553,16 @@ productshop.noItemsInCart = There are no products in shopping cart
productshop.plusOne = +1 productshop.plusOne = +1
productshop.plusTen = +10 productshop.plusTen = +10
productshop.total = Total productshop.total = Total
reader.automaticProduct = Default product
reader.automaticProductCount = Amount
reader.assocToCard = Associate to card reader.assocToCard = Associate to card
reader.automaticProduct = Default product
reader.automaticProductCount = Amount
reader.createNewCard = Create new card reader.createNewCard = Create new card
reader.description = Description reader.description = Description
reader.edit = Edit reader.edit = Edit
reader.save = Save
reader.identification = Identification reader.identification = Identification
reader.name = Reader name reader.name = Reader name
reader.save = Save
reader.select = Select reader reader.select = Select reader
reader.tag = Tag reader.tag = Tag
reader.type = Type reader.type = Type
...@@ -641,7 +640,7 @@ sidebar.map.placemap = Placemap ...@@ -641,7 +640,7 @@ sidebar.map.placemap = Placemap
sidebar.maps = Maps sidebar.maps = Maps
sidebar.other = Other sidebar.other = Other
sidebar.product.create = New product sidebar.product.create = New product
sidebar.product.createBill = Create bill sidebar.product.createBill = Buy products
sidebar.product.list = Products sidebar.product.list = Products
sidebar.products = Products sidebar.products = Products
sidebar.role.create = New role sidebar.role.create = New role
...@@ -669,13 +668,13 @@ submenu.auth.login = Login ...@@ -669,13 +668,13 @@ submenu.auth.login = Login
submenu.auth.logoutResponse = Logout successfull submenu.auth.logoutResponse = Logout successfull
submenu.auth.sendResetMail = Password reset submenu.auth.sendResetMail = Password reset
submenu.bill.billSummary = Bill summary submenu.bill.billSummary = Bill summary
submenu.bill.list = My bills
submenu.bill.listAll = All bills
submenu.foodadmin.createTemplate = Create foodwave template submenu.foodadmin.createTemplate = Create foodwave template
submenu.foodadmin.listTemplates = List foodwave templates submenu.foodadmin.listTemplates = List foodwave templates
submenu.foodmanager.listFoodwaves = List active foodwaves submenu.foodmanager.listFoodwaves = List active foodwaves
submenu.foodwave.list = Open foodwaves submenu.foodwave.list = Open foodwaves
submenu.foodwave.listTemplates = Food provides submenu.foodwave.listTemplates = Food provides
submenu.bill.list = My bills
submenu.bill.listAll = All bills
submenu.index = Frontpage submenu.index = Frontpage
submenu.map.create = Create map submenu.map.create = Create map
submenu.map.list = List maps submenu.map.list = List maps
...@@ -696,9 +695,9 @@ submenu.shop.listReaders = List readers ...@@ -696,9 +695,9 @@ submenu.shop.listReaders = List readers
submenu.shop.showReaderEvents = Reader events submenu.shop.showReaderEvents = Reader events
submenu.user.accountEvents = Account events submenu.user.accountEvents = Account events
submenu.user.changePassword = Change password submenu.user.changePassword = Change password
submenu.user.foodwave = Food
submenu.user.create = Create new user submenu.user.create = Create new user
submenu.user.edit = User information submenu.user.edit = User information
submenu.user.foodwave = Food
submenu.user.invite = Invite friends submenu.user.invite = Invite friends
submenu.user.manageuserlinks = Manage users submenu.user.manageuserlinks = Manage users
submenu.user.other = Other submenu.user.other = Other
...@@ -728,10 +727,14 @@ svm.success.successMessage = Payment was successfull. You can now your credits i ...@@ -728,10 +727,14 @@ svm.success.successMessage = Payment was successfull. You can now your credits i
template.loggedInAs = Logged in as template.loggedInAs = Logged in as
topmenu.login = Login
topnavi.adminshop = Adminshop topnavi.adminshop = Adminshop
topnavi.billing = Billing topnavi.billing = Billing
topnavi.competitions = Competitions
topnavi.compos = Compos topnavi.compos = Compos
topnavi.contents = Site contents topnavi.contents = Site contents
topnavi.createuser = Create user
topnavi.foodwave = Food topnavi.foodwave = Food
topnavi.frontpage = Front page topnavi.frontpage = Front page
topnavi.log = Log topnavi.log = Log
...@@ -741,8 +744,10 @@ topnavi.poll = Polls ...@@ -741,8 +744,10 @@ topnavi.poll = Polls
topnavi.products = Products topnavi.products = Products
topnavi.shop = Shop topnavi.shop = Shop
topnavi.user = My properties topnavi.user = My properties
topnavi.userevent = Event
topnavi.userinit = User auth topnavi.userinit = User auth
topnavi.usermgmt = Users topnavi.usermgmt = Users
topnavi.usershop = Shop
user.accountBalance = Account balance user.accountBalance = Account balance
user.accountEventHeader = Account events user.accountEventHeader = Account events
...@@ -760,11 +765,11 @@ user.createdmessage = User has been created successfully. You can no ...@@ -760,11 +765,11 @@ user.createdmessage = User has been created successfully. You can no
user.defaultImage = Default picture user.defaultImage = Default picture
user.edit = Edit user.edit = Edit
user.edit.title = My information user.edit.title = My information
user.email = Email
user.firstNames = Firstname
user.food.title = Choose Menu user.food.title = Choose Menu
user.foodwave.products.title = Choose Products user.foodwave.products.title = Choose Products
user.foodwavelist.title = Choose Foodwave user.foodwavelist.title = Choose Foodwave
user.email = Email
user.firstNames = Firstname
user.hasImage = Image user.hasImage = Image
user.image = Image user.image = Image
user.imagelist = Saved images user.imagelist = Saved images
...@@ -777,7 +782,10 @@ user.invite.header = Accept invitation ...@@ -777,7 +782,10 @@ user.invite.header = Accept invitation
user.invitemail = Email address user.invitemail = Email address
user.lastName = Lastname user.lastName = Lastname
user.login = Login user.login = Login
user.logout = Logout
user.myGroups = My place reservations user.myGroups = My place reservations
user.myPlaces = Reserved places
user.myProperties = My properties
user.nick = Nick user.nick = Nick
user.noAccountevents = No account events user.noAccountevents = No account events
user.noCurrentImage = No image user.noCurrentImage = No image
...@@ -817,9 +825,9 @@ userImport.commit = Commit ...@@ -817,9 +825,9 @@ userImport.commit = Commit
userView.image = Image userView.image = Image
usercart.clear = Clear Cart
usercart.addSearchedUsers = Add searched users usercart.addSearchedUsers = Add searched users
usercart.cartsize = Size usercart.cartsize = Size
usercart.clear = Clear Cart
usercart.showCart = Show usercart usercart.showCart = Show usercart
usercart.traverse = Traverse usercart.traverse = Traverse
...@@ -842,7 +850,7 @@ userview.oldPasswordError = Invalid password! ...@@ -842,7 +850,7 @@ userview.oldPasswordError = Invalid password!
userview.passwordTooShort = Password has to be atleast 5 characters long! userview.passwordTooShort = Password has to be atleast 5 characters long!
userview.passwordsChanged = Password changed userview.passwordsChanged = Password changed
userview.passwordsDontMatch = Passwords do not match! Please try again! userview.passwordsDontMatch = Passwords do not match! Please try again!
userview.userExists = Username already exists! please select another. userview.userExists = Username already exists! You may already have an account.
viewexpired.body = Please login again. viewexpired.body = Please login again.
viewexpired.title = Login expired. Please login again. viewexpired.title = Login expired. Please login again.
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
...@@ -122,8 +122,8 @@ checkout.return.successDelayed = Viiv\u00E4stetty maksu onnistunut. Maksu vahvis ...@@ -122,8 +122,8 @@ checkout.return.successDelayed = Viiv\u00E4stetty maksu onnistunut. Maksu vahvis
checkout.return.successMessage = Maksu vahvistettu. Tuotteet on maksettu. Voit siirty\u00E4 eteenp\u00E4in tilauksessasi. checkout.return.successMessage = Maksu vahvistettu. Tuotteet on maksettu. Voit siirty\u00E4 eteenp\u00E4in tilauksessasi.
compo.edit = Muokkaa compoa compo.edit = Muokkaa compoa
compo.savesort = Tallenna j\u00E4rjestys
compo.saveVotes = Tallenna \u00E4\u00E4net compo.saveVotes = Tallenna \u00E4\u00E4net
compo.savesort = Tallenna j\u00E4rjestys
compo.votesSaved = \u00C4\u00E4net tallennettu compo.votesSaved = \u00C4\u00E4net tallennettu
compofile.download = lataa compofile.download = lataa
...@@ -196,35 +196,36 @@ eventorg.save = Tallenna ...@@ -196,35 +196,36 @@ eventorg.save = Tallenna
eventorgView.eventname = Tapahtuman nimi eventorgView.eventname = Tapahtuman nimi
eventorganiser.name = Tapahtumaj\u00E4rjest\u00E4j\u00E4 eventorganiser.name = Tapahtumaj\u00E4rjest\u00E4j\u00E4
feedback.canFeedback = Vituttaako? feedback.canFeedback = Vituttaako?
feedback.submit = L\u00E4het\u00E4 feedback.submit = L\u00E4het\u00E4
feedback.thanks = Kiiiiitooooos! :) feedback.thanks = Kiiiiitooooos! :)
food = Ruoka food = Ruoka
foodWave.accountevents = Maksetut tilaukset foodWave.accountevents = Maksetut tilaukset
foodWave.activeFoodWaves = Aktiiviset Ruokatilaukset foodWave.activeFoodWaves = Aktiiviset Ruokatilaukset
foodWave.billLines = Maksamattomat Verkkomaksut foodWave.billLines = Maksamattomat Verkkomaksut
foodWave.deliveredFoodWaves = Toimitetut Ruokatilaukset foodWave.deliveredFoodWaves = Toimitetut Ruokatilaukset
foodWave.list = Ruokatilaukset foodWave.list = Ruokatilaukset
foodWave.name = Ruokatilaus foodWave.name = Ruokatilaus
foodWave.orders = Tilausten M\u00E4\u00E4r\u00E4 foodWave.orders = Tilausten M\u00E4\u00E4r\u00E4
foodWave.paid = Maksettuja foodWave.paid = Maksettuja
foodWave.show = N\u00E4yt\u00E4 foodWave.show = N\u00E4yt\u00E4
foodWave.template.name = Tilauspohja foodWave.template.name = Nimi
foodWave.template.waves = Ruokatilaus foodWave.template.waves = Ruokatilaus
foodWave.templatename = Valitse tuotteet foodWave.templatename = Valitse tuotteet
foodWave.time = Aika
foodWave.totalReserved = Yhteens\u00E4 foodWave.totalReserved = Yhteens\u00E4
foodWave.unconfirmedOrders = Vahvistamattomia foodWave.unconfirmedOrders = Vahvistamattomia
foodWave.template.name = Nimi
foodadmin.editTemplate = Muokkaa foodadmin.editTemplate = Muokkaa
foodshop.buyAndPay = Varaa ja maksa foodshop.buyAndPay = Varaa ja maksa
foodWave.time = Aika
foodshop.total = Yhteens\u00E4
foodshop.buyFromCounter = Maksa infossa foodshop.buyFromCounter = Maksa infossa
foodshop.buyFromInternet = Maksa Internetiss\u00E4
foodshop.total = Yhteens\u00E4
foodwave.buyInPrice = Sis\u00E4\u00E4nostohinta foodwave.buyInPrice = Sis\u00E4\u00E4nostohinta
foodwave.foodwaveBuyInPrice = Sis\u00E4\u00E4nostohinta foodwave.foodwaveBuyInPrice = Sis\u00E4\u00E4nostohinta
foodwave.markPaid = Merkitty maksetuksi foodwave.markPaid = Merkitty maksetuksi
...@@ -262,8 +263,6 @@ foodwavetemplate.selectproducts = Tuotteet ...@@ -262,8 +263,6 @@ foodwavetemplate.selectproducts = Tuotteet
foodwavetemplate.startTime = Tilausaika foodwavetemplate.startTime = Tilausaika
foodwavetemplate.waveName = Tilauksen nimi foodwavetemplate.waveName = Tilauksen nimi
foodshop.buyFromInternet = Maksa Internetiss\u00E4
game.gamepoints = Insomnia Game pisteet: game.gamepoints = Insomnia Game pisteet:
gamepoints = Pelipisteit\u00E4 gamepoints = Pelipisteit\u00E4
...@@ -359,14 +358,14 @@ mapView.errorWhenReleasingPlace = Paikkaa vapauttassa tapahtui virhe. ...@@ -359,14 +358,14 @@ mapView.errorWhenReleasingPlace = Paikkaa vapauttassa tapahtui virhe.
mapView.errorWhenReservingPlace = Paikkaa varatessa tapahtui virhe. mapView.errorWhenReservingPlace = Paikkaa varatessa tapahtui virhe.
mapView.errorWhileBuyingPlaces = Virhe paikkojen ostossa. Ole hyv\u00E4 ja yrit\u00E4 uudelleen. Jos virhe toistuu ota yhteytt\u00E4 j\u00E4rjest\u00E4jiin. mapView.errorWhileBuyingPlaces = Virhe paikkojen ostossa. Ole hyv\u00E4 ja yrit\u00E4 uudelleen. Jos virhe toistuu ota yhteytt\u00E4 j\u00E4rjest\u00E4jiin.
mapView.notEnoughCreditsToReserve = Sinulla ei ole riitt\u00E4v\u00E4sti suoritettuja konepaikkamaksuja t\u00E4m\u00E4n paikan varaamiseen. mapView.notEnoughCreditsToReserve = Sinulla ei ole riitt\u00E4v\u00E4sti suoritettuja konepaikkamaksuja t\u00E4m\u00E4n paikan varaamiseen.
menu.name = Nimi
menu.index = Etusivu menu.index = Etusivu
menu.select = Valitse menu.name = Nimi
menu.place.placemap = Paikkakartta menu.place.placemap = Paikkakartta
menu.sort = J\u00E4rjest\u00E4
menu.poll.index = Kyselyt menu.poll.index = Kyselyt
menu.select = Valitse
menu.shop.createBill = Kauppa menu.shop.createBill = Kauppa
menu.sort = J\u00E4rjest\u00E4
menu.user.edit = Omat tiedot menu.user.edit = Omat tiedot
news.abstract = Lyhennelm\u00E4 news.abstract = Lyhennelm\u00E4
...@@ -538,16 +537,16 @@ productshop.noItemsInCart = Ostoskorissa ei ole tuotteita ...@@ -538,16 +537,16 @@ productshop.noItemsInCart = Ostoskorissa ei ole tuotteita
productshop.plusOne = +1 productshop.plusOne = +1
productshop.plusTen = +10 productshop.plusTen = +10
productshop.total = Yhteens\u00E4 productshop.total = Yhteens\u00E4
reader.automaticProduct = Oletustuote
reader.automaticProductCount = M\u00E4\u00E4r\u00E4
reader.assocToCard = Yhdist\u00E4 korttiin reader.assocToCard = Yhdist\u00E4 korttiin
reader.automaticProduct = Oletustuote
reader.automaticProductCount = M\u00E4\u00E4r\u00E4
reader.createNewCard = Luo uusi kortti reader.createNewCard = Luo uusi kortti
reader.description = Kuvaus reader.description = Kuvaus
reader.edit = Muokkaa reader.edit = Muokkaa
reader.save = Tallenna
reader.identification = Tunniste reader.identification = Tunniste
reader.name = Lukijan nimi reader.name = Lukijan nimi
reader.save = Tallenna
reader.select = Valitse lukija reader.select = Valitse lukija
reader.tag = Tag reader.tag = Tag
reader.type = Tyyppi reader.type = Tyyppi
...@@ -621,7 +620,7 @@ sidebar.map.placemap = Paikkakartta ...@@ -621,7 +620,7 @@ sidebar.map.placemap = Paikkakartta
sidebar.maps = Kartat sidebar.maps = Kartat
sidebar.other = Muuta sidebar.other = Muuta
sidebar.product.create = Uusi tuote sidebar.product.create = Uusi tuote
sidebar.product.createBill = Luo lasku sidebar.product.createBill = Osta tuotteita
sidebar.product.list = Tuotteet sidebar.product.list = Tuotteet
sidebar.products = Tuotteet sidebar.products = Tuotteet
sidebar.role.create = Uusi rooli sidebar.role.create = Uusi rooli
...@@ -648,12 +647,12 @@ submenu.auth.login = Kirjaudu ...@@ -648,12 +647,12 @@ submenu.auth.login = Kirjaudu
submenu.auth.logoutResponse = Uloskirjautuminen onnistui submenu.auth.logoutResponse = Uloskirjautuminen onnistui
submenu.auth.sendResetMail = Salasanan palautus submenu.auth.sendResetMail = Salasanan palautus
submenu.bill.billSummary = Laskujen yhteenveto submenu.bill.billSummary = Laskujen yhteenveto
submenu.bill.list = N\u00E4yt\u00E4 omat laskut
submenu.bill.listAll = Kaikki laskut
submenu.foodadmin.createTemplate = Luo tilauspohja submenu.foodadmin.createTemplate = Luo tilauspohja
submenu.foodadmin.listTemplates = Muokkaa tilauspohjia submenu.foodadmin.listTemplates = Muokkaa tilauspohjia
submenu.foodmanager.listFoodwaves = Aktiiviset ruokatilaukset submenu.foodmanager.listFoodwaves = Aktiiviset ruokatilaukset
submenu.foodwave.list = Avoimet tilaukset submenu.foodwave.list = Avoimet tilaukset
submenu.bill.list = N\u00E4yt\u00E4 omat laskut
submenu.bill.listAll = Kaikki laskut
submenu.index = Etusivu submenu.index = Etusivu
submenu.map.create = Uusi kartta submenu.map.create = Uusi kartta
submenu.map.list = N\u00E4yt\u00E4 kartat submenu.map.list = N\u00E4yt\u00E4 kartat
...@@ -675,9 +674,9 @@ submenu.shop.showReaderEvents = Lukijan tapahtumat ...@@ -675,9 +674,9 @@ submenu.shop.showReaderEvents = Lukijan tapahtumat
submenu.user.accountEvents = Tilitapahtumat submenu.user.accountEvents = Tilitapahtumat
submenu.user.changePassword = Vaihda salasana submenu.user.changePassword = Vaihda salasana
submenu.user.create = Luo k\u00E4ytt\u00E4j\u00E4 submenu.user.create = Luo k\u00E4ytt\u00E4j\u00E4
submenu.user.foodwave = Ruoka
submenu.user.createCardTemplate = Luo korttiryhm\u00E4 submenu.user.createCardTemplate = Luo korttiryhm\u00E4
submenu.user.edit = K\u00E4ytt\u00E4j\u00E4n tiedot submenu.user.edit = K\u00E4ytt\u00E4j\u00E4n tiedot
submenu.user.foodwave = Ruoka
submenu.user.invite = Kutsu yst\u00E4vi\u00E4 submenu.user.invite = Kutsu yst\u00E4vi\u00E4
submenu.user.list = Kaikki k\u00E4ytt\u00E4j\u00E4t submenu.user.list = Kaikki k\u00E4ytt\u00E4j\u00E4t
submenu.user.listCardTemplates = Korttiryhm\u00E4t submenu.user.listCardTemplates = Korttiryhm\u00E4t
...@@ -709,10 +708,14 @@ svm.success.successMessage = Verkkomaksu onnistui. ...@@ -709,10 +708,14 @@ svm.success.successMessage = Verkkomaksu onnistui.
template.loggedInAs = Kirjautunut tunnuksella template.loggedInAs = Kirjautunut tunnuksella
topmenu.login = Kirjaudu sis\u00E4\u00E4n
topnavi.adminshop = Kauppa topnavi.adminshop = Kauppa
topnavi.billing = Laskutus topnavi.billing = Laskutus
topnavi.competitions = Kilpailut
topnavi.compos = Kilpailut topnavi.compos = Kilpailut
topnavi.contents = Sivuston sis\u00E4lt\u00F6 topnavi.contents = Sivuston sis\u00E4lt\u00F6
topnavi.createuser = Luo k\u00E4ytt\u00E4j\u00E4
topnavi.foodwave = Ruokatilaus topnavi.foodwave = Ruokatilaus
topnavi.frontpage = Etusivu topnavi.frontpage = Etusivu
topnavi.log = Logi topnavi.log = Logi
...@@ -722,8 +725,10 @@ topnavi.poll = Kyselyt ...@@ -722,8 +725,10 @@ topnavi.poll = Kyselyt
topnavi.products = Tuotteet topnavi.products = Tuotteet
topnavi.shop = Kauppa topnavi.shop = Kauppa
topnavi.user = Omat tiedot topnavi.user = Omat tiedot
topnavi.userevent = Tapahtuma
topnavi.userinit = K\u00E4ytt\u00E4j\u00E4n tunnistus topnavi.userinit = K\u00E4ytt\u00E4j\u00E4n tunnistus
topnavi.usermgmt = K\u00E4ytt\u00E4j\u00E4t topnavi.usermgmt = K\u00E4ytt\u00E4j\u00E4t
topnavi.usershop = Kauppa
user.accountBalance = Tilin saldo user.accountBalance = Tilin saldo
user.accountEventHeader = Tilitapahtumat user.accountEventHeader = Tilitapahtumat
...@@ -741,11 +746,11 @@ user.createdmessage = K\u00E4ytt\u00E4j\u00E4tunnus on luotu onnistu ...@@ -741,11 +746,11 @@ user.createdmessage = K\u00E4ytt\u00E4j\u00E4tunnus on luotu onnistu
user.defaultImage = Oletukuva user.defaultImage = Oletukuva
user.edit = Muokkaa user.edit = Muokkaa
user.edit.title = Omat tiedot user.edit.title = Omat tiedot
user.email = S\u00E4hk\u00F6posti
user.firstNames = Etunimi
user.food.title = Valitse Menu user.food.title = Valitse Menu
user.foodwave.products.title = Valitse tuotteet user.foodwave.products.title = Valitse tuotteet
user.foodwavelist.title = Valitse Ruokatilaus user.foodwavelist.title = Valitse Ruokatilaus
user.email = S\u00E4hk\u00F6posti
user.firstNames = Etunimi
user.hasImage = Kuva user.hasImage = Kuva
user.imageUploaded = Kuva l\u00E4hetetty. user.imageUploaded = Kuva l\u00E4hetetty.
user.imagelist = Tallennetut kuvat user.imagelist = Tallennetut kuvat
...@@ -757,6 +762,9 @@ user.invite.header = Luo k\u00E4ytt\u00E4j\u00E4 kutsusta ...@@ -757,6 +762,9 @@ user.invite.header = Luo k\u00E4ytt\u00E4j\u00E4 kutsusta
user.invitemail = S\u00E4hk\u00F6postiosoite user.invitemail = S\u00E4hk\u00F6postiosoite
user.lastName = Sukunimi user.lastName = Sukunimi
user.login = K\u00E4ytt\u00E4j\u00E4tunnus user.login = K\u00E4ytt\u00E4j\u00E4tunnus
user.logout = Kirjaudu ulos
user.myPlaces = Omat konepaikat
user.myProperties = Omat tiedot
user.nick = Nick user.nick = Nick
user.noAccountevents = Ei tilitapahtumia user.noAccountevents = Ei tilitapahtumia
user.noCurrentImage = Ei kuvaa user.noCurrentImage = Ei kuvaa
...@@ -795,9 +803,9 @@ userImport.commit = Hyv\u00E4ksy ...@@ -795,9 +803,9 @@ userImport.commit = Hyv\u00E4ksy
userView.image = Kuva userView.image = Kuva
usercart.clear = Tyhjenn\u00E4 k\u00E4ytt\u00E4j\u00E4kori
usercart.addSearchedUsers = Lis\u00E4\u00E4 haetut k\u00E4ytt\u00E4j\u00E4t usercart.addSearchedUsers = Lis\u00E4\u00E4 haetut k\u00E4ytt\u00E4j\u00E4t
usercart.cartsize = Koko usercart.cartsize = Koko
usercart.clear = Tyhjenn\u00E4 k\u00E4ytt\u00E4j\u00E4kori
usercart.showCart = K\u00E4ytt\u00E4j\u00E4kori usercart.showCart = K\u00E4ytt\u00E4j\u00E4kori
usercart.traverse = K\u00E4y l\u00E4pi usercart.traverse = K\u00E4y l\u00E4pi
...@@ -819,7 +827,7 @@ userview.oldPasswordError = V\u00E4\u00E4r\u00E4 salasana! ...@@ -819,7 +827,7 @@ userview.oldPasswordError = V\u00E4\u00E4r\u00E4 salasana!
userview.passwordTooShort = Salasana liian lyhyt. Pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n {0} merkki\u00E4 pitk\u00E4. userview.passwordTooShort = Salasana liian lyhyt. Pit\u00E4\u00E4 olla v\u00E4hint\u00E4\u00E4n {0} merkki\u00E4 pitk\u00E4.
userview.passwordsChanged = Salasana vaihdettu userview.passwordsChanged = Salasana vaihdettu
userview.passwordsDontMatch = Salasanat eiv\u00E4t ole samat! Ole hyv\u00E4 ja sy\u00F6t\u00E4 salasanat uudelleen. userview.passwordsDontMatch = Salasanat eiv\u00E4t ole samat! Ole hyv\u00E4 ja sy\u00F6t\u00E4 salasanat uudelleen.
userview.userExists = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole hyv\u00E4 ja valitse toinen tunnus. userview.userExists = K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Sinulla saattaa jo olla tunnus j\u00E4rjestelm\u00E4ss\u00E4.
viewexpired.body = Ole hyv\u00E4 ja kirjaudu sis\u00E4\u00E4n uudelleen. viewexpired.body = Ole hyv\u00E4 ja kirjaudu sis\u00E4\u00E4n uudelleen.
viewexpired.title = N\u00E4kym\u00E4 on vanhentunut viewexpired.title = N\u00E4kym\u00E4 on vanhentunut
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/menu/PrimeMenuView.java
...@@ -4,6 +4,7 @@ import java.util.List; ...@@ -4,6 +4,7 @@ import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import org.primefaces.component.menuitem.MenuItem; import org.primefaces.component.menuitem.MenuItem;
...@@ -15,9 +16,11 @@ import org.slf4j.Logger; ...@@ -15,9 +16,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.MenuBeanLocal; import fi.insomnia.bortal.beans.MenuBeanLocal;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.MenuNavigation; import fi.insomnia.bortal.model.MenuNavigation;
import fi.insomnia.bortal.utilities.I18n; import fi.insomnia.bortal.utilities.I18n;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
import fi.insomnia.bortal.web.helper.LayoutView;
@Named @Named
@RequestScoped @RequestScoped
...@@ -45,16 +48,45 @@ public class PrimeMenuView extends GenericCDIView { ...@@ -45,16 +48,45 @@ public class PrimeMenuView extends GenericCDIView {
private DefaultMenuModel menuModel; private DefaultMenuModel menuModel;
@Inject
private LayoutView layoutview;
private MenuModel nameMenu;
private EventUser user;
private static final Logger logger = LoggerFactory.getLogger(PrimeMenuView.class); private static final Logger logger = LoggerFactory.getLogger(PrimeMenuView.class);
// public MenuModel getNameMenu()
// {
//
// if (nameMenu == null)
// {
// nameMenu = new DefaultMenuModel();
// nameMenu.MenuItem item = new MenuItem();
//
// }
// return nameMenu;
// }
public MenuModel getMenuModel() public MenuModel getMenuModel()
{ {
if (menuModel == null) if (menuModel == null)
{ {
menuModel = new DefaultMenuModel(); menuModel = new DefaultMenuModel();
// menubean.findNavigation(layoutview.getPagepath()); MenuNavigation selectedTop = menubean.findNavigation(layoutview.getPagepath());
while (selectedTop != null && selectedTop.getParent() != null)
{
selectedTop = selectedTop.getParent();
}
List<MenuNavigation> tops = menubean.getTopmenus(); List<MenuNavigation> tops = menubean.getTopmenus();
for (MenuNavigation m : tops) if (!tops.contains(selectedTop) && !tops.isEmpty())
{
selectedTop = tops.get(0);
}
for (MenuNavigation m : selectedTop.getChildren())
{ {
if (m.getItem() != null && m.getChildren().isEmpty()) if (m.getItem() != null && m.getChildren().isEmpty())
{ {
...@@ -74,7 +106,45 @@ public class PrimeMenuView extends GenericCDIView { ...@@ -74,7 +106,45 @@ public class PrimeMenuView extends GenericCDIView {
} }
} }
} }
user = permbean.getCurrentUser();
if (permbean.isLoggedIn())
{
Submenu nameSub = new Submenu();
nameSub.setId("nameSubmenu");
nameSub.setStyle("float:right;");
nameSub.setLabel(user.getWholeName());
MenuItem myprop = new MenuItem();
myprop.setOutcome("/user/edit");
myprop.setValue(I18n.get("user.myProperties"));
nameSub.getChildren().add(myprop);
MenuItem myPlces = new MenuItem();
myPlces.setOutcome("/place/myGroups");
myPlces.setValue(I18n.get("user.myPlaces"));
nameSub.getChildren().add(myPlces);
nameSub.getChildren().add(new Separator());
MenuItem logout = new MenuItem();
logout.setOutcome("/auth/logout");
logout.setValue(I18n.get("user.logout"));
nameSub.getChildren().add(logout);
menuModel.addSubmenu(nameSub);
} else {
MenuItem loginbtn = new MenuItem();
loginbtn.setId("loginMenuItem");
loginbtn.setStyleClass("nameMenuItem");
loginbtn.setOutcome("/auth/login");
loginbtn.setValue(I18n.get("topmenu.login"));
menuModel.addMenuItem(loginbtn);
}
} }
return menuModel; return menuModel;
} }
...@@ -141,4 +211,12 @@ public class PrimeMenuView extends GenericCDIView { ...@@ -141,4 +211,12 @@ public class PrimeMenuView extends GenericCDIView {
return item; return item;
} }
public LayoutView getLayoutview() {
return layoutview;
}
public void setLayoutview(LayoutView layoutview) {
this.layoutview = layoutview;
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!