Skip to content

Codecrew / Moya

Go to a project
Commit 915b1c14 by Petri Jarvisalo
Options

favicon and fixes

1 parent 9fe3c878
Inline Side-by-side
Showing with 262 additions and 134 deletions
code/MoyaWeb/WebContent/admin/incoming/printCard.xhtml
...@@ -12,27 +12,34 @@ ...@@ -12,27 +12,34 @@
<f:event type="preRenderView" listener="#{userView.prepareCardDownload}" /> <f:event type="preRenderView" listener="#{userView.prepareCardDownload}" />
</f:metadata> </f:metadata>
<ui:define name="content"> <ui:define name="content">
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" /> <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<user:edit commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" /> <h:panelGrid columns="3">
<br /> <h:panelGroup>
<br /> <user:edit commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" />
<br /> </h:panelGroup>
<h:panelGroup>
<h:form> <h:form>
<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" /> <p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" />
<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" /> <h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
</h:form> </h:form>
<br /> </h:panelGroup>
<br /> <h:panelGroup>
<h:form> <h:form>
<user:previewAndPrintCard /> <user:previewAndPrintCard />
<p:commandButton action="#{userView.acceptPrintedCard()}" value="accept printed card" /> <p:commandButton action="#{userView.acceptPrintedCard()}" value="accept printed card" />
</h:form> </h:form>
</h:panelGroup>
</h:panelGrid>
</ui:define> </ui:define>
<ui:define name="sidebar">
</ui:define>
</ui:composition> </ui:composition>
</h:body> </h:body>
</html> </html>
\ No newline at end of file
code/MoyaWeb/WebContent/admin/info/computerplaces.xhtml
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<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>
<img src="#{request.contextPath}/resources/style/blipview/img/arrow.png" /> <img src="#{request.contextPath}/resources/templates/blipview/img/arrow.png" />
</div> </div>
</h:link> </h:link>
......
code/MoyaWeb/WebContent/admin/info/general.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: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: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">
<h:body> <h:body>
<ui:composition <ui:composition template="/resources/templates/#{sessionHandler.fullscreen}/template.xhtml">
template="/resources/templates/#{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}" />
...@@ -20,7 +12,7 @@ ...@@ -20,7 +12,7 @@
<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>
<img src="#{request.contextPath}/resources/style/blipview/img/arrow.png" /> <img src="#{request.contextPath}/resources/templates/blipview/img/arrow.png" />
</div> </div>
</h:link> </h:link>
...@@ -29,7 +21,7 @@ ...@@ -29,7 +21,7 @@
<h:link outcome="/admin/info/shop" class="usertile" value=""> <h:link outcome="/admin/info/shop" class="usertile" value="">
<div> <div>
<img src="#{request.contextPath}/resources/style/blipview/img/shop.png" /> <img src="#{request.contextPath}/resources/templates/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}" /> <f:param name="userid" value="#{userView.user.id}" />
...@@ -37,7 +29,7 @@ ...@@ -37,7 +29,7 @@
<h:link outcome="/admin/info/computerplaces" 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/templates/blipview/img/computer.png" />
<h:outputText value="#{i18n['infoview.computerplace']}" /> <h:outputText value="#{i18n['infoview.computerplace']}" />
</div> </div>
</h:link> </h:link>
......
code/MoyaWeb/WebContent/admin/info/index.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: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:reader="http://java.sun.com/jsf/composite/cditools/reader"
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:reader="http://java.sun.com/jsf/composite/cditools/reader"
xmlns:tools="http://java.sun.com/jsf/composite/cditools"> xmlns:tools="http://java.sun.com/jsf/composite/cditools">
<h:body> <h:body>
<ui:composition <ui:composition template="/resources/templates/#{sessionHandler.fullscreen}/template.xhtml">
template="/resources/templates/#{sessionHandler.fullscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:event type="preRenderView" listener="#{infoView.initView}" /> <f:event type="preRenderView" listener="#{infoView.initView}" />
......
code/MoyaWeb/WebContent/admin/info/shop.xhtml
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<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>
<img src="#{request.contextPath}/resources/style/blipview/img/arrow.png" /> <img src="#{request.contextPath}/resources/templates/blipview/img/arrow.png" />
</div> </div>
</h:link> </h:link>
</ui:define> </ui:define>
......
code/MoyaWeb/WebContent/resources/cditools/user/edit.xhtml
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<h:panelGroup> <h:panelGroup>
<ui:fragment rendered="#{not empty userView.user.id}"> <ui:fragment rendered="#{not empty userView.user.id}">
<p:dialog id="chartPanel" for="webcamButton" modal="true" dynamic="true" widgetVar="webcamDialog" onHide="pc.hide()"> <p:dialog id="chartPanel" for="webcamButton" modal="true" dynamic="true" widgetVar="webcamDialog">
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" /> <p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" />
<p:commandButton type="button" value="Capture" onclick="pc.capture()" /> <p:commandButton type="button" value="Capture" onclick="pc.capture()" />
</p:dialog> </p:dialog>
......
code/MoyaWeb/WebContent/resources/templates/blipview/css/style.css
* {padding:0; margin:0;} * {
body { padding: 0;
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*/ 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*/
#page-container { #page-container {
width: 900px; width: 900px;
margin: 0 auto; margin: 0 auto;
...@@ -9,11 +16,16 @@ body { ...@@ -9,11 +16,16 @@ body {
margin-top: 10px; margin-top: 10px;
background: white; background: white;
border-radius: 12px; border-radius: 12px;
background:rgb(255,255,255) url("../img/bg_main_nav.jpg"); background: rgb(255, 255, 255) url("../img/bg_main_nav.jpg");
} }
#page-header {height:80px; background:rgb(240,240,240) url("../img/bg_head_top.jpg"); overflow:visible !important /*Firefox*/; overflow:hidden /*IE6*/; border-radius: 12px 12px 0 0; } #page-header {
height: 80px;
background: rgb(240, 240, 240) url("../img/bg_head_top.jpg");
overflow: visible !important /*Firefox*/;
overflow: hidden /*IE6*/;
border-radius: 12px 12px 0 0;
}
#login { #login {
margin-top: 10px; margin-top: 10px;
...@@ -22,45 +34,150 @@ body { ...@@ -22,45 +34,150 @@ body {
text-align: right; text-align: right;
} }
#login a, #login a:visited { #login a,#login a:visited {
text-decoration: none; text-decoration: none;
color: black; color: black;
font-weight: bold; font-weight: bold;
} }
#login a:hover { #login a:hover {
color: red; color: red;
} }
#top-menu {position:relative; z-index:0; top: 2em;} #top-menu {
#top-menu ul { float:left; width: 100%; padding-left: 25px; border:1px solid rgba(200,200,200,0); background:rgba(200,200,200,0); border-radius: 16px 16px 0 0; } position: relative;
#top-menu li {display:inline; list-style:none; } z-index: 0;
#top-menu 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.1); color: rgba(0,0,0,0.3); border-radius: 12px 12px 0 0; border: 1px solid rgba(0,0,0,0.1); border-bottom: none;} top: 2em;
#top-menu a:hover {text-decoration:none; color:rgb(50,50,50);} }
#top-menu 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 }
#top-menu ul {
float: left;
width: 100%;
padding-left: 25px;
border: 1px solid rgba(200, 200, 200, 0);
background: rgba(200, 200, 200, 0);
border-radius: 16px 16px 0 0;
}
#top-menu li {
display: inline;
list-style: none;
}
#top-menu 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.1);
color: rgba(0, 0, 0, 0.3);
border-radius: 12px 12px 0 0;
border: 1px solid rgba(0, 0, 0, 0.1);
border-bottom: none;
}
#top-menu a:hover {
text-decoration: none;
color: rgb(50, 50, 50);
}
#top-menu 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
}
#pageheader { #pageheader {
background: red; background: red;
} }
#main { #main {
clear: both; clear: both;
} }
#main-nav {float:left; width: 100%; border-top:1px solid #bbb; border-bottom:1px solid #bbb; background:rgb(220,220,220) url("../img/bg_head_bottom_nav.jpg") repeat-x; color:rgb(75,75,75); font-size:130%;} #main-nav {
#main-nav ul {list-style-type:none;} float: left;
#main-nav ul li {float:left; position:relative; z-index:auto !important /*Non-IE6*/; z-index:1000 /*IE6*/; } width: 100%;
#main-nav ul li a {float:none !important /*Non-IE6*/; float:left /*IE-6*/; display:block; height:3.1em; line-height:3.1em; padding:0 16px 0 16px; text-decoration:none; font-weight:bold; color: rgb(100,100,100);} border-top: 1px solid #bbb;
#main-nav ul li ul {display:none; border:none;} border-bottom: 1px solid #bbb;
background: rgb(220, 220, 220) url("../img/bg_head_bottom_nav.jpg")
repeat-x;
color: rgb(75, 75, 75);
font-size: 130%;
}
#main-nav ul li .active { font-weight: bold; background-color:rgba(0,150,250,0.35); color: rgba(255,255,250,0.8); } #main-nav ul {
#main-nav ul li:hover a { background-color:rgba(0,150,250,0.1); text-decoration:none; } /*Color main cells hovering mode*/ list-style-type: none;
#main-nav ul li:hover ul {display:block; width:10.0em; position:absolute; z-index:999; top:3.0em; margin-top:0.1em; left:0;} }
#main-nav ul li:hover ul li a {display:block; width:10.0em; height:auto; line-height:1.3em; margin-left:-1px; padding:4px 16px 4px 16px; border-left:solid 1px rgb(175,175,175); border-bottom: solid 1px rgb(175,175,175); background-color:rgb(237,237,237); font-weight:normal; color:rgb(50,50,50);} /*Color subcells normal mode*/
#main-nav ul li:hover ul li a:hover {background-color:rgb(210,210,210); text-decoration:none;} /*Color subcells hovering mode*/ #main-nav ul li {
float: left;
position: relative;
z-index: auto !important /*Non-IE6*/;
z-index: 1000 /*IE6*/;
}
.container.top, .container.bottom { #main-nav ul li a {
float: none !important /*Non-IE6*/;
float: left /*IE-6*/;
display: block;
height: 3.1em;
line-height: 3.1em;
padding: 0 16px 0 16px;
text-decoration: none;
font-weight: bold;
color: rgb(100, 100, 100);
}
#main-nav ul li ul {
display: none;
border: none;
}
#main-nav ul li .active {
font-weight: bold;
background-color: rgba(0, 150, 250, 0.35);
color: rgba(255, 255, 250, 0.8);
}
#main-nav ul li:hover a {
background-color: rgba(0, 150, 250, 0.1);
text-decoration: none;
} /*Color main cells hovering mode*/
#main-nav ul li:hover ul {
display: block;
width: 10.0em;
position: absolute;
z-index: 999;
top: 3.0em;
margin-top: 0.1em;
left: 0;
}
#main-nav ul li:hover ul li a {
display: block;
width: 10.0em;
height: auto;
line-height: 1.3em;
margin-left: -1px;
padding: 4px 16px 4px 16px;
border-left: solid 1px rgb(175, 175, 175);
border-bottom: solid 1px rgb(175, 175, 175);
background-color: rgb(237, 237, 237);
font-weight: normal;
color: rgb(50, 50, 50);
} /*Color subcells normal mode*/
#main-nav ul li:hover ul li a:hover {
background-color: rgb(210, 210, 210);
text-decoration: none;
} /*Color subcells hovering mode*/
.container.top,.container.bottom {
clear: both; clear: both;
text-align: center; text-align: center;
margin-bottom: 2em; margin-bottom: 2em;
...@@ -68,17 +185,32 @@ body { ...@@ -68,17 +185,32 @@ body {
padding-left: 2em; padding-left: 2em;
} }
.container.top a, .container.bottom a { .container.top a,.container.bottom a {
font-size: 90%; font-size: 90%;
color: #aaa; color: #aaa;
text-decoration: none; text-decoration: none;
} }
#right {display:inline /*Fix IE floating margin bug*/; float:right; overflow:visible !important /*Firefox*/; overflow:hidden /*IE6*/;} #right {
#right {width: 400px; float-left: 1px solid black; } display: inline /*Fix IE floating margin bug*/;
float: right;
overflow: visible !important /*Firefox*/;
overflow: hidden /*IE6*/;
}
#right {
width: 400px;
float-left: 1px solid black;
}
#left {display:inline; /*Fix IE floating margin bug*/; float:left; width:660px; margin: 0 20px; overflow:visible !important /*Firefox*/; overflow:hidden /*IE6*/;} #left {
display: inline; /*Fix IE floating margin bug*/;
float: left;
width: 660px;
margin: 0 20px;
overflow: visible !important /*Firefox*/;
overflow: hidden /*IE6*/;
}
#left h1 { #left h1 {
margin-bottom: 1em; margin-bottom: 1em;
...@@ -93,8 +225,8 @@ body { ...@@ -93,8 +225,8 @@ body {
color: blue; color: blue;
} }
#left h1, #left h2, #left p { #left h1,#left h2,#left p {
margin-bottom: 1.5em; margin-bottom: 1.5em;
} }
.container.bottom { .container.bottom {
...@@ -102,35 +234,55 @@ margin-bottom: 1.5em; ...@@ -102,35 +234,55 @@ margin-bottom: 1.5em;
} }
table { table {
border: none; border: none;
border-spacing: 0; border-spacing: 0;
width: 100%; width: 100%;
text-align: left; text-align: left;
margin-bottom: 1.5em; margin-bottom: 1.5em;
} }
table thead th { table thead th {
border: none; border: none;
font-size: 120%; font-size: 120%;
} }
table thead th { table thead th {
border-bottom: 1px solid black; border-bottom: 1px solid black;
padding: 5px; padding: 5px;
padding-left: 1em; padding-left: 1em;
} }
table tbody td { table tbody td {
border: none; border: none;
padding: 5px; padding: 5px;
padding-left: 1em; padding-left: 1em;
vertical-align: top; vertical-align: top;
} }
label { label {
} }
.expired { .expired {
color: #c0c0c0; color: #c0c0c0;
} }
.bgColor1 {
background-color: #68A3C2;
}
#header {
clear: both;
float: left;
width: 100%;
border-bottom: 4px solid #333;
}
#header a {
color: white;
text-decoration: none;
}
#header_right {
text-align: right;
}
\ No newline at end of file
code/MoyaWeb/WebContent/resources/templates/blipview/template.xhtml
<?xml version="1.0" encoding="UTF-8" ?> <?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"> <!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" <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">
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}"> <f:view contentType="text/html" locale="#{sessionHandler.locale}">
...@@ -17,11 +11,9 @@ ...@@ -17,11 +11,9 @@
<meta name="description" content="Lippukauppa" /> <meta name="description" content="Lippukauppa" />
<meta name="author" content="CodeCrew ry" /> <meta name="author" content="CodeCrew ry" />
<meta http-equiv="Content-Language" content="fi" /> <meta http-equiv="Content-Language" content="fi" />
<link rel="icon" href="#{request.contextPath}/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/blipview/css/style.css" />
href="#{request.contextPath}/resources/templates/blipview/css/style.css" /> <link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/blipview/css/general.css" />
<link rel="stylesheet" type="text/css"
href="#{request.contextPath}/resources/templates/blipview/css/general.css" />
<ui:insert name="headerdata" /> <ui:insert name="headerdata" />
</h:head> </h:head>
...@@ -29,51 +21,42 @@ ...@@ -29,51 +21,42 @@
<h:body> <h:body>
<p:menubar model="#{primeMenuView.menuModel}"> <div id="header" class="bgColor1">
<div id="header_left">
</p:menubar> <h:link outcome="/index">
<c:choose>
<c:when test="#{sessionHandler.isInDevelopmentMode()}">
<img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
</c:when>
<c:otherwise>
<p:graphicImage rendered="#{!empty layoutView.headerimage}" value="#{layoutView.headerimage}" />
<ui:fragment rendered="#{empty layoutView.headerimage}">
<h1>
<h:outputText value="#{layoutView.headertext}" />
</h1>
</ui:fragment>
</c:otherwise>
</c:choose>
</h:link>
</div>
<div id="header_right">
<img src="#{request.contextPath}/resources/templates/template1/img/moya_logo.png" />
</div>
</div>
<div class="container top"> <div class="container top">
<ui:insert name="topbar" /> <ui:insert name="topbar" />
<p:messages showDetail="false" autoUpdate="true" />
</div> </div>
<div class="container clearfix"> <div class="clearfix"></div>
<div id="right"> <div>
<ui:insert name="sidebar" />
</div>
<div id="left">
<ui:insert name="content" /> <ui:insert name="content" />
</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>
<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> </h:body>
</f:view> </f:view>
......
code/MoyaWeb/WebContent/resources/templates/insomnia1/template.xhtml
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<div id="navigation"> <div id="navigation">
<div id="topheadercontainer"> <div id="topheadercontainer">
<img id="head" src="#{request.contextPath}/resources/style/insomnia1/img/header.gif" alt="headerimage" /> <img id="head" src="#{request.contextPath}/resources/templates/insomnia1/img/header.gif" alt="headerimage" />
<div style="float: left"> <div style="float: left">
<div id="headerbox"> <div id="headerbox">
......
code/MoyaWeb/WebContent/resources/templates/insomnia2/template.xhtml
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<h:outputText value="#{layoutView.headertext}" /> <h:outputText value="#{layoutView.headertext}" />
</h1> </h1>
</ui:fragment> </ui:fragment>
<!-- <img src="#{request.contextPath}/resources/style/insomnia2/img/logo.png" /> <!-- <img src="#{request.contextPath}/resources/templates/insomnia2/img/logo.png" />
<h1>STREAM INTRA</h1> --> <h1>STREAM INTRA</h1> -->
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</ui:fragment> </ui:fragment>
<div id="left"> <div id="left">
<ui:insert name="title" /> <ui:insert name="title" />
<p:messages /> <p:messages showDetail="false" autoUpdate="true" />
<ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}"> <ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
<h:outputText value="#{cont1.content}" escape="false" /> <h:outputText value="#{cont1.content}" escape="false" />
</ui:repeat> </ui:repeat>
......
code/MoyaWeb/WebContent/resources/templates/skynett17/template.xhtml
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<!-- <tools:loginLogout /> --> <!-- <tools:loginLogout /> -->
</div> </div>
<h:link outcome="/index"> <h:link outcome="/index">
<img src="#{request.contextPath}/resources/style/skynett17/img/header.jpg" /> <img src="#{request.contextPath}/resources/templates/skynett17/img/header.jpg" />
</h:link> </h:link>
</div> </div>
......
code/MoyaWeb/WebContent/resources/templates/stream1/template.xhtml
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</h:head> </h:head>
<h:body> <h:body>
<div id="topheader"> <div id="topheader">
<img src="#{request.contextPath}/resources/style/stream10/header.png" /> <img src="#{request.contextPath}/resources/templates/stream10/header.png" />
</div> </div>
<div id="container"> <div id="container">
<div id="page"> <div id="page">
......
code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<meta name="description" content="Lippukauppa" /> <meta name="description" content="Lippukauppa" />
<meta name="author" content="CodeCrew ry" /> <meta name="author" content="CodeCrew ry" />
<meta http-equiv="Content-Language" content="fi" /> <meta http-equiv="Content-Language" content="fi" />
<link rel="icon" href="#{request.contextPath}/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template1/css/style.css" /> <link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template1/css/style.css" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template1/css/general.css" /> <link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template1/css/general.css" />
<ui:insert name="headerdata" /> <ui:insert name="headerdata" />
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<h:link outcome="/index"> <h:link outcome="/index">
<c:choose> <c:choose>
<c:when test="#{sessionHandler.isInDevelopmentMode()}"> <c:when test="#{sessionHandler.isInDevelopmentMode()}">
<img src="#{request.contextPath}/resources/style/insomnia2/img/devel_logo.png" /> <img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p:graphicImage rendered="#{!empty layoutView.headerimage}" value="#{layoutView.headerimage}" /> <p:graphicImage rendered="#{!empty layoutView.headerimage}" value="#{layoutView.headerimage}" />
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!