Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 75972bd0 by Tuomas Riihimäki
Options

Leiskauksen uudelleenajattelu..

1 parent 4f95edcd
Inline Side-by-side
Showing with 281 additions and 536 deletions
code/LanBortalWeb/WebContent/HelloStuff/listPeople.xhtml deleted 100644 → 0
So far said hello to the following people
<h:dataTable id="dt1" value="#{helloWorl.helloedPeople}" var="item">
<h:column>
<f:facet name="header">
<h:outputText value="id" />
</f:facet>
<h:outputText value="#{item.id}"></h:outputText>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="name" />
</f:facet>
<h:commandLink action="#{helloWorld.getDetail}" value="#{item.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="saved" />
</f:facet>
<h:outputText value="#{item.saved}"></h:outputText>
</h:column>
</h:dataTable>
\ No newline at end of file
code/LanBortalWeb/WebContent/WEB-INF/sun-web.xml
......@@ -21,7 +21,7 @@
<description>Keep a copy of the generated servlet class java code.</description>
</property>
</jsp-config>
<locale-charset-info default-locale="">
<locale-charset-info >
<locale-charset-map locale="" charset=""/>
<parameter-encoding default-charset="UTF-8"/>
</locale-charset-info>
......
code/LanBortalWeb/WebContent/admin/frontpage.xhtml deleted 100644 → 0
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Insert title here</title>
</head>
<body>
MOI!
</body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/auth/login.xhtml
......@@ -11,14 +11,11 @@ xmlns:c="http://java.sun.com/jsp/jstl/core">
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">CreateUser</ui:define>
<ui:define name="header">Add new user</ui:define>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.auth.login" />
<ui:define name="content">
<login:login />
<login:login />
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/auth/loginError.xhtml
......@@ -7,18 +7,12 @@ xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:tools="http://java.sun.com/jsf/composite/tools/auth"
xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">CreateUser</ui:define>
<ui:define name="header">Add new user</ui:define>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.auth.loginerror" />
<ui:define name="content">
<h:outputText value="#{i18n['login.loginerror'] }" />
<tools:login />
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/auth/logout.xhtml
......@@ -2,18 +2,13 @@
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">CreateUser</ui:define>
<ui:define name="header">Add new user</ui:define>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.auth.logout" />
<ui:define name="content">
<h:outputText value="#{i18n['logoutmessage'] }" />
<h:outputText value="login.logoutmessage" />
${sessionHandler.logout() }
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/auth/notauthorized.jsf
......@@ -13,14 +13,11 @@ xmlns:c="http://java.sun.com/jsp/jstl/core">
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">Not authorized!</ui:define>
<ui:define name="header">Not authorized!</ui:define>
<ui:composition template="/layout/${sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.auth.notauthorized" />
<ui:define name="content">
<h:outputText value="#{i18n['notauth.notauthorized'] }" />
<h:outputText value="#{i18n['global.notauthorized'] }" />
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/detail.xhtml deleted 100644 → 0
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">HelloWorld</ui:define>
<ui:define name="header">Header</ui:define>
<ui:define name="content">
<h:panelGrid columns="2" border="0">
<h:outputText value="#{msgs.Name}:" />
<h:outputText value="#{helloWorld.detailItem.name}" title="Name" />
<h:outputText value="#{msgs.Id}:" />
<h:outputText value="#{helloWorld.detailItem.id}" title="Id" />
<h:outputText value="#{msgs.saved}" />
<h:outputText value="#{helloWorld.detailItem.saved}" title="Saved" />
</h:panelGrid>
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/helloPage.xhtml deleted 100644 → 0
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">HelloWorld</ui:define>
<ui:define name="header">Header</ui:define>
<ui:define name="content">
<p>
Hello Message: <i>${helloWorld.sayHello()}</i>
</p>
So far said hello to the following people
<h:dataTable id="dt1" value="#{helloWorld.helloedPeople}" var="item">
<h:column>
<f:facet name="header">
<h:outputText value="id" />
</f:facet>
<h:outputText value="#{item.id}"></h:outputText>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="name" />
</f:facet>
<h:commandLink action="#{helloWorld.getDetail}" value="#{item.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="saved" />
</f:facet>
<h:outputText value="#{item.saved}"></h:outputText>
</h:column>
</h:dataTable>
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/helloWorld.xhtml deleted 100644 → 0
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">HelloWorld</ui:define>
<ui:define name="header">Header</ui:define>
<ui:define name="content">
Foo #{i18n.teststr }
fallback #{i18n.fallbackstr }
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/index.xhtml
......@@ -7,22 +7,20 @@
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">Omnia</ui:define>
<ui:define name="header">Header</ui:define>
<ui:define name="content">
<h:form>
<ul>
<li><h:commandLink action="generateTestData">Generate test data</h:commandLink></li>
<li><h:commandLink action="user/list">List users</h:commandLink></li>
<li><h:commandLink action="user/create">Create user</h:commandLink></li>
<li><h:commandLink action="tests/placemap">Placemap test</h:commandLink></li>
<li><h:commandLink action="PlaceMap?mapid=1">Show map 1</h:commandLink></li>
</ul>
</h:form>
</ui:define>
<ui:define name="footer">Footer</ui:define>
</ui:composition>
</h:body>
<h:body>
<ui:composition template="/layout/insomnia1/template.xhtml">
<ui:param name="thispage" value="page.index" />
<ui:define name="content">
<h:form>
<ul>
<li><h:commandLink action="generateTestData">Generate test data</h:commandLink></li>
<li><h:commandLink action="user/list">List users</h:commandLink></li>
<li><h:commandLink action="user/create">Create user</h:commandLink></li>
<li><h:commandLink action="tests/placemap">Placemap test</h:commandLink></li>
<li><h:commandLink action="PlaceMap?mapid=1">Show map 1</h:commandLink></li>
</ul>
</h:form>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/layout/default-template.xhtml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:tools="http://java.sun.com/jsf/composite/tools"
xmlns:layout="http://java.sun.com/jsf/composite/tools/layout"
xmlns:ui="http://java.sun.com/jsf/facelets">
<h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml" >
<ui:define name="title"><ui:insert name="title" /></ui:define>
<ui:define name="topmenu"><layout:toplinks selected="frontpage" /></ui:define>
<ui:define name="content"><ui:insert name="content" /></ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/layout/insomnia1/level1link.xhtml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:tools="http://java.sun.com/jsf/composite/tools"
xmlns:ui="http://java.sun.com/jsf/facelets" >
<h:head>
</h:head>
<h:body>
<ui:component><div class="link#{ isSelected ?'a': ''}" ><ui:insert name="link" /></div></ui:component>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/layout/insomnia1/template.xhtml
......@@ -9,26 +9,35 @@
<f:view locale="#{sessionHandler.locale}">
<h:head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Omnia <ui:insert name="title"></ui:insert></title>
<title><h:outputText value="#{i18n['global.eventname']}" /> - <h:outputText value="#{i18n[util.concat(thispage,'.header') ] }" /></title>
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia1/style.css" />
</h:head>
<h:body>
<div id="wrapper">
<div id="navigation">
<img id="head" src="#{request.contextPath}/resources/style/insomnia1/img/header.gif" alt="" />
<img id="head" src="#{request.contextPath}/resources/style/insomnia1/img/header.gif" alt="headerimage" />
<div style="float: left" >
<div id="headerbox"><tools:loginLogout /></div>
<div><ui:insert name="topmenu" /></div>
<div>
<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'frontpage'?'a':''}"> <h:link outcome="frontpage" value="#{i18n['topmenu.frontpage']}" /></div>
<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'user'?'a':''}"> <h:link outcome="userprefs" value="#{i18n['topmenu.usersPreferences']}" /></div>
<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'shop'?'a': ''}"> <h:link outcome="shopfrontpage" value="#{i18n['topmenu.shoppings']}" /></div>
<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'admin'?'a':''}"> <h:link outcome="adminfront" value="#{i18n['topmenu.adminfront']}" /></div>
</div>
</div>
</div>
<div id="content">
<div id="cwrap">
<!-- <ui:include src="/insomnia1/#{i18n[concat['#thispage,.pagegroup'] ] }.xhtml" />
-->
#{thispage}
COnc: #{i18n[util.concat(thispage,'.pagegroup')] }
<h:messages globalOnly="true" />
<h:messages />
<ui:insert name="content" />
</div>
</div>
<div id="footer">#{i18n['copyright']}</div>
<div id="footer">#{i18n['global.copyright']}</div>
</div>
</h:body>
</f:view>
......
code/LanBortalWeb/WebContent/product/create.xhtml
......@@ -9,9 +9,8 @@
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:products="http://java.sun.com/jsf/composite/tools/products">
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">CreateUser</ui:define>
<ui:define name="header">Add new user</ui:define>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.product.create" />
<ui:define name="content">
<products:create />
</ui:define>
......
code/LanBortalWeb/WebContent/product/createBill.xhtml
......@@ -11,21 +11,16 @@
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">Users</ui:define>
<ui:define name="header">Edit user</ui:define>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.product.createBill" />
<h:outputScript target="head" library="script" name="jquery.min.js" />
<h:outputScript target="head" library="script" name="shopscript.js" />
<ui:define name="content">
<h:outputScript target="head" library="script" name="jquery.min.js" />
<h:outputScript target="head" library="script" name="shopscript.js" />
<tools:canRead id ="authcont" target="PRODUCT">
<products:shop items="#{productShopView.billCart}" commitValue="#{i18n['productshop.commit']}" >
<f:actionListener for="commitbutton" binding="#{productShopView.commitBillCart()}" />
</products:shop>
</tools:canRead>
<products:shop items="#{productShopView.billCart}" commitValue="#{i18n['productshop.commit']}" >
<f:actionListener for="commitbutton" binding="#{productShopView.commitBillCart()}" />
</products:shop>
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/product/edit.xhtml
......@@ -12,9 +12,8 @@
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">CreateUser</ui:define>
<ui:define name="header">Add new user</ui:define>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.product.edit" />
<ui:define name="content">
<products:edit />
</ui:define>
......
code/LanBortalWeb/WebContent/product/list.xhtml
......@@ -8,15 +8,11 @@
xmlns:products="http://java.sun.com/jsf/composite/tools/products"
xmlns:f="http://java.sun.com/jsf/core">
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">Users</ui:define>
<ui:define name="header">Edit user</ui:define>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.product.list" />
<ui:define name="content">
<products:list />
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/tools/layout/level1link.xhtml deleted 100644 → 0
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:tools="http://java.sun.com/jsf/composite/tools">
<composite:interface>
<composite:attribute name="value" required="true" />
<composite:attribute name="outcome" required="true" />
<composite:attribute name="selected" required="true" />
</composite:interface>
<composite:implementation>
<ui:decorate template="/layout/#{sessionHandler.layout}/level1link.xhtml" >
<ui:define name="link">
<h:link outcome="#{cc.attrs.outcome}" value="#{i18n[cc.attrs.value]}" />
</ui:define>
<ui:param name="isSelected" value="#{cc.attrs.selected}" />
</ui:decorate>
</composite:implementation>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/tools/login/logout.xhtml
......@@ -14,7 +14,7 @@
<composite:implementation>
<h:form>
<h:commandLink action="#{sessionHandler.logout}" value="#{i18n['logout']}" />
<h:commandLink action="#{sessionHandler.logout}" value="#{i18n['login.logout']}" />
</h:form>
</composite:implementation>
......
code/LanBortalWeb/WebContent/resources/tools/map/placeSelect.xhtml
......@@ -19,7 +19,7 @@
<h:form>
<h:commandButton image="#{mapView.selectPlaceMapUrl}" actionListener="#{mapView.placeSelectActionListener}" />
<h:outputText value="#{i18n['placeSelect.left']}: #{mapView.placeLeftToSelect()}" />
<h:outputText value="#{i18n['placeSelect.placesleft']}: #{mapView.placeLeftToSelect()}" />
</h:form>
......
code/LanBortalWeb/WebContent/resources/tools/products/create.xhtml
......@@ -20,7 +20,7 @@
<h:panelGrid columns="2">
<h:outputLabel value="#{i18n['product.name']}:" /><h:inputText value="#{productView.productname}" />
<h:outputLabel value="#{i18n['product.price']}:" /><h:inputText value="#{productView.productprice}" />
<h:commandButton action="#{productView.createProduct()}" value="#{i18n['create']}" />
<h:commandButton action="#{productView.createProduct()}" value="#{i18n['product.create']}" />
</h:panelGrid>
</h:form>
......
code/LanBortalWeb/WebContent/resources/tools/products/edit.xhtml
......@@ -25,7 +25,7 @@
<h:outputLabel value="#{i18n['product.sort']}:" /><h:inputText value="#{productView.product.sort}" />
<h:outputLabel value="#{i18n['product.barcode']}:" /><h:inputText value="#{productView.product.barcode}" />
<h:outputLabel value="#{i18n['product.prepaid']}" /><h:selectBooleanCheckbox value="#{productView.product.prepaid}" />
<h:commandButton action="#{productView.saveProduct()}" value="#{i18n['save']}" />
<h:commandButton action="#{productView.saveProduct()}" value="#{i18n['product.save']}" />
</h:panelGrid>
</h:form>
......
code/LanBortalWeb/WebContent/resources/tools/products/list.xhtml
......@@ -36,7 +36,7 @@
<f:facet name="header">
<h:outputText value="Edit" />
</f:facet>
<h:commandButton action="#{productView.edit()}" value="Edit" />
<h:commandButton action="#{productView.edit()}" value="#{i18n[product.edit]}" />
</h:column>
</h:dataTable>
......
code/LanBortalWeb/WebContent/resources/tools/products/shop.xhtml
......@@ -19,11 +19,7 @@
<composite:implementation>
<h:form id="shopform">
<h:dataTable
border="1"
id="billcart"
value="#{cc.attrs.items}"
var="cart">
<h:dataTable border="1" id="billcart" value="#{cc.attrs.items}" var="cart">
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.name']}" />
......
code/LanBortalWeb/WebContent/resources/tools/role/create.xhtml
......@@ -20,12 +20,12 @@
<h:form>
<tools:canWrite target="ROLE_MANAGEMENT">
<f:facet name="errorMessage">
<h:outputText value="#{i18n['nasty.user']}" />
<h:outputText value="#{i18n['global.notauthorized']}" />
</f:facet>
<ui:include src="form.xhtml" />
<h:commandButton value="#{i18n['create']}" action="#{roleView.create}" />
<h:commandButton value="#{i18n['role.create']}" action="#{roleView.create}" />
</tools:canWrite>
</h:form>
......
code/LanBortalWeb/WebContent/resources/tools/role/list.xhtml
......@@ -33,10 +33,7 @@
<h:outputText value="#{role.name}" />
</h:column>
<h:column rendered="#{sessionHandler.canWrite('ROLE_MANAGEMENT') }">
<f:facet name="header">
<h:outputText value="#{i18n['edit']}" />
</f:facet>
<h:commandButton action="#{roleView.edit()}" value="Edit" />
<h:commandButton action="#{roleView.edit()}" value="#{i18n['role.edit']}"" />
</h:column>
</h:dataTable>
</tools:canRead>
......
code/LanBortalWeb/WebContent/resources/tools/user/edit.xhtml
......@@ -32,7 +32,7 @@
<f:selectItem id="male" itemLabel="#{i18n['user.gender.MALE']}" itemValue="MALE" />
<f:selectItem id="female" itemLabel="#{i18n['user.gender.FEMALE']}" itemValue="FEMALE" />
</h:selectOneRadio>
<h:commandButton action="#{userView.saveUser()}" value="#{i18n['save']}" />
<h:commandButton action="#{userView.saveUser()}" value="#{i18n['user.save']}" />
</h:panelGrid>
</h:form>
......
code/LanBortalWeb/WebContent/resources/tools/user/list.xhtml
......@@ -52,10 +52,7 @@
</h:column>
<h:column rendered="#{sessionHandler.canWrite('USER_MANAGEMENT') }">
<f:facet name="header">
<h:outputText value="Edit" />
</f:facet>
<h:commandButton action="#{userView.edit()}" value="Edit" />
<h:commandButton action="#{userView.edit()}" value="#{i18n['user.edit']}" />
</h:column>
</h:dataTable>
......
code/LanBortalWeb/WebContent/role/create.xhtml
......@@ -8,16 +8,11 @@
xmlns:role="http://java.sun.com/jsf/composite/tools/role"
xmlns:c="http://java.sun.com/jsp/jstl/core">
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">CreateRole</ui:define>
<ui:define name="header">Add new role</ui:define>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.role.create" />
<ui:define name="content">
<role:create />
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/role/edit.xhtml
......@@ -7,17 +7,12 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:role="http://java.sun.com/jsf/composite/tools/role"
xmlns:c="http://java.sun.com/jsp/jstl/core">
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">EditRole</ui:define>
<ui:define name="header">Edit role</ui:define>
<ui:define name="content">
<h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.role.edit" />
<ui:define name="content">
<role:edit />
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/role/list.xhtml
......@@ -7,17 +7,12 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:role="http://java.sun.com/jsf/composite/tools/role"
xmlns:c="http://java.sun.com/jsp/jstl/core">
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">listRoles</ui:define>
<ui:define name="header">List "roles</ui:define>
<ui:define name="content">
<h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.role.list" />
<ui:define name="content">
<role:list />
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/tests/placemap.xhtml
......@@ -6,17 +6,12 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:map="http://java.sun.com/jsf/composite/tools/map"
>
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">Omnia</ui:define>
<ui:define name="header">Paikkakartta</ui:define>
<ui:define name="content">
<map:placeSelect />
</ui:define>
<ui:define name="footer">Valitse kartta</ui:define>
</ui:composition>
</h:body>
<h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.test.placemap" />
<ui:define name="content">
<map:placeSelect />
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/user/create.xhtml
......@@ -6,24 +6,18 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">CreateUser</ui:define>
<ui:define name="header">Add new user</ui:define>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.user.create" />
<ui:define name="content">
<h:form>
<h:panelGrid columns="2">
<h:outputLabel value="Login name:" /><h:inputText value="#{userView.login}" />
<h:outputLabel value="Password:" /><h:inputSecret value="#{userView.password}" />
<h:commandButton action="#{userView.createUser()}" value="Create" />
</h:panelGrid>
<h:form>
<h:panelGrid columns="2">
<h:outputLabel value="#{user.username}:" /><h:inputText value="#{userView.login}" />
<h:outputLabel value="#{user.password}:" /><h:inputSecret value="#{userView.password}" />
<h:commandButton action="#{userView.createUser()}" value="#{global.create}" />
</h:panelGrid>
</h:form>
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/user/edit.xhtml
......@@ -7,18 +7,12 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:users="http://java.sun.com/jsf/composite/tools/user"
xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">CreateUser</ui:define>
<ui:define name="header">Add new user</ui:define>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.user.create" />
<ui:define name="content">
<users:edit />
<users:edit />
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/user/fault.xhtml deleted 100644 → 0
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">Fail</ui:define>
<ui:define name="header"></ui:define>
<ui:define name="content">
<h:outputText value="User creation failed" />
<h:commandButton value="Back" action="create"/>
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/user/list.xhtml
......@@ -7,20 +7,12 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:users="http://java.sun.com/jsf/composite/tools/user"
xmlns:f="http://java.sun.com/jsf/core">
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">EditUser</ui:define>
<ui:define name="header">Edit user</ui:define>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.user.create" />
<ui:define name="content">
<h:outputText value="${i18n['userlist.title']}"/>
<users:list />
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/viewExpired.xhtml
......@@ -7,14 +7,12 @@
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">HelloWorld</ui:define>
<ui:define name="header">Header</ui:define>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.viewexpired" />
<ui:define name="content">
<h1>View expired!</h1>
<p>Please refresh the page.</p>
<h1>#{i18n['viewexpired.title']}</h1>
<p>#{i18n['viewexpired.body']}</p>
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java
......@@ -46,6 +46,8 @@ public class UserView {
public String edit() {
setUser(items.getRowData());
logger.info("Editing: Firstname: {} ",getUser().getFirstnames());
return "userEdit";
}
......@@ -81,6 +83,7 @@ public class UserView {
public String saveUser() {
try {
setUser(userBean.mergeChanges(getUser()));
logger.info("Firstname: {} ",getUser().getFirstnames());
} catch (EjbPermissionDeniedException e) {
throw new PermissionDeniedException(e);
}
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/helper/ConcatMBean.java
package fi.insomnia.bortal.web.helper;
/**
* Copypaste from http://forums.sun.com/thread.jspa?threadID=5136965
*
......@@ -12,12 +13,10 @@ import javax.faces.bean.ManagedBean;
import javax.faces.bean.NoneScoped;
import javax.faces.context.FacesContext;
@ManagedBean(name = "concat")
@ManagedBean(name = "util")
@NoneScoped
public class ConcatMBean extends HashMap<Object,Object>
{
public class ConcatMBean extends HashMap<Object, Object> {
/**
*
*/
......@@ -27,62 +26,52 @@ public class ConcatMBean extends HashMap<Object,Object>
* Concat the string separated by a comma Evaluate JSF EL expression if
* token begin by # or $
*
* @param inObject :
* is the list of string to concat separated by a comma. return a
* String exemple : <h:outputText
* @param inObject
* : is the list of string to concat separated by a comma. return
* a String exemple : <h:outputText
* value="#{lang[concat['mpr.canton.,#offer.canton']]}"/>
*/
public Object get(Object inObject)
{
public Object concat(Object a, Object b) {
return new StringBuilder().append(a).append(b).toString();
}
public Object get(Object inObject) {
StringBuffer resultBuffer = new StringBuffer();
try
{
try {
String inToken = (String) inObject;
StringTokenizer tok = new StringTokenizer((String) inToken, ",", false);
while (tok.hasMoreTokens())
{
while (tok.hasMoreTokens()) {
String token = tok.nextToken().trim();
if (token.startsWith("#{"))
{
if (token.startsWith("#{")) {
Object tokenEvaluated = this.getElValue(token);
resultBuffer.append(String.valueOf(tokenEvaluated));
}
else if (token.startsWith("${"))
{
} else if (token.startsWith("${")) {
token = token.substring(2, token.length() - 1);
Object tokenEvaluated = this.getElValue(this.getJsfEl(token));
resultBuffer.append(String.valueOf(tokenEvaluated));
}
else if (token.startsWith("#"))
{
} else if (token.startsWith("#")) {
token = token.substring(1);
Object tokenEvaluated = this.getElValue(this.getJsfEl(token));
Object tokenEvaluated = this.getElValue(this.getJsfEl(token));
resultBuffer.append(String.valueOf(tokenEvaluated));
}
else
{
} else {
resultBuffer.append(token);
}
}
}
catch (Exception e)
{
} catch (Exception e) {
System.out.println("ConcatenationBackingBean error: " + e.getMessage());
}
return resultBuffer.toString();
}
private Object getElValue(String el)
{
ApplicationFactory appFactory = (ApplicationFactory)FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
private Object getElValue(String el) {
ApplicationFactory appFactory = (ApplicationFactory) FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
return appFactory.getApplication().evaluateExpressionGet(FacesContext.getCurrentInstance(), el, java.lang.String.class);
}
private String getJsfEl(String value)
{
private String getJsfEl(String value) {
return "#{" + value + "}";
}
}
code/LanBortalWeb/src/resources/i18n.properties
user.username=K\u00E4ytt\u00E4j\u00E4tunnus
user.realname=Nimi
user.password=Salasana
user.email=S\u00E4hk\u00F6postiosoite
user.phone=Puhelinnumero
user.bankaccount=Tilinumero
user.bank=Pankki
user.gender.UNDEFINED=Mrittelemtt
user.gender.MALE=Mies
user.gender.FEMALE=Nainen
login.username=K\u00E4ytt\u00E4j\u00E4tunnus:
login.password=Salasana:
login.submit=Kirjaudu sis\u00E4\u00E4n
user.validate.notUniqueUsername=i18n K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole hyv\u00E4 ja valitse toinen tunnus.
fallbackstr="fallback default"
teststr=default locale test
defaultstr="Something default..."
logout=H\u00E4ivy
nasty.user=paha k\u00E4ytt\u00E4j\u00E4 ei yrit\u00E4 haxoroida meid\u00E4n softaa. Kts.
product.name=Tuote
product.price=Hinta
role.name=Rooli
role.description=Roolin kuvaus
role.read=Luku
role.write=Kirjoitus
role.execute=Suoritus
save=Tallenna
cancel=Peruuta
global.productname=Omnia
navi.auth.login=frontpage
navi.auth.loginerror=frontpage
navi.auth.logout=frontpage
pagegroup.auth.login=frontpage
page.auth.login.header=Login
page.auth.login.header=Login error
page.auth.login.title=Login error
page.auth.login.pagegroup=frontpage
page.auth.loginerror.pagegroup=frontpage
page.auth.logout.pagegroup=frontpage
page.auth.notauthorized.pagegroup=frontpage
page.product.create.pagegroup=admin
page.product.createBill.pagegroup=shop
page.product.edit.pagegroup=admin
page.product.list.pagegroup=admin
page.role.create.pagegroup=admin
page.role.edit.pagegroup=admin
page.role.list.pagegroup=admin
page.tests.placemap.pagegroup=shop
page.user.create.pagegroup=user
page.user.edit.pagegroup=user
page.user.list.pagegroup=user
page.auth.login.loginerror=frontpage
page.auth.login.logout=frontpage
page.viewexpired=frontpage
\ No newline at end of file
code/LanBortalWeb/src/resources/i18n_en.properties
user.username=K\u00E4ytt\u00E4j\u00E4tunnus
user.realname=Name
user.password=Password
user.email=Email address
user.phone=Phone
user.bankaccount=Bank account
user.bank=Bank
save=Save
cancel=Cancel
# Java Resource Bundle
# Modified by Zaval JRC Editor (C) Zaval CE Group
# http://www.zaval.org/products/jrc-editor/
#
login.username=User
login.password=Password
global.cancel=Cancel
global.infomail=
global.save=Save
global.webpage=
login.logout=Logout
login.password=Password
login.submit=Login
login.username=User
nasty.user=Hax attempt! Go away!
topmenu.adminfront=Adminstuff
topmenu.frontpage=Frontpage
topmenu.usersPreferences=Preferences
topmenu.shoppings=Shop
topmenu.adminfront=Adminstuff
topmenu.usersPreferences=Preferences
user.bank=Bank
user.bankaccount=Bank account
user.email=Email address
user.nick=Nickname
user.password=Password
user.phone=Phone
user.realname=Name
user.sex.FEMALE=Female
user.sex.MALE=Male
user.sex.UNDEFINED=Undefined
user.username=Username
user.validate.notUniqueUsername=Username already exists. Please select another.
fallbackstr="fallback default"
teststr=default local
defaultstr="Something default..."
logout=Logout
nasty.user=Hax attempt! Go away!
global.sex.UNDEFINED=Undefined
global.sex.MALE=Male
global.sex.FEMALE=Female
\ No newline at end of file
code/LanBortalWeb/src/resources/i18n_en_ST.properties
# Java Resource Bundle
# Modified by Zaval JRC Editor (C) Zaval CE Group
# http://www.zaval.org/products/jrc-editor/
#
global.infomail=info@streamparty.org
global.webpage=http://www.streamparty.org
\ No newline at end of file
global.webpage=http://www.streamparty.org
code/LanBortalWeb/src/resources/i18n_fi.properties 0 → 100644
# Java Resource Bundle
# Modified by Zaval JRC Editor (C) Zaval CE Group
# http://www.zaval.org/products/jrc-editor/
#
global.cancel=Peruuta
global.infomail=
global.save=Tallenna
global.webpage=
global.viewexpired=<h1>Nkym on vanhentunut</h1><p></p>
global.notauthorized=Sinulla ei ole riittvi oikeuksia tlle sivulle.
login.login=Kirjaudu sisn
login.logout=Kirjaudu ulos
login.password=Salasana
login.submit=Kirjaudu sis\u00e4\u00e4n
login.username=K\u00e4ytt\u00e4j\u00e4tunnus
login.logoutmessage=Olet kirjautunut ulos jrjestelmst
placeSelect.placesleft=Paikkoja jljell
nasty.user=Wait, wot! Mene pois!
topmenu.adminfront=Admintavaraa
topmenu.frontpage=Etusivu
topmenu.shoppings=Kauppa
topmenu.usersPreferences=Omat asetukset
user.bank=Pankki
user.bankaccount=Pankkitili
user.email=S\u00e4hk\u00f6posti
user.nick=Nick
user.password=Salasana
user.phone=Puhelin
user.realname=Nimi
user.sex.FEMALE=Nainen
user.sex.MALE=Mies
user.sex.UNDEFINED=M\u00e4\u00e4rittelem\u00e4tt\u00e4
user.username=K\u00e4ytt\u00e4j\u00e4tunnus
user.validate.notUniqueUsername=K\u00e4ytt\u00e4j\u00e4tunnus on jo olemassa. Ole hyv\u00e4 ja valitse toinen tunnus
user.edit=Muokkaa
user.save=Tallenna
product.create=Luo tuote
product.name=Tuotteen nimi
product.price=Tuotteen hinta
product.unitName=Tuoteyksikk
product.vat=ALV
product.sort=Jrjestysluku
product.barcode=Viivakoodi
product.prepaid=Prepaid
product.save=Tallenna
product.edit=Muokkaa
role.create=Luo rooli
role.name=Nimi
role.parents=Periytyy
role.edit=Muokkaa
code/LanBortalWeb/src/resources/i18n_fi_IN.properties
user.username=K\u00E4ytt\u00E4j\u00E4tunnus
user.realname=Nimi
user.password=Salasana
user.email=S\u00E4hk\u00F6postiosoite
user.phone=Puhelinnumero
user.bankaccount=Tilinumero
user.bank=Pankki
save=Tallenna
cancel=Peruuta
# Java Resource Bundle
# Modified by Zaval JRC Editor (C) Zaval CE Group
# http://www.zaval.org/products/jrc-editor/
#
login.username=K\u00E4ytt\u00E4j\u00E4tunnus:
login.password=Salasana:
login.submit=Kirjaudu sis\u00E4\u00E4n
global.infomail=info@insomnia.fi
global.webpage=http://www.insomnia.fi
user.validate.notUniqueUsername=i18n K\u00E4ytt\u00E4j\u00E4tunnus on jo olemassa. Ole hyv\u00E4 ja valitse toinen tunnus.
teststr=brlocale test
fallbackstr=InsomniaSpecific fallback
logout=H\u00E4ivy
nasty.user=paha k\u00E4ytt\u00E4j\u00E4 ei yrit\u00E4 haxoroida meid\u00E4n softaa. Kts.
code/LanBortalWeb/src/resources/i18n_fi_IN_XII.properties
teststr=XII locale test
logout=H\u00E4ivy
nasty.user=paha k\u00E4ytt\u00E4j\u00E4 ei yrit\u00E4 haxoroida meid\u00E4n softaa. Kts.
global.eventname=Insomnia XII
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!