From 56a406a324edea50be41bdd649319491fa391ca4 Mon Sep 17 00:00:00 2001 From: Yasin Rahman Date: Thu, 9 Apr 2015 18:30:03 +0200 Subject: [PATCH] F4F logo fixed. width needs to be adjusted --- portal/actions.py | 2 +- portal/templates/fed4fire/fed4fire_activate_user.html | 2 +- .../fed4fire/fed4fire_contact_support_email.html | 2 +- .../templates/fed4fire/fed4fire_slice_request_denied.html | 2 +- .../templates/fed4fire/fed4fire_slice_request_email.html | 2 +- .../fed4fire/fed4fire_slice_request_validated.html | 2 +- .../templates/fed4fire/fed4fire_user_request_denied.html | 2 +- .../templates/fed4fire/fed4fire_user_request_email.html | 2 +- .../fed4fire/fed4fire_user_request_validated.html | 8 +++----- 9 files changed, 11 insertions(+), 13 deletions(-) diff --git a/portal/actions.py b/portal/actions.py index 82221abc..6d657ed8 100644 --- 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 4ad469b5..3d7e7497 100644 --- a/portal/templates/fed4fire/fed4fire_activate_user.html +++ b/portal/templates/fed4fire/fed4fire_activate_user.html @@ -1,4 +1,4 @@ - +

We have received a user signup request for your email address at {{current_site}}

You have the following user details:

diff --git a/portal/templates/fed4fire/fed4fire_contact_support_email.html b/portal/templates/fed4fire/fed4fire_contact_support_email.html index 6330475f..0e62c782 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_slice_request_denied.html b/portal/templates/fed4fire/fed4fire_slice_request_denied.html index c472fab8..c84753bf 100644 --- a/portal/templates/fed4fire/fed4fire_slice_request_denied.html +++ b/portal/templates/fed4fire/fed4fire_slice_request_denied.html @@ -1,4 +1,4 @@ - +

Dear Fed4FIRE user,

diff --git a/portal/templates/fed4fire/fed4fire_slice_request_email.html b/portal/templates/fed4fire/fed4fire_slice_request_email.html index 8fc65698..5bd94a39 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 7c9e1986..d65603d5 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 7b49f43b..673ec5c1 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 87717933..bbd68759 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 7d6833b1..ad187404 100644 --- a/portal/templates/fed4fire/fed4fire_user_request_validated.html +++ b/portal/templates/fed4fire/fed4fire_user_request_validated.html @@ -1,12 +1,10 @@ - +

Dear {{first_name}} {{last_name}},

-

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.

+

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.

-

-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. -

+

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.

We wish you a fruitful user experience with the Fed4FIRE portal.

-- 2.43.0