cosmetic fixes, about page reorganised, footer (totest)

diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index 7d11324..a6f9af8 100644 (file)
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -634,6 +634,45 @@ div.secondary .account span {
 div.secondary .account a {
     color:black;
 }
+
+
+div.footer {
+    padding-top:15px;
+    
+}
+div.footer div.bottom {
+    position:absolute;
+    bottom:0;
+}
+div.footer ul {
+   margin:6px 0 0 0;
+   padding:0;
+}
+
+div.footer li {
+    font-size:9pt;
+    display:inline;
+    list-style:none;
+    margin:0px;
+    padding:0;
+    margin-right:15px;
+    color:#747474;
+    letter-spacing:0.4px;
+}
+
+div.footer li a {
+    color:#747474;
+}
+div.footer li a:hover {
+    text-decoration:underline;
+}
+div.copy {
+    font-size:8pt;
+    color:gray;
+    padding-top:15px;
+    padding-bottom:15px;
+}
+
 div.home {
     font-size:11pt;
     line-height:1.2em;
@@ -729,6 +768,3 @@ div.slogan {
 th {
     border:0 !important;
 }
-th.checkbox {
-    
-}

diff --git a/portal/templates/base.html b/portal/templates/base.html
index d16b2a4..268c9aa 100644 (file)
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -91,6 +91,22 @@ $(document).ready(function() {
        {% block base_content %}
        {% endblock %}
 {% endblock container %}
+<div class="footer">
+<div class="container">
+       <div class="row">
+               <div class="col-md-12">
+                       <ul>
+                               <li><a href="/terms">Terms and Conditions</a></li>
+                       </ul>
+               </div>
+       </div>
+       <div class="row">
+               <div class="col-md-12 copy">
+                       Copyright © UPMC Sorbonne Universités, on behalf of the OneLab consortium
+               </div>
+       </div>
+</div>
+</div>
 <div class="loading">
        <div><img src="{{ STATIC_URL }}/img/loading.gif" /> Loading...</div>
        <div>&nbsp;</div>

diff --git a/portal/templates/management-tab-requests.html b/portal/templates/management-tab-requests.html
index d534915..2270a3b 100644 (file)
--- a/portal/templates/management-tab-requests.html
+++ b/portal/templates/management-tab-requests.html
@@ -44,7 +44,7 @@
 </script>
 
 <div class="col-md-12">
-       <h2>Authorities</h2>
+       <h2>From your authorities</h2>
 </div>
 {% if my_authorities %}
        
@@ -108,7 +108,7 @@
 {% endif %}
 <br />
 <div class="col-md-12">
-       <h2>Sub-Authorities</h2>
+       <h2>From your sub-authorities</h2>
 </div>
 {% if sub_authorities %}
        
@@ -166,7 +166,7 @@
 {% endif %}
 <br />
 <div class="col-md-12">
-       <h2>Authorities with delegation</h2>
+       <h2>From your authorities with delegation</h2>
 </div>
 
 {% if delegation_authorities %}

diff --git a/portal/templates/onelab/onelab_about.html b/portal/templates/onelab/onelab_about.html
index 5b7eb96..40fb258 100644 (file)
--- a/portal/templates/onelab/onelab_about.html
+++ b/portal/templates/onelab/onelab_about.html
@@ -1,44 +1,35 @@
-{% extends "layout.html" %}
+{% extends "layout_wide.html" %}
 
 {% block content %}
-<div class="row">
-       <div class="col-md-12">
-                <div class="breadcrumbs">
-                </div>
-       </div>
-</div>
-<div class="row">
-    <div class="col-md-12">
-        <ul class="nav nav-tabs nav-section">
-            <li class="active"><a href="#about">About</a></li>
-            <li><a href="#components">Underlying technologies</a></li>
-        </ul>
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+               <h1><img src="{{ STATIC_URL }}icons/support-xs.png" alt="About" />About</h1>
+        </div>
     </div>
-</div>
-
-
-<div class="tab-content">
-    <div class="tab-pane active row" id="about">
-               <div class="col-md-12">
+ 
+       <div class="row">
+        <div class="col-md-12">
                        <p>
-                               OneLab Portal is a central place to get acess to all OneLab testbeds.In order to get access to the portal,
-                               an experimenter needs to  <a href="/portal/register">register</a> to the portal. The portal administrative body
+                               OneLab Portal is a central place to get acess to all OneLab testbeds. In order to get access to the portal,
+                               an experimenter needs to  <a href="/register">register</a> to the portal. The portal administrative body
                                is responsible to accept or reject newly registered users.   
                        </p>
                        <p>
-                               To learn more about OneLab visit:  <a href="http://onelab.eu/" target="_blank">http://onelab.eu/</a>                    
+                               To learn more about OneLab visit:  <a href="http://onelab.eu" target="_blank">onelab.eu</a>                     
                        </p>
                        <p>
-                               If you have any questions regarding using the portal visit: <a href="/portal/support">OneLab support</a>
+                               If you have any questions regarding using the portal visit: <a href="/support">OneLab support</a>
                        </p>
                        <p>
                                OneLab portal is a community effot. To get more information about OneLab portal team visit: 
-                               <a href="http://myslice.info/community" target="_blank">http://myslice.info/community</a>
+                               <a href="http://myslice.info/community" target="_blank">myslice.info/community</a>
                        </p>
                </div>
        </div>
-       <div class="tab-pane row" id="components">
+       <div class="row">
                <div class="col-md-12">
+                       <br />
                        <h3>A ready-made and easily customisable user interface for your testbed.</h3>
                                <p>
                                        MySlice is an ambitious project aiming to support researchers throughout the lifecycle of experiments that can run on a variety 
@@ -63,6 +54,7 @@
                                </p>
                </div>
                <div class="col-md-12">
+                       <br />
                        <h3>Portal Components</h3>
                                <h5>Myslice (Web Frontend)</h5>
                                        <p>
@@ -90,15 +82,4 @@
        </div>
    </div>
 </div>
-
-<script>
-$(document).ready(function() {
-    $('.nav-tabs a').click(function (e) {
-        e.preventDefault();
-        $(this).tab('show');
-    });
-});
-</script>
-
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file

diff --git a/portal/templates/onelab/onelab_management-tab-requests.html b/portal/templates/onelab/onelab_management-tab-requests.html
index 488e63e..87b8e8e 100644 (file)
--- a/portal/templates/onelab/onelab_management-tab-requests.html
+++ b/portal/templates/onelab/onelab_management-tab-requests.html
@@ -42,7 +42,7 @@
 </script>
 
 <div class="col-md-12">
-       <h2>Authorities</h2>
+       <h2>From your authorities</h2>
 </div>
 {% if my_authorities %}
        
@@ -105,7 +105,7 @@
 {% endif %}
 <div>nnllknjkn<br /><br /></div>
 <div class="col-md-12">
-       <h2>Sub-Authorities</h2>
+       <h2>From your sub-authorities</h2>
 </div>
 {% if sub_authorities %}
        
@@ -164,7 +164,7 @@
 {% endif %}
 
 <div class="col-md-12">
-       <h2>Authorities with delegation</h2>
+       <h2>From your authorities with delegation</h2>
 </div>
 
 {% if delegation_authorities %}

diff --git a/portal/templates/onelab/onelab_news.html b/portal/templates/onelab/onelab_news.html
index 69b417d..b46eab1 100644 (file)
--- a/portal/templates/onelab/onelab_news.html
+++ b/portal/templates/onelab/onelab_news.html
@@ -5,13 +5,12 @@
     <div class="row">
         <div class="col-md-12">
                <h1><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="News" />News</h1>
-               <br />
         </div>
     </div>
  
        <div class="row">
         <div class="col-md-12">
-               <b>15 July 2014</b> - The <b>OneLab</b> Portal opens with the <b>PlanetLab Europe</b>, <b>IOTLab</b> and <b>NITOS</b> testbeds!
+               <b>1 August 2014</b> - The <b>OneLab</b> Portal opens for beta test with the <b>PlanetLab Europe</b>, <b>IOTLab</b> and <b>NITOS</b> testbeds!
                <p>
                        Existing PlanetLab users will be able to open an account with their existing PLE credentials.
                </p>