Author: solomax
Date: Thu Nov 27 10:26:07 2014
New Revision: 1642076
URL: http://svn.apache.org/r1642076
Log:
[OPENMEETINGS-1130] email creation is moved to templates
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.html?rev=1642076&r1=1642075&r2=1642076&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.html
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.html
Thu Nov 27 10:26:07 2014
@@ -22,7 +22,7 @@
<wicket:panel>
<b><span wicket:id="titleLbl"></span></b><br />
<span wicket:id="userLbl"></span> <span wicket:id="user"></span><br/>
- <span wicket:id="messageLbl"></span> <span
wicket:id="messageLbl"></span><br/>
+ <span wicket:id="messageLbl"></span> <span
wicket:id="message"></span><br/>
<div wicket:id="links">
<span wicket:id="comment_for_link1"></span><br/>
<a wicket:id="invitation_link1"><span
wicket:id="clickMe"></span></a><br/>
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java?rev=1642076&r1=1642075&r2=1642076&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
Thu Nov 27 10:26:07 2014
@@ -34,9 +34,10 @@ public class InvitationTemplate extends
ensureApplication(langId);
FieldLanguagesValuesDao dao =
getBean(FieldLanguagesValuesDao.class);
- add(new Label("titleLbl", dao.getString(500,
langId).replaceAll("\\$APP_NAME",
getBean(ConfigurationDao.class).getAppName())));
- add(new Label("userLbl", dao.getString(501, langId)));
+ add(new Label("titleLbl", dao.getString(500,
langId).replaceAll("\\$APP_NAME",
getBean(ConfigurationDao.class).getAppName())));
+ add(new Label("userLbl", dao.getString(501, langId)));
add(new Label("user", invitorName));
+ add(new Label("messageLbl", dao.getString(502, langId)));
add(new Label("message", message).setEscapeModelStrings(false));
add(new WebMarkupContainer("links")
Modified:
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html?rev=1642076&r1=1642075&r2=1642076&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
Thu Nov 27 10:26:07 2014
@@ -22,7 +22,7 @@
<wicket:panel>
<b><span wicket:id="titleLbl"></span></b><br />
<span wicket:id="userLbl"></span> <span wicket:id="user"></span><br/>
- <span wicket:id="messageLbl"></span> <span
wicket:id="messageLbl"></span><br/>
+ <span wicket:id="messageLbl"></span> <span
wicket:id="message"></span><br/>
<div wicket:id="links">
<span wicket:id="comment_for_link1"></span><br/>
<a wicket:id="invitation_link1"><span
wicket:id="clickMe"></span></a><br/>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java?rev=1642076&r1=1642075&r2=1642076&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java
Thu Nov 27 10:26:07 2014
@@ -40,6 +40,7 @@ public class InvitationTemplate extends
add(new Label("titleLbl", dao.getString(500,
langId).replaceAll("\\$APP_NAME",
a.getOmBean(ConfigurationDao.class).getAppName())));
add(new Label("userLbl", dao.getString(501, langId)));
add(new Label("user", invitorName));
+ add(new Label("messageLbl", dao.getString(502, langId)));
add(new Label("message", message).setEscapeModelStrings(false));
add(new WebMarkupContainer("links")
