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/05/01 06:11:28 UTC
[37/50] [abbrv] openmeetings git commit: [OPENMEETINGS-1540]
placeholder is replaced in email
[OPENMEETINGS-1540] placeholder is replaced in email
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/304a4884
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/304a4884
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/304a4884
Branch: refs/heads/3.1.x
Commit: 304a4884850018a5c7f82210ffa337252299395b
Parents: aedef5c
Author: Maxim Solodovnik <so...@apache.org>
Authored: Sat Jan 21 03:43:30 2017 +0000
Committer: Maxim Solodovnik <so...@apache.org>
Committed: Sat Jan 21 03:43:30 2017 +0000
----------------------------------------------------------------------
.../service/mail/template/ResetPasswordTemplate.html | 4 ++--
.../service/mail/template/ResetPasswordTemplate.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/304a4884/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
index a6d5e04..a02fbf3 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
@@ -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/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/304a4884/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java
index 4c07bab..9531f2c 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java
@@ -27,10 +27,11 @@ public class ResetPasswordTemplate extends AbstractTemplatePanel {
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();
}