Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --git a/portal/templates/about.html b/portal/templates/about.html
index 1764fc4..cb118c2 100644 (file)
--- a/portal/templates/about.html
+++ b/portal/templates/about.html
@@ -32,14 +32,40 @@
        according to their own requirements. Opening in this way the development of web-based user tools for experimentation and 
        sharing effort and information can increase significantly the chances for the achievement of our challenging objective.
        </p>
-       <p>
-       You can access the code at git.myslice.info. If you need write access to the git repository you need first to send
-        your public key to <a href="mailto:support@myslice.info">support@myslice.info</a>. 
-       </p>
-       <p>
-               Go to the <a href ="http://myslice.info" target="_blank">MySlice web site</a>   
-    </p>
        </div>
 </div>
 
+
+<div class="row">
+       <div class="col-md-12">
+<h2>Portal Components</h2>
+<h3>Myslice (Web Frontend)</h3>
+<p>
+       MySlice is an ambitious project aiming to support researchers throughout the 
+       lifecycle of experiments that can run on a variety of testbeds spanning different 
+       administrative domains and networking technologies. Its basic principle is to bring 
+       together available <b>resources</b> with <b>useful information</b> (characteristics, performance, network measurements).
+       </p>
+
+<p> More Info: <a href="http://myslice.info/" target="_blank">http://myslice.info/</a></p>
+<p> Code: <a href="http://git.onelab.eu/?p=myslice.git;a=summary" target="_blank">Git Repository</a> (read only)</p> 
+
+<p> 
+If you need write access to the git repository you need first to send your public key to <a href="mailto:support@myslice.info">support@myslice.info</a>.
+</p>
+
+
+<h3>Manifold (Portal backend)</h3>
+Manifold is the backend that is running behind the portal.
+
+<p> Documentation: <a href="http://trac.myslice.info/" target="_blank">http://trac.myslice.info/</a></p>
+<p> Code: <a href="https://git.top-hat.info/?p=tophat.git;a=shortlog;h=refs/heads/devel" target="_blank">Git Repository</a> (read only)</p>    
+
+<h3>OneLab Registry</h3>
+<p>It's a SFA registry. SFA Registry is a specific installation mode of the SFAWrapper (Registry Only mode).</p>
+<p> More Info: <a href="http://svn.planet-lab.org/wiki/SfaDeveloperRegistryTutorial#RunninginRegistry-Onlymode" target="_blank">SFA Registry</a></p>
+
+    </div>
+</div>
+
 {% endblock %}

diff --git a/portal/templates/documentationview.html b/portal/templates/documentationview.html
index 5def24b..92196c6 100644 (file)
--- a/portal/templates/documentationview.html
+++ b/portal/templates/documentationview.html
@@ -8,33 +8,12 @@
 </div>
 <div class="row">
        <div class="col-md-12">
-<h2>Portal Components</h2>
-<h3>Myslice (Web Frontend)</h3>
-<p>
-       MySlice is an ambitious project aiming to support researchers throughout the 
-       lifecycle of experiments that can run on a variety of testbeds spanning different 
-       administrative domains and networking technologies. Its basic principle is to bring 
-       together available <b>resources</b> with <b>useful information</b> (characteristics, performance, network measurements).
-       </p>
-
-<p> More Info: <a href="http://myslice.info/" target="_blank">http://myslice.info/</a></p>
-<p> Code: <a href="http://git.onelab.eu/?p=myslice.git;a=summary" target="_blank">Git Repository</a> (read only)</p> 
-
-<h3>Manifold (Portal backend)</h3>
-Manifold is the backend that is running behind the portal.
-
-<p> Documentation: <a href="http://trac.myslice.info/" target="_blank">http://trac.myslice.info/</a></p>
-<p> Code: <a href="https://git.top-hat.info/?p=tophat.git;a=shortlog;h=refs/heads/devel" target="_blank">Git Repository</a> (read only)</p>    
-
-<h3>OneLab Registry</h3>
-<p>It's a SFA registry. SFA Registry is a specific installation mode of the SFAWrapper (Registry Only mode).</p>
-<p> More Info: <a href="http://svn.planet-lab.org/wiki/SfaDeveloperRegistryTutorial#RunninginRegistry-Onlymode" target="_blank">SFA Registry</a></p>
-<h2>FAQ<h2>
+<h2>Frequently Asked Questions (FAQs)<h2>
 
 <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
+<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
 have the right to do any admin operation such as managing slices, users and resources.</p>
 
 
@@ -59,7 +38,7 @@ have the right to do any admin operation such as managing slices, users and reso
 <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>
 
 <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 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> 
 
 <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>
@@ -74,7 +53,7 @@ slices that belong to his institution.</p>
 <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>
 
 <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 <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>
 
 </ul>
 </div>