Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 73931ba3 by Tuomas Riihimäki
Options

Merge branch 'newui' into newui-merge 

Conflicts:
	code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java
2 parents d404584a 47453cc9
Inline Side-by-side
Showing with 504 additions and 12 deletions
code/LanBortalWeb/WebContent/WEB-INF/web.xml
......@@ -9,8 +9,8 @@
</session-config>
<context-param>
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Production</param-value>
<!--<param-value>Development</param-value> -->
<!-- <param-value>Production</param-value>-->
<param-value>Development</param-value>
</context-param>
<context-param>
......
code/LanBortalWeb/WebContent/admin/adduser/newuser.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:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools">
<h:body>
<ui:composition template="/layout/#{sessionHandler.adduserfullscreen}/template.xhtml">
<f:metadata>
<f:event type="preRenderView" listener="#{userView.initCreateView}" />
</f:metadata>
<ui:define name="content">
<div style="text-align: center;">
<h1>#{i18n["adduser.newuser"]}</h1>
<users:create creating="true" commitaction="#{userView.createUser()}" commitvalue="#{i18n['user.create']}" />
</div>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/admin/adduser/start.xhtml
......@@ -21,8 +21,8 @@
</p>
<br/><br/>
<p:commandButton styleClass="start" value="#{i18n['adduser.newuser']}" />
<p:commandButton styleClass="start" value="#{i18n['adduser.update']}" />
<p:commandButton styleClass="start" ajax="false" action="/admin/adduser/newuser" value="#{i18n['adduser.newuser']}" /><br/>
<p:commandButton styleClass="start" ajax="false" action="/admin/adduser/update" value="#{i18n['adduser.update']}" />
</h:form>
</div>
......
code/LanBortalWeb/WebContent/admin/adduser/update.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.update"]}</h1>
</h:form>
</div>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/layout/skynett17/template.xhtml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html>
<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" manifest="offline.appcache">
<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/skynett17/css/style.css" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/skynett17/css/general.css" />
<ui:insert name="headerdata" />
</h:head>
<h:body>
<div id="container">
<div id="header">
<div align="right">
<!-- <tools:loginLogout /> -->
</div>
<h:link outcome="/index">
<img src="#{request.contextPath}/resources/style/skynett17/img/header.jpg" />
</h:link>
</div>
<div id="menu">
<p:menubar model="#{primeMenuView.menuModel}" />
</div>
<div id="content">
<div id="primarycontainer">
<div id="primarycontent">
<ui:insert name="title" />
<p:messages severity="info" />
<h:messages />
<ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
<h:outputText value="#{cont1.content}" escape="false" />
</ui:repeat>
<ui:insert name="content" />
<ui:repeat var="cont1" value="#{menuView.getPagecontent('bottom')}">
<h:outputText value="#{cont1.content}" escape="false" />
</ui:repeat>
</div>
</div>
</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>
<h:outputScript library="primefaces" name="jquery/jquery.js" />
<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>
code/LanBortalWeb/WebContent/resources/style/skynett17/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;
}
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/style/skynett17/css/style.css 0 → 100644
*
{
padding: 0em;
margin: 0em;
font-smooth: always;
}
body
{
background: url("../img/tausta.jpg");
background-attachment: fixed;
background-size: cover;
background-repeat: none;
background-position: center, center;
padding: 35px 0px 35px 0px;
}
body,input
{
font-size: 10pt;
font-family: "Calibri";
color: #333333;
}
p
{
line-height: 1.5em;
margin-bottom: 1.0em;
text-align: justify;
}
a
{
color: #B96D00;
text-decoration: underline;
}
a:hover
{
text-decoration: none;
}
h3 span
{
font-weight: normal;
}
h3,h4
{
display: inline;
font-weight: bold;
background-repeat: no-repeat;
background-position: right;
}
h3
{
font-size: 1.7em;
padding-right: 34px;
}
h4
{
font-size: 1.2em;
padding-right: 28px;
}
.contentarea
{
padding: 1.5em;
padding-top: 1.3em;
}
img
{
display:block;
margin: 0 auto;
}
img.left
{
position: relative;
float: left;
margin: 0em 1.8em 1.4em 0em;
}
img.right
{
position: relative;
float: right;
margin: 0em 0em 1.8em 1.8em;
}
.divider1
{
position: relative;
height: 14px;
margin: 2.0em 0em 1.5em 0em;
clear: both;
}
.divider2
{
position: relative;
height: 1px;
border-bottom: solid 1px #eaeaea;
margin: 2.0em 0em 2.0em 0em;
}
.post .details
{
position: relative;
top: -1.5em;
font-size: 0.8em;
color: #787878;
}
.post ul.controls
{
clear: both;
}
.post ul.controls li
{
display: inline;
font-size: 0.8em;
}
.post ul.controls li a
{
background-repeat: no-repeat;
background-position: left;
padding: 0em 1.0em 0em 20px;
}
.post ul.controls li a.printerfriendly
{
background-image: url('images/icon-printerfriendly.gif');
}
.post ul.controls li a.comments
{
background-image: url('images/icon-comments.gif');
}
.post ul.controls li a.more
{
background-image: url('images/icon-more.gif');
}
.box h1 {
font-size: 16pt;
color: white;
background: url('../img/boxbg.jpg') repeat-x;
display: block;
height: 46px;
padding-top: 4px;
padding-left: 10px;
text-align: left;
margin: 0;
border-radius: 5px;
}
.box
{
border-radius: 5px;
position: relative;
background: #fff;
}
ul.linklist
{
list-style: none;
}
ul.linklist li
{
line-height: 2.0em;
}
#container
{
z-index: 2;
position: relative;
width: 960px;
background-color: #DCE8E9;
margin: 0 auto;
border: 2px solid white;
}
#menu
{
}
#content
{
padding: 0em 2.0em 0em 2.0em;
}
#primarycontent
{
margin: 1.5em 310px 0em 0em;
}
#secondarycontent
{
margin-top: 1.5em;
float: right;
width: 290px;
}
#footer
{
position: relative;
height: 2.0em;
clear: both;
padding-top: 5.0em;
font-size: 0.8em;
}
#footer .left
{
position: absolute;
left: 2.0em;
bottom: 1.2em;
}
#footer .right
{
position: absolute;
right: 2.0em;
bottom: 1.2em;
}
img.kuva {
float: right;
}
a.tyhja
{
color: black;
text-decoration: none;
}
.ui-menu, .ui-menu .ui-menu-child {
background: #03080C;
}
.ui-widget-content a {
color: #eee !important;
}
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/style/skynett17/css/tabnav.css 0 → 100644
#edit { float: left; width:100%; border-bottom: 1px solid black; }
ul#usertabnav { float:left; width: 100%; border:1px solid rgba(200,200,200,0); background:rgba(200,200,200,0); border-radius: 16px 16px 0 0; }
ul#usertabnav li {display:inline; list-style:none; }
ul#usertabnav li a {display:block; line-height: 1.7em; float:left; padding:2px 5px 2px 5px; color:rgb(125,125,125); text-decoration:none; font-size:120%; background-color:rgba(100,100,100,0.3); color: rgba(0,0,0,1); border-radius: 12px 12px 0 0; border: 1px solid rgba(0,0,0,0.1); border-bottom: none;}
ul#usertabnava:hover {text-decoration:none; color:rgb(50,50,50);}
ul#usertabnav li .active {font-weight: bold; background-color:rgba(250,250,250,0.4); color: rgba(0,0,0,1); border-radius: 12px 12px 0 0; border: 1px solid black; border-bottom: none }
#edit {
clear: both;
}
\ No newline at end of file
code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java
......@@ -66,12 +66,12 @@ public class SessionHandler {
template = "blipview";
return template;
}
public String getAdduserfullscreen() {
template = "adduser";
return template;
}
public String getLayout() {
if (template == null) {
template = eventbean.getPropertyString(LanEventPropertyKey.EVENT_LAYOUT);
......@@ -155,7 +155,10 @@ public class SessionHandler {
return eventbean.flushCache();
}
public String navigateTo(String url) {
return url;
}
private String preurlString;
public String getRequestPreUrl()
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
......@@ -34,9 +34,9 @@ actionlog.time = Time
actionlog.user = User
adduser.newuser = Create new user
adduser.update = Update picture
adduser.update = Update profile 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.
adduser.welcometext = Here you can add new user or update your current user profile image. Please select desired action below.
applicationPermission.description = description
applicationPermission.name = Rightsgroup
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
......@@ -33,10 +33,10 @@ actionlog.tasklist.header = Teht\u00E4v\u00E4lista
actionlog.time = Aika
actionlog.user = Tekij\u00E4
adduser.newuser = Luo uusi k\u00E4ytt\u00E4j\u00E4
adduser.update = P\u00E4ivit\u00E4 k\u00E4vij\u00E4kuva
adduser.newuser = Luo uusi k\u00E4ytt\u00E4j\u00E4tunnus
adduser.update = P\u00E4ivit\u00E4 profiilin kuva
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.
adduser.welcometext = Voit luoda t\u00E4ss\u00E4 k\u00E4tev\u00E4sti uuden tunnuksen tai vaihtaa nykyisen tunnuksen profiilikuvan uudempaan.
applicationPermission.description = kuvaus
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!