Skip to content

Codecrew / Moya

Go to a project
Commit 63d0a5c9 by Petri Jarvisalo
Options

ui juttuja

1 parent ad1c00cd
Inline Side-by-side
Showing with 107 additions and 198 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
......@@ -23,6 +23,7 @@ import fi.codecrew.moya.facade.MenuNavigationFacade;
import fi.codecrew.moya.facade.MenuitemFacade;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.MenuNavigation;
import fi.codecrew.moya.model.Menuitem;
/**
* Session Bean implementation class Menubean
......@@ -65,177 +66,18 @@ public class MenuBean implements MenuBeanLocal {
initializeOldMenu();
}
private synchronized void initializeMenu_skynett() {
int menusort = 100;
logger.info("Initializing 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 userkauppa = usermenu.addPage(null, null);
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 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);
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/create"), CompoPermission.MANAGE);
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 initializeMenu() {
int menusort = 100;
logger.info("Initializing new default menu");
LanEvent ev = eventbean.getCurrentEvent();
Menuitem idxpage = menuitemfacade.findOrCreate("/index");
MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.usernavi", menusort = +10);
usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.ANYUSER);
// usermenu.setItem(idxpage);
// usermenu.setPermission( UserPermission.ANYUSER);
usermenu.addPage(idxpage, 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);
......@@ -273,11 +115,15 @@ public class MenuBean implements MenuBeanLocal {
navifacade.create(usermenu);
Menuitem adminlist = menuitemfacade.findOrCreate("/useradmin/list");
MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminnavi", menusort = +10);
// adminmenu.setItem(adminlist);
// adminmenu.setPermission(UserPermission.VIEW_ALL);
//
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(adminlist, 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);
......@@ -561,4 +407,9 @@ public class MenuBean implements MenuBeanLocal {
}
@Override
public MenuNavigation findNavigationId(Integer id) {
return navifacade.find(id);
}
}
code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/MenuNavigationFacade.java
......@@ -80,6 +80,7 @@ public class MenuNavigationFacade extends IntegerPkGenericFacade<MenuNavigation>
Query q = getEm().createQuery("delete from MenuNavigation where event = :event");
q.setParameter("event", eventbean.getCurrentEvent());
q.executeUpdate();
getEm().flush();
}
}
code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/MenuBeanLocal.java
......@@ -19,4 +19,6 @@ public interface MenuBeanLocal {
void flushOldMenu();
MenuNavigation findNavigationId(Integer id);
}
code/MoyaWeb/WebContent/resources/templates/insomnia2/css/tyyli.css
.ui-widget,
.ui-widget .ui-widget
{
font-size: 90% !important;
}
body,html {
width: 100%;
height: 100%;
......
code/MoyaWeb/WebContent/resources/templates/template1/css/style.css
.ui-widget,
.ui-widget .ui-widget, .ui-button-text {
font-size: 90% !important;
}
/* Left column content*/
.left h1 {
font-family: Oxygen, Calibri;
......@@ -20,7 +26,6 @@
}
.center h2 {
font-family: Oxygen, Calibri;
font-size: 12pt;
border-bottom: 1px solid #B1B7AF;
......@@ -48,9 +53,7 @@
}
.center form {
padding: 2em;
background: #eaeaea;
border: 1px solid #bbb;
padding: 2em;
}
.center form label {
......@@ -61,15 +64,9 @@
}
.ui-widget,
.ui-widget .ui-widget
{
font-size: 90% !important;
}
label {
text-shadow: rgba(0,0,0,0.3) 3px 2px 4px;
color: #999;
color: #000;
font-weight: 100;
font-family: Oxygen;
......@@ -291,3 +288,4 @@ h1 {
#header_right {
text-align: right;
}
code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml
......@@ -96,14 +96,16 @@
<tools:loginLogout />
</div>
</div>
<br />
<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>
<h:form>
<p:selectOneMenu value="#{menuView.menuChange}">
<p:ajax listener="#{menuView.menuChangeEvent}" />
<f:selectItems var="menuitem" value="#{menuView.getMenu(0)}" itemLabel="#{i18n[menuitem.navigation.key]}" itemValue="#{menuitem.outcome}" />
</p:selectOneMenu>
</h:form>
</div>
</div>
</div>
......
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">
<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>
<ui:define name="content">
<p:dataTable value="#{userCartView.usercart}" var="cartItem">
<p:column>
<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>
<h2><h:outputText value="#{cartItem.nick}" /></h2>
<h:outputText value="#{cartItem.firstnames} #{cartItem.lastname}" />
</p:column>
</p:dataTable>
</ui:define>
<p:column>
<p:commandButton value="OK" />
<p:commandButton value="Notify" />
<p:commandButton value="Reject" />
</p:column>
</p:dataTable>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/MenuView.java
......@@ -9,6 +9,8 @@ import java.util.Map;
import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.faces.context.FacesContext;
import javax.faces.event.ValueChangeEvent;
import javax.faces.event.ValueChangeListener;
import javax.inject.Inject;
import javax.inject.Named;
......@@ -18,6 +20,7 @@ import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.MenuBeanLocal;
import fi.codecrew.moya.beans.SitePageBeanLocal;
import fi.codecrew.moya.model.MenuNavigation;
import fi.codecrew.moya.model.Menuitem;
import fi.codecrew.moya.model.PageContent;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.helper.LayoutView;
......@@ -48,6 +51,8 @@ public class MenuView extends GenericCDIView {
@EJB
private transient SitePageBeanLocal pagebean;
private String menuChange;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(MenuView.class);
......@@ -71,10 +76,15 @@ public class MenuView extends GenericCDIView {
}
List<JsfMenuitem> ret = menus.get(level);
return ret;
}
public void menuChangeEvent() {
super.navihandler.forward(menuChange);
}
public LinkedList<List<JsfMenuitem>> getMenus()
{
if (menus == null)
......@@ -181,4 +191,12 @@ public class MenuView extends GenericCDIView {
this.layoutview = layoutview;
}
public String getMenuChange() {
return menuChange;
}
public void setMenuChange(String menuChange) {
this.menuChange = menuChange;
}
}
code/MoyaWeb/src/fi/codecrew/moya/web/converter/MenuNavigationConverter.java 0 → 100644
package fi.codecrew.moya.web.converter;
import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import fi.codecrew.moya.beans.EventMapBeanLocal;
import fi.codecrew.moya.beans.MenuBeanLocal;
import fi.codecrew.moya.model.EventMap;
import fi.codecrew.moya.model.MenuNavigation;
import fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter;
@Named()
@RequestScoped
public class MenuNavigationConverter extends GenericIntegerEntityConverter<MenuNavigation> {
@EJB
private MenuBeanLocal menuBean;
@Override
protected MenuNavigation find(Integer id) {
return menuBean.findNavigationId(id);
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!