Skip to content

Codecrew / Moya

Go to a project
Commit 62dede1a by Petri Jarvisalo
Options

menu hommeleita

1 parent c8f187d1
Inline Side-by-side
Showing with 88 additions and 36 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MenuBean.java
...@@ -71,45 +71,50 @@ public class MenuBean implements MenuBeanLocal { ...@@ -71,45 +71,50 @@ public class MenuBean implements MenuBeanLocal {
logger.info("Initializing menu"); logger.info("Initializing menu");
LanEvent ev = eventbean.getCurrentEvent(); LanEvent ev = eventbean.getCurrentEvent();
MenuNavigation usernavi = new MenuNavigation(ev, "topnavi.frontpage", menusort = +10); MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.frontpage", menusort = +10);
// usernavi.addPage(menuitemfacade.findOrCreate("/index"), // usernavi.addPage(menuitemfacade.findOrCreate("/index"),
// UserPermission.ANYUSER); // UserPermission.ANYUSER);
navifacade.create(usernavi); navifacade.create(usermenu);
MenuNavigation adminnavi = new MenuNavigation(ev, "topnavi.adminpage", menusort = +10); MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminpage", menusort = +10);
// adminnavi.addPage(menuitemfacade.findOrCreate("/index2"), // adminnavi.addPage(menuitemfacade.findOrCreate("/index2"),
// UserPermission.ANYUSER); // UserPermission.ANYUSER);
navifacade.create(adminnavi); navifacade.create(adminmenu);
MenuNavigation shopnavi = new MenuNavigation(ev, "topnavi.shopnavi", menusort = +10); MenuNavigation shopmenu = new MenuNavigation(ev, "topnavi.shopnavi", menusort = +10);
// shopnavi.addPage(menuitemfacade.findOrCreate("/index3"), // shopnavi.addPage(menuitemfacade.findOrCreate("/index3"),
// UserPermission.ANYUSER); // UserPermission.ANYUSER);
navifacade.create(shopnavi); navifacade.create(shopmenu);
// Kauppa // Index
MenuNavigation shopTopmenu = new MenuNavigation(ev, "topnavi.shop", menusort = +10); usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.VIEW_ALL);
shopTopmenu.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
shopTopmenu.addPage(menuitemfacade.findOrCreate("/place/myGroups"), UserPermission.VIEW_SELF);
shopTopmenu.addPage(null, null);
shopTopmenu.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL);
shopTopmenu.addPage(menuitemfacade.findOrCreate("/user/accountEvents"), UserPermission.VIEW_SELF);
shopTopmenu.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN);
MenuNavigation prodsubmenu = shopTopmenu.addPage(null, null); // kuppa
MenuNavigation usershop = usermenu.addPage(null, null);
usermenu.setKey("topnavi.shop.products");
usermenu.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
usershop.addPage(menuitemfacade.findOrCreate("/place/myGroups"), UserPermission.VIEW_SELF);
usershop.addPage(null, null);
usershop.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL);
usershop.addPage(menuitemfacade.findOrCreate("/user/accountEvents"), UserPermission.VIEW_SELF);
usershop.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN);
MenuNavigation prodsubmenu = usermenu.addPage(null, null);
prodsubmenu.setKey("topnavi.shop.products"); prodsubmenu.setKey("topnavi.shop.products");
prodsubmenu.addPage(menuitemfacade.findOrCreate("/product/list"), ShopPermission.LIST_ALL_PRODUCTS); prodsubmenu.addPage(menuitemfacade.findOrCreate("/product/list"), ShopPermission.LIST_ALL_PRODUCTS);
prodsubmenu.addPage(menuitemfacade.findOrCreate("/product/create"), ShopPermission.MANAGE_PRODUCTS); prodsubmenu.addPage(menuitemfacade.findOrCreate("/product/create"), ShopPermission.MANAGE_PRODUCTS);
MenuNavigation adminshop = shopTopmenu.addPage(null, null); MenuNavigation adminshop = usermenu.addPage(null, null);
adminshop.setKey("topnavi.shop.adminshop"); adminshop.setKey("topnavi.shop.adminshop");
adminshop.addPage(menuitemfacade.findOrCreate("/shop/showReaderEvents"), ShopPermission.SHOP_TO_OTHERS); adminshop.addPage(menuitemfacade.findOrCreate("/shop/showReaderEvents"), ShopPermission.SHOP_TO_OTHERS);
adminshop.addPage(menuitemfacade.findOrCreate("/shop/listReaders"), ShopPermission.SHOP_TO_OTHERS); adminshop.addPage(menuitemfacade.findOrCreate("/shop/listReaders"), ShopPermission.SHOP_TO_OTHERS);
MenuNavigation billnavi = shopTopmenu.addPage(null, null); MenuNavigation billnavi = usermenu.addPage(null, null);
billnavi.setKey("topnavi.shop.bill"); billnavi.setKey("topnavi.shop.bill");
billnavi.addPage(menuitemfacade.findOrCreate("/bill/billSummary"), BillPermission.READ_ALL); billnavi.addPage(menuitemfacade.findOrCreate("/bill/billSummary"), BillPermission.READ_ALL);
billnavi.addPage(menuitemfacade.findOrCreate("/bill/listAll"), BillPermission.WRITE_ALL); billnavi.addPage(menuitemfacade.findOrCreate("/bill/listAll"), BillPermission.WRITE_ALL);
navifacade.create(shopTopmenu); navifacade.create(usermenu);
MenuNavigation eventTopmenu = new MenuNavigation(ev, "topnavi.event", menusort = +10); MenuNavigation eventTopmenu = new MenuNavigation(ev, "topnavi.event", menusort = +10);
eventTopmenu.addPage(menuitemfacade.findOrCreate("/map/list"), MapPermission.MANAGE_MAPS); eventTopmenu.addPage(menuitemfacade.findOrCreate("/map/list"), MapPermission.MANAGE_MAPS);
...@@ -123,11 +128,13 @@ public class MenuBean implements MenuBeanLocal { ...@@ -123,11 +128,13 @@ public class MenuBean implements MenuBeanLocal {
eventTopmenu.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER); eventTopmenu.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER);
navifacade.create(eventTopmenu); navifacade.create(eventTopmenu);
/*
MenuNavigation profileTopmenu = new MenuNavigation(ev, "topnavi.profile", menusort = +10); MenuNavigation profileTopmenu = new MenuNavigation(ev, "topnavi.profile", menusort = +10);
profileTopmenu.addPage(menuitemfacade.findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL); 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("/useradmin/list"), UserPermission.VIEW_ALL).setHeader("submenu.user.manageuserlinks");
profileTopmenu.addPage(menuitemfacade.findOrCreate("/user/edit"), UserPermission.VIEW_SELF); profileTopmenu.addPage(menuitemfacade.findOrCreate("/user/edit"), UserPermission.VIEW_SELF);
profileTopmenu.addPage(menuitemfacade.findOrCreate("/user/changePassword"), UserPermission.VIEW_SELF); profileTopmenu.addPage(menuitemfacade.findOrCreate("/user/changePassword"), UserPermission.VIEW_SELF);
*/
MenuNavigation usermgmt = profileTopmenu.addPage(null, null); MenuNavigation usermgmt = profileTopmenu.addPage(null, null);
usermgmt.setKey("topnavi.user.mgmt"); usermgmt.setKey("topnavi.user.mgmt");
......
code/LanBortalWeb/WebContent/layout/blipview/template.xhtml
...@@ -28,6 +28,11 @@ ...@@ -28,6 +28,11 @@
<h:body> <h:body>
<p:menubar model="#{primeMenuView.menuModel}"
style="width:80%; float: left;">
</p:menubar>
<div class="container top"> <div class="container top">
<ui:insert name="topbar" /> <ui:insert name="topbar" />
......
code/LanBortalWeb/WebContent/layout/template1/template.xhtml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:tools="http://java.sun.com/jsf/composite/cditools" <html xmlns="http://www.w3.org/1999/xhtml"
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}">
...@@ -13,8 +18,10 @@ ...@@ -13,8 +18,10 @@
<meta name="author" content="CodeCrew ry" /> <meta name="author" content="CodeCrew ry" />
<meta http-equiv="Content-Language" content="fi" /> <meta http-equiv="Content-Language" content="fi" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/template1/css/style.css" /> <link rel="stylesheet" type="text/css"
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/template1/css/general.css" /> href="#{request.contextPath}/resources/style/template1/css/style.css" />
<link rel="stylesheet" type="text/css"
href="#{request.contextPath}/resources/style/template1/css/general.css" />
<ui:insert name="headerdata" /> <ui:insert name="headerdata" />
</h:head> </h:head>
...@@ -26,10 +33,12 @@ ...@@ -26,10 +33,12 @@
<h:link outcome="/index"> <h:link outcome="/index">
<c:choose> <c:choose>
<c:when test="#{sessionHandler.isInDevelopmentMode()}"> <c:when test="#{sessionHandler.isInDevelopmentMode()}">
<img src="#{request.contextPath}/resources/style/insomnia2/img/devel_logo.png" /> <img
src="#{request.contextPath}/resources/style/insomnia2/img/devel_logo.png" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p:graphicImage rendered="#{!empty layoutView.headerimage}" value="#{layoutView.headerimage}" /> <p:graphicImage rendered="#{!empty layoutView.headerimage}"
value="#{layoutView.headerimage}" />
<ui:fragment rendered="#{empty layoutView.headerimage}"> <ui:fragment rendered="#{empty layoutView.headerimage}">
<h1> <h1>
<h:outputText value="#{layoutView.headertext}" /> <h:outputText value="#{layoutView.headertext}" />
...@@ -45,7 +54,8 @@ ...@@ -45,7 +54,8 @@
<div id="login"> <div id="login">
<h:outputText rendered="#{sessionHandler.loggedIn}" value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" /> <h:outputText rendered="#{sessionHandler.loggedIn}"
value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" />
<div> <div>
<tools:loginLogout /> <tools:loginLogout />
</div> </div>
...@@ -55,10 +65,27 @@ ...@@ -55,10 +65,27 @@
<div id="main"> <div id="main">
<p:menubar model="#{primeMenuView.menuModel}"/> <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"> <div class="container top">
<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> </div>
...@@ -69,8 +96,12 @@ ...@@ -69,8 +96,12 @@
<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}" value="&lt;/ul>&lt;h1>#{i18n[menuitem.header]}&lt;/h1>&lt;ul>" escape="false" /> <h:outputText rendered="#{!empty menuitem.header}"
<li><h:link outcome="#{menuitem.outcome}" value="#{i18n[menuitem.navigation.key]}" styleClass="#{menuitem.selected?'active':''}" /></li> 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> </ui:repeat>
</ul> </ul>
</div> </div>
...@@ -84,14 +115,17 @@ ...@@ -84,14 +115,17 @@
<h:outputText value="#{cont1.content}" escape="false" /> <h:outputText value="#{cont1.content}" escape="false" />
</ui:repeat> </ui:repeat>
<ui:insert name="content" /> <ui:insert name="content" />
<ui:repeat var="cont1" value="#{menuView.getPagecontent('bottom')}"> <ui:repeat var="cont1"
value="#{menuView.getPagecontent('bottom')}">
<h:outputText value="#{cont1.content}" escape="false" /> <h:outputText value="#{cont1.content}" escape="false" />
</ui:repeat> </ui:repeat>
</div> </div>
</div> </div>
<div class="container bottom"> <div class="container bottom">
<h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editBottom']}" outcome="/pages/manage"> <h:link rendered="#{layoutView.manageContent}"
styleClass="editorlink" value="#{i18n['layout.editBottom']}"
outcome="/pages/manage">
<f:param name="pagename" value="#{layoutView.pagepath}:bottom" /> <f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
</h:link> </h:link>
</div> </div>
...@@ -100,19 +134,26 @@ ...@@ -100,19 +134,26 @@
<!-- Piwik --> <!-- Piwik -->
<script type="text/javascript"> <script type="text/javascript">
var pkBaseURL = (("https:" == document.location.protocol) ? "https://jolez.pingtimeout.net/piwik/" : "http://jolez.pingtimeout.net/piwik/"); var pkBaseURL = (("https:" == document.location.protocol) ? "https://jolez.pingtimeout.net/piwik/"
document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); : "http://jolez.pingtimeout.net/piwik/");
document.write(unescape("%3Cscript src='" + pkBaseURL
+ "piwik.js' type='text/javascript'%3E%3C/script%3E"));
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
try { try {
var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 5); var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 5);
piwikTracker.trackPageView(); piwikTracker.trackPageView();
piwikTracker.enableLinkTracking(); piwikTracker.enableLinkTracking();
} catch (err) {
} }
catch( err ) {}
</script> </script>
<noscript><p><img src="http://jolez.pingtimeout.net/piwik/piwik.php?idsite=5" style="border:0" alt="" /></p></noscript> <noscript>
<p>
<img src="http://jolez.pingtimeout.net/piwik/piwik.php?idsite=5"
style="border: 0" alt="" />
</p>
</noscript>
<!-- End Piwik Tracking Code --> <!-- End Piwik Tracking Code -->
</h:body> </h:body>
......
code/LanBortalWeb/WebContent/menu/list.xhtml
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
</h:panelGrid> </h:panelGrid>
</h:form> </h:form>
</h:panelGrid> </h:panelGrid>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</h:body> </h:body>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!