texts: revised

diff --git a/portal/templates/activate_user.html b/portal/templates/activate_user.html
index 8f2b0c1..9f165d0 100644 (file)
--- a/portal/templates/activate_user.html
+++ b/portal/templates/activate_user.html
@@ -15,12 +15,12 @@ You may now <a href="http://{{current_site}}">log</a> in to the portal using you
 
 <ul style="list-style-type:decimal;">
 <li>
-You confirm that you have indeed made this request by clicking on the following link: <br>
+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 validates your request. Upon confirmation of your signup request, we will send an email to the managers at your organization with a validation request.
+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>

diff --git a/portal/templates/activate_user.txt b/portal/templates/activate_user.txt
index fd7278f..a68d1ce 100644 (file)
--- a/portal/templates/activate_user.txt
+++ b/portal/templates/activate_user.txt
@@ -9,13 +9,13 @@ Email: {{email}}
 
 You may now log 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:
 
-       1. You confirm that you have indeed made this request by clicking on the following link:
+       1. You must confirm that you have indeed made this request by clicking on the following link:
 
                {{validation_link}}
 
                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.
 
-       2. A manager from your organization validates your request. Upon confirmation of your signup request, we will send an email to the managers at your organization with a validation request.
+       2. 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.
 
 We look forward to welcoming you to OneLab. 
 Please don't hesitate to contact us at support@onelab.eu with any additional questions that you might have.

diff --git a/portal/templates/onelab/onelab_supportview.html b/portal/templates/onelab/onelab_supportview.html
index 72e013d..e59d281 100644 (file)
--- a/portal/templates/onelab/onelab_supportview.html
+++ b/portal/templates/onelab/onelab_supportview.html
@@ -23,13 +23,13 @@
 
 <div class="container tab-content">
        <div class="tab-pane active row" id="faq">
-               <div class="col-md-12">
+               <div class="col-md-12" style="text-align:justify;">
                        <h2>Frequently Asked Questions (FAQs)<h2>
 
                        <h3>PlanetLab Europe Users</h3>
                        <ul>
                                <li>
-                                       <h4>I am a PlanetLab Europe user, how do I sign up?</h4>
+                                       <h4>I am already a PlanetLab Europe user, how do I sign up?</h4>
                                        <p>
                                                Users that already have an account on PlanetLab Europe will be able to <a href="/register">sign up</a> using the
                                                available form and selecting their institution from the provided list.<br />
@@ -37,7 +37,7 @@
                                        </p>
                                </li>
                                <li>
-                                       <h4>Which testbeds will I be able to access to?</h4>
+                                       <h4>Which testbeds will I be able to access?</h4>
                                        <p>
                                                You will be able to access NITOS, a wireless based testbed, and IoT-LAB, a sensor and radio based testbed.
                                        </p>
@@ -50,7 +50,7 @@
                                                We are working to provide you with an equally good PlanetLab experience through the OneLab portal, 
                                                and we will invite you to help us beta-test this feature as soon as it is available. <br />
                                                Other users, who do not have PlanetLab Europe accounts, currently have limited access to
-                                               PlanetLab Europe through the OneLab portal, but this is not equivalent to the full access you 
+                                               PlanetLab Europe through the OneLab portal. This is not the same as the full access that you 
                                                currently enjoy through your PlanetLab Europe account.
                                        </p>
                                </li>
@@ -59,32 +59,41 @@
                        <h3>Users</h3>
                        <ul>
                        <li><h4>Who is a user?</h4></li>
-                       <p>A user is an experimenter who registers to the OneLab portal and able to use all the facilites that the portal has to offer. However, a user does not
+                       <p>A user is an experimenter who registers to the OneLab portal and able to use all of the facilities that the portal has to offer. However, a user does not
                        have the right to do any admin operation such as managing slices, users and resources.</p>
                        
                        
                        <li><h4>How do I register?</h4></li>
-                       <p>In order to register you must go to the <a href="/register">Registration</a> page. You have to choose your corresponding institution (authority). After registration you have to wait until the PI validates your account. However upon registration, you will be able login to the portal with a limited access. Do not try to re-register with the same email address.</p>
+                       <p>In order to register you must go to the <a href="/register">Registration</a> page. You must choose your corresponding institution (authority). 
+                       After registration you will have to wait until the manager of your organization validates your account. However upon registration, you will be able login to the portal with 
+                       a limited access. Do not try to re-register with the same email address.</p>
                        
                        <li><h4>Why can't I register with my email?</h4></li>
                        <p>If you have already registered then you won't be able to register again with the same email address. However, if you have never registered and still you are not able to use your email then please 
                        <a href="/contact">Contact Support</a> and mention the error message that you are getting while trying to register.</p>
                        
-                       <li><h4>In registration, in "My keys" option, what should i choose?</h4></li>
-                       <p>There are two choices.</p> 
-                               <p class="text-justify"><b>1. Generate Key Pairs:</b> This option is for users who have no knowledge about SFA and MySlice i.e., new users. We offer convenience to the new users in order to avoid addtional efforts to delegate keys manually. If you choose this option, the portal will automatically handle your credentials and you would be able use the portal as soon as the PI validates your account. However, you can delete your private key from the portal if you are concerned about privacy issues. In that case once your current credentials expire, you have to delegate your credentials manually using <a href="http://trac.myslice.info/wiki/InstallSfa" target="_blank">SFA</a>. As this needs advance knowledge about SFA and Myslice, we highly recommend to the new users to keep both private and public keys in the portal in order to keep the process automatic. </p>
-                               <p class="text-justify"><b>2. Upload My Public Key:</b> This option is for users who have experience with MySlice and SFA. If you choose this option, once the PI validates your account, you have to delegate your credentials manually using <a href="http://trac.myslice.info/wiki/InstallSfa" target="_blank">SFA</a>. You have to repeat the same process everytime your credentials expire. Normally, credentials expire every one month. You can see the expiration date in your Account page. </p>
+                       <li><h4>In the "My keys" option under registration, what should I choose?</h4></li>
+                       <p>You may choose one of the two options.</p> 
+                               <p ><b>1. Generate Key Pairs:</b> This option is for users who have no knowledge about SFA and MySlice i.e., new users. 
+                                       We offer convenience to the new users in order to avoid additional efforts to delegate keys manually. If you choose this option, 
+                                       the portal will automatically handle your credentials and you would be able use the portal as soon as your organization's manager 
+                                       validates your account. However, you can delete your private key from the portal if you are concerned about privacy issues. In this instance, 
+                                       once your current credentials expire, you will have to delegate your credentials manually using <a href="http://trac.myslice.info/wiki/InstallSfa" target="_blank">SFA</a>. 
+                                       As this needs advance knowledge about SFA and Myslice, we highly recommend to the new users to keep both private and public keys in 
+                                       the portal in order to keep the process automatic. 
+                               </p>
+                               <p><b>2. Upload My Public Key:</b> This option is for users who have experience with MySlice and SFA. If you choose this option, once your organization's manager  validates your account, you will have to delegate your credentials manually using <a href="http://trac.myslice.info/wiki/InstallSfa" target="_blank">SFA</a>. You have will to repeat this same process every time your credentials expire. Credentials must generally be renewed every 30 days. You can see the expiration date in your Account page. </p>
                        
                        <li><h4>Who is responsible for validating my account?</h4></li>
-                       <p>When you register, you choose an authority fromt he list of authorities. For each authority there is a Principal Investigator (PI). PI of your authority will verify your identity and if he finds that you are from his institution, he will validate your account otherwise he will reject your account.</p>
+                       <p>When you register, you choose an authority from he list of authorities. For each authority there is a manager. The manager of your organization will verify your identity and if he finds that you are from his institution, he will validate your account.If you are not a part of his organization, then he will not approve your account.</p>
                        
-                       <li><h4>How long I have to wait for validation?</h4></li>
+                       <li><h4>How long must I wait for validation?</h4></li>
                        <p>It depends on the PI of your authority. In general, it should not take more than a week. If you are waiting more than usual, please <a href="/contact">Contact Support</a> and explain your problem.</p>
                        <li><h4>I just registered. Why can't I see any slices and resources?</h4></li>
-                       <p>Once you register, you can login to your account with limited access. It means that you can view your account details, modify your name and password. You can also view other pages. However, you will not be able to see any slices as well as resources before your account validation. But you can <a href="/portal/slice_request/">Request Slice</a> before being validated. Therefore, the PI will validate your account as well as your requested slice. Once validated, you will be able to see your slice and if you click on your slice, you will be able to see resources in that slice and you can reserve nodes and start your experiment.</p>
+                       <p>Once you register, you can login to your account with limited access. It means that you can view your account details, modify your name and password. You can also view other pages. However, you will not be able to see any slices as well as resources before your account validation. But you can <a href="/portal/slice_request/">Request Slice</a> before being validated. In this instance, your organization's manager will validate your account as well as your requested slice. Once validated, you will be able to see your slice. If you click on your slice, you will be able to see the resources in that slice and you can reserve nodes and start your experiment.</p>
                        
                        <li><h4>How can I get access to a slice?</h4></li>
-                       <p>If you are a completely new user, you have to <a href="/portal/slice_request/">Request Slice</a>. It is upto the PI of your authority to accept/reject your slice request. </br>On the other hand, if you are a new user to the portal but you already have an account in OneLab SFA registry and you have access to slices, you will be able to see all your slices once your account is validated by the PI.</p> 
+                       <p>If you are a completely new user, you have to <a href="/portal/slice_request/">Request Slice</a>. It is up to the manager of your organization to accept/reject your slice request. </br>On the other hand, if you are a new user to the portal but you already have an account in the OneLab SFA registry and you have access to slices, you will be able to see all of your slices once your account is validated by the PI.</p> 
                        
                        <li><h4>I forgot my password, how to recover it?</h4></li>
                        <p>If you have an account in the portal but you forgot the password, you can always <a href="/portal/pass_reset/">Reset your password</a>.</p></ul>
@@ -92,14 +101,22 @@
                        <h3>Managers</h3>
                        <ul>
                        <li><h4>Who is a manager?</h4></li>
-                       <p>A manager is the Principal Investigator (PI) of the institution. Each PI has authority over his own institution. A PI can add, delete, validate users/ 
-                       slices that belong to his institution.</p>
+                       <p>
+                               A manager is the contact person and principal authority of the a particular organization. Each manager has authority over his 
+                               or her own institution/department/team. A manager may add, delete or validate users/slices that belong to his institution.
+
+                       </p>
                        
                        <li><h4>What is pending users/slices?</h4></li>
-                       <p>In <a href="/portal/validate">Requests</a> page you will be able to see all the users that registered under your authority and the slices that users of your authority has requested. Therefore, pending users/slices are those users and slices that are yet to be validated. You can validate/reject these requests based on the policy of your institution.</p>
+                       <p>In  the <a href="/portal/validate">Requests</a> page you will be able to see all the users that have registered under your authority and the slices that they have requested. Therefore, pending users/slices are those users and slices that are yet to be validated. You can validate/reject these requests based on the policy of your institution.</p>
                        
                        <li><h4>How can I manage the users/slices that belong to my institution?</h4></li>
-                       <p>In <a href="/portal/institution">Instution</a> page, under "Users" tab, you will be able to see all the users that belong to your authority. You can delete the users that you don't want anymore. Under "Slices" tab, you will be able to see all the slices that belong to your authority. You can renew/delete the slices based on your requirements. As a PI you can also <a href="/portal/slice_request/">Create Slice</a>. Just fill the form of request slice and the slice will be automatically validated if it is requested by a PI. </p>
+                       <p>
+                               In the <a href="/portal/institution">Instution</a> page, under "Users" tab, you will be able to see all the users that belong to your authority. 
+                               You can delete the users that you don't want anymore. Under "Slices" tab, you will be able to see all the slices that belong to your authority. 
+                               You can renew/delete the slices based on your requirements. As a manager you may also <a href="/portal/slice_request/">Create Slice</a>. 
+                               Just fill in the create slice and the slice will automatically be validated if it is requested by a manager. 
+                       </p>
                        
                        </ul>
                </div>
@@ -117,7 +134,7 @@
                                                <p class="address">
                                                        <a href="mailto:contact@onelab.eu">contact@onelab.eu</a>
                                                </p>
-                                               <p>Also you can adress any issues in the same email address.</p>
+                                               <p>Also you may adress any other issues in the same email address.</p>
                                        </div>
                                        <div class="col-md-6">
                                                <h3>Mailing Address</h3>
@@ -137,7 +154,7 @@
                                <div class="row">
                                        <div class="col-md-6">
                                                <h3>Report a Bug</h3>
-                                               <p>If you have found a bug or having difficulties accesing some features or found some anomalies, 
+                                               <p>If you have found a bug, are having difficulties accessing some features or have found some anomalies, 
                                                        please report it using our ticketing system.
                                                </p>
                                                <button id="ticketbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Create Ticket</button>