Skip to content

Codecrew / Moya

Go to a project
Commit 5cc1a71a by Tuomas Riihimäki
Options

Merge branch 'devel' of codecrew.fi:bortal into devel

2 parents abde6c01 13418584
Expand all
Inline Side-by-side
Showing with 239 additions and 88 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
...@@ -65,7 +65,7 @@ public class MenuBean implements MenuBeanLocal { ...@@ -65,7 +65,7 @@ public class MenuBean implements MenuBeanLocal {
initializeOldMenu(); initializeOldMenu();
} }
private synchronized void initializeMenu() { private synchronized void initializeMenu_skynett() {
int menusort = 100; int menusort = 100;
logger.info("Initializing menu"); logger.info("Initializing menu");
...@@ -227,6 +227,166 @@ public class MenuBean implements MenuBeanLocal { ...@@ -227,6 +227,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() { private synchronized void initializeOldMenu() {
LanEvent ev = eventbean.getCurrentEvent(); LanEvent ev = eventbean.getCurrentEvent();
......
code/MoyaWeb/.settings/org.eclipse.core.resources.prefs 0 → 100644
eclipse.preferences.version=1
encoding//WebContent/resources/templates/template1/css/style.css=UTF-8
code/MoyaWeb/WebContent/resources/cditools/products/shop.xhtml
<?xml version='1.0' encoding='UTF-8' ?> <?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools">
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools">
<composite:interface> <composite:interface>
...@@ -15,9 +14,6 @@ ...@@ -15,9 +14,6 @@
<!-- <h:outputScript target="head" library="script" name="jquery.min.js" /> --> <!-- <h:outputScript target="head" library="script" name="jquery.min.js" /> -->
<!-- <h:outputScript target="head" library="script" name="shopscript.js" /> --> <!-- <h:outputScript target="head" library="script" name="shopscript.js" /> -->
<h:outputScript library="primefaces" name="jquery/jquery.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:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" id="billcart" value="#{cc.attrs.items}" var="cart">
<h:column> <h:column>
...@@ -26,7 +22,7 @@ ...@@ -26,7 +22,7 @@
</f:facet> </f:facet>
<h:outputText value="#{cart.product.name}" /> <h:outputText value="#{cart.product.name}" />
</h:column> </h:column>
<h:column > <h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['product.price']}" /> <h:outputText value="${i18n['product.price']}" />
</f:facet> </f:facet>
...@@ -51,8 +47,8 @@ ...@@ -51,8 +47,8 @@
<f:ajax render="@form" /> <f:ajax render="@form" />
</h:commandButton> </h:commandButton>
<h:inputText size="4" id="cartcount" value="#{cart.count}"> <h:inputText size="4" id="cartcount" value="#{cart.count}">
<f:convertNumber maxIntegerDigits="2" minFractionDigits="0"/> <f:convertNumber maxIntegerDigits="2" minFractionDigits="0" />
<f:ajax render="@form" event="valueChange" listener="#{productShopView.updateAllCartLimits()}"/> <f:ajax render="@form" event="valueChange" listener="#{productShopView.updateAllCartLimits()}" />
</h:inputText> </h:inputText>
<h:commandButton action="#{productShopView.addOne}" value="#{i18n['productshop.plusOne']}"> <h:commandButton action="#{productShopView.addOne}" value="#{i18n['productshop.plusOne']}">
<f:ajax render="@form" /> <f:ajax render="@form" />
...@@ -63,8 +59,8 @@ ...@@ -63,8 +59,8 @@
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['productshop.limits']}" /> <h:outputText value="#{i18n['productshop.limits']}" />
</f:facet> </f:facet>
<h:outputText value="#{cart.limit}" > <h:outputText value="#{cart.limit}">
<f:convertNumber maxIntegerDigits="2" minFractionDigits="0"/> <f:convertNumber maxIntegerDigits="2" minFractionDigits="0" />
</h:outputText> </h:outputText>
</h:column> </h:column>
<h:column> <h:column>
...@@ -82,6 +78,7 @@ ...@@ -82,6 +78,7 @@
</h:column> </h:column>
</h:dataTable> </h:dataTable>
<hr />
<div> <div>
<h:outputText value="#{i18n['productshop.total']} " /> <h:outputText value="#{i18n['productshop.total']} " />
<h:outputText value="#{productShopView.cartPrice}"> <h:outputText value="#{productShopView.cartPrice}">
...@@ -90,8 +87,6 @@ ...@@ -90,8 +87,6 @@
</div> </div>
<h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-botton" value="#{cc.attrs.commitValue}" /> <h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-botton" value="#{cc.attrs.commitValue}" />
</composite:implementation> </composite:implementation>
</html> </html>
code/MoyaWeb/WebContent/resources/templates/insomnia2/template.xhtml
...@@ -70,6 +70,8 @@ ...@@ -70,6 +70,8 @@
<h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editTop']}" outcome="/pages/manage"> <h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editTop']}" outcome="/pages/manage">
<f:param name="pagename" value="#{layoutView.pagepath}:top" /> <f:param name="pagename" value="#{layoutView.pagepath}:top" />
</h:link> </h:link>
<div class="container top" /> <div class="container top" />
<div class="container clearfix"> <div class="container clearfix">
<ui:fragment rendered="#{menuView.getMenu(2).size() > 1}"> <ui:fragment rendered="#{menuView.getMenu(2).size() > 1}">
......
code/MoyaWeb/WebContent/resources/templates/template1/css/tabnav.css deleted 100644 → 0
#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/templates/template1/template.xhtml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <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">
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:tools="http://java.sun.com/jsf/composite/cditools"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:p="http://primefaces.org/ui">
<f:view contentType="text/html" locale="#{sessionHandler.locale}"> <f:view contentType="text/html" locale="#{sessionHandler.locale}">
...@@ -18,27 +12,24 @@ ...@@ -18,27 +12,24 @@
<meta name="author" content="CodeCrew ry" /> <meta name="author" content="CodeCrew ry" />
<meta http-equiv="Content-Language" content="fi" /> <meta http-equiv="Content-Language" content="fi" />
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template1/css/style.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" />
<link rel="stylesheet" type="text/css"
href="#{request.contextPath}/resources/templates/template1/css/general.css" />
<ui:insert name="headerdata" /> <ui:insert name="headerdata" />
</h:head> </h:head>
<h:body> <h:body>
<div id="page-container"> <div id="header" class="bgColor1">
<div id="logo">
<div id="header_left">
<h:link outcome="/index"> <h:link outcome="/index">
<c:choose> <c:choose>
<c:when test="#{sessionHandler.isInDevelopmentMode()}"> <c:when test="#{sessionHandler.isInDevelopmentMode()}">
<img <img src="#{request.contextPath}/resources/style/insomnia2/img/devel_logo.png" />
src="#{request.contextPath}/resources/style/insomnia2/img/devel_logo.png" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p:graphicImage rendered="#{!empty layoutView.headerimage}" <p:graphicImage rendered="#{!empty layoutView.headerimage}" value="#{layoutView.headerimage}" />
value="#{layoutView.headerimage}" />
<ui:fragment rendered="#{empty layoutView.headerimage}"> <ui:fragment rendered="#{empty layoutView.headerimage}">
<h1> <h1>
<h:outputText value="#{layoutView.headertext}" /> <h:outputText value="#{layoutView.headertext}" />
...@@ -47,74 +38,81 @@ ...@@ -47,74 +38,81 @@
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</h:link> </h:link>
</div> </div>
<div id="page-header"> <div id="header_right">
<div id="login"> <img src="#{request.contextPath}/resources/templates/template1/img/moya_logo.png" />
<h:outputText rendered="#{sessionHandler.loggedIn}"
value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" />
<div>
<tools:loginLogout />
</div> </div>
</div> </div>
</div> <div class="colmask threecol">
<div class="colmid">
<div id="main"> <div class="colleft">
<div id="main" class="col1 center">
<p:menubar model="#{primeMenuView.menuModel}" />
<div class="container top"> <div class="container top">
<h:link rendered="#{layoutView.manageContent}" <h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editTop']}" outcome="/pages/manage">
styleClass="editorlink" value="#{i18n['layout.editTop']}"
outcome="/pages/manage">
<f:param name="pagename" value="#{layoutView.pagepath}:top" /> <f:param name="pagename" value="#{layoutView.pagepath}:top" />
</h:link> </h:link>
</div> </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 class="container clearfix"> <div id="menu" class="col2 left">
<ui:fragment rendered="#{menuView.getMenu(2).size() > 1}"> <p:panelMenu model="#{primeMenuView.menuModel}" />
<!-- <ui:fragment rendered="#{menuView.getMenu(2).size() > 1}">
<div id="right"> <div id="right">
<ul> <ul>
<ui:repeat var="menuitem" value="#{menuView.getMenu(2)}"> <ui:repeat var="menuitem" value="#{menuView.getMenu(2)}">
<h:outputText rendered="#{!empty menuitem.header}" <h:outputText rendered="#{!empty menuitem.header}" value="&lt;/ul>&lt;h1>#{i18n[menuitem.header]}&lt;/h1>&lt;ul>" escape="false" />
value="&lt;/ul>&lt;h1>#{i18n[menuitem.header]}&lt;/h1>&lt;ul>" <li><h:link outcome="#{menuitem.outcome}" value="#{i18n[menuitem.navigation.key]}" styleClass="#{menuitem.selected?'active':''}" /></li>
escape="false" />
<li><h:link outcome="#{menuitem.outcome}"
value="#{i18n[menuitem.navigation.key]}"
styleClass="#{menuitem.selected?'active':''}" /></li>
</ui:repeat> </ui:repeat>
</ul> </ul>
</div> </div>
</ui:fragment> </ui:fragment>
-->
</div>
<div class="col3">
<div id="left"> <div class="right">
<ui:insert name="title" />
<p:messages severity="info" /> <div class="ui-widget-header">Login</div>
<h:messages /> <div class="ui-widget-content" style="text-align: center">
<ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
<h:outputText value="#{cont1.content}" escape="false" /> <h:outputText rendered="#{sessionHandler.loggedIn}" value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" />
</ui:repeat> <div>
<ui:insert name="content" /> <tools:loginLogout />
<ui:repeat var="cont1" </div>
value="#{menuView.getPagecontent('bottom')}">
<h:outputText value="#{cont1.content}" escape="false" />
</ui:repeat>
</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 class="container bottom">
<h:link rendered="#{layoutView.manageContent}"
styleClass="editorlink" value="#{i18n['layout.editBottom']}"
outcome="/pages/manage">
<f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
</h:link>
</div> </div>
</div> </div>
</div> </div>
</div>
<div id="footer" class="bgColor1"></div>
</h:body> </h:body>
</f:view> </f:view>
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
...@@ -698,10 +698,11 @@ submenu.auth.sendResetMail = Password reset ...@@ -698,10 +698,11 @@ submenu.auth.sendResetMail = Password reset
submenu.bill.billSummary = Bill summary submenu.bill.billSummary = Bill summary
submenu.bill.list = My bills submenu.bill.list = My bills
submenu.bill.listAll = All bills submenu.bill.listAll = All bills
submenu.feedback.index = Feedback
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 = Foodwaves
submenu.foodwave.listTemplates = Food provides submenu.foodwave.listTemplates = Food provides
submenu.index = Frontpage submenu.index = Frontpage
submenu.map.create = Create map submenu.map.create = Create map
...@@ -718,7 +719,7 @@ submenu.product.create = Create product ...@@ -718,7 +719,7 @@ submenu.product.create = Create product
submenu.product.list = List products submenu.product.list = List products
submenu.role.create = Create role submenu.role.create = Create role
submenu.role.list = Roles submenu.role.list = Roles
submenu.shop.createBill = Shop submenu.shop.createBill = Purchase
submenu.shop.listReaders = List readers 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
...@@ -831,6 +832,7 @@ user.password = Password ...@@ -831,6 +832,7 @@ user.password = Password
user.passwordcheck = Password ( again ) user.passwordcheck = Password ( again )
user.passwordlengthMessage = Password is too short! user.passwordlengthMessage = Password is too short!
user.phone = Tel user.phone = Tel
user.profile = Profile
user.realname = Name user.realname = Name
user.roles = Roles user.roles = Roles
user.rolesave = Save roles user.rolesave = Save roles
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -681,10 +681,11 @@ submenu.auth.sendResetMail = Salasanan palautus ...@@ -681,10 +681,11 @@ 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.list = N\u00E4yt\u00E4 omat laskut
submenu.bill.listAll = Kaikki laskut submenu.bill.listAll = Kaikki laskut
submenu.feedback.index = Palaute
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 = Ruokailu
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
...@@ -700,7 +701,7 @@ submenu.product.create = Uusi tuote ...@@ -700,7 +701,7 @@ submenu.product.create = Uusi tuote
submenu.product.list = Listaa tuotteet submenu.product.list = Listaa tuotteet
submenu.role.create = Luo rooli submenu.role.create = Luo rooli
submenu.role.list = Roolit submenu.role.list = Roolit
submenu.shop.createBill = Luo lasku submenu.shop.createBill = Osta tuotteita
submenu.shop.listReaders = N\u00E4yt\u00E4 lukijat submenu.shop.listReaders = N\u00E4yt\u00E4 lukijat
submenu.shop.showReaderEvents = Lukijan tapahtumat submenu.shop.showReaderEvents = Lukijan tapahtumat
submenu.user.accountEvents = Tilitapahtumat submenu.user.accountEvents = Tilitapahtumat
...@@ -815,6 +816,7 @@ user.passwordcheck = Salasana ( uudelleen ) ...@@ -815,6 +816,7 @@ user.passwordcheck = Salasana ( uudelleen )
user.passwordlengthMessage = Salasana liian lyhyt user.passwordlengthMessage = Salasana liian lyhyt
user.phone = Puhelin user.phone = Puhelin
user.placegroups = Omat paikkaryhm\u00E4t user.placegroups = Omat paikkaryhm\u00E4t
user.profile = Profiili
user.realname = Nimi user.realname = Nimi
user.roles = Roolit user.roles = Roolit
user.rolesave = Tallenna roolit user.rolesave = Tallenna roolit
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/PrimeMenuView.java
...@@ -113,7 +113,7 @@ public class PrimeMenuView extends GenericCDIView { ...@@ -113,7 +113,7 @@ public class PrimeMenuView extends GenericCDIView {
Submenu nameSub = new Submenu(); Submenu nameSub = new Submenu();
nameSub.setId("nameSubmenu"); nameSub.setId("nameSubmenu");
nameSub.setStyle("float:right;"); nameSub.setStyle("float:right;");
nameSub.setLabel(user.getWholeName()); nameSub.setLabel(I18n.get("user.profile"));
MenuItem myprop = new MenuItem(); MenuItem myprop = new MenuItem();
myprop.setOutcome("/user/edit"); myprop.setOutcome("/user/edit");
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!