From: Yasin Date: Fri, 10 Oct 2014 16:11:24 +0000 (+0200) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.2~1^2~10 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d6af048d07b442a232c964ba369786851e7b51d6;hp=045944b2a08a43707cf5194c2340268d151b6132;p=myslice.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab --- diff --git a/portal/templates/email_activation.html b/portal/templates/email_activation.html index ce763ba3..d923b9da 100644 --- a/portal/templates/email_activation.html +++ b/portal/templates/email_activation.html @@ -8,17 +8,17 @@
{% if activation_status == 'success' %}

Signup request confirmed.

-

You are currently able to log in to the portal using your email address and the password that you provided, but your access is still limited.

-

You will have full access as soon as your account is validated by a manager at your organization. We have sent an email to the managers with a validation request.

+

You are currently able to log in to the portal using your email address and the password that you have provided; however, your access is still limited.

+

You will have full access as soon as your account is validated by a manager at your organization. We have sent an email to your organisation's managers with a validation request.

{% elif activation_status == 'validated' %}

Account validated.

We have identified you as a valid PLE user. Your OneLab account has automatically been approved.

You have a full access to OneLab testbeds.

{%else%}

Signup confirmation failed.

-

You have probably arrived at this page by clicking a confirmation link in an email that we have sent to you. However, - we have been unable to match the link that you have clicked to a signup request in our database.

-

Please contact support so that we can help you complete the signup process.

+

You have probably arrived at this page by clicking a confirmation link in an email that we have sent to you. + We have been unable to match the link that you have clicked to a signup request in our database.

+

Please contact support so that we may help you complete the signup process.

{%endif%}
diff --git a/portal/templates/onelab/onelab_contact.html b/portal/templates/onelab/onelab_contact.html index 2a7c60af..4014ede6 100644 --- a/portal/templates/onelab/onelab_contact.html +++ b/portal/templates/onelab/onelab_contact.html @@ -14,9 +14,9 @@
-

Please check our FAQ section. Most of the basic problems are explained there.

+

If you are having any problems, please read our FAQ section as many of them are explained there.

- If you haven't find your answes in the FAQ, please contact us by filling the form below.
+ If you cannot find the answers to your questions in our FAQ section, please contact us by filling out the form below.
You can also e-mail us directly.

diff --git a/portal/templates/slice-request-done-view.html b/portal/templates/slice-request-done-view.html index 9419d136..0d0a03b4 100644 --- a/portal/templates/slice-request-done-view.html +++ b/portal/templates/slice-request-done-view.html @@ -4,7 +4,7 @@

Slice created

-As you are a manager of your institution, your slice has directly been created. +As a manager of your institution, your slice has directly been created directly. {% endblock %} diff --git a/portal/templates/slice_request_denied.html b/portal/templates/slice_request_denied.html index c3814131..ab95deea 100644 --- a/portal/templates/slice_request_denied.html +++ b/portal/templates/slice_request_denied.html @@ -2,13 +2,14 @@

Dear OneLab user,

-

You have recently requested the following slice in the OneLab portal({{portal_url}}):

+

You have recently requested the following slice on the OneLab portal({{portal_url}}):


Slice name : {{slice_name}}
URL : {{url}}
Purpose : {{purpose}}

-

We regret to inform you that, a manager of your institution has rejected your request. Please contact the manager of your institution for further information. For any other queries, contact us by replying to this email.

+

We regret to inform you that, a manager of your institution has not confirmed your request. Please contact the manager of your institution for further information. +For any other queries, please contact us by replying to this email.


On behalf of the entire team, I wish you a fruitful user experience on OneLab.


diff --git a/portal/templates/slice_request_denied.txt b/portal/templates/slice_request_denied.txt index 7dcbee3b..521ec5ef 100644 --- a/portal/templates/slice_request_denied.txt +++ b/portal/templates/slice_request_denied.txt @@ -1,14 +1,14 @@ Dear OneLab user, -You have recently requested the following slice in the OneLab portal({{portal_url}}): +You have recently requested the following slice on the OneLab portal({{portal_url}}): Slice name : {{slice_name}} URL : {{url}} Purpose : {{purpose}} -We regret to inform you that, a manager of your institution has rejected your request. Please contact the manager of your institution for further information. For any other queries, contact us by replying to this email. +We regret to inform you that, a manager of your institution has not confirmed your request. Please contact the manager of your institution for further information. For any other queries, please contact us by replying to this email. -On behalf of the entire team, I wish you a fruitful user experience on OneLab.. +On behalf of the entire team, I wish you a fruitful user experience on OneLab. Yours sincerely, diff --git a/portal/templates/slice_request_validated.html b/portal/templates/slice_request_validated.html index c508a241..7fac65ce 100644 --- a/portal/templates/slice_request_validated.html +++ b/portal/templates/slice_request_validated.html @@ -8,9 +8,12 @@ URL : {{number_of_nodes}}
Purpose : {{purpose}}

-

We are glad to inform you that, a manager of your institution has validated your slice request. You can now add resources to the slice and start experimenting.

+

+ We are pleased to inform you that a manager from your institution has validated your slice request on the OneLab portal. + You can now add resources to you slice and start experimenting. +

-

On behalf of the entire team, I wish you a fruitful user experience on OneLab.

+

On behalf of the entire team, I wish you a fruitful user experience with the OneLab portal.

Yours sincerely,

diff --git a/portal/templates/slice_request_validated.txt b/portal/templates/slice_request_validated.txt index f0cd3c5c..993e6ef8 100644 --- a/portal/templates/slice_request_validated.txt +++ b/portal/templates/slice_request_validated.txt @@ -6,9 +6,10 @@ Slice name : {{slice_name}} URL : {{number_of_nodes}} Purpose : {{purpose}} -We are glad to inform you that, a manager of your institution has validated your slice request. You can now add resources to the slice and start experimenting. -On behalf of the entire team, I wish you a fruitful user experience on OneLab. +We are pleased to inform you that a manager from your institution has validated your slice request on the OneLab portal. You can now add resources to you slice and start experimenting. + +On behalf of the entire team, I wish you a fruitful user experience with the OneLab portal. Yours sincerely, diff --git a/portal/templates/user_request_validated.html b/portal/templates/user_request_validated.html index fc883167..8821b66d 100644 --- a/portal/templates/user_request_validated.html +++ b/portal/templates/user_request_validated.html @@ -2,13 +2,13 @@

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

-

It is my pleasure to welcome you as a fully signed up user of the OneLab experimental facility. OneLab provides you with access to world class computer networking testbeds, such as IoT-LAB, NITOS, and PlanetLab Europe. Our aim at OneLab is to promote the use of these testbeds for pre-commercial research and development by industry, for scientific research, and for university level laboratory exercises.

+

It is my pleasure to welcome you as a fully signed-up user of the OneLab experimental facility. OneLab provides you with access to world class computer networking testbeds, such as IoT-LAB, NITOS, and PlanetLab Europe. Our aim at OneLab is to promote the use of these testbeds for pre-commercial research and development by industry, for scientific research, and for university level laboratory exercises.

-Your entry point for access to the testbeds is the OneLab 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 OneLab public/private key pair, or use an experiment control tool such as as NEPI or OMF. The OneLab operations team is standing by at support@onelab.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 the testbeds is the OneLab 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 OneLab public/private key pair, or you may use an experiment control tool such as as NEPI or OMF. The OneLab operations team is standing by at support@onelab.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.

-

On behalf of the entire team, I wish you a fruitful user experience on OneLab.

+

On behalf of the entire team, I wish you a fruitful user experience with the OneLab portal.

Yours sincerely,

diff --git a/portal/templates/user_request_validated.txt b/portal/templates/user_request_validated.txt index 6c290f62..6765f3b3 100644 --- a/portal/templates/user_request_validated.txt +++ b/portal/templates/user_request_validated.txt @@ -4,7 +4,7 @@ It is my pleasure to welcome you as a fully signed-up user of the OneLab experim Your entry point for access to the testbeds is the OneLab 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 to individual nodes on the testbed with your OneLab public/private key pair, or you may use an experiment control tool such as as NEPI or OMF. The OneLab operations team is standing by at support@onelab.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. -On behalf of the entire team, I wish you a fruitful user experience on OneLab. +On behalf of the entire team, I wish you a fruitful user experience with the OneLab portal. Yours sincerely,