layout changes

diff --git a/portal/templates/institution.html b/portal/templates/institution.html
index 771a5e5..abde744 100644 (file)
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@ -1,15 +1,16 @@
-{% extends "layout-unfold1.html" %}
+{% extends "layout.html" %}
 
-{% block unfold_main %}
-<div class="wrapper" id="institution">
+{% block content %}
+<div class="row">
+       <h1><img src="{{ STATIC_URL }}img/icon_authority_color_small.png" alt="" /> Affiliation to an Institution</h1>
+</div>
+<div class="row" id="institution">
     <ul class="nav nav-tabs">
       <li class="active"><a class="home-tab" data-panel="institution" href="#">INSTITUTION</a></li>
       <li><a class="home-tab" data-panel="users" href="#">USERS</a></li>
       <li><a class="home-tab" data-panel="slices" href="#">SLICES</a></li>
     </ul>
     <div class="home-panel" id="institution">
-        <h1><img src="{{ STATIC_URL }}img/icon_authority_color_small.png" alt="" /> Affiliation to an Institution</h1>
-        <br>
         <div id="authority-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Authority" /></div>
         <div id="authority-tab-loaded" style="display:none;">
             <div id="onelab_membership" style="float:left; width:30%;">
@@ -204,4 +205,4 @@
          {% endif %}
     });
 </script>
-{% endblock unfold_main %}
+{% endblock %}

diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html
index 6fd7e1d..9bf7cb3 100644 (file)
--- a/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "layout.html" %}
 
 {% block content %}
 <div class="row" id="home-dashboard">
@@ -72,10 +72,14 @@
                                {% endif %}
                                </td>
                                <td>
+                                       {% if person %}
                                    <button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Create a Slice</button>
+                                       {% endif %}
                                </td>
                                <td class="support">
+                                       {% if person %}
                                    <button id="validaterequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Validate Requests</button>
+                                       {% endif %}
                                </td>
                        </tr>
                </table>

diff --git a/portal/templates/onelab/onelab_slice-view.html b/portal/templates/onelab/onelab_slice-view.html
index 85ae5a8..623bf89 100644 (file)
--- a/portal/templates/onelab/onelab_slice-view.html
+++ b/portal/templates/onelab/onelab_slice-view.html
@@ -1,7 +1,6 @@
-{% extends "layout-unfold1.html" %}
+{% extends "layout_wide.html" %}
 
-{% block unfold_main %}
-<div id="slice-view">  
+{% block content %}
        <div class="col-md-2"></div>
        <div class="col-md-10">
                <div class="row">
@@ -45,5 +44,4 @@
         </table>
        </div>
     
-</div>
-{% endblock unfold_main %}
+{% endblock %}

diff --git a/portal/templates/slicerequest_view.html b/portal/templates/slicerequest_view.html
index d59bd68..c99ca4d 100644 (file)
--- a/portal/templates/slicerequest_view.html
+++ b/portal/templates/slicerequest_view.html
@@ -1,15 +1,11 @@
-{% extends "layout-unfold1.html" %}
+{% extends "layout.html" %}
 {% load i18n %}
 
-{% block head %}
-{{ wizard.form.media }}
-{% endblock %}
-
-{% block unfold_main %}
-
-<div class="wrapper" id="slice-request">
-<h1><img src="{{ STATIC_URL }}img/icon_slices_small.png" alt="Request a Slice" /> Request a new Slice</h1>
+{% block content %}
 
+<div class="row">
+       <h1><img src="{{ STATIC_URL }}img/icon_slices_small.png" alt="Request a Slice" /> Request a new Slice</h1>
+</div>
 {% if errors %}
 <ul>
   {% for error in errors %}
@@ -18,7 +14,7 @@
 </ul>
 {% endif %}
 
-<div>
+<div class="row">
   <form id="commentForm" class="form-horizontal" method="post">
   {% csrf_token %}
   <fieldset>
@@ -81,7 +77,6 @@
   </fieldset>
   </form>
 </div>
-</div>
 <script>
 jQuery(document).ready(function(){
     var availableTags = [