Skip to content

Riina Antikainen / Moya

Go to a project
Commit 4a03aef1 by Tuomas Riihimäki
Options

Added english localisation and stream1 layout fixes

1 parent ed0283e2
Expand all
Inline Side-by-side
Showing with 375 additions and 196 deletions
.code_swarm/log.xml 0 → 100644
This diff could not be displayed because it is too large.
.code_swarm/project.config 0 → 100644
# This is a sample configuration file for code_swarm
# Input file
InputFile=log.xml
# Color assignment rules
# Keep in order, do not skip numbers. Numbers start
# at 1.
#
# Pattern: "Label", "regex", R,G,B, R,G,B
# Label is optional. If it is omitted, the regex
# will be used.
#
ColorAssign1="Tests",".*test.*", 90,225,90, 110,200,90
ColorAssign2="Localizations","(.*(\.mo|\.po))|(.*\.lproj.*)", 90,225,225, 110,200,200
ColorAssign3="Source Code",".*(\.py|\.rb|\.erb|\.hs|\.sql|\.c|\.cpp|\.h|\.m|\.d|\.js|\.pl|\.sh|\.java|\.lhs|\.hi)", 225,90,90, 200,90,110
ColorAssign4="Documents/Images",".*(\.txt|\.html|\.tex|\.tmpl|\.css|\.xml|\.yml|\.json|\.png|\.jpg|\.gif|\.jpeg|README|COPYING|LICENSE|AUTHORS)", 90,90,225, 90,110,200
# Save each frame to an image?
TakeSnapshots=false
# Where to save each frame
SnapshotLocation=code_swarm_frames/#####.png
#Is the input xml sorted by date? It's faster and uses much less memory if it is
IsInputSorted=true
# - All of the given scripts for producing repository xml files produce sorted data
# - Please file a bug if one doesn't
# Uncomment to not use avatars
#AvatarFetcher=NoAvatar
# To use local avatars, uncomment this line:
#AvatarFetcher=LocalAvatar
# then place png files named after the usernames of committers in
# the data/local_avatars directory
# data/local_avatars/default.png is used by default
\ No newline at end of file
code/LanBortalWeb/WebContent/WEB-INF/faces-config.xml
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<faces-config xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <faces-config
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee xmlns="http://java.sun.com/xml/ns/javaee"
http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="2.0"> xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
version="2.0">
<application> <application>
<resource-bundle> <resource-bundle>
<base-name>fi.insomnia.bortal.resources.i18n</base-name> <base-name>fi.insomnia.bortal.resources.i18n</base-name>
...@@ -16,7 +17,7 @@ ...@@ -16,7 +17,7 @@
<!-- Vector VE (VENEZUELA, BOLIVARIAN REPUBLIC OF) --> <!-- Vector VE (VENEZUELA, BOLIVARIAN REPUBLIC OF) -->
<locale-config> <locale-config>
<default-locale>fi_FI</default-locale> <default-locale>fi_FI</default-locale>
<supported-locale>fi_IN_XII</supported-locale> <supported-locale>fi_fi_XII</supported-locale>
<supported-locale>en_ST_v7</supported-locale> <supported-locale>en_ST_v7</supported-locale>
</locale-config> </locale-config>
</application> </application>
......
code/LanBortalWeb/WebContent/WEB-INF/jsp/Test1_edit.jsp 0 → 100644
<%@page contentType="text/html"%>
<%@page pageEncoding="UTF-8"%>
<%-- Uncomment below lines to add portlet taglibs to jsp
<%@ page import="javax.portlet.*"%>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
<portlet:defineObjects />
--%>
<b>
EDIT MODE
</b>
\ No newline at end of file
code/LanBortalWeb/WebContent/WEB-INF/jsp/Test1_help.jsp 0 → 100644
<%@page contentType="text/html"%>
<%@page pageEncoding="UTF-8"%>
<%-- Uncomment below lines to add portlet taglibs to jsp
<%@ page import="javax.portlet.*"%>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
<portlet:defineObjects />
--%>
<b>
HELP MODE
</b>
\ No newline at end of file
code/LanBortalWeb/WebContent/WEB-INF/jsp/Test1_view.jsp 0 → 100644
<%@page contentType="text/html"%>
<%@page pageEncoding="UTF-8"%>
<%-- Uncomment below lines to add portlet taglibs to jsp
<%@ page import="javax.portlet.*"%>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
<portlet:defineObjects />
--%>
<b>
VIEW MODE
</b>
\ No newline at end of file
code/LanBortalWeb/WebContent/WEB-INF/jsp/testportlet2_edit.jsp 0 → 100644
<%@page contentType="text/html"%>
<%@page pageEncoding="UTF-8"%>
<%-- Uncomment below lines to add portlet taglibs to jsp
<%@ page import="javax.portlet.*"%>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
<portlet:defineObjects />
--%>
<b>
EDIT MODE
</b>
\ No newline at end of file
code/LanBortalWeb/WebContent/WEB-INF/jsp/testportlet2_help.jsp 0 → 100644
<%@page contentType="text/html"%>
<%@page pageEncoding="UTF-8"%>
<%-- Uncomment below lines to add portlet taglibs to jsp
<%@ page import="javax.portlet.*"%>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
<portlet:defineObjects />
--%>
<b>
HELP MODE
</b>
\ No newline at end of file
code/LanBortalWeb/WebContent/WEB-INF/jsp/testportlet2_view.jsp 0 → 100644
<%@page contentType="text/html"%>
<%@page pageEncoding="UTF-8"%>
<%-- Uncomment below lines to add portlet taglibs to jsp
<%@ page import="javax.portlet.*"%>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
<portlet:defineObjects />
--%>
<b>
VIEW MODE
</b>
\ No newline at end of file
code/LanBortalWeb/WebContent/WEB-INF/portlet.xml 0 → 100644
<?xml version='1.0' encoding='UTF-8' ?>
<portlet-app xmlns='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' version='2.0'>
<portlet>
<description>testportlet2</description>
<portlet-name>testportlet2</portlet-name>
<display-name>testportlet2</display-name>
<portlet-class>fi.iki.tuomari.portlettest.testportlet2</portlet-class>
<expiration-cache>0</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
<portlet-mode>EDIT</portlet-mode>
<portlet-mode>HELP</portlet-mode>
</supports>
<portlet-info>
<title>testportlet2</title>
<short-title>testportlet2</short-title>
</portlet-info>
</portlet>
</portlet-app>
code/LanBortalWeb/WebContent/account/edit.xhtml
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<h:outputLabel value="#{i18n['accountevent.total']}:" /> <h:outputLabel value="#{i18n['accountEvent.total']}:" />
<h:outputText value="#{accountView.account.total}"> <h:outputText value="#{accountView.account.total}">
<f:convertNumber minFractionDigits="2" maxFractionDigits="2" /> <f:convertNumber minFractionDigits="2" maxFractionDigits="2" />
</h:outputText> </h:outputText>
<h:outputLabel value="#{i18n['accountevent.quantity']}:" /> <h:outputLabel value="#{i18n['accountEvent.quantity']}:" />
<h:inputText value="#{accountView.account.quantity}"> <h:inputText value="#{accountView.account.quantity}">
<f:convertNumber minFractionDigits="2" maxFractionDigits="2" /> <f:convertNumber minFractionDigits="2" maxFractionDigits="2" />
</h:inputText> </h:inputText>
...@@ -38,27 +38,27 @@ ...@@ -38,27 +38,27 @@
<h:outputLabel value="#{i18n['accountevent.eventTime']}:" /> <h:outputLabel value="#{i18n['accountEvent.eventTime']}:" />
<h:inputText value="#{accountView.account.eventTime.time}"> <h:inputText value="#{accountView.account.eventTime.time}">
<f:convertDateTime type="both" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime type="both" timeZone="#{sessionHandler.timezone}" />
</h:inputText> </h:inputText>
<h:outputLabel value="#{i18n['accountevent.delivered']}:" /> <h:outputLabel value="#{i18n['accountEvent.delivered']}:" />
<h:inputText value="#{accountView.account.delivered.time}"> <h:inputText value="#{accountView.account.delivered.time}">
<f:convertDateTime type="both" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime type="both" timeZone="#{sessionHandler.timezone}" />
</h:inputText> </h:inputText>
<h:outputLabel value="#{i18n['accountevent.seller']}:" /> <h:outputLabel value="#{i18n['accountEvent.seller']}:" />
<h:outputText value="#{accountView.account.seller.wholeName}"> <h:outputText value="#{accountView.account.seller.wholeName}">
</h:outputText> </h:outputText>
</h:panelGrid> </h:panelGrid>
<h:commandButton rendered="#{sessionHandler.canWrite('ACCOUNT_MANAGEMENT')}" id="commitbtn" <h:commandButton rendered="#{sessionHandler.canWrite('ACCOUNT_MANAGEMENT')}" id="commitbtn"
action="#{accountView.merge()}" value="#{i18n['accountevent.commit']}" /> action="#{accountView.merge()}" value="#{i18n['accountEvent.commit']}" />
<br /> <br />
<h:commandButton rendered="#{sessionHandler.canWrite('ACCOUNT_MANAGEMENT')}" id="deletebtn" <h:commandButton rendered="#{sessionHandler.canWrite('ACCOUNT_MANAGEMENT')}" id="deletebtn"
action="#{accountView.delete()}" value="#{i18n['accountevent.delete']}" /> action="#{accountView.delete()}" value="#{i18n['accountEvent.delete']}" />
</h:form> </h:form>
<h:dataTable border="0" id="discountlist" value="#{accountView.account.discountInstances}" var="discount"> <h:dataTable border="0" id="discountlist" value="#{accountView.account.discountInstances}" var="discount">
<h:column> <h:column>
......
code/LanBortalWeb/WebContent/auth/login.xhtml
<!DOCTYPE html <!DOCTYPE html
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" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
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:h="http://java.sun.com/jsf/html" xmlns:login="http://java.sun.com/jsf/composite/tools/login" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:f="http://java.sun.com/jsf/core" >
xmlns:login="http://java.sun.com/jsf/composite/tools/login"
xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:head> <h:head>
<title></title> <title></title>
</h:head> </h:head>
...@@ -14,6 +12,8 @@ xmlns:c="http://java.sun.com/jsp/jstl/core"> ...@@ -14,6 +12,8 @@ xmlns:c="http://java.sun.com/jsp/jstl/core">
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml"> <ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.auth.login" /> <ui:param name="thispage" value="page.auth.login" />
<ui:define name="content"> <ui:define name="content">
<h1>#{i18n['login.login']}</h1>
<login:login /> <login:login />
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
code/LanBortalWeb/WebContent/index.xhtml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<title></title> <title></title>
</h:head> </h:head>
<h:body> <h:body>
<ui:composition template="/layout/insomnia1/template.xhtml"> <ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<ui:param name="thispage" value="page.index" /> <ui:param name="thispage" value="page.index" />
<ui:define name="content"> <ui:define name="content">
<h3>Lippujen hinnat</h3> <h3>Lippujen hinnat</h3>
......
code/LanBortalWeb/WebContent/layout/stream1/sidebar-admin.xhtml
...@@ -3,65 +3,71 @@ ...@@ -3,65 +3,71 @@
"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" <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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools"> xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools"
>
<h:body> <h:body>
<ui:composition rendered="#{sessionHandler.loggedIn}" template="/layout/insomnia1/sidebartemplate.xhtml"> <ui:composition rendered="#{sessionHandler.loggedIn}" template="sidebartemplate.xhtml">
<ui:param name="rendered" value="true" /> <ui:param name="rendered" value="true" />
<ui:define name="sidebarcontent"> <ui:define name="sidebarcontent">
<ul> <tools:canRead target="ROLE_MANAGEMENT">
<tools:canRead target="ROLE_MANAGEMENT"> <h1>
<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.roles']}" /> <h:outputText value="#{i18n['sidebar.roles']}" />
<ul> </h1>
<li><h:link outcome="/role/create" value="#{i18n['sidebar.role.create']}" /></li> <ul>
<li><h:link outcome="/role/list" value="#{i18n['sidebar.role.list']}" /></li> <li><h:link outcome="/role/create" value="#{i18n['sidebar.role.create']}" /></li>
<li><h:link outcome="/user/createCardTemplate" value="#{i18n['sidebar.cardTemplate.create']}" /></li> <li><h:link outcome="/role/list" value="#{i18n['sidebar.role.list']}" /></li>
<li><h:link outcome="/user/listCardTemplates" value="#{i18n['sidebar.cardTemplate.list']}" /></li> <li><h:link outcome="/user/createCardTemplate" value="#{i18n['sidebar.cardTemplate.create']}" /></li>
<li><h:link outcome="/user/listCardTemplates" value="#{i18n['sidebar.cardTemplate.list']}" /></li>
</ul>
</li>
</tools:canRead>
<tools:canRead target="BILL">
<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.bills']}" />
<ul>
<li><h:link outcome="/bill/listAll" value="#{i18n['sidebar.bill.listAll']}" /></li>
<li><h:link outcome="/bill/billSummary" value="#{i18n['sidebar.bill.summary']}" /></li>
</ul>
</li>
</tools:canRead>
<tools:canRead target="USER_MANAGEMENT">
<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.users']}" />
<ul>
<li><h:link outcome="/user/create" value="#{i18n['sidebar.user.create']}" /></li>
<li><h:link outcome="/user/list" value="#{i18n['sidebar.user.list']}" /></li>
</ul>
</li>
</tools:canRead>
<tools:canRead target="PRODUCT">
<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.products']}" />
<ul>
<li><h:link outcome="/product/create" value="#{i18n['sidebar.product.create']}" /></li>
<li><h:link outcome="/product/list" value="#{i18n['sidebar.product.list']}" /></li>
</ul>
</li>
</tools:canRead>
<tools:canRead target="MAP"> </ul>
<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.maps']}" /> </tools:canRead>
<ul> <tools:canRead target="BILL">
<li><h:link outcome="/map/list" value="#{i18n['sidebar.map.list']}" /></li> <h1>
</ul> <h:outputText value="#{i18n['sidebar.bills']}" />
</li> </h1>
</tools:canRead> <ul>
<li><h:link outcome="/bill/listAll" value="#{i18n['sidebar.bill.listAll']}" /></li>
<li><h:link outcome="/bill/billSummary" value="#{i18n['sidebar.bill.summary']}" /></li>
</ul>
</tools:canRead>
<tools:canRead target="USER_MANAGEMENT">
<h1>
<h:outputText value="#{i18n['sidebar.users']}" />
</h1>
<ul>
<li><h:link outcome="/user/create" value="#{i18n['sidebar.user.create']}" /></li>
<li><h:link outcome="/user/list" value="#{i18n['sidebar.user.list']}" /></li>
</ul>
</tools:canRead>
<tools:canRead target="PRODUCT">
<h1>
<h:outputText value="#{i18n['sidebar.products']}" />
</h1>
<ul>
<li><h:link outcome="/product/create" value="#{i18n['sidebar.product.create']}" /></li>
<li><h:link outcome="/product/list" value="#{i18n['sidebar.product.list']}" /></li>
</ul>
</tools:canRead>
<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.other']}" /> <tools:canRead target="MAP">
<h1>
<h:outputText value="#{i18n['sidebar.maps']}" />
</h1>
<ul> <ul>
<li><h:link outcome="/eventorg/list" value="#{i18n['sidebar.eventorg.list']}" /></li> <li><h:link outcome="/map/list" value="#{i18n['sidebar.map.list']}" /></li>
<li><h:link outcome="/utils/flushCache" value="#{i18n['sidebar.utils.flushCache']}" /></li>
<li><h:link outcome="/generateTestData" value="#{i18n['sidebar.utils.testdata']}" /></li>
</ul> </ul>
</li> </tools:canRead>
<h1>
<h:outputText value="#{i18n['sidebar.other']}" />
</h1>
<ul>
<li><h:link outcome="/eventorg/list" value="#{i18n['sidebar.eventorg.list']}" /></li>
<li><h:link outcome="/utils/flushCache" value="#{i18n['sidebar.utils.flushCache']}" /></li>
<li><h:link outcome="/generateTestData" value="#{i18n['sidebar.utils.testdata']}" /></li>
</ul> </ul>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
code/LanBortalWeb/WebContent/layout/stream1/sidebar-frontpage.xhtml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
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:body> <h:body>
<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml"> <ui:composition template="sidebartemplate.xhtml">
<ui:param name="rendered" value="#{!sessionHandler.isLoggedIn()}" /> <ui:param name="rendered" value="#{!sessionHandler.isLoggedIn()}" />
<ui:define name="sidebarcontent"> <ui:define name="sidebarcontent">
<ul> <ul>
......
code/LanBortalWeb/WebContent/layout/stream1/sidebar-game.xhtml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" 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:c="http://java.sun.com/jsp/jstl/core"> xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:body> <h:body>
<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml"> <ui:composition template="sidebartemplate.xhtml">
<ui:param name="rendered" value="false" /> <ui:param name="rendered" value="false" />
<ui:define name="sidebarcontent"> <ui:define name="sidebarcontent">
......
code/LanBortalWeb/WebContent/layout/stream1/sidebar-login.xhtml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
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:body> <h:body>
<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml"> <ui:composition template="sidebartemplate.xhtml">
<ui:define name="sidebarcontent"> <ui:define name="sidebarcontent">
<ul> <ul>
<li><h:link outcome="/user/create.xhtml" value="#{i18n['sidebar.user.create']}"/></li> <li><h:link outcome="/user/create.xhtml" value="#{i18n['sidebar.user.create']}"/></li>
......
code/LanBortalWeb/WebContent/layout/stream1/sidebar-placemap.xhtml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" 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:c="http://java.sun.com/jsp/jstl/core"> xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:body> <h:body>
<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml"> <ui:composition template="sidebartemplate.xhtml">
<ui:param name="rendered" value="false" /> <ui:param name="rendered" value="false" />
<ui:define name="sidebarcontent"> <ui:define name="sidebarcontent">
......
code/LanBortalWeb/WebContent/layout/stream1/sidebar-poll.xhtml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:tools="http://java.sun.com/jsf/composite/tools"
xmlns:c="http://java.sun.com/jsp/jstl/core"> xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:body> <h:body>
<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml"> <ui:composition template="sidebartemplate.xhtml">
<ui:param name="rendered" value="false" /> <ui:param name="rendered" value="false" />
<ui:define name="sidebarcontent"> <ui:define name="sidebarcontent">
......
code/LanBortalWeb/WebContent/layout/stream1/sidebar-rfidshop.xhtml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" 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:c="http://java.sun.com/jsp/jstl/core"> xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:body> <h:body>
<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml"> <ui:composition template="sidebartemplate.xhtml">
<ui:param name="rendered" value="true" /> <ui:param name="rendered" value="true" />
<ui:define name="sidebarcontent"> <ui:define name="sidebarcontent">
<ul> <ul>
......
code/LanBortalWeb/WebContent/layout/stream1/sidebar-shop.xhtml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
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:body> <h:body>
<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml"> <ui:composition template="sidebartemplate.xhtml">
<ui:param name="rendered" value="true" /> <ui:param name="rendered" value="true" />
<ui:define name="sidebarcontent"> <ui:define name="sidebarcontent">
......
code/LanBortalWeb/WebContent/layout/stream1/sidebar-user.xhtml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:tools="http://java.sun.com/jsf/composite/tools"
xmlns:c="http://java.sun.com/jsp/jstl/core"> xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:body> <h:body>
<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml"> <ui:composition template="sidebartemplate.xhtml">
<ui:param name="rendered" value="#{sessionHandler.isLoggedIn()}" /> <ui:param name="rendered" value="#{sessionHandler.isLoggedIn()}" />
<ui:define name="sidebarcontent"> <ui:define name="sidebarcontent">
<ul> <ul>
......
code/LanBortalWeb/WebContent/layout/stream1/sidebartemplate.xhtml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<h:body> <h:body>
<ui:component> <ui:component>
<c:if test="#{rendered}"> <c:if test="#{rendered}">
<div id="sidebar"><ui:insert name="sidebarcontent" /></div> <ui:insert name="sidebarcontent" />
</c:if> </c:if>
</ui:component> </ui:component>
</h:body> </h:body>
......
code/LanBortalWeb/WebContent/layout/stream1/template.xhtml
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
<ui:insert name="metadata" /> <ui:insert name="metadata" />
<h:head> <h:head>
<title>STREAM INTRA</title>
<link href="#{request.contextPath}/resources/style/stream10/intra_style.css" rel="stylesheet" type="text/css" /> <link href="#{request.contextPath}/resources/style/stream10/intra_style.css" rel="stylesheet" type="text/css" />
<meta http-equiv="CACHE-CONTROL" content="NO-CACHE" /> <meta http-equiv="CACHE-CONTROL" content="NO-CACHE" />
<meta http-equiv="PRAGMA" content="NO-CACHE" /> <meta http-equiv="PRAGMA" content="NO-CACHE" />
...@@ -19,8 +17,7 @@ ...@@ -19,8 +17,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title><h:outputText value="#{i18n['global.eventname']}" /> - <h:outputText <title><h:outputText value="#{i18n['global.eventname']}" /> - <h:outputText
value="#{i18n[util.concat(thispage,'.header') ] }" value="#{i18n[util.concat(thispage,'.header') ] }"
/> /></title>
</title>
</h:head> </h:head>
<h:body> <h:body>
<div id="topheader"> <div id="topheader">
...@@ -29,9 +26,16 @@ ...@@ -29,9 +26,16 @@
<div id="container"> <div id="container">
<div id="page"> <div id="page">
<div id="leftnav"> <div id="leftnav">
<tools:isLoggedIn>#{sessionHandler.loginname}</tools:isLoggedIn> <h1>
<tools:loginLogout /> <tools:isLoggedIn>#{sessionHandler.loginname}</tools:isLoggedIn>
<ui:include src="/layout/insomnia1/sidebar-#{i18n[util.concat(thispage,'.pagegroup')]}.xhtml" /> </h1>
<ui:include src="menu.xhtml" />
<hr/>
<ui:include src="sidebar-#{i18n[util.concat(thispage,'.pagegroup')]}.xhtml" />
<ul>
<li><tools:loginLogout />
</li>
</ul>
</div> </div>
<div id="content"> <div id="content">
<h:messages globalOnly="true" /> <h:messages globalOnly="true" />
......
code/LanBortalWeb/WebContent/resources/style/stream10/intra_style.css
...@@ -27,31 +27,18 @@ p ...@@ -27,31 +27,18 @@ p
{ {
margin: 2px 0px 7px 0px; margin: 2px 0px 7px 0px;
} }
a #content a
{ {
text-decoration: none; text-decoration: none;
color: #aaaaaa; color: #aaaaaa;
border: 0px; border: 0px;
} }
a:hover #content a:hover
{ {
color: #ffffff; color: #ffffff;
background-color: #E45F00; background-color: #E45F00;
} }
h1
{
font-size: 23px;
margin: 0px;
color: #FFFFFF;
letter-spacing: -0.05em;
}
h3
{
font-size: 20px;
margin: 0px;
color: #FFFFFF;
letter-spacing: -0.05em;
}
#container #container
{ {
margin-left: auto; margin-left: auto;
...@@ -80,7 +67,44 @@ h3 ...@@ -80,7 +67,44 @@ h3
background-color: #888888; background-color: #888888;
letter-spacing: 1px; letter-spacing: 1px;
} }
#leftnavitem
#leftnav h1
{
margin: 0;
padding: 2px 6px;
background-color: #666666;
border-width: 0 0 1px 0;
color: #ffffff;
font-size: 1.1em;
}
#leftnav a
{
color: #ffffff;
text-decoration: none;
}
#leftnav a:hover
{
text-decoration: underline;
}
#leftnav hr
{
margin: 0;
padding: 0;
height: 6px;
background-color: #dddddd;
border-width: 0;
}
#leftnav ul, #leftnav ul ul
{
padding: 0;
margin: 0;
}
#leftnav li li
{ {
color: #ffffff; color: #ffffff;
float: left; float: left;
...@@ -88,6 +112,20 @@ h3 ...@@ -88,6 +112,20 @@ h3
background-color: #444444; background-color: #444444;
width: 190px; width: 190px;
margin-bottom: 1px; margin-bottom: 1px;
list-style-type: none;
}
#leftnav li
{
color: #ffffff;
padding: 4px 0px 4px 10px;
background-color: #444444;
width: 190px;
margin-top: 0px;
margin-bottom: 1px;
list-style-type: none;
} }
#topheader #topheader
{ {
...@@ -97,19 +135,33 @@ h3 ...@@ -97,19 +135,33 @@ h3
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
} }
#header h1,h2,h3,h4
{ {
background-color: #222222; background-color: #222222;
border: 0px; border-width: 0 0 4px 0;
border-style: solid; border-style: solid;
border-color: #c0c0c0; border-color: #FF7200;
padding-left: 5px; padding: 2px 2px 2px 10px;
margin: 0 -20px;
} }
#lighttext #lighttext
{ {
color: #bbbbbb; color: #bbbbbb;
} }
#lightborder
#content
{
width: 742px;
float: left;
height: auto !important;
height: 1000px;
background-color: #303035;
color: #ffffff;
padding: 0 20px 20px;
}
#content p
{ {
border: 0px; border: 0px;
border-style: solid; border-style: solid;
...@@ -138,26 +190,11 @@ h3 ...@@ -138,26 +190,11 @@ h3
width: 200px; width: 200px;
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
background-color: #ffffff;
} }
#leftnavsep
{
color: #ffffff;
float: left;
padding: 4px 0px 4px 10px;
background-color: #666666;
width: 190px;
margin-top: 0px;
margin-bottom: 1px;
}
#content
{
width: 782px;
float: left;
height: auto !important;
height: 1000px;
background-color: #FF7200;
color: #ffffff;
}
input input
{ {
background: #6f6f6f; background: #6f6f6f;
......
code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java
...@@ -52,12 +52,12 @@ public class SessionHandler { ...@@ -52,12 +52,12 @@ public class SessionHandler {
public String getLocale() { public String getLocale() {
// TODO: Locale selection code missing // TODO: Locale selection code missing
// return "en_ST_v7"; // return "en_ST_v7";
return "fi_IN_XII"; return "en_ST_v7";
} }
public String getLayout() { public String getLayout() {
// TODO: layout selection code missing!! // TODO: layout selection code missing!!
return "insomnia1"; return "stream1";
} }
public boolean hasPermission(String target, String permission) { public boolean hasPermission(String target, String permission) {
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n.properties
...@@ -10,14 +10,8 @@ navi.auth.logout=frontpage ...@@ -10,14 +10,8 @@ navi.auth.logout=frontpage
pagegroup.auth.login=frontpage pagegroup.auth.login=frontpage
page.auth.login.header=Login error
page.auth.login.title=Login error
page.index.pagegroup=frontpage page.index.pagegroup=frontpage
page.index.header=Etusivu
page.auth.login.pagegroup=login page.auth.login.pagegroup=login
page.auth.loginerror.pagegroup=frontpage page.auth.loginerror.pagegroup=frontpage
...@@ -54,107 +48,55 @@ page.role.list.pagegroup=admin ...@@ -54,107 +48,55 @@ page.role.list.pagegroup=admin
page.place.placemap.pagegroup=placemap page.place.placemap.pagegroup=placemap
page.place.placemap.header=Varaa paikka
page.place.mygroups.pagegroup=user page.place.mygroups.pagegroup=user
page.place.mygroups.header=Omat paikat
page.place.insertToken.pagegroup=user page.place.insertToken.pagegroup=user
page.place.insertToken.header=Sy\u02C6t\u2030 konepaikkakoodi
page.place.edit.pagegroup=admin page.place.edit.pagegroup=admin
page.place.edit.header=Edit place
page.account.edit.pagegroup=admin page.account.edit.pagegroup=admin
page.account.edit.header=Muokkaa tilitapahtumia
page.user.create.pagegroup=user page.user.create.pagegroup=user
page.user.create.header=Uusi k\u2030ytt\u2030j\u2030
page.user.edit.pagegroup=user page.user.edit.pagegroup=user
page.user.edit.header=K\u2030ytt\u2030j\u2030n muokkaus
page.user.list.pagegroup=user page.user.list.pagegroup=user
page.user.list.header=K\u2030ytt\u2030j\u2030t
page.user.editself.pagegroup=user page.user.editself.pagegroup=user
page.user.editself.header=Omat tiedot
page.user.mygroups.pagegroup=user page.user.mygroups.pagegroup=user
page.user.mygroups.header=Omat paikat
page.admin.sendimage.pagegroup=admin page.admin.sendimage.pagegroup=admin
page.admin.sendimage.header=L\u2030het\u2030 kuva
page.auth.login.loginerror.pagegroup=frontpage page.auth.login.loginerror.pagegroup=frontpage
page.auth.login.loginerror.header=Kirjautumisvirhe
page.auth.login.logout.pagegroup=frontpage page.auth.login.logout.pagegroup=frontpage
page.auth.login.logout.header=Uloskirjautuminen
page.permissionDenied.pagegroup=frontpage page.permissionDenied.pagegroup=frontpage
page.permissionDenied.header=P\u2030\u2030sy kielletty
page.bill.placemap.pagegroup=placemap page.bill.placemap.pagegroup=placemap
page.bill.placemap.header=Paikkakartta
page.bill.listAll.pagegroup=admin page.bill.listAll.pagegroup=admin
page.bill.listAll.header=Laskut
page.bill.edit.pagegroup=admin page.bill.edit.pagegroup=admin
page.bill.edit.header=Edit bill
page.bill.billSummary.pagegroup=admin page.bill.billSummary.pagegroup=admin
page.bill.billSummary.header=Laskujen yhteenveto
page.account.list.pagegroup=user page.account.list.pagegroup=user
page.account.list.header=Tilitapahtumat
page.auth.resetPassword.pagegroup=user page.auth.resetPassword.pagegroup=user
page.auth.resetPassword.header=Salasanan resetointi
page.shop.readerevents.pagegroup=rfidshop page.shop.readerevents.pagegroup=rfidshop
page.shop.readerevents.header=RFID kauppa
page.game.start.pagegroup=game page.game.start.pagegroup=game
page.game.start.header=Insomnia Game
page.game.list.pagegroup=game page.game.list.pagegroup=game
page.game.list.header=Insomnia Game
page.poll.start.pagegroup=poll page.poll.start.pagegroup=poll
page.poll.start.header=Kysely
page.poll.answer.pagegroup=poll page.poll.answer.pagegroup=poll
page.poll.answer.header=Kysely
page.poll.answered.pagegroup=poll page.poll.answered.pagegroup=poll
page.poll.answered.header=Kiitos vastauksestasi
#Bill number #Bill number
# Validationmessages # Validationmessages
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en_ST.properties
#Bill number
# Validationmessages
global.infomail=info@streamparty.org global.infomail=info@streamparty.org
global.webpage=http\u003A//www.streamparty.org global.webpage=http\u003A//www.streamparty.org
#Bill number bill.billMarkedPaidMail.message=Your bill number {0} has been marked as paid.
# Validationmessages bill.billMarkedPaidMail.subject=[INSOMNIA] Lasku merkitty maksetuksi
\ No newline at end of file
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en_ST_v7.properties
global.eventname=Stream seven
#Bill number #Bill number
# Validationmessages # Validationmessages
global.eventname=Stream seven
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi_IN.properties
#Bill number
# Validationmessages
global.infomail=info@insomnia.fi global.infomail=info@insomnia.fi
global.webpage=http\u003A//www.insomnia.fi global.webpage=http\u003A//www.insomnia.fi
#Bill number bill.billMarkedPaidMail.message=Laskusi numero {0} on merkitty maksetuksi. Voit nyt siirty\u2030 lippukauppaan varamaamaan haluamasi paikat. \nTervetuloa tapahtumaan!\n\nTerveisin,\nInsomnia lippupalvelu\nwww.insomnia.fi
# Validationmessages bill.billMarkedPaidMail.subject=[INSOMNIA] Lasku merkitty maksetuksi
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi_IN_XII.properties
global.eventname=Insomnia XII
#Bill number #Bill number
# Validationmessages # Validationmessages
global.eventname=Insomnia XII
code/LanBortalWeb/src/fi/insomnia/bortal/resources/tunkh.pl 0 → 100644
#!/bin/perl
use strict;
my ($fromfile, $tofile) = @ARGV;
open (FROMFILE, $fromfile);
open (OUTFILE, ">".$tofile.".out") or die ("Could not open outfile");
while ( my $row = <FROMFILE>) {
print("checking ", $row . "\n");
my ($name, $val) = split('=', $row);
open (CHECKFILE, $tofile);
my $found = 0;
while(my $checkrow = <CHECKFILE>)
{
if($checkrow =~ m/$name."="/)
{
print($row . " Found already. skipping\n");
$found = 1;
last;
}
}
close(CHECKFILE);
if($found eq 0)
{
print "adding ".$row . " to file\n";
print OUTFILE $row . "\n";
}
}
close (OUTFILE);
close(CHECKBOOK);
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!