Skip to content

Max Mecklin / Moya

Go to a project
Commit 12bb64c6 by Tuomas Riihimäki
Options

Add template properties

1 parent e2de4678
Inline Side-by-side
Showing with 70 additions and 12 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CheckoutFiBean.java
...@@ -334,6 +334,7 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal { ...@@ -334,6 +334,7 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
if (bill.getAccountEvent() == null if (bill.getAccountEvent() == null
&& bill.getPaidDate() == null) && bill.getPaidDate() == null)
{ {
logger.info("Trying to mark bill {} paid", bill);
vmrunner.markPaid(bill, Calendar.getInstance()); vmrunner.markPaid(bill, Calendar.getInstance());
logbean.logMessage(SecurityLogType.verkkomaksu, permbean.getCurrentUser(), "Marking bill paid. Received bill status ", statusInt, " for bill ", bill, " stamp ", stamp, " payment: ", payment, " reference ", reference); logbean.logMessage(SecurityLogType.verkkomaksu, permbean.getCurrentUser(), "Marking bill paid. Received bill status ", statusInt, " for bill ", bill, " stamp ", stamp, " payment: ", payment, " reference ", reference);
ret = true; ret = true;
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/checkoutTestfile.xml
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<id>3821058</id> <id>3821058</id>
<description/> <description/>
<status>1</status> <status>1</status>
<returnURL>http://localhost/LanBortalWeb/checkout/return.jsf</returnURL> <returnURL>http://localhost/MoyaWeb/checkout/return.jsf</returnURL>
<returnMAC/> <returnMAC/>
<cancelURL>http://localhost/LanBortalWeb/checkout/cancel.jsf</cancelURL> <cancelURL>http://localhost/MoyaWeb/checkout/cancel.jsf</cancelURL>
<cancelMAC>8B97471C27317150BEC42B6948334584</cancelMAC> <cancelMAC>8B97471C27317150BEC42B6948334584</cancelMAC>
<rejectURL>http://localhost/LanBortalWeb/checkout/reject.jsf</rejectURL> <rejectURL>http://localhost/MoyaWeb/checkout/reject.jsf</rejectURL>
<delayedURL>http://localhost/LanBortalWeb/checkout/delayed.jsf</delayedURL> <delayedURL>http://localhost/MoyaWeb/checkout/delayed.jsf</delayedURL>
<delayedMAC>00CF8456F8DF896B3FD6B4B42B45F8B3</delayedMAC> <delayedMAC>00CF8456F8DF896B3FD6B4B42B45F8B3</delayedMAC>
<stamp>512</stamp> <stamp>512</stamp>
<version>0001</version> <version>0001</version>
......
code/MoyaDatabase/src/fi/codecrew/moya/model/LanEventPropertyKey.java
...@@ -16,7 +16,13 @@ public enum LanEventPropertyKey { ...@@ -16,7 +16,13 @@ public enum LanEventPropertyKey {
PLACECODE_PRINT_ONLY_OWN(Type.BOOL, null), PLACECODE_PRINT_ONLY_OWN(Type.BOOL, null),
CHECK_BILL_STATS_PERMISSION(Type.BOOL, null), CHECK_BILL_STATS_PERMISSION(Type.BOOL, null),
GATHER_OTHER_BILL_INFO(Type.BOOL, null), GATHER_OTHER_BILL_INFO(Type.BOOL, null),
ALLOW_BILLING(Type.BOOL, null); ALLOW_BILLING(Type.BOOL, null),
TEMPLATE_PROPERTY1(Type.TEXT, null),
TEMPLATE_PROPERTY2(Type.TEXT, null),
TEMPLATE_PROPERTY3(Type.TEXT, null),
TEMPLATE_PROPERTY4(Type.TEXT, null),
TEMPLATE_PROPERTY5(Type.TEXT, null),
; ;
private enum Type { private enum Type {
......
code/MoyaWeb/WebContent/WEB-INF/web.xml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1"> version="3.1">
<display-name>LanBortalWeb</display-name> <display-name>MoyaWeb</display-name>
<context-param> <context-param>
<param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name> <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
<param-value>true</param-value> <param-value>true</param-value>
......
code/MoyaWeb/WebContent/resources/templates/template1/css/style.css
...@@ -180,9 +180,6 @@ aside { ...@@ -180,9 +180,6 @@ aside {
color: #2694e8; color: #2694e8;
} }
.bgColor1 {
background-color: #68A3C2;
}
#header a { #header a {
color: white; color: white;
......
code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml
...@@ -21,6 +21,12 @@ ...@@ -21,6 +21,12 @@
<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" />
<script src="#{request.contextPath}/resources/templates/template1/js/modernizr-2.6.2.min.js"></script> <script src="#{request.contextPath}/resources/templates/template1/js/modernizr-2.6.2.min.js"></script>
<h:outputStylesheet>
.bgColor1 {
background-color: #{layoutView.getLayoutProperty1('#68A3C2')};
}
</h:outputStylesheet>
<ui:insert name="headerdata" /> <ui:insert name="headerdata" />
...@@ -106,7 +112,11 @@ ...@@ -106,7 +112,11 @@
<div class="ui-widget-header">Login</div> <div class="ui-widget-header">Login</div>
<div class="ui-widget-content" style="text-align: center"> <div class="ui-widget-content" style="text-align: center">
<h:outputText rendered="#{sessionHandler.loggedIn}" value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" /> <ui:fragment rendered="#{sessionHandler.loggedIn}">
<h:outputText value="#{i18n['template.loggedInAs']}" />
<br />
<b><h:outputText value="#{sessionHandler.currentUser.nick}" /></b>
</ui:fragment>
<div> <div>
<tools:loginLogout /> <tools:loginLogout />
</div> </div>
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
...@@ -932,7 +932,7 @@ submenu.shop.showReaderEvents = Reader events ...@@ -932,7 +932,7 @@ submenu.shop.showReaderEvents = Reader events
submenu.user.accountEvents = Account events submenu.user.accountEvents = Account events
submenu.user.changePassword = Change password submenu.user.changePassword = Change password
submenu.user.create = Create new user submenu.user.create = Create new user
submenu.user.edit = User information submenu.user.edit = My information
submenu.user.foodwave = Food submenu.user.foodwave = Food
submenu.user.invite = Invite friends submenu.user.invite = Invite friends
submenu.user.manageuserlinks = Manage users submenu.user.manageuserlinks = Manage users
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -913,7 +913,7 @@ submenu.user.accountEvents = Tilitapahtumat ...@@ -913,7 +913,7 @@ submenu.user.accountEvents = Tilitapahtumat
submenu.user.changePassword = Vaihda salasana submenu.user.changePassword = Vaihda salasana
submenu.user.create = Luo k\u00E4ytt\u00E4j\u00E4 submenu.user.create = Luo k\u00E4ytt\u00E4j\u00E4
submenu.user.createCardTemplate = Luo korttiryhm\u00E4 submenu.user.createCardTemplate = Luo korttiryhm\u00E4
submenu.user.edit = K\u00E4ytt\u00E4j\u00E4n tiedot submenu.user.edit = Omat tiedot
submenu.user.foodwave = Ruoka submenu.user.foodwave = Ruoka
submenu.user.invite = Kutsu yst\u00E4vi\u00E4 submenu.user.invite = Kutsu yst\u00E4vi\u00E4
submenu.user.list = Kaikki k\u00E4ytt\u00E4j\u00E4t submenu.user.list = Kaikki k\u00E4ytt\u00E4j\u00E4t
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/PrimeMenuView.java
...@@ -106,6 +106,9 @@ public class PrimeMenuView extends GenericCDIView { ...@@ -106,6 +106,9 @@ public class PrimeMenuView extends GenericCDIView {
ret = new DefaultSubMenu(); ret = new DefaultSubMenu();
if (selectedSet.contains(m)) { if (selectedSet.contains(m)) {
ret.setStyleClass("prime-menu-selected"); ret.setStyleClass("prime-menu-selected");
logger.info("Setting styleclass on menuitem {}, {}", m.getItem().getUrl(), m);
} }
ret.setLabel(I18n.get(m.getKey())); ret.setLabel(I18n.get(m.getKey()));
for (MenuNavigation child : m.getChildren()) for (MenuNavigation child : m.getChildren())
......
code/MoyaWeb/src/fi/codecrew/moya/web/helper/LayoutView.java
...@@ -182,4 +182,45 @@ public class LayoutView { ...@@ -182,4 +182,45 @@ public class LayoutView {
this.pagename = menuChange; this.pagename = menuChange;
selectedTop = null; selectedTop = null;
} }
public String getLayoutProperty1(String value) {
LanEventProperty val = eventbean.getProperty(LanEventPropertyKey.TEMPLATE_PROPERTY1);
if (val != null) {
value = val.getTextvalue();
}
return value;
}
public String getLayoutProperty2(String value) {
LanEventProperty val = eventbean.getProperty(LanEventPropertyKey.TEMPLATE_PROPERTY2);
if (val != null) {
value = val.getTextvalue();
}
return value;
}
public String getLayoutProperty3(String value) {
LanEventProperty val = eventbean.getProperty(LanEventPropertyKey.TEMPLATE_PROPERTY3);
if (val != null) {
value = val.getTextvalue();
}
return value;
}
public String getLayoutProperty4(String value) {
LanEventProperty val = eventbean.getProperty(LanEventPropertyKey.TEMPLATE_PROPERTY4);
if (val != null) {
value = val.getTextvalue();
}
return value;
}
public String getLayoutProperty5(String value) {
LanEventProperty val = eventbean.getProperty(LanEventPropertyKey.TEMPLATE_PROPERTY5);
if (val != null) {
value = val.getTextvalue();
}
return value;
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!