Skip to content

Linnea Samila / Moya

Go to a project
Commit 8a0b8812 by Petri Jarvisalo
Options

hurrdurr

1 parent 4e500888
Inline Side-by-side
Showing with 389 additions and 10 deletions
code/LanBortalWeb/WebContent/admin/adduser/start.xhtml 0 → 100644
<!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"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:p="http://primefaces.org/ui"
xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"
xmlns:tools="http://java.sun.com/jsf/composite/cditools">
<h:body>
<ui:composition
template="/layout/#{sessionHandler.adduserfullscreen}/template.xhtml">
<ui:define name="content">
<div style="text-align: center;">
<h:form>
<h1>#{i18n["adduser.welcome"]}</h1>
<br/><br/><p>#{i18n["adduser.welcometext"]}
</p>
<br/><br/>
<p:commandButton styleClass="start" value="#{i18n['adduser.newuser']}" />
<p:commandButton styleClass="start" value="#{i18n['adduser.update']}" />
</h:form>
</div>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/admin/info/computerplaces.xhtml 0 → 100644
<!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"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:p="http://primefaces.org/ui"
xmlns:user="http://java.sun.com/jsf/composite/cditools/user"
xmlns:tools="http://java.sun.com/jsf/composite/cditools"
xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"
>
<h:body>
<ui:composition
template="/layout/#{sessionHandler.fullscreen}/template.xhtml">
<f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{userView.initView}" />
</f:metadata>
<ui:define name="topbar">
<h:link outcome="/admin/info/general" class="userbackbutton" value="">
<div>
<img src="#{request.contextPath}/resources/style/blipview/img/arrow.png" />
</div>
</h:link>
</ui:define>
<ui:define name="content">
<h:outputText rendered="#{empty placeGroupView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" />
<h:form rendered="#{!empty placeGroupView.groupMemberships}" id="placelistform">
<h:dataTable value="#{placeGroupView.groupMemberships}" var="member">
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['placegroupview.reservationName']}" />
</f:facet>
<h:outputText value="#{member.placeReservation.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['placegroupview.reservationProduct']}" />
</f:facet>
<h:outputText value="#{member.placeReservation.product.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['placegroupview.token']}" />
</f:facet>
<h:outputText rendered="#{empty member.user}" value="#{member.inviteToken}" />
<h:outputText rendered="#{!empty member.user}" value="#{member.user.firstnames} #{member.user.lastname} (#{member.user.nick})" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['placegroupview.groupCreator']}" />
</f:facet>
<h:outputText value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})" />
</h:column>
<h:column>
<h:commandButton rendered="#{placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull}" action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" />
</h:column>
</h:dataTable>
</h:form>
<p>
<input type="button" onclick="location.replace('#{request.contextPath}/PlaceGroupPdf');" value="#{i18n['placegroup.printPdf']}" />
</p>
<h2>#{i18n['placetoken.pageHeader']}</h2>
<p>#{i18n['placetoken.topText']}</p>
<h:form id="placeTokenForm">
<h:outputLabel value="#{i18n['placetoken.token']}:" />
<h:inputText value="#{tokenView.token}" />
<h:commandButton id="commitbtn" action="#{tokenView.saveToken()}" value="#{i18n['placetoken.commit']}" />
</h:form>
</ui:define>
<ui:define name="sidebar">
<user:tileview />
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/admin/info/general.xhtml
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
<ui:define name="topbar"> <ui:define name="topbar">
<h:link outcome="/admin/info/index" class="userbackbutton" value=""> <h:link outcome="/admin/info/index" class="userbackbutton" value="">
<div> <div>
<h:outputText value="#{i18n['infoview.back']}" /> <img src="#{request.contextPath}/resources/style/blipview/img/arrow.png" />
</div> </div>
</h:link> </h:link>
</ui:define> </ui:define>
...@@ -31,9 +32,10 @@ ...@@ -31,9 +32,10 @@
<img src="#{request.contextPath}/resources/style/blipview/img/shop.png" /> <img src="#{request.contextPath}/resources/style/blipview/img/shop.png" />
<h:outputText value="#{i18n['infoview.shop']}" /> <h:outputText value="#{i18n['infoview.shop']}" />
</div> </div>
<f:param name="userid" value="#{userView.user.id}" />
</h:link> </h:link>
<h:link outcome="/admin/info/shop" class="usertile" value=""> <h:link outcome="/admin/info/computerplaces" class="usertile" value="">
<div> <div>
<img src="#{request.contextPath}/resources/style/blipview/img/computer.png" /> <img src="#{request.contextPath}/resources/style/blipview/img/computer.png" />
<h:outputText value="#{i18n['infoview.computerplace']}" /> <h:outputText value="#{i18n['infoview.computerplace']}" />
......
code/LanBortalWeb/WebContent/admin/info/shop.xhtml
...@@ -8,25 +8,26 @@ ...@@ -8,25 +8,26 @@
xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:p="http://primefaces.org/ui" xmlns:p="http://primefaces.org/ui"
xmlns:user="http://java.sun.com/jsf/composite/cditools/user" xmlns:user="http://java.sun.com/jsf/composite/cditools/user"
xmlns:tools="http://java.sun.com/jsf/composite/cditools"> xmlns:tools="http://java.sun.com/jsf/composite/cditools"
xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop">
<h:body> <h:body>
<ui:composition <ui:composition
template="/layout/#{sessionHandler.fullscreen}/template.xhtml"> template="/layout/#{sessionHandler.fullscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{userView.initView}" /> <f:event type="preRenderView" listener="#{userView.initView}" />
<f:event type="preRenderView" listener="#{productShopView.initShopView}" />
</f:metadata> </f:metadata>
<ui:define name="topbar"> <ui:define name="topbar">
<h:link outcome="/admin/info/general" class="userbackbutton" value=""> <h:link outcome="/admin/info/general" class="userbackbutton" value="">
<div> <div>
<h:outputText value="#{i18n['infoview.back']}" /> <img src="#{request.contextPath}/resources/style/blipview/img/arrow.png" />
</div> </div>
</h:link> </h:link>
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
<h1>Kaappa</h1> <shop:shoppingcart />
</ui:define> </ui:define>
......
code/LanBortalWeb/WebContent/layout/adduser/template.xhtml 0 → 100644
<?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/cditools"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:p="http://primefaces.org/ui">
<f:view contentType="text/html" locale="#{sessionHandler.locale}">
<h:head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title><h:outputText value="#{layoutView.getHeader()}" /></title>
<meta name="description" content="Lippukauppa" />
<meta name="author" content="CodeCrew ry" />
<meta http-equiv="Content-Language" content="fi" />
<link rel="stylesheet" type="text/css"
href="#{request.contextPath}/resources/style/blipview/css/style.css" />
<link rel="stylesheet" type="text/css"
href="#{request.contextPath}/resources/style/blipview/css/general.css" />
<ui:insert name="headerdata" />
</h:head>
<h:body>
<div class="container top">
<ui:insert name="topbar" />
</div>
<div class="container clearfix">
<div id="content">
<ui:insert name="content" />
</div>
</div>
<!-- Piwik -->
<script type="text/javascript">
var pkBaseURL = (("https:" == document.location.protocol) ? "https://jolez.pingtimeout.net/piwik/"
: "http://jolez.pingtimeout.net/piwik/");
document.write(unescape("%3Cscript src='" + pkBaseURL
+ "piwik.js' type='text/javascript'%3E%3C/script%3E"));
</script>
<script type="text/javascript">
try {
var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 5);
piwikTracker.trackPageView();
piwikTracker.enableLinkTracking();
} catch (err) {
}
</script>
<noscript>
<p>
<img src="http://jolez.pingtimeout.net/piwik/piwik.php?idsite=5"
style="border: 0" alt="" />
</p>
</noscript>
<!-- End Piwik Tracking Code -->
</h:body>
</f:view>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/layout/blipview/template.xhtml
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
<h:body> <h:body>
<p:menubar model="#{primeMenuView.menuModel}"
style="width:80%; float: left;"> <p:menubar model="#{primeMenuView.menuModel}">
</p:menubar> </p:menubar>
......
code/LanBortalWeb/WebContent/resources/style/adduser/css/general.css 0 → 100644
/* General css, use for non-layout purposes for general elements */
/* userlistview popup */
.userdata_popup {
position: absolute;
border: 1px solid black;
background: white;
border-radius: 3px;
display: none;
width: 300px;
height: 150px;
}
/* general class for hoverable usage */
.hoverable {
}
.hidden {
display: none;
}
#webcamcontainer {
}
#shopItems {
}
.ui-panel-title {
text-overflow: clip;
}
.shopItem {
float: left;
width: 72px;
height: 72px;
background: burlywood;
border: 1px solid black;
margin: 2px;
}
a.shopItem {
color: black !important;
}
a.shopItem div {
position: absolute;
height: 72px;
width: 72px;
text-align: center;
/* Firefox */
display: -moz-box;
-moz-box-orient: horizontal;
-moz-box-pack: center;
-moz-box-align: center;
/* Safari and Chrome */
display: -webkit-box;
-webkit-box-orient: horizontal;
-webkit-box-pack: center;
-webkit-box-align: center;
/* W3C */
display: box;
box-orient: horizontal;
box-pack: center;
box-align: center;
clip: rect(0, 72px, 72px, 0);
}
}
a.shopItem:hover {
background: darkgoldenrod;
}
a.shopItem:active {
background: red;
}
a.userimagetile, a.usertile {
float: left;
}
a.userimagetile div {
width: 128px;
height: 224px;
border: 1px solid black;
margin: 2px;
}
a.userimagetile div img {
width: 100%;
}
.usertilenick {
font-size: 14pt;
}
a.userbackbutton:link, a.userbackbutton:visited {
color: black;
text-decoration: none;
}
a.userbackbutton div{
background: #CEE4ED;
width:8em;
height: 2em;
padding: 1em;
border: 1px solid black;
}
a.usertile div {
background: #CEE4ED;
width: 10em;
height: 10em;
padding: 1em;
margin: 1em;
border: 1px solid black;
}
code/LanBortalWeb/WebContent/resources/style/adduser/css/style.css 0 → 100644
* {
padding: 0;
margin: 0;
}
body {
margin: 0em;
font-size: 62.5%;
background-color: #fff;
font-family: verdana, arial, sans-serif;
} /*Font-size: 1.0em = 10px when browser default size is 16px*/
#main {
clear: both;
}
.container.top,.container.bottom {
clear: both;
text-align: center;
}
.container.top a,.container.bottom a {
font-size: 90%;
color: #aaa;
text-decoration: none;
}
.container.bottom {
clear: both;
}
#content {
width: 800px;
margin: 0 auto;
}
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/style/blipview/css/general.css
/* General css, use for non-layout purposes for general elements */ /* General css, use for non-layout purposes for general elements */
/* userlistview popup */ /* userlistview popup */
.userdata_popup { .userdata_popup {
position: absolute; position: absolute;
border: 1px solid black; border: 1px solid black;
......
code/LanBortalWeb/WebContent/resources/style/blipview/css/style.css
* {padding:0; margin:0;} * {padding:0; margin:0;}
body { body {
margin: 2em; font-size:62.5%; background-color: #fff; font-family:verdana,arial,sans-serif;} /*Font-size: 1.0em = 10px when browser default size is 16px*/ margin: 0em; font-size:62.5%; background-color: #fff; font-family:verdana,arial,sans-serif;} /*Font-size: 1.0em = 10px when browser default size is 16px*/
#page-container { #page-container {
width: 900px; width: 900px;
...@@ -63,6 +63,9 @@ body { ...@@ -63,6 +63,9 @@ body {
.container.top, .container.bottom { .container.top, .container.bottom {
clear: both; clear: both;
text-align: center; text-align: center;
margin-bottom: 2em;
margin-top: 1em;
padding-left: 2em;
} }
.container.top a, .container.bottom a { .container.top a, .container.bottom a {
......
code/LanBortalWeb/WebContent/shop/shopToUser.xhtml
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
"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" <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:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:c="http://java.sun.com/jsp/jstl/core"> xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"
>
<h:body> <h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml"> <ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata> <f:metadata>
......
code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java
...@@ -67,6 +67,11 @@ public class SessionHandler { ...@@ -67,6 +67,11 @@ public class SessionHandler {
return template; return template;
} }
public String getAdduserfullscreen() {
template = "adduser";
return template;
}
public String getLayout() { public String getLayout() {
// TODO: layout selection code missing!! // TODO: layout selection code missing!!
template = "template1"; template = "template1";
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
...@@ -27,6 +27,11 @@ actionlog.tasklist.header = Tasklist ...@@ -27,6 +27,11 @@ actionlog.tasklist.header = Tasklist
actionlog.time = Time actionlog.time = Time
actionlog.user = User actionlog.user = User
adduser.newuser = Create new user
adduser.update = Update picture
adduser.welcome = Welcome
adduser.welcometext = You can easily add a new user or update your user image for your profile. Simply to start, wanted action to start.
applicationPermission.description = description applicationPermission.description = description
applicationPermission.name = Rightsgroup applicationPermission.name = Rightsgroup
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
...@@ -27,6 +27,11 @@ actionlog.tasklist.header = Teht\u00E4v\u00E4lista ...@@ -27,6 +27,11 @@ actionlog.tasklist.header = Teht\u00E4v\u00E4lista
actionlog.time = Aika actionlog.time = Aika
actionlog.user = Tekij\u00E4 actionlog.user = Tekij\u00E4
adduser.newuser = Luo uusi k\u00E4ytt\u00E4j\u00E4
adduser.update = P\u00E4ivit\u00E4 k\u00E4vij\u00E4kuva
adduser.welcome = Tervetuloa
adduser.welcometext = Voit helposti ja k\u00E4tev\u00E4sti luoda tai p\u00E4ivitt\u00E4\u00E4 k\u00E4ytt\u00E4j\u00E4profiilisi kuvan t\u00E4ss\u00E4. Valitse toiminto allaolevista valinnoista.
applicationPermission.description = kuvaus applicationPermission.description = kuvaus
applicationPermission.name = Oikeusryhm\u00E4 applicationPermission.name = Oikeusryhm\u00E4
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!