From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Tue, 5 Aug 2014 10:49:48 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~29^2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=be7f5824d2561c5eb66000793ce2b7a3044cc7e2;hp=8b57a969811e44c6ffb714399a3f75b2945fdb41;p=unfold.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/portal/templates/onelab/onelab_user_request_email.html b/portal/templates/onelab/onelab_user_request_email.html
index fa0e896b..4786a5cf 100644
--- a/portal/templates/onelab/onelab_user_request_email.html
+++ b/portal/templates/onelab/onelab_user_request_email.html
@@ -14,5 +14,9 @@
 <b>User hrn     :</b> {{user_hrn}}<br>
 <b>Portal url	:</b> {{ current_site }}<br>
 <p></p>
-<p>You can validate the user <a href="http://{{current_site}}/portal/validate">here</a>.<p>
-<p>Please note that the validation request will only become visible to you on the OneLab portal once the user has confirmed his/her email address.</p>
+<p>You can see new user request <a href="http://{{current_site}}/portal/validate">in the portal.</a><p>
+<p>Please note that the request will only become visible to you on the OneLab portal once the user has confirmed his/her email address.</p>
+<p>Please only validate users who you know for whose actions you are prepared to take responsibility, as described in the 
+<a href="http://{{current_site}}/terms">OneLab terms and conditions.</a> If you find any anomalies in the request 
+(mistakes/spam/unauthorized persons) please <a href="mailto:support@onelab.eu">notify us.</a></p>
+
diff --git a/portal/templates/onelab/onelab_user_request_email.txt b/portal/templates/onelab/onelab_user_request_email.txt
index b782e71f..83ec9d3c 100644
--- a/portal/templates/onelab/onelab_user_request_email.txt
+++ b/portal/templates/onelab/onelab_user_request_email.txt
@@ -12,8 +12,10 @@ Email        : {{email}}
 User hrn     : {{user_hrn}}
 Portal url   : {{ current_site }}
 
-You can validate the user here: http://{{current_site}}/portal/validate
+You can see new user request in the portal: http://{{current_site}}/portal/validate
 
-Please note that the validation request will only become visible to you on the OneLab portal once the user has confirmed his/her email address.
+Please note that the request will only become visible to you on the OneLab portal once the user has confirmed his/her email address.
 
+Please only validate users who you know for whose actions you are prepared to take responsibility, as described in the OneLab terms and conditions. 
+If you find any anomalies in the request (mistakes/spam/unauthorized persons)  please notify us at support@onelab.eu.