From 9cd3ef1923c5fe70187ea6532735b6e46eca5891 Mon Sep 17 00:00:00 2001
From: Yasin Rahman <loic.baron@lip6.fr>
Date: Fri, 13 Mar 2015 14:29:25 +0100
Subject: [PATCH] F4F: templates updated
---
.../fed4fire/fed4fire_activate_user.html | 32 +++++++++++++++----
.../fed4fire_contact_support_email.html | 2 +-
.../fed4fire/fed4fire_registration_view.html | 4 +--
.../fed4fire_slice_request_denied.html | 2 +-
.../fed4fire_slice_request_email.html | 2 +-
.../fed4fire_slice_request_validated.html | 2 +-
.../fed4fire_user_request_denied.html | 2 +-
.../fed4fire/fed4fire_user_request_email.html | 2 +-
.../fed4fire_user_request_validated.html | 2 +-
9 files changed, 35 insertions(+), 15 deletions(-)
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 @@
-<img src="http://www.fed4fire.eu/uploads/media/fed4fire-logo.jpg">
+<img src="http://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
<br>
-<h1>You have registered to {{current_site}}</h1>
-<br>
-<h1>Please validate your email address by clicking the following link</h1>
-<br>
-<a href={{validation_link}}>{{validation_link}}</a>
+<p>We have received a user signup request for your email address at {{current_site}}</p>
+<p>You have the following user details:</p>
+
+First name: {{first_name}}<br>
+Last name: {{last_name}}<br>
+Email: {{email}}<br>
+
+<p></p>
+<p>
+You may now <a href="http://{{current_site}}">log</a> 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:
+</p>
+<ul style="list-style-type:decimal;">
+<li>
+You must confirm that you have indeed made this request by clicking on the following link: <br>
+ <a href={{validation_link}}>{{validation_link}}</a>
+ <ul><li>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.</li></ul>
+</li>
+<li>
+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.
+</li>
+</ul>
+<p>
+We look forward to welcoming you to Fed4FIRE portal. You will find answers to frequently asked questions <a href="http://{{current_site}}/support/">here</a>.
+Please don't hesitate to <a href="http://{{current_site}}/contact/">contact us</a> with any additional questions that you might have.
+</p>
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 @@
-<img src="http://www.fed4fire.eu/uploads/media/fed4fire-logo.jpg">
+<img src="http://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
<br>
<b>Email :</b> {{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 @@
<label for="password" class="control-label">Authentication</label>
</p>
<p>
- <input type="password" id="password" name="password" class="form-control" style="width:250px" minlength="4" value="{{ password }}" title="Your password allows you to log in to this portal." placeholder="Password" required />
+ <input type="password" id="password" name="password" class="form-control" style="width:250px" minlength="8" value="{{ password }}" title="Your password allows you to log in to this portal." placeholder="Password" required />
</p>
<p>
- <input type="password" id="confirmpassword" name="confirmpassword" style="width:250px" minlength="4" class="form-control" value="" placeholder="Confirm password" required />
+ <input type="password" id="confirmpassword" name="confirmpassword" style="width:250px" minlength="8" class="form-control" value="" placeholder="Confirm password" required />
</p>
<p>
<select name="question" class="form-control" style="width:350px" id="key-policy"
diff --git a/portal/templates/fed4fire/fed4fire_slice_request_denied.html b/portal/templates/fed4fire/fed4fire_slice_request_denied.html
index ca2b9107..c472fab8 100644
--- a/portal/templates/fed4fire/fed4fire_slice_request_denied.html
+++ b/portal/templates/fed4fire/fed4fire_slice_request_denied.html
@@ -1,4 +1,4 @@
-<img src="http://www.fed4fire.eu/uploads/media/fed4fire-logo.jpg">
+<img src="http://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
<br>
<p>Dear Fed4FIRE user,</p>
<p></p>
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 @@
-<img src="http://www.fed4fire.eu/uploads/media/fed4fire-logo.jpg">
+<img src="http://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
<br>
<h1>NEW SLICE REQUEST</h1>
<br>
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 @@
-<img src="http://www.fed4fire.eu/uploads/media/fed4fire-logo.jpg">
+<img src="http://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
<br>
<p>Dear Fed4FIRE user,</p>
<p></p>
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 @@
-<img src="http://www.fed4fire.eu/uploads/media/fed4fire-logo.jpg">
+<img src="http://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
<br>
<p>Dear {{first_name}} {{last_name}},</p>
<p></p>
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 @@
-<img src="http://www.fed4fire.eu/uploads/media/fed4fire-logo.jpg">
+<img src="http://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
<br>
<h1>NEW USER REQUEST</h1>
<br>
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 @@
-<img src="http://www.fed4fire.eu/uploads/media/fed4fire-logo.jpg">
+<img src="http://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
<br>
<p>Dear {{first_name}} {{last_name}},</p>
<p></p>
--
2.47.0