Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Riina Antikainen
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 75972bd0
authored
Aug 20, 2010
by
Tuomas Riihimäki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Leiskauksen uudelleenajattelu..
1 parent
4f95edcd
Hide whitespace changes
Inline
Side-by-side
Showing
47 changed files
with
281 additions
and
536 deletions
code/LanBortalWeb/WebContent/HelloStuff/listPeople.xhtml
code/LanBortalWeb/WebContent/WEB-INF/sun-web.xml
code/LanBortalWeb/WebContent/admin/frontpage.xhtml
code/LanBortalWeb/WebContent/auth/login.xhtml
code/LanBortalWeb/WebContent/auth/loginError.xhtml
code/LanBortalWeb/WebContent/auth/logout.xhtml
code/LanBortalWeb/WebContent/auth/notauthorized.jsf
code/LanBortalWeb/WebContent/detail.xhtml
code/LanBortalWeb/WebContent/helloPage.xhtml
code/LanBortalWeb/WebContent/helloWorld.xhtml
code/LanBortalWeb/WebContent/index.xhtml
code/LanBortalWeb/WebContent/layout/default-template.xhtml
code/LanBortalWeb/WebContent/layout/insomnia1/level1link.xhtml
code/LanBortalWeb/WebContent/layout/insomnia1/template.xhtml
code/LanBortalWeb/WebContent/product/create.xhtml
code/LanBortalWeb/WebContent/product/createBill.xhtml
code/LanBortalWeb/WebContent/product/edit.xhtml
code/LanBortalWeb/WebContent/product/list.xhtml
code/LanBortalWeb/WebContent/resources/tools/layout/level1link.xhtml
code/LanBortalWeb/WebContent/resources/tools/login/logout.xhtml
code/LanBortalWeb/WebContent/resources/tools/map/placeSelect.xhtml
code/LanBortalWeb/WebContent/resources/tools/products/create.xhtml
code/LanBortalWeb/WebContent/resources/tools/products/edit.xhtml
code/LanBortalWeb/WebContent/resources/tools/products/list.xhtml
code/LanBortalWeb/WebContent/resources/tools/products/shop.xhtml
code/LanBortalWeb/WebContent/resources/tools/role/create.xhtml
code/LanBortalWeb/WebContent/resources/tools/role/list.xhtml
code/LanBortalWeb/WebContent/resources/tools/user/edit.xhtml
code/LanBortalWeb/WebContent/resources/tools/user/list.xhtml
code/LanBortalWeb/WebContent/role/create.xhtml
code/LanBortalWeb/WebContent/role/edit.xhtml
code/LanBortalWeb/WebContent/role/list.xhtml
code/LanBortalWeb/WebContent/tests/placemap.xhtml
code/LanBortalWeb/WebContent/user/create.xhtml
code/LanBortalWeb/WebContent/user/edit.xhtml
code/LanBortalWeb/WebContent/user/fault.xhtml
code/LanBortalWeb/WebContent/user/list.xhtml
code/LanBortalWeb/WebContent/viewExpired.xhtml
code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java
code/LanBortalWeb/src/fi/insomnia/bortal/web/helper/ConcatMBean.java
code/LanBortalWeb/src/resources/i18n.properties
code/LanBortalWeb/src/resources/i18n_en.properties
code/LanBortalWeb/src/resources/i18n_en_ST.properties
code/LanBortalWeb/src/resources/i18n_en_ST_v7.properties
code/LanBortalWeb/src/resources/i18n_fi.properties
code/LanBortalWeb/src/resources/i18n_fi_IN.properties
code/LanBortalWeb/src/resources/i18n_fi_IN_XII.properties
code/LanBortalWeb/WebContent/HelloStuff/listPeople.xhtml
deleted
100644 → 0
View file @
4f95edc
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
View file @
75972bd
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<description>
Keep a copy of the generated servlet class java code.
</description>
<description>
Keep a copy of the generated servlet class java code.
</description>
</property>
</property>
</jsp-config>
</jsp-config>
<locale-charset-info
default-locale=
""
>
<locale-charset-info
>
<locale-charset-map
locale=
""
charset=
""
/>
<locale-charset-map
locale=
""
charset=
""
/>
<parameter-encoding
default-charset=
"UTF-8"
/>
<parameter-encoding
default-charset=
"UTF-8"
/>
</locale-charset-info>
</locale-charset-info>
...
...
code/LanBortalWeb/WebContent/admin/frontpage.xhtml
deleted
100644 → 0
View file @
4f95edc
<
%@ 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
View file @
75972bd
...
@@ -11,14 +11,11 @@ xmlns:c="http://java.sun.com/jsp/jstl/core">
...
@@ -11,14 +11,11 @@ xmlns:c="http://java.sun.com/jsp/jstl/core">
<title></title>
<title></title>
</h:head>
</h:head>
<h:body>
<h:body>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:define
name=
"title"
>
CreateUser
</ui:define>
<ui:param
name=
"thispage"
value=
"page.auth.login"
/>
<ui:define
name=
"header"
>
Add new user
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<login:login
/>
<login:login
/>
</ui:define>
</ui:define>
<ui:define
name=
"footer"
>
footer
</ui:define>
</ui:composition>
</ui:composition>
</h:body>
</h:body>
</html>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/auth/loginError.xhtml
View file @
75972bd
...
@@ -7,18 +7,12 @@ xmlns:h="http://java.sun.com/jsf/html"
...
@@ -7,18 +7,12 @@ xmlns:h="http://java.sun.com/jsf/html"
xmlns:f=
"http://java.sun.com/jsf/core"
xmlns:f=
"http://java.sun.com/jsf/core"
xmlns:tools=
"http://java.sun.com/jsf/composite/tools/auth"
xmlns:tools=
"http://java.sun.com/jsf/composite/tools/auth"
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
>
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
>
<h:head>
<title></title>
</h:head>
<h:body>
<h:body>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:define
name=
"title"
>
CreateUser
</ui:define>
<ui:param
name=
"thispage"
value=
"page.auth.loginerror"
/>
<ui:define
name=
"header"
>
Add new user
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<h:outputText
value=
"#{i18n['login.loginerror'] }"
/>
<tools:login
/>
<tools:login
/>
</ui:define>
</ui:define>
<ui:define
name=
"footer"
>
footer
</ui:define>
</ui:composition>
</ui:composition>
</h:body>
</h:body>
</html>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/auth/logout.xhtml
View file @
75972bd
...
@@ -2,18 +2,13 @@
...
@@ -2,18 +2,13 @@
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
"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"
>
<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>
<h:body>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:define
name=
"title"
>
CreateUser
</ui:define>
<ui:param
name=
"thispage"
value=
"page.auth.logout"
/>
<ui:define
name=
"header"
>
Add new user
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<h:outputText
value=
"
#{i18n['logoutmessage'] }
"
/>
<h:outputText
value=
"
login.logoutmessage
"
/>
${sessionHandler.logout() }
${sessionHandler.logout() }
</ui:define>
</ui:define>
<ui:define
name=
"footer"
>
footer
</ui:define>
</ui:composition>
</ui:composition>
</h:body>
</h:body>
</html>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/auth/notauthorized.jsf
View file @
75972bd
...
@@ -13,14 +13,11 @@ xmlns:c="http://java.sun.com/jsp/jstl/core">
...
@@ -13,14 +13,11 @@ xmlns:c="http://java.sun.com/jsp/jstl/core">
<title></title>
<title></title>
</h:head>
</h:head>
<h:body>
<h:body>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:composition
template=
"/layout/${sessionHandler.layout}/template.xhtml"
>
<ui:define
name=
"title"
>
Not authorized!
</ui:define>
<ui:param
name=
"thispage"
value=
"page.auth.notauthorized"
/>
<ui:define
name=
"header"
>
Not authorized!
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<h:outputText
value=
"#{i18n['notauth.notauthorized'] }"
/>
<h:outputText
value=
"#{i18n['global.notauthorized'] }"
/>
</ui:define>
</ui:define>
<ui:define
name=
"footer"
>
footer
</ui:define>
</ui:composition>
</ui:composition>
</h:body>
</h:body>
</html>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/detail.xhtml
deleted
100644 → 0
View file @
4f95edc
<!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
View file @
4f95edc
<!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
View file @
4f95edc
<!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
View file @
75972bd
...
@@ -7,22 +7,20 @@
...
@@ -7,22 +7,20 @@
<h:head>
<h:head>
<title></title>
<title></title>
</h:head>
</h:head>
<h:body>
<h:body>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:composition
template=
"/layout/insomnia1/template.xhtml"
>
<ui:define
name=
"title"
>
Omnia
</ui:define>
<ui:param
name=
"thispage"
value=
"page.index"
/>
<ui:define
name=
"header"
>
Header
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<h:form>
<h:form>
<ul>
<ul>
<li><h:commandLink
action=
"generateTestData"
>
Generate test data
</h:commandLink></li>
<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/list"
>
List users
</h:commandLink></li>
<li><h:commandLink
action=
"user/create"
>
Create user
</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=
"tests/placemap"
>
Placemap test
</h:commandLink></li>
<li><h:commandLink
action=
"PlaceMap?mapid=1"
>
Show map 1
</h:commandLink></li>
<li><h:commandLink
action=
"PlaceMap?mapid=1"
>
Show map 1
</h:commandLink></li>
</ul>
</ul>
</h:form>
</h:form>
</ui:define>
</ui:define>
</ui:composition>
<ui:define
name=
"footer"
>
Footer
</ui:define>
</h:body>
</ui:composition>
</h:body>
</html>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/layout/default-template.xhtml
deleted
100644 → 0
View file @
4f95edc
<?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
View file @
4f95edc
<?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
View file @
75972bd
...
@@ -9,26 +9,35 @@
...
@@ -9,26 +9,35 @@
<f:view
locale=
"#{sessionHandler.locale}"
>
<f:view
locale=
"#{sessionHandler.locale}"
>
<h:head>
<h:head>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
/>
<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"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"#{request.contextPath}/resources/style/insomnia1/style.css"
/>
</h:head>
</h:head>
<h:body>
<h:body>
<div
id=
"wrapper"
>
<div
id=
"wrapper"
>
<div
id=
"navigation"
>
<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
style=
"float: left"
>
<div
id=
"headerbox"
><tools:loginLogout
/></div>
<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>
</div>
<div
id=
"content"
>
<div
id=
"content"
>
<div
id=
"cwrap"
>
<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
globalOnly=
"true"
/>
<h:messages
/>
<h:messages
/>
<ui:insert
name=
"content"
/>
<ui:insert
name=
"content"
/>
</div>
</div>
</div>
</div>
<div
id=
"footer"
>
#{i18n['copyright']}
</div>
<div
id=
"footer"
>
#{i18n['
global.
copyright']}
</div>
</div>
</div>
</h:body>
</h:body>
</f:view>
</f:view>
...
...
code/LanBortalWeb/WebContent/product/create.xhtml
View file @
75972bd
...
@@ -9,9 +9,8 @@
...
@@ -9,9 +9,8 @@
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
xmlns:products=
"http://java.sun.com/jsf/composite/tools/products"
>
xmlns:products=
"http://java.sun.com/jsf/composite/tools/products"
>
<h:body>
<h:body>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:define
name=
"title"
>
CreateUser
</ui:define>
<ui:param
name=
"thispage"
value=
"page.product.create"
/>
<ui:define
name=
"header"
>
Add new user
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<products:create
/>
<products:create
/>
</ui:define>
</ui:define>
...
...
code/LanBortalWeb/WebContent/product/createBill.xhtml
View file @
75972bd
...
@@ -11,21 +11,16 @@
...
@@ -11,21 +11,16 @@
<h:body>
<h:body>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:define
name=
"title"
>
Users
</ui:define>
<ui:param
name=
"thispage"
value=
"page.product.createBill"
/>
<ui:define
name=
"header"
>
Edit user
</ui:define>
<h:outputScript
target=
"head"
library=
"script"
name=
"jquery.min.js"
/>
<h:outputScript
target=
"head"
library=
"script"
name=
"shopscript.js"
/>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<h:outputScript
target=
"head"
library=
"script"
name=
"jquery.min.js"
/>
<products:shop
items=
"#{productShopView.billCart}"
commitValue=
"#{i18n['productshop.commit']}"
>
<h:outputScript
target=
"head"
library=
"script"
name=
"shopscript.js"
/>
<f:actionListener
for=
"commitbutton"
binding=
"#{productShopView.commitBillCart()}"
/>
<tools:canRead
id =
"authcont"
target=
"PRODUCT"
>
</products:shop>
<products:shop
items=
"#{productShopView.billCart}"
commitValue=
"#{i18n['productshop.commit']}"
>
<f:actionListener
for=
"commitbutton"
binding=
"#{productShopView.commitBillCart()}"
/>
</products:shop>
</tools:canRead>
</ui:define>
</ui:define>
<ui:define
name=
"footer"
>
footer
</ui:define>
</ui:composition>
</ui:composition>
</h:body>
</h:body>
</html>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/product/edit.xhtml
View file @
75972bd
...
@@ -12,9 +12,8 @@
...
@@ -12,9 +12,8 @@
<title></title>
<title></title>
</h:head>
</h:head>
<h:body>
<h:body>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:define
name=
"title"
>
CreateUser
</ui:define>
<ui:param
name=
"thispage"
value=
"page.product.edit"
/>
<ui:define
name=
"header"
>
Add new user
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<products:edit
/>
<products:edit
/>
</ui:define>
</ui:define>
...
...
code/LanBortalWeb/WebContent/product/list.xhtml
View file @
75972bd
...
@@ -8,15 +8,11 @@
...
@@ -8,15 +8,11 @@
xmlns:products=
"http://java.sun.com/jsf/composite/tools/products"
xmlns:products=
"http://java.sun.com/jsf/composite/tools/products"
xmlns:f=
"http://java.sun.com/jsf/core"
>
xmlns:f=
"http://java.sun.com/jsf/core"
>
<h:body>
<h:body>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:define
name=
"title"
>
Users
</ui:define>
<ui:param
name=
"thispage"
value=
"page.product.list"
/>
<ui:define
name=
"header"
>
Edit user
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<products:list
/>
<products:list
/>
</ui:define>
</ui:define>
<ui:define
name=
"footer"
>
footer
</ui:define>
</ui:composition>
</ui:composition>
</h:body>
</h:body>
</html>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/tools/layout/level1link.xhtml
deleted
100644 → 0
View file @
4f95edc
<?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
View file @
75972bd
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
<composite:implementation>
<composite:implementation>
<h:form>
<h:form>
<h:commandLink
action=
"#{sessionHandler.logout}"
value=
"#{i18n['logout']}"
/>
<h:commandLink
action=
"#{sessionHandler.logout}"
value=
"#{i18n['log
in.log
out']}"
/>
</h:form>
</h:form>
</composite:implementation>
</composite:implementation>
...
...
code/LanBortalWeb/WebContent/resources/tools/map/placeSelect.xhtml
View file @
75972bd
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<h:form>
<h:form>
<h:commandButton
image=
"#{mapView.selectPlaceMapUrl}"
actionListener=
"#{mapView.placeSelectActionListener}"
/>
<h:commandButton
image=
"#{mapView.selectPlaceMapUrl}"
actionListener=
"#{mapView.placeSelectActionListener}"
/>
<h:outputText
value=
"#{i18n['placeSelect.left']}: #{mapView.placeLeftToSelect()}"
/>
<h:outputText
value=
"#{i18n['placeSelect.
places
left']}: #{mapView.placeLeftToSelect()}"
/>
</h:form>
</h:form>
...
...
code/LanBortalWeb/WebContent/resources/tools/products/create.xhtml
View file @
75972bd
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<h:panelGrid
columns=
"2"
>
<h:panelGrid
columns=
"2"
>
<h:outputLabel
value=
"#{i18n['product.name']}:"
/><h:inputText
value=
"#{productView.productname}"
/>
<h:outputLabel
value=
"#{i18n['product.name']}:"
/><h:inputText
value=
"#{productView.productname}"
/>
<h:outputLabel
value=
"#{i18n['product.price']}:"
/><h:inputText
value=
"#{productView.productprice}"
/>
<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:panelGrid>
</h:form>
</h:form>
...
...
code/LanBortalWeb/WebContent/resources/tools/products/edit.xhtml
View file @
75972bd
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
<h:outputLabel
value=
"#{i18n['product.sort']}:"
/><h:inputText
value=
"#{productView.product.sort}"
/>
<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.barcode']}:"
/><h:inputText
value=
"#{productView.product.barcode}"
/>
<h:outputLabel
value=
"#{i18n['product.prepaid']}"
/><h:selectBooleanCheckbox
value=
"#{productView.product.prepaid}"
/>
<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:panelGrid>
</h:form>
</h:form>
...
...
code/LanBortalWeb/WebContent/resources/tools/products/list.xhtml
View file @
75972bd
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
<f:facet
name=
"header"
>
<f:facet
name=
"header"
>
<h:outputText
value=
"Edit"
/>
<h:outputText
value=
"Edit"
/>
</f:facet>
</f:facet>
<h:commandButton
action=
"#{productView.edit()}"
value=
"
Edit
"
/>
<h:commandButton
action=
"#{productView.edit()}"
value=
"
#{i18n[product.edit]}
"
/>
</h:column>
</h:column>
</h:dataTable>
</h:dataTable>
...
...
code/LanBortalWeb/WebContent/resources/tools/products/shop.xhtml
View file @
75972bd
...
@@ -19,11 +19,7 @@
...
@@ -19,11 +19,7 @@
<composite:implementation>
<composite:implementation>
<h:form
id=
"shopform"
>
<h:form
id=
"shopform"
>
<h:dataTable
<h:dataTable
border=
"1"
id=
"billcart"
value=
"#{cc.attrs.items}"
var=
"cart"
>
border=
"1"
id=
"billcart"
value=
"#{cc.attrs.items}"
var=
"cart"
>
<h:column>
<h:column>
<f:facet
name=
"header"
>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['product.name']}"
/>
<h:outputText
value=
"${i18n['product.name']}"
/>
...
...
code/LanBortalWeb/WebContent/resources/tools/role/create.xhtml
View file @
75972bd
...
@@ -20,12 +20,12 @@
...
@@ -20,12 +20,12 @@
<h:form>
<h:form>
<tools:canWrite
target=
"ROLE_MANAGEMENT"
>
<tools:canWrite
target=
"ROLE_MANAGEMENT"
>
<f:facet
name=
"errorMessage"
>
<f:facet
name=
"errorMessage"
>
<h:outputText
value=
"#{i18n['
nasty.user
']}"
/>
<h:outputText
value=
"#{i18n['
global.notauthorized
']}"
/>
</f:facet>
</f:facet>
<ui:include
src=
"form.xhtml"
/>
<ui:include
src=
"form.xhtml"
/>
<h:commandButton
value=
"#{i18n['create']}"
action=
"#{roleView.create}"
/>
<h:commandButton
value=
"#{i18n['
role.
create']}"
action=
"#{roleView.create}"
/>
</tools:canWrite>
</tools:canWrite>
</h:form>
</h:form>
...
...
code/LanBortalWeb/WebContent/resources/tools/role/list.xhtml
View file @
75972bd
...
@@ -33,10 +33,7 @@
...
@@ -33,10 +33,7 @@
<h:outputText
value=
"#{role.name}"
/>
<h:outputText
value=
"#{role.name}"
/>
</h:column>
</h:column>
<h:column
rendered=
"#{sessionHandler.canWrite('ROLE_MANAGEMENT') }"
>
<h:column
rendered=
"#{sessionHandler.canWrite('ROLE_MANAGEMENT') }"
>
<f:facet
name=
"header"
>
<h:commandButton
action=
"#{roleView.edit()}"
value=
"#{i18n['role.edit']}"
"
/>
<h:outputText
value=
"#{i18n['edit']}"
/>
</f:facet>
<h:commandButton
action=
"#{roleView.edit()}"
value=
"Edit"
/>
</h:column>
</h:column>
</h:dataTable>
</h:dataTable>
</tools:canRead>
</tools:canRead>
...
...
code/LanBortalWeb/WebContent/resources/tools/user/edit.xhtml
View file @
75972bd
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<f:selectItem
id=
"male"
itemLabel=
"#{i18n['user.gender.MALE']}"
itemValue=
"MALE"
/>
<f:selectItem
id=
"male"
itemLabel=
"#{i18n['user.gender.MALE']}"
itemValue=
"MALE"
/>
<f:selectItem
id=
"female"
itemLabel=
"#{i18n['user.gender.FEMALE']}"
itemValue=
"FEMALE"
/>
<f:selectItem
id=
"female"
itemLabel=
"#{i18n['user.gender.FEMALE']}"
itemValue=
"FEMALE"
/>
</h:selectOneRadio>
</h:selectOneRadio>
<h:commandButton
action=
"#{userView.saveUser()}"
value=
"#{i18n['save']}"
/>
<h:commandButton
action=
"#{userView.saveUser()}"
value=
"#{i18n['
user.
save']}"
/>
</h:panelGrid>
</h:panelGrid>
</h:form>
</h:form>
...
...
code/LanBortalWeb/WebContent/resources/tools/user/list.xhtml
View file @
75972bd
...
@@ -52,10 +52,7 @@
...
@@ -52,10 +52,7 @@
</h:column>
</h:column>
<h:column
rendered=
"#{sessionHandler.canWrite('USER_MANAGEMENT') }"
>
<h:column
rendered=
"#{sessionHandler.canWrite('USER_MANAGEMENT') }"
>
<f:facet
name=
"header"
>
<h:commandButton
action=
"#{userView.edit()}"
value=
"#{i18n['user.edit']}"
/>
<h:outputText
value=
"Edit"
/>
</f:facet>
<h:commandButton
action=
"#{userView.edit()}"
value=
"Edit"
/>
</h:column>
</h:column>
</h:dataTable>
</h:dataTable>
...
...
code/LanBortalWeb/WebContent/role/create.xhtml
View file @
75972bd
...
@@ -8,16 +8,11 @@
...
@@ -8,16 +8,11 @@
xmlns:role=
"http://java.sun.com/jsf/composite/tools/role"
xmlns:role=
"http://java.sun.com/jsf/composite/tools/role"
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
>
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:param
name=
"thispage"
value=
"page.role.create"
/>
<ui:define
name=
"title"
>
CreateRole
</ui:define>
<ui:define
name=
"header"
>
Add new role
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<role:create
/>
<role:create
/>
</ui:define>
</ui:define>
<ui:define
name=
"footer"
>
footer
</ui:define>
</ui:composition>
</ui:composition>
</html>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/role/edit.xhtml
View file @
75972bd
...
@@ -7,17 +7,12 @@
...
@@ -7,17 +7,12 @@
xmlns:f=
"http://java.sun.com/jsf/core"
xmlns:f=
"http://java.sun.com/jsf/core"
xmlns:role=
"http://java.sun.com/jsf/composite/tools/role"
xmlns:role=
"http://java.sun.com/jsf/composite/tools/role"
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
>
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
>
<h:body>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:param
name=
"thispage"
value=
"page.role.edit"
/>
<ui:define
name=
"title"
>
EditRole
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"header"
>
Edit role
</ui:define>
<ui:define
name=
"content"
>
<role:edit
/>
<role:edit
/>
</ui:define>
</ui:define>
<ui:define
name=
"footer"
>
footer
</ui:define>
</ui:composition>
</ui:composition>
</h:body>
</html>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/role/list.xhtml
View file @
75972bd
...
@@ -7,17 +7,12 @@
...
@@ -7,17 +7,12 @@
xmlns:f=
"http://java.sun.com/jsf/core"
xmlns:f=
"http://java.sun.com/jsf/core"
xmlns:role=
"http://java.sun.com/jsf/composite/tools/role"
xmlns:role=
"http://java.sun.com/jsf/composite/tools/role"
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
>
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
>
<h:body>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:param
name=
"thispage"
value=
"page.role.list"
/>
<ui:define
name=
"title"
>
listRoles
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"header"
>
List "roles
</ui:define>
<ui:define
name=
"content"
>
<role:list
/>
<role:list
/>
</ui:define>
</ui:define>
<ui:define
name=
"footer"
>
footer
</ui:define>
</ui:composition>
</ui:composition>
</h:body>
</html>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/tests/placemap.xhtml
View file @
75972bd
...
@@ -6,17 +6,12 @@
...
@@ -6,17 +6,12 @@
xmlns:f=
"http://java.sun.com/jsf/core"
xmlns:f=
"http://java.sun.com/jsf/core"
xmlns:map=
"http://java.sun.com/jsf/composite/tools/map"
xmlns:map=
"http://java.sun.com/jsf/composite/tools/map"
>
>
<h:head>
<h:body>
<title></title>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
</h:head>
<ui:param
name=
"thispage"
value=
"page.test.placemap"
/>
<h:body>
<ui:define
name=
"content"
>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<map:placeSelect
/>
<ui:define
name=
"title"
>
Omnia
</ui:define>
</ui:define>
<ui:define
name=
"header"
>
Paikkakartta
</ui:define>
</ui:composition>
<ui:define
name=
"content"
>
</h:body>
<map:placeSelect
/>
</ui:define>
<ui:define
name=
"footer"
>
Valitse kartta
</ui:define>
</ui:composition>
</h:body>
</html>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/user/create.xhtml
View file @
75972bd
...
@@ -6,24 +6,18 @@
...
@@ -6,24 +6,18 @@
xmlns:h=
"http://java.sun.com/jsf/html"
xmlns:h=
"http://java.sun.com/jsf/html"
xmlns:f=
"http://java.sun.com/jsf/core"
xmlns:f=
"http://java.sun.com/jsf/core"
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
>
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
>
<h:head>
<title></title>
</h:head>
<h:body>
<h:body>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:define
name=
"title"
>
CreateUser
</ui:define>
<ui:param
name=
"thispage"
value=
"page.user.create"
/>
<ui:define
name=
"header"
>
Add new user
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<h:form>
<h:form>
<h:panelGrid
columns=
"2"
>
<h:panelGrid
columns=
"2"
>
<h:outputLabel
value=
"#{user.username}:"
/><h:inputText
value=
"#{userView.login}"
/>
<h:outputLabel
value=
"Login name:"
/><h:inputText
value=
"#{userView.login}"
/>
<h:outputLabel
value=
"#{user.password}:"
/><h:inputSecret
value=
"#{userView.password}"
/>
<h:outputLabel
value=
"Password:"
/><h:inputSecret
value=
"#{userView.password}"
/>
<h:commandButton
action=
"#{userView.createUser()}"
value=
"#{global.create}"
/>
<h:commandButton
action=
"#{userView.createUser()}"
value=
"Create"
/>
</h:panelGrid>
</h:panelGrid>
</h:form>
</h:form>
</ui:define>
</ui:define>
<ui:define
name=
"footer"
>
footer
</ui:define>
</ui:composition>
</ui:composition>
</h:body>
</h:body>
</html>
</html>
\ No newline at end of file
\ No newline at end of file
code/LanBortalWeb/WebContent/user/edit.xhtml
View file @
75972bd
...
@@ -7,18 +7,12 @@
...
@@ -7,18 +7,12 @@
xmlns:f=
"http://java.sun.com/jsf/core"
xmlns:f=
"http://java.sun.com/jsf/core"
xmlns:users=
"http://java.sun.com/jsf/composite/tools/user"
xmlns:users=
"http://java.sun.com/jsf/composite/tools/user"
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
>
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
>
<h:head>
<title></title>
</h:head>
<h:body>
<h:body>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:define
name=
"title"
>
CreateUser
</ui:define>
<ui:param
name=
"thispage"
value=
"page.user.create"
/>
<ui:define
name=
"header"
>
Add new user
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<users:edit
/>
<users:edit
/>
</ui:define>
</ui:define>
<ui:define
name=
"footer"
>
footer
</ui:define>
</ui:composition>
</ui:composition>
</h:body>
</h:body>
</html>
</html>
\ No newline at end of file
\ No newline at end of file
code/LanBortalWeb/WebContent/user/fault.xhtml
deleted
100644 → 0
View file @
4f95edc
<!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
View file @
75972bd
...
@@ -7,20 +7,12 @@
...
@@ -7,20 +7,12 @@
xmlns:h=
"http://java.sun.com/jsf/html"
xmlns:h=
"http://java.sun.com/jsf/html"
xmlns:users=
"http://java.sun.com/jsf/composite/tools/user"
xmlns:users=
"http://java.sun.com/jsf/composite/tools/user"
xmlns:f=
"http://java.sun.com/jsf/core"
>
xmlns:f=
"http://java.sun.com/jsf/core"
>
<h:head>
<title></title>
</h:head>
<h:body>
<h:body>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:define
name=
"title"
>
EditUser
</ui:define>
<ui:param
name=
"thispage"
value=
"page.user.create"
/>
<ui:define
name=
"header"
>
Edit user
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<h:outputText
value=
"${i18n['userlist.title']}"
/>
<users:list
/>
<users:list
/>
</ui:define>
</ui:define>
<ui:define
name=
"footer"
>
footer
</ui:define>
</ui:composition>
</ui:composition>
</h:body>
</h:body>
</html>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/viewExpired.xhtml
View file @
75972bd
...
@@ -7,14 +7,12 @@
...
@@ -7,14 +7,12 @@
<title></title>
<title></title>
</h:head>
</h:head>
<h:body>
<h:body>
<ui:composition
template=
"/layout/default-template.xhtml"
>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:define
name=
"title"
>
HelloWorld
</ui:define>
<ui:param
name=
"thispage"
value=
"page.viewexpired"
/>
<ui:define
name=
"header"
>
Header
</ui:define>
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<h1>
View expired!
</h1>
<h1>
#{i18n['viewexpired.title']}
</h1>
<p>
Please refresh the page.
</p>
<p>
#{i18n['viewexpired.body']}
</p>
</ui:define>
</ui:define>
<ui:define
name=
"footer"
>
footer
</ui:define>
</ui:composition>
</ui:composition>
</h:body>
</h:body>
</html>
</html>
\ No newline at end of file
code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java
View file @
75972bd
...
@@ -46,6 +46,8 @@ public class UserView {
...
@@ -46,6 +46,8 @@ public class UserView {
public
String
edit
()
{
public
String
edit
()
{
setUser
(
items
.
getRowData
());
setUser
(
items
.
getRowData
());
logger
.
info
(
"Editing: Firstname: {} "
,
getUser
().
getFirstnames
());
return
"userEdit"
;
return
"userEdit"
;
}
}
...
@@ -81,6 +83,7 @@ public class UserView {
...
@@ -81,6 +83,7 @@ public class UserView {
public
String
saveUser
()
{
public
String
saveUser
()
{
try
{
try
{
setUser
(
userBean
.
mergeChanges
(
getUser
()));
setUser
(
userBean
.
mergeChanges
(
getUser
()));
logger
.
info
(
"Firstname: {} "
,
getUser
().
getFirstnames
());
}
catch
(
EjbPermissionDeniedException
e
)
{
}
catch
(
EjbPermissionDeniedException
e
)
{
throw
new
PermissionDeniedException
(
e
);
throw
new
PermissionDeniedException
(
e
);
}
}
...
...
code/LanBortalWeb/src/fi/insomnia/bortal/web/helper/ConcatMBean.java
View file @
75972bd
package
fi
.
insomnia
.
bortal
.
web
.
helper
;
package
fi
.
insomnia
.
bortal
.
web
.
helper
;
/**
/**
* Copypaste from http://forums.sun.com/thread.jspa?threadID=5136965
* Copypaste from http://forums.sun.com/thread.jspa?threadID=5136965
*
*
...
@@ -12,12 +13,10 @@ import javax.faces.bean.ManagedBean;
...
@@ -12,12 +13,10 @@ import javax.faces.bean.ManagedBean;
import
javax.faces.bean.NoneScoped
;
import
javax.faces.bean.NoneScoped
;
import
javax.faces.context.FacesContext
;
import
javax.faces.context.FacesContext
;
@ManagedBean
(
name
=
"
concat
"
)
@ManagedBean
(
name
=
"
util
"
)
@NoneScoped
@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>
...
@@ -27,62 +26,52 @@ public class ConcatMBean extends HashMap<Object,Object>
* Concat the string separated by a comma Evaluate JSF EL expression if
* Concat the string separated by a comma Evaluate JSF EL expression if
* token begin by # or $
* token begin by # or $
*
*
* @param inObject
:
* @param inObject
*
is the list of string to concat separated by a comma. return a
*
: is the list of string to concat separated by a comma. return
* String exemple : <h:outputText
*
a
String exemple : <h:outputText
* value="#{lang[concat['mpr.canton.,#offer.canton']]}"/>
* 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
();
StringBuffer
resultBuffer
=
new
StringBuffer
();
try
try
{
{
String
inToken
=
(
String
)
inObject
;
String
inToken
=
(
String
)
inObject
;
StringTokenizer
tok
=
new
StringTokenizer
((
String
)
inToken
,
","
,
false
);
StringTokenizer
tok
=
new
StringTokenizer
((
String
)
inToken
,
","
,
false
);
while
(
tok
.
hasMoreTokens
())
while
(
tok
.
hasMoreTokens
())
{
{
String
token
=
tok
.
nextToken
().
trim
();
String
token
=
tok
.
nextToken
().
trim
();
if
(
token
.
startsWith
(
"#{"
))
if
(
token
.
startsWith
(
"#{"
))
{
{
Object
tokenEvaluated
=
this
.
getElValue
(
token
);
Object
tokenEvaluated
=
this
.
getElValue
(
token
);
resultBuffer
.
append
(
String
.
valueOf
(
tokenEvaluated
));
resultBuffer
.
append
(
String
.
valueOf
(
tokenEvaluated
));
}
}
else
if
(
token
.
startsWith
(
"${"
))
{
else
if
(
token
.
startsWith
(
"${"
))
{
token
=
token
.
substring
(
2
,
token
.
length
()
-
1
);
token
=
token
.
substring
(
2
,
token
.
length
()
-
1
);
Object
tokenEvaluated
=
this
.
getElValue
(
this
.
getJsfEl
(
token
));
Object
tokenEvaluated
=
this
.
getElValue
(
this
.
getJsfEl
(
token
));
resultBuffer
.
append
(
String
.
valueOf
(
tokenEvaluated
));
resultBuffer
.
append
(
String
.
valueOf
(
tokenEvaluated
));
}
}
else
if
(
token
.
startsWith
(
"#"
))
{
else
if
(
token
.
startsWith
(
"#"
))
{
token
=
token
.
substring
(
1
);
token
=
token
.
substring
(
1
);
Object
tokenEvaluated
=
this
.
getElValue
(
this
.
getJsfEl
(
token
));
Object
tokenEvaluated
=
this
.
getElValue
(
this
.
getJsfEl
(
token
));
resultBuffer
.
append
(
String
.
valueOf
(
tokenEvaluated
));
resultBuffer
.
append
(
String
.
valueOf
(
tokenEvaluated
));
}
}
else
{
else
{
resultBuffer
.
append
(
token
);
resultBuffer
.
append
(
token
);
}
}
}
}
}
}
catch
(
Exception
e
)
{
catch
(
Exception
e
)
{
System
.
out
.
println
(
"ConcatenationBackingBean error: "
+
e
.
getMessage
());
System
.
out
.
println
(
"ConcatenationBackingBean error: "
+
e
.
getMessage
());
}
}
return
resultBuffer
.
toString
();
return
resultBuffer
.
toString
();
}
}
private
Object
getElValue
(
String
el
)
private
Object
getElValue
(
String
el
)
{
{
ApplicationFactory
appFactory
=
(
ApplicationFactory
)
FactoryFinder
.
getFactory
(
FactoryFinder
.
APPLICATION_FACTORY
);
ApplicationFactory
appFactory
=
(
ApplicationFactory
)
FactoryFinder
.
getFactory
(
FactoryFinder
.
APPLICATION_FACTORY
);
return
appFactory
.
getApplication
().
evaluateExpressionGet
(
FacesContext
.
getCurrentInstance
(),
el
,
java
.
lang
.
String
.
class
);
return
appFactory
.
getApplication
().
evaluateExpressionGet
(
FacesContext
.
getCurrentInstance
(),
el
,
java
.
lang
.
String
.
class
);
}
}
private
String
getJsfEl
(
String
value
)
private
String
getJsfEl
(
String
value
)
{
{
return
"#{"
+
value
+
"}"
;
return
"#{"
+
value
+
"}"
;
}
}
}
}
code/LanBortalWeb/src/resources/i18n.properties
View file @
75972bd
user.username
=
K
\u
00E4ytt
\u
00E4j
\u
00E4tunnus
global.productname
=
Omnia
user.realname
=
Nimi
user.password
=
Salasana
user.email
=
S
\u
00E4hk
\u
00F6postiosoite
user.phone
=
Puhelinnumero
user.bankaccount
=
Tilinumero
user.bank
=
Pankki
user.gender.UNDEFINED
=
Mrittelemtt
user.gender.MALE
=
Mies
user.gender.FEMALE
=
Nainen
login.username
=
K
\u
00E4ytt
\u
00E4j
\u
00E4tunnus:
login.password
=
Salasana:
login.submit
=
Kirjaudu sis
\u
00E4
\u
00E4n
user.validate.notUniqueUsername
=
i18n K
\u
00E4ytt
\u
00E4j
\u
00E4tunnus on jo olemassa. Ole hyv
\u
00E4 ja valitse toinen tunnus.
fallbackstr
=
"fallback default"
teststr
=
default locale test
defaultstr
=
"Something default..."
logout
=
H
\u
00E4ivy
nasty.user
=
paha k
\u
00E4ytt
\u
00E4j
\u
00E4 ei yrit
\u
00E4 haxoroida meid
\u
00E4n 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
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
View file @
75972bd
user.username
=
K
\u
00E4ytt
\u
00E4j
\u
00E4tunnus
# Java Resource Bundle
user.realname
=
Name
# Modified by Zaval JRC Editor (C) Zaval CE Group
user.password
=
Password
# http://www.zaval.org/products/jrc-editor/
user.email
=
Email address
#
user.phone
=
Phone
user.bankaccount
=
Bank account
user.bank
=
Bank
save
=
Save
cancel
=
Cancel
login.username
=
User
global.cancel
=
Cancel
login.password
=
Password
global.infomail
=
global.save
=
Save
global.webpage
=
login.logout
=
Logout
login.password
=
Password
login.submit
=
Login
login.submit
=
Login
login.username
=
User
nasty.user
=
Hax attempt! Go away!
topmenu.adminfront
=
Adminstuff
topmenu.frontpage
=
Frontpage
topmenu.frontpage
=
Frontpage
topmenu.usersPreferences
=
Preferences
topmenu.shoppings
=
Shop
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.
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
View file @
75972bd
# 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.infomail
=
info@streamparty.org
global.webpage
=
http://www.streamparty.org
global.webpage
=
http://www.streamparty.org
\ No newline at end of file
code/LanBortalWeb/src/resources/i18n_en_ST_v7.properties
View file @
75972bd
global.eventname
=
Stream seven
global.eventname
=
Stream seven
code/LanBortalWeb/src/resources/i18n_fi.properties
0 → 100644
View file @
75972bd
# 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
\u
00e4
\u
00e4n
login.username
=
K
\u
00e4ytt
\u
00e4j
\u
00e4tunnus
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
\u
00e4hk
\u
00f6posti
user.nick
=
Nick
user.password
=
Salasana
user.phone
=
Puhelin
user.realname
=
Nimi
user.sex.FEMALE
=
Nainen
user.sex.MALE
=
Mies
user.sex.UNDEFINED
=
M
\u
00e4
\u
00e4rittelem
\u
00e4tt
\u
00e4
user.username
=
K
\u
00e4ytt
\u
00e4j
\u
00e4tunnus
user.validate.notUniqueUsername
=
K
\u
00e4ytt
\u
00e4j
\u
00e4tunnus on jo olemassa. Ole hyv
\u
00e4 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
View file @
75972bd
user.username
=
K
\u
00E4ytt
\u
00E4j
\u
00E4tunnus
# Java Resource Bundle
user.realname
=
Nimi
# Modified by Zaval JRC Editor (C) Zaval CE Group
user.password
=
Salasana
# http://www.zaval.org/products/jrc-editor/
user.email
=
S
\u
00E4hk
\u
00F6postiosoite
#
user.phone
=
Puhelinnumero
user.bankaccount
=
Tilinumero
user.bank
=
Pankki
save
=
Tallenna
cancel
=
Peruuta
login.username
=
K
\u
00E4ytt
\u
00E4j
\u
00E4tunnus:
global.infomail
=
info@insomnia.fi
login.password
=
Salasana:
global.webpage
=
http://www.insomnia.fi
login.submit
=
Kirjaudu sis
\u
00E4
\u
00E4n
user.validate.notUniqueUsername
=
i18n K
\u
00E4ytt
\u
00E4j
\u
00E4tunnus on jo olemassa. Ole hyv
\u
00E4 ja valitse toinen tunnus.
teststr
=
brlocale test
fallbackstr
=
InsomniaSpecific fallback
logout
=
H
\u
00E4ivy
nasty.user
=
paha k
\u
00E4ytt
\u
00E4j
\u
00E4 ei yrit
\u
00E4 haxoroida meid
\u
00E4n softaa. Kts.
code/LanBortalWeb/src/resources/i18n_fi_IN_XII.properties
View file @
75972bd
teststr
=
XII locale test
global.eventname
=
Insomnia XII
logout
=
H
\u
00E4ivy
\ No newline at end of file
nasty.user
=
paha k
\u
00E4ytt
\u
00E4j
\u
00E4 ei yrit
\u
00E4 haxoroida meid
\u
00E4n softaa. Kts.
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment