Skip to content

Codecrew / Moya

Go to a project
Commit b7a8a404 by Tuomas Riihimäki
Options

Layout stuff

1 parent 42decab2
Inline Side-by-side
Showing with 188 additions and 96 deletions
code/moya-web/WebContent/resources/script/prime_calendar.js
PrimeFaces.locales ['fi'] = { PrimeFaces.locales['fi'] = {
closeText: 'Sulje', closeText: 'Sulje',
prevText: 'Edellinen', prevText: 'Edellinen',
nextText: 'Seuraava', nextText: 'Seuraava',
...@@ -12,7 +12,7 @@ PrimeFaces.locales ['fi'] = { ...@@ -12,7 +12,7 @@ PrimeFaces.locales ['fi'] = {
firstDay: 1, firstDay: 1,
isRTL: false, isRTL: false,
showMonthAfterYear: false, showMonthAfterYear: false,
yearSuffix:'', yearSuffix: '',
timeOnlyTitle: 'Vain aika', timeOnlyTitle: 'Vain aika',
timeText: 'Aika', timeText: 'Aika',
hourText: 'Tunti', hourText: 'Tunti',
...@@ -24,4 +24,140 @@ PrimeFaces.locales ['fi'] = { ...@@ -24,4 +24,140 @@ PrimeFaces.locales ['fi'] = {
week: 'Viikko', week: 'Viikko',
day: 'Päivä', day: 'Päivä',
allDayText: 'Koko päivä' allDayText: 'Koko päivä'
};
PrimeFaces.locales['swe'] = {
closeText: 'Stäng',
prevText: 'Föregående',
nextText: 'Nästa',
monthNames: ['januari', 'februari', 'mars', 'april', 'maj', 'juni', 'juli', 'augusti', 'september', 'oktober', 'november', 'december' ],
monthNamesShort: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'aug', 'sep', 'okt', 'nov', 'dec' ],
dayNames: ['söndag', 'måndag', 'tisdag', 'onsdag', 'torsdag', 'fredag', 'lördag'],
dayNamesShort: ['sön', 'mån', 'tis', 'ons', 'tor', 'fre', 'lör'],
dayNamesMin: ['sö', 'må', 'ti', 'on', 'to', 'fr', 'lö'],
weekHeader: 'Vecka',
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: '',
timeOnlyTitle: 'Endast tid',
timeText: 'Tid',
hourText: 'timmar',
minuteText: 'minuter',
secondText: 'sekunder',
currentText: 'Nuvarande datum',
ampm: false,
month: 'månad',
week: 'vecka',
day: 'dag',
allDayText: 'Hela dagen'
};
PrimeFaces.locales['de'] = {
closeText: 'Schließen',
prevText: 'Zurück',
nextText: 'Weiter',
currentText: 'Start',
monthNames: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
monthNamesShort: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
dayNames: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
dayNamesShort: ['Son', 'Mon', 'Die', 'Mit', 'Don', 'Fre', 'Sam'],
dayNamesMin: ['S', 'M', 'D', 'M ', 'D', 'F ', 'S'],
weekHeader: 'Woche',
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: '',
timeOnlyTitle: 'Nur Zeit',
timeText: 'Zeitasdads',
hourText: 'Stunde',
minuteText: 'Minute',
secondText: 'Sekunde',
currentText: 'Aktuelles Datum',
ampm: false,
month: 'Monat',
week: 'Woche',
day: 'Tag',
allDayText: 'Ganzer Tag'
};
PrimeFaces.locales['fr'] = {
closeText: 'Fermer',
prevText: 'Précédent',
nextText: 'Suivant',
monthNames: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre' ],
monthNamesShort: ['Jan', 'Fév', 'Mar', 'Avr', 'Mai', 'Jun', 'Jul', 'Aoû', 'Sep', 'Oct', 'Nov', 'Déc' ],
dayNames: ['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'],
dayNamesShort: ['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'],
dayNamesMin: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
weekHeader: 'Semaine',
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: '',
timeOnlyTitle: 'Choisir l\'heure',
timeText: 'Heure',
hourText: 'Heures',
minuteText: 'Minutes',
secondText: 'Secondes',
currentText: 'Maintenant',
ampm: false,
month: 'Mois',
week: 'Semaine',
day: 'Jour',
allDayText: 'Toute la journée'
};
PrimeFaces.locales['en'] = {
closeText: 'Close',
prevText: 'Previous',
nextText: 'Next',
monthNames: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' ],
monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ],
dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Tue', 'Fri', 'Sat'],
dayNamesMin: ['S', 'M', 'T', 'W ', 'T', 'F ', 'S'],
weekHeader: 'Week',
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: '',
timeOnlyTitle: 'Only Time',
timeText: 'Time',
hourText: 'Time',
minuteText: 'Minute',
secondText: 'Second',
currentText: 'Current Date',
ampm: false,
month: 'Month',
week: 'week',
day: 'Day',
allDayText: 'All Day'
};
PrimeFaces.locales['ru'] = {
closeText: 'Закрыть',
prevText: 'Назад',
nextText: 'Вперёд',
monthNames: ['Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь' ],
monthNamesShort: ['Янв', 'Фев', 'Мар', 'Апр', 'Май', 'Июн', 'Июл', 'Авг', 'Сен', 'Окт', 'Ноя', 'Дек' ],
dayNames: ['Воскресенье', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Субота'],
dayNamesShort: ['Воск', 'Пон', 'Вт', 'Ср', 'Четв', 'Пят', 'Суб'],
dayNamesMin: ['В', 'П', 'Вт', 'С ', 'Ч', 'П ', 'Сб'],
weekHeader: 'Неделя',
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: '',
timeOnlyTitle: 'Только время',
timeText: 'Время',
hourText: 'Час',
minuteText: 'Минута',
secondText: 'Секунда',
currentText: 'Сегодня',
ampm: false,
month: 'Месяц',
week: 'неделя',
day: 'День',
allDayText: 'Весь день'
}; };
\ No newline at end of file
code/moya-web/WebContent/resources/templates/primelayout/template.xhtml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html> <!DOCTYPE html>
<html class="no-js" 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"> <html class="no-js" 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}"> <f:view contentType="text/html" locale="#{sessionHandler.locale}">
...@@ -19,6 +20,7 @@ ...@@ -19,6 +20,7 @@
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/primelayout/css/skinning.css" /> <link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/primelayout/css/skinning.css" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/primelayout/css/structual.css" /> <link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/primelayout/css/structual.css" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/custom_components.css" /> <link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/custom_components.css" />
<script type="text/javascript" src="#{request.contextPath}/resources/script/prime_calendar.js" ></script>
<ui:insert name="headerdata" /> <ui:insert name="headerdata" />
...@@ -38,10 +40,19 @@ ...@@ -38,10 +40,19 @@
<h:body> <h:body>
<!-- Javascript-lokalisaatiolippupuljausta --> <!-- Javascript-lokalisaatiolippupuljausta -->
<h:form id="conversationKeepaliver">
<p:remoteCommand name="cdiKeepalive" update=":cdiloop" actionListener="#{conversationKeepaliveView.ping()}" />
</h:form>
<h:outputText id="cdiloop" value="#{conversationKeepaliveView.value}" />
<script type="text/javascript"> <script type="text/javascript">
$(document) $(document)
.ready( .ready(
function() { function() {
setInterval(function() {
cdiKeepalive();
}, 20000);
<ui:repeat value="#{localeSelectorView.availableLocales}" var="loc" varStatus="idx"> <ui:repeat value="#{localeSelectorView.availableLocales}" var="loc" varStatus="idx">
$( $(
".languageSelector .ui-button:eq(#{idx.index})") ".languageSelector .ui-button:eq(#{idx.index})")
...@@ -63,30 +74,24 @@ ...@@ -63,30 +74,24 @@
<p:layout widgetVar="mainlayout" fullPage="true" id="mainlayoutpanel">
<p:layout widgetVar="mainlayout" fullPage="true" id="mainlayoutpanel" >
<p:layoutUnit id="toppanel" position="north" styleClass="bgColor1" size="60"> <p:layoutUnit id="toppanel" position="north" styleClass="bgColor1" size="60">
<div id="header_box"> <div id="header_box">
<div id="header_left"> <div id="header_left">
<h:link outcome="/index"> <h:link id="logolink" outcome="/index">
<c:choose> <c:choose>
<c:when test="#{sessionHandler.isInDevelopmentMode()}"> <c:when test="#{sessionHandler.isInDevelopmentMode()}">
<img src="#{request.contextPath}/resources/templates/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="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" /> <p:graphicImage id="eventlogo" rendered="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" />
<ui:fragment rendered="#{!layoutView.headerIsImage}"> <ui:fragment rendered="#{!layoutView.headerIsImage}">
<h1> <h1>
<h:outputText value="#{layoutView.headertext}" /> <h:outputText value="#{layoutView.headertext}" />
...@@ -100,17 +105,17 @@ ...@@ -100,17 +105,17 @@
<div id="header_center"> <div id="header_center">
<h:form rendered="#{menuView.renderTopmenuChanger}"> <h:form id="adminchanger" rendered="#{menuView.renderTopmenuChanger}">
<p:button outcome="/index" value="#{i18n['mode.user']}" /> <p:button id="user" outcome="/index" value="#{i18n['mode.user']}" />
<p:button outcome="/useradmin/list" value="#{i18n['mode.admin']}" /> <p:button id="admin" outcome="/useradmin/list" value="#{i18n['mode.admin']}" />
</h:form> </h:form>
<ui:fragment rendered="#{layoutView.canManageContent}"> <ui:fragment rendered="#{layoutView.canManageContent}">
<div> <div>
<h:form> <h:form id="contentlinks">
<h:outputLabel for="manageBtn" value="#{i18n['content.showContentEditLinks']}" /> <h:outputLabel for="manageBtn" value="#{i18n['content.showContentEditLinks']}" />
<h:selectBooleanCheckbox value="#{sessionStore.manageContentLinks}" onclick="this.form.submit()" /> <h:selectBooleanCheckbox id="showcontentlinks" value="#{sessionStore.manageContentLinks}" onclick="this.form.submit()" />
</h:form> </h:form>
</div> </div>
</ui:fragment> </ui:fragment>
...@@ -123,9 +128,9 @@ ...@@ -123,9 +128,9 @@
</p:layoutUnit> </p:layoutUnit>
<p:layoutUnit header="#{i18n['menu']}" collapsible="true" id="leftpanel" position="west" resizable="true" size="225" minSize="100" > <p:layoutUnit header="#{i18n['menu']}" collapsible="true" id="leftpanel" position="west" resizable="true" size="225" minSize="100">
<p:fieldset rendered="#{sessionHandler.loggedIn}"> <p:fieldset id="leftlogin" rendered="#{sessionHandler.loggedIn}">
<h:outputText value="#{i18n['template.loggedInAs']}" /> <h:outputText value="#{i18n['template.loggedInAs']}" />
<br /> <br />
<b><h:outputText value="#{sessionHandler.currentUser.login}" /></b> <b><h:outputText value="#{sessionHandler.currentUser.login}" /></b>
...@@ -143,18 +148,20 @@ ...@@ -143,18 +148,20 @@
</h:form> </h:form>
<h:link style="font-size: 10px;" rendered="#{readerView.shopToOthers}" outcome="/shop/showReaderEvents" value="Readers" /> <h:link style="font-size: 10px;" rendered="#{readerView.shopToOthers}" outcome="/shop/showReaderEvents" value="Readers" />
</nav> </nav>
<br /> <br />
<p:fieldset rendered="#{!sessionHandler.loggedIn}"> <p:fieldset id="leftuserinfo" rendered="#{!sessionHandler.loggedIn}">
<div style="text-align: left; padding: 0.7em;"> <div style="text-align: left; padding: 0.7em;">
<h:form> <h:form>
<p:inputText styleClass="form" id="linelogin" value="#{authView.login}" /> <p:inputText styleClass="form" id="linelogin" value="#{authView.login}" />
<p:watermark for="linelogin" value="#{i18n['login.username']}" /> <p:watermark for="linelogin" value="#{i18n['login.username']}" />
<br /> <br />
<p:password styleClass="form" id="linepwd" value="#{authView.password}" /> <p:password styleClass="form" id="linepwd" value="#{authView.password}" />
<p:watermark for="linepwd" value="#{i18n['login.password']}" /> <p:watermark for="linepwd" value="#{i18n['login.password']}" />
<br /><br /> <br />
<br />
<p:commandButton update="messages" styleClass="button" id="onelinesubmit" action="#{authView.executeLoginAction}" ajax="false" value="#{i18n['login.submit']}" /> <p:commandButton update="messages" styleClass="button" id="onelinesubmit" action="#{authView.executeLoginAction}" ajax="false" value="#{i18n['login.submit']}" />
<br /><br /> <br />
<br />
</h:form> </h:form>
<ui:fragment rendered="#{authView.canCreateUser}"> <ui:fragment rendered="#{authView.canCreateUser}">
<h:link value="#{i18n['submenu.user.create']}" outcome="/user/create" /> <h:link value="#{i18n['submenu.user.create']}" outcome="/user/create" />
...@@ -209,8 +216,11 @@ ...@@ -209,8 +216,11 @@
<f:param name="pagename" value="#{layoutView.pagepath}:bottom" /> <f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
</h:link> </h:link>
<footer class="bgColor1"> </footer>
</p:layoutUnit> </p:layoutUnit>
</p:layout> </p:layout>
<h:form> <h:form>
...@@ -222,79 +232,24 @@ ...@@ -222,79 +232,24 @@
<footer class="bgColor1"> </footer>
<script type="text/javascript"> <script type="text/javascript">
$(function() {
$(function() { // autoresize for main panels, this is magic :)
PrimeFaces.widgets.mainlayout.layout.loadCookie();
// autoresize for main panels, this is magic :)
PrimeFaces.widgets.mainlayout.layout.loadCookie(); PrimeFaces.widgets.mainlayout.onclose = function() {
PrimeFaces.widgets.mainlayout.layout.saveCookie()
PrimeFaces.widgets.mainlayout.onclose = function() { }
PrimeFaces.widgets.mainlayout.layout.saveCookie()
} PrimeFaces.widgets.mainlayout.onopen = function() {
PrimeFaces.widgets.mainlayout.layout.saveCookie()
PrimeFaces.widgets.mainlayout.onopen = function() { }
PrimeFaces.widgets.mainlayout.layout.saveCookie()
} });
});
PrimeFaces.locales['fi'] = {
closeText : 'Sulje',
prevText : 'Edellinen',
nextText : 'Seuraava',
currentText : 'Tänään',
monthNames : [ 'Tammikuu', 'Helmikuu', 'Maaliskuu', 'Huhtikuu',
'Toukokuu', 'Kesäkuu', 'Heinäkuu', 'Elokuu', 'Syyskuu',
'Lokakuu', 'Marraskuu', 'Joulukuu' ],
monthNamesShort : [ 'Tammikuu', 'Helmikuu', 'Maaliskuu',
'Huhtikuu', 'Toukokuu', 'Kesäkuu', 'Heinäkuu',
'Elokuu', 'Syyskuu', 'Lokakuu', 'Marraskuu', 'Joulukuu' ],
dayNames : [ 'Sunnuntai', 'Maanantai', 'Tiistain',
'Keskiviikko', 'Torstai', 'Perjantai', 'Lauantai' ],
dayNamesShort : [ 'Su', 'Ma', 'Ti', 'Ke', 'To', 'Pe', 'La' ],
dayNamesMin : [ 'Su', 'Ma', 'Ti', 'Ke', 'To', 'Pe', 'La' ],
weekHeader : 'vk',
firstDay : 1,
isRTL : false,
showMonthAfterYear : false,
yearSuffix : '',
month : 'Kuukausi',
week : 'Viikko',
day : 'Päivä',
allDayText : 'Koko päivä'
};
PrimeFaces.locales['und'] = {
closeText : 'Sulje',
prevText : 'Edellinen',
nextText : 'Seuraava',
currentText : 'Tänään',
monthNames : [ 'Tammikuu', 'Helmikuu', 'Maaliskuu', 'Huhtikuu',
'Toukokuu', 'Kesäkuu', 'Heinäkuu', 'Elokuu', 'Syyskuu',
'Lokakuu', 'Marraskuu', 'Joulukuu' ],
monthNamesShort : [ 'Tammikuu', 'Helmikuu', 'Maaliskuu',
'Huhtikuu', 'Toukokuu', 'Kesäkuu', 'Heinäkuu',
'Elokuu', 'Syyskuu', 'Lokakuu', 'Marraskuu', 'Joulukuu' ],
dayNames : [ 'Sunnuntai', 'Maanantai', 'Tiistain',
'Keskiviikko', 'Torstai', 'Perjantai', 'Lauantai' ],
dayNamesShort : [ 'Su', 'Ma', 'Ti', 'Ke', 'To', 'Pe', 'La' ],
dayNamesMin : [ 'Su', 'Ma', 'Ti', 'Ke', 'To', 'Pe', 'La' ],
weekHeader : 'vk',
firstDay : 1,
isRTL : false,
showMonthAfterYear : false,
yearSuffix : '',
month : 'Kuukausi',
week : 'Viikko',
day : 'Päivä',
allDayText : 'Koko päivä'
};
</script> </script>
<c:if test="#{sessionHandler.isInDevelopmentMode()}"> <c:if test="#{sessionHandler.isInDevelopmentMode()}">
......
code/moya-web/src/main/java/fi/codecrew/moya/handler/SessionStore.java
...@@ -66,7 +66,7 @@ public class SessionStore implements Serializable { ...@@ -66,7 +66,7 @@ public class SessionStore implements Serializable {
locale = ret; locale = ret;
} }
logger.info("Using locale {}",ret); // logger.info("Using locale {}",ret);
return ret; return ret;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!