fixes #20

Tuukka Kivilahti
Commit 49e5e369 authored Mar 01, 2014 by Tuukka Kivilahti
Showing with 22 additions and 5 deletions
code/MoyaWeb/WebContent/resources/cditools/user/create.xhtml
code/MoyaWeb/WebContent/user/create.xhtml
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
--- a/code/MoyaWeb/WebContent/resources/cditools/user/create.xhtml
+++ b/code/MoyaWeb/WebContent/resources/cditools/user/create.xhtml
@@ -112,8 +112,21 @@

 				<br />

-				<p:commandButton ajax="false" rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}" onerror="location.reload(true);"/>
+				<p:commandButton ajax="false" rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}" onerror="location.reload(true);" />

+				<br />
+				<br />
+
+
+
+
+				<p:lightBox iframe="true">
+					<h:outputLink value="http://codecrew.fi/rekisteriseloste.html" title="#{i18n['registerleaflet.title']}">
+						<h:outputText value="Rekisteriseloste" />
+					</h:outputLink>
+				</p:lightBox>
+
+				<br />
 			</h:panelGroup>

 		</h:panelGrid>

--- a/code/MoyaWeb/WebContent/user/create.xhtml
+++ b/code/MoyaWeb/WebContent/user/create.xhtml
 <!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:users="http://java.sun.com/jsf/composite/cditools/user"
-	xmlns:f="http://java.sun.com/jsf/core" 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:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
 	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>

--- a/code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
+++ b/code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
@@ -156,6 +156,7 @@ global.notauthorized        = You don't have enough rights to enter this site.
 global.save                 = Save

 httpsession.creationTime = Created
+
 incomingflow.giveplace = Merkitse annetuksi

 lanEventPrivateProperty.defaultValue          = Default value
@@ -220,6 +221,8 @@ productshop.minusTen = -10
 productshop.plusOne  = +1
 productshop.plusTen  = +10

+registerleaflet.title = Rekisteriseloste
+
 resetMail.header   = Reset lost password
 resetMail.username = Username


--- a/code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
+++ b/code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
@@ -799,6 +799,8 @@ readerevent.tagname         = Tag

 readerview.cards = Card ( printcount )

+registerleaflet.title = Register leaflet
+
 resetMail.body     = You can change a forgotten password by inserting your username or email address to the field below. A link where you can change the password will be sent to the email address associated to that.
 resetMail.email    = Email address
 resetMail.header   = Reset lost password

--- a/code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
+++ b/code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
@@ -785,6 +785,8 @@ readerevent.tagname         = Tagi

 readerview.cards = Kortit ( tulostuslkm )

+registerleaflet.title = Rekisteriseloste
+
 resetMail.body     = Voit vaihtaa unohtuneen salasanan sy\u00F6tt\u00E4m\u00E4ll\u00E4 k\u00E4ytt\u00E4j\u00E4tunnuksesi tai tunnukseen liitetyn s\u00E4hk\u00F6postiosoitteen allaolevaan kentt\u00E4\u00E4n. Tunnukseen liitettyyn s\u00E4hk\u00F6postiosoitteeseen l\u00E4hetet\u00E4\u00E4n kertak\u00E4ytt\u00F6inen osoite jossa voit vaihtaa sy\u00F6tt\u00E4m\u00E4si k\u00E4ytt\u00E4j\u00E4tunnuksen salasanan.
 resetMail.email    = S\u00E4hk\u00F6postiosoite
 resetMail.header   = Salasana unohtunut?