F4F logo fixed. width needs to be adjusted

diff --git a/portal/actions.py b/portal/actions.py
index 82221ab..6d657ed 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -1056,7 +1056,7 @@ def sfa_create_user(wsgi_request, request, namespace = None, as_admin = False):
             sender = sender.replace('\n', '')
 
 
-            subject = 'User validated'
+            subject = 'Account validated'
 
             msg = EmailMultiAlternatives(subject, text_content, sender, [request['email']])
             msg.attach_alternative(html_content, "text/html")

diff --git a/portal/templates/fed4fire/fed4fire_activate_user.html b/portal/templates/fed4fire/fed4fire_activate_user.html
index 4ad469b..3d7e749 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_activate_user.html
+++ b/portal/templates/fed4fire/fed4fire_activate_user.html
@@ -1,4 +1,4 @@
-<img src="http://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
+<img src="https://portal.fed4fire.eu/static/img/f4f-logo.png">
 <br>
 <p>We have received a user signup request for your email address at {{current_site}}</p>
 <p>You have the following user details:</p>

diff --git a/portal/templates/fed4fire/fed4fire_contact_support_email.html b/portal/templates/fed4fire/fed4fire_contact_support_email.html
index 6330475..0e62c78 100644 (file)
--- 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://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
+<img src="https://portal.fed4fire.eu/static/img/f4f-logo.png">
 <br>
 <b>Email        :</b> {{email}}
 

diff --git a/portal/templates/fed4fire/fed4fire_slice_request_denied.html b/portal/templates/fed4fire/fed4fire_slice_request_denied.html
index c472fab..c84753b 100644 (file)
--- 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://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
+<img src="https://portal.fed4fire.eu/static/img/f4f-logo.png">
 <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 8fc6569..5bd94a3 100644 (file)
--- 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://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
+<img src="https://portal.fed4fire.eu/static/img/f4f-logo.png">
 <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 7c9e198..d65603d 100644 (file)
--- 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://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
+<img src="https://portal.fed4fire.eu/static/img/f4f-logo.png">
 <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 7b49f43..673ec5c 100644 (file)
--- 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://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
+<img src="https://portal.fed4fire.eu/static/img/f4f-logo.png">
 <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 8771793..bbd6875 100644 (file)
--- 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://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
+<img src="https://portal.fed4fire.eu/static/img/f4f-logo.png">
 <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 7d6833b..ad18740 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_user_request_validated.html
+++ b/portal/templates/fed4fire/fed4fire_user_request_validated.html
@@ -1,12 +1,10 @@
-<img src="http://doc.fed4fire.eu/_static/fed4fire-logo.jpg">
+<img src="https://portal.fed4fire.eu/static/img/f4f-logo.png">
 <br>
 <p>Dear {{first_name}} {{last_name}},</p>
 <p></p>
-<p>It is my pleasure to welcome you as a fully signed-up user of the Fed4FIRE portal. Fed4FIRE provides you with access to world class computer networking testbeds. Our aim at Fed4FIRE is to promote the use of these testbeds for research and development by industry, for scientific research, and for university level laboratory exercises.</p>
+<p>It is my pleasure to welcome you as a fully registered user of the Fed4FIRE portal. Fed4FIRE provides you with access to world-class computer networking testbeds. Our aim in Fed4FIRE is to promote the use of these testbeds for industrial research and development, scientific research, and university-level laboratory exercises.</p>
 <p></p>
-</p>
-Your entry point for access to the testbeds is the Fed4FIRE portal, which provides a web-based interface for browsing and reserving resources on the various testbeds. To run an experiment using those resources, you may log in to the testbed and/or individual nodes on the testbed with your Fed4FIRE public/private key pair, or you may use an experiment control tool such as as NEPI or OMF. The Fed4FIRE  operations team is standing by at contact@fed4fire.eu to provide you with help regarding the portal and to refer your testbed- and tool-specific queries to those best able to answer them.
-</p>
+<p>Your entry point for access to our testbeds is the Fed4FIRE portal, which provides a web-based interface for browsing and reserving resources on the various testbeds. To run an experiment using these resources, you may either log into the specific testbed and/or individual nodes on the testbed using your Fed4FIRE public/private key pair, or you may use an experiment control tool such as as NEPI or OMF. The Fed4FIRE operations team is standing by at contact@fed4fire.eu to provide you with any help regarding the portal, or to refer your testbed and tool-specific queries to those best able to answer them.</p>
 <p></p>
 </p>We  wish you a fruitful user experience with the Fed4FIRE portal.</p>
 <p></p>