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 ce763ba..d923b9d 100644 (file)
--- a/portal/templates/email_activation.html
+++ b/portal/templates/email_activation.html
@@ -8,17 +8,17 @@
 <div class="row">
        {% if activation_status == 'success' %}
                <h3>Signup request confirmed.</h3>
-               <p>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.</p> 
-               <p>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.</p>
+               <p>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.</p> 
+               <p>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.</p>
     {% elif activation_status == 'validated' %}
                <h3>Account validated.</h3>
                <p>We have identified you as a valid PLE user. Your OneLab account has automatically been approved.</p>
         <p>You have a full access to OneLab testbeds.</p>
        {%else%}
                <h3>Signup confirmation failed.</h3>
-               <p>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.</p>
-               <p>Please <a href="/portal/contact/">contact support</a> so that we can help you complete the signup process.</p>
+               <p>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.</p>
+               <p>Please <a href="/portal/contact/">contact support</a> so that we may help you complete the signup process.</p>
        {%endif%}
  </div>
 

diff --git a/portal/templates/onelab/onelab_contact.html b/portal/templates/onelab/onelab_contact.html
index 2a7c60a..4014ede 100644 (file)
--- a/portal/templates/onelab/onelab_contact.html
+++ b/portal/templates/onelab/onelab_contact.html
@@ -14,9 +14,9 @@
 </div>
 <div class="row">
        <div class="col-md-12">
-       <p>Please check our <a href="/portal/support/">FAQ</a> section. Most of the basic problems are explained there.</p>
+       <p>If you are having any problems, please read our <a href="/portal/support/">FAQ</a> section as many of them are explained there.</p>
        <p>
-       If you haven't find your answes in the FAQ, please contact us by filling the form below.<br />
+       If you cannot find the answers to your questions in our FAQ section, please contact us by filling out the form below.<br />
        You can also <a href="mailto:support@onelab.eu">e-mail</a> us directly.
        </p>
        </div>

diff --git a/portal/templates/slice-request-done-view.html b/portal/templates/slice-request-done-view.html
index 9419d13..0d0a03b 100644 (file)
--- a/portal/templates/slice-request-done-view.html
+++ b/portal/templates/slice-request-done-view.html
@@ -4,7 +4,7 @@
 
   <h1>Slice created</h1>
 
-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 c381413..ab95dee 100644 (file)
--- a/portal/templates/slice_request_denied.html
+++ b/portal/templates/slice_request_denied.html
@@ -2,13 +2,14 @@
 <br>
 <p>Dear OneLab user,</p>
 <p></p>
-<p>You have recently requested the following slice in the OneLab portal({{portal_url}}):</p> 
+<p>You have recently requested the following slice on the OneLab portal({{portal_url}}):</p> 
 <br>
 <b>Slice name   :</b> {{slice_name}}<br>
 <b>URL          :</b> {{url}}<br>
 <b>Purpose      :</b> {{purpose}}<br>
 <br>
-<p>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.</p>
+<p>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.</p>
 <br>
 <p>On behalf of the entire team, I wish you a fruitful user experience on OneLab.</p>
 <br>

diff --git a/portal/templates/slice_request_denied.txt b/portal/templates/slice_request_denied.txt
index 7dcbee3..521ec5e 100644 (file)
--- 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 c508a24..7fac65c 100644 (file)
--- a/portal/templates/slice_request_validated.html
+++ b/portal/templates/slice_request_validated.html
@@ -8,9 +8,12 @@
 <b>URL          :</b> {{number_of_nodes}}<br>
 <b>Purpose      :</b> {{purpose}}<br>
 <p></p>
-<p>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.</p>
+<p>
+       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.
+</p>
 <p></p>
-<p>On behalf of the entire team, I wish you a fruitful user experience on OneLab.</p>
+<p>On behalf of the entire team, I wish you a fruitful user experience with the OneLab portal.</p>
 <p></p>
 <p>Yours sincerely,</p>
 

diff --git a/portal/templates/slice_request_validated.txt b/portal/templates/slice_request_validated.txt
index f0cd3c5..993e6ef 100644 (file)
--- 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 fc88316..8821b66 100644 (file)
--- a/portal/templates/user_request_validated.html
+++ b/portal/templates/user_request_validated.html
@@ -2,13 +2,13 @@
 <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 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.</p>
+<p>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.</p>
 <p></p>
 </p>
-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.
 </p>
 <p></p>
-</p>On behalf of the entire team, I wish you a fruitful user experience on OneLab.</p>
+</p>On behalf of the entire team, I wish you a fruitful user experience with the OneLab portal.</p>
 <p></p>
 <p>Yours sincerely,</p>
 <p></p>

diff --git a/portal/templates/user_request_validated.txt b/portal/templates/user_request_validated.txt
index 6c290f6..6765f3b 100644 (file)
--- 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,