From: Yasin Rahman
Date: Fri, 13 Mar 2015 13:29:25 +0000 (+0100)
Subject: F4F: templates updated
X-Git-Tag: myslice-1.3~62
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=9cd3ef1923c5fe70187ea6532735b6e46eca5891;hp=49d547d943fa0585e18d38810ff894435a3f6486;p=unfold.git
F4F: templates updated
---
diff --git a/portal/templates/fed4fire/fed4fire_activate_user.html b/portal/templates/fed4fire/fed4fire_activate_user.html
index a1f73bca..078c498e 100644
--- a/portal/templates/fed4fire/fed4fire_activate_user.html
+++ b/portal/templates/fed4fire/fed4fire_activate_user.html
@@ -1,8 +1,28 @@
-
+
-You have registered to {{current_site}}
-
-Please validate your email address by clicking the following link
-
-{{validation_link}}
+We have received a user signup request for your email address at {{current_site}}
+You have the following user details:
+
+First name: {{first_name}}
+Last name: {{last_name}}
+Email: {{email}}
+
+
+
+You may now log in to the portal using your email address and the password that you provided, but your access will be limited. To gain full access, two steps are required:
+
+
+
+You must confirm that you have indeed made this request by clicking on the following link:
+ {{validation_link}}
+ If you did not make this request, we apologise. You may disregard this email or you may advise us the error by replying to this email.
+
+
+A manager from your organization must also validate your request. Upon confirmation of your signup request, we will send an email to the managers at your organization with a validation request.
+
+
+
+We look forward to welcoming you to Fed4FIRE portal. You will find answers to frequently asked questions here .
+Please don't hesitate to contact us with any additional questions that you might have.
+
diff --git a/portal/templates/fed4fire/fed4fire_contact_support_email.html b/portal/templates/fed4fire/fed4fire_contact_support_email.html
index c50f2eeb..6330475f 100644
--- a/portal/templates/fed4fire/fed4fire_contact_support_email.html
+++ b/portal/templates/fed4fire/fed4fire_contact_support_email.html
@@ -1,4 +1,4 @@
-
+
Email : {{email}}
diff --git a/portal/templates/fed4fire/fed4fire_registration_view.html b/portal/templates/fed4fire/fed4fire_registration_view.html
index ebfb4e62..31b5b9ea 100644
--- a/portal/templates/fed4fire/fed4fire_registration_view.html
+++ b/portal/templates/fed4fire/fed4fire_registration_view.html
@@ -78,10 +78,10 @@
Authentication
-
+
-
+
+
Dear Fed4FIRE user,
diff --git a/portal/templates/fed4fire/fed4fire_slice_request_email.html b/portal/templates/fed4fire/fed4fire_slice_request_email.html
index 1a49a144..770b78b0 100644
--- a/portal/templates/fed4fire/fed4fire_slice_request_email.html
+++ b/portal/templates/fed4fire/fed4fire_slice_request_email.html
@@ -1,4 +1,4 @@
-
+
NEW SLICE REQUEST
diff --git a/portal/templates/fed4fire/fed4fire_slice_request_validated.html b/portal/templates/fed4fire/fed4fire_slice_request_validated.html
index fbcbea86..7c9e1986 100644
--- a/portal/templates/fed4fire/fed4fire_slice_request_validated.html
+++ b/portal/templates/fed4fire/fed4fire_slice_request_validated.html
@@ -1,4 +1,4 @@
-
+
Dear Fed4FIRE user,
diff --git a/portal/templates/fed4fire/fed4fire_user_request_denied.html b/portal/templates/fed4fire/fed4fire_user_request_denied.html
index 56f7f4f5..7b49f43b 100644
--- a/portal/templates/fed4fire/fed4fire_user_request_denied.html
+++ b/portal/templates/fed4fire/fed4fire_user_request_denied.html
@@ -1,4 +1,4 @@
-
+
Dear {{first_name}} {{last_name}},
diff --git a/portal/templates/fed4fire/fed4fire_user_request_email.html b/portal/templates/fed4fire/fed4fire_user_request_email.html
index 60abd27e..14061334 100644
--- a/portal/templates/fed4fire/fed4fire_user_request_email.html
+++ b/portal/templates/fed4fire/fed4fire_user_request_email.html
@@ -1,4 +1,4 @@
-
+
NEW USER REQUEST
diff --git a/portal/templates/fed4fire/fed4fire_user_request_validated.html b/portal/templates/fed4fire/fed4fire_user_request_validated.html
index 9048a6c8..7d6833b1 100644
--- a/portal/templates/fed4fire/fed4fire_user_request_validated.html
+++ b/portal/templates/fed4fire/fed4fire_user_request_validated.html
@@ -1,4 +1,4 @@
-
+
Dear {{first_name}} {{last_name}},