You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/01/21 03:43:30 UTC
svn commit: r1779696 - in /openmeetings/application:
branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/
branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/
trunk...
Author: solomax
Date: Sat Jan 21 03:43:30 2017
New Revision: 1779696
URL: http://svn.apache.org/viewvc?rev=1779696&view=rev
Log:
[OPENMEETINGS-1540] placeholder is replaced in email
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html?rev=1779696&r1=1779695&r2=1779696&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html Sat Jan 21 03:43:30 2017
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <b><wicket:message key="513"/></b><br />
+ <b><span wicket:id="reset-header"></span></b><br />
<b><wicket:message key="514"/></b><br/>
<a wicket:id="reset_link1"><wicket:message key="515"/></a><br/>
<wicket:message key="516"/><br/>
Modified: openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java?rev=1779696&r1=1779695&r2=1779696&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java Sat Jan 21 03:43:30 2017
@@ -27,10 +27,11 @@ public class ResetPasswordTemplate exten
public ResetPasswordTemplate(String link) {
super(getOmSession().getLocale());
+ add(new Label("reset-header", getString("513", locale)));
add(new ExternalLink("reset_link1", link));
add(new Label("reset_link2", link));
}
-
+
public static String getEmail(String link) {
return ComponentRenderer.renderComponent(new ResetPasswordTemplate(link)).toString();
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html?rev=1779696&r1=1779695&r2=1779696&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html Sat Jan 21 03:43:30 2017
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,10 +20,10 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <b><wicket:message key="513"/></b><br />
+ <b><span wicket:id="reset-header"></span></b><br />
<b><wicket:message key="514"/></b><br/>
<a wicket:id="reset_link1"><wicket:message key="515"/></a><br/>
<wicket:message key="516"/><br/>
<span wicket:id="reset_link2"></span>
</wicket:extend>
-</html>
\ No newline at end of file
+</html>
Modified: openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java?rev=1779696&r1=1779695&r2=1779696&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java Sat Jan 21 03:43:30 2017
@@ -27,10 +27,11 @@ public class ResetPasswordTemplate exten
public ResetPasswordTemplate(String link) {
super(getOmSession().getLocale());
+ add(new Label("reset-header", getString("513", locale)));
add(new ExternalLink("reset_link1", link));
add(new Label("reset_link2", link));
}
-
+
public static String getEmail(String link) {
return ComponentRenderer.renderComponent(new ResetPasswordTemplate(link)).toString();
}
Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html?rev=1779696&r1=1779695&r2=1779696&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html (original)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html Sat Jan 21 03:43:30 2017
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,10 +20,10 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <b><wicket:message key="513"/></b><br />
+ <b><span wicket:id="reset-header"></span></b><br />
<b><wicket:message key="514"/></b><br/>
<a wicket:id="reset_link1"><wicket:message key="515"/></a><br/>
<wicket:message key="516"/><br/>
<span wicket:id="reset_link2"></span>
</wicket:extend>
-</html>
\ No newline at end of file
+</html>
Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java?rev=1779696&r1=1779695&r2=1779696&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java (original)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java Sat Jan 21 03:43:30 2017
@@ -27,10 +27,11 @@ public class ResetPasswordTemplate exten
public ResetPasswordTemplate(String link) {
super(getOmSession().getLocale());
+ add(new Label("reset-header", getString("513", locale)));
add(new ExternalLink("reset_link1", link));
add(new Label("reset_link2", link));
}
-
+
public static String getEmail(String link) {
return ComponentRenderer.renderComponent(new ResetPasswordTemplate(link)).toString();
}