Slice sections became generic

diff --git a/portal/templates/_widget-slice-sections.html b/portal/templates/_widget-slice-sections.html
index 0856bd8..63902e4 100644 (file)
--- a/portal/templates/_widget-slice-sections.html
+++ b/portal/templates/_widget-slice-sections.html
@@ -1,25 +1,39 @@
+<div class="container">
+       <div class="row">
+               <div class="col-md-12">
+                        <div class="breadcrumbs">
+                                Experiment &nbsp;>&nbsp; Slice: {{ slice }}
+                        </div>
+               </div>
+       </div>
+</div>
+<div class="container-fluid container-slice">
+<div class="row">
+               <div class="col-md-12">
 {% if section == "resources" %}
 <ul class="nav nav-tabs nav-section">
-       <li><a href="/slice/{{ slice }}#info"><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="About MySlice" /> {{ slice }}</a></li>
-       <li><a href="/slice/{{ slice }}#testbeds">Testbeds</a></li>
+       
+       <!-- <li><a href="/slice/{{ slice }}#testbeds">Testbeds</a></li> -->
        <li class="active"><a class="link" href="/resources/{{ slice }}">Resources</a></li>
        <li><a href="/slice/{{ slice }}#users">Users</a></li>
-       <li><a href="/slice/{{ slice }}#statistics">Statistics</a></li>
-       <li><a href="/slice/{{ slice }}#measurements">Measurements</a></li>
-       <li><a href="/slice/{{ slice }}#experiment" data-toggle="tab">Experiment</a></li>
-       <li><a href="/slice/{{ slice }}#sla">SLA</a></li>
+       <li><a href="/slice/{{ slice }}#info">Information</a></li>
+       <!-- <li><a href="/slice/{{ slice }}#experiment">Statistics</a></li> -->
+       <!-- <li><a href="/slice/{{ slice }}#measurements">Measurements</a></li> -->
+       <li><a href="/slice/{{ slice }}#experiment">Tools</a></li>
+       <!-- <li><a href="/slice/{{ slice }}#studentslabs">Students Labs</a></li> -->
 </ul>
 {% else %}
 <ul class="nav nav-tabs nav-section">
-       <li class="active"><a href="#info"><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="About MySlice" /> {{ slice }}</a></li>
-       <li class="testbeds"><a href="#testbeds">Testbeds</a></li>
+       <!-- <li class="testbeds"><a href="#testbeds">Testbeds</a></li> -->
        <li><a class="link" href="/resources/{{ slice }}">Resources</a></li>
        <li class="users"><a href="#users">Users</a></li>
-       <li class="statistics"><a href="#statistics">Statistics</a></li>
-       <li class="measurements"><a href="#measurements">Measurements</a></li>
-       <li class="experiment"><a href="#experiment" data-toggle="tab">Experiment</a></li>
-       <li class="sla"><a href="#sla" data-toggle="tab">SLA</a></li>
+       <li class="active"><a href="#info">Information</a></li>
+       <!-- <li class="statistics"><a href="#experiment">Statistics</a></li> -->
+       <!-- <li class="measurements"><a href="#measurements">Measurements</a></li> -->
+       <li class="experiment"><a href="#experiment">Tools</a></li>
+       <!-- <li class="studentslabs"><a href="#studentslabs">Students Labs</a></li> -->
 </ul>
+
 <script>
 $(document).ready(function() {
        $('.nav-tabs a').click(function (e) {
@@ -29,7 +43,16 @@ $(document).ready(function() {
        var id = $(this).attr('href').substr(1);        
        $("#" + id).load('/' + id + '/{{ slice }}/');
        });
-       $('div#info').load('/info/{{ slice }}/');
+       
+       var hash = window.location.hash;
+       if (hash) {
+               $('.nav-tabs a[href='+hash+']').click();
+       } else {
+               $('div#info').load('/info/{{ slice }}/');
+       }
 });
 </script>
 {% endif %}
+</div>
+</div>
+</div>

diff --git a/portal/templates/fed4fire/fed4fire_slice-view.html b/portal/templates/fed4fire/fed4fire_slice-view.html
index 29c93e0..3823f9e 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_slice-view.html
+++ b/portal/templates/fed4fire/fed4fire_slice-view.html
@@ -1,12 +1,12 @@
 {% extends "layout_wide.html" %}
+{% load portal_filters %}
 
 {% block head %}
 <script type="text/javascript" src="{{STATIC_URL}}/js/experiment.js"></script>
 {% endblock %}
 
+{% widget "_widget-slice-sections.html" %}
 {% block content %}
-{% include theme|add:"_widget-slice-sections.html" %}
-         
 <div class="container-fluid tab-content container-slice">
   <!-- <div class="tab-pane row" id="testbeds">...</div> -->
   <div class="tab-pane active row" id="resources">...</div>

diff --git a/portal/templates/onelab/onelab_slice-view.html b/portal/templates/onelab/onelab_slice-view.html
deleted file mode 100644 (file)
index 294de8b..0000000
--- a/portal/templates/onelab/onelab_slice-view.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "layout_wide.html" %}
-
-{% block head %}
-<script type="text/javascript" src="{{STATIC_URL}}/js/experiment.js"></script>
-{% endblock %}
-
-{% block content %}
-{% include theme|add:"_widget-slice-sections.html" %}
-<div class="container-fluid tab-content container-slice">
-  <div class="tab-pane active row" id="info"></div>
-  <div class="tab-pane row" id="testbeds"></div>
-  <div class="tab-pane row" id="resources"></div>
-  <div class="tab-pane row" id="users"></div>
-  <!-- <div class="tab-pane row" id="statistics"></div> -->
-  <div class="tab-pane row" id="measurements"></div>
-  <div class="tab-pane row" id="experiment"></div>
-  <!-- <div class="tab-pane row" id="studentslabs"></div> -->
-</div>         
-{% endblock %}

diff --git a/portal/templates/onelab/onelab_widget-slice-sections.html b/portal/templates/onelab/onelab_widget-slice-sections.html
deleted file mode 100644 (file)
index 44b5d63..0000000
--- a/portal/templates/onelab/onelab_widget-slice-sections.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="container">
-       <div class="row">
-               <div class="col-md-12">
-                        <div class="breadcrumbs">
-                                Experiment &nbsp;>&nbsp; Slice: {{ slice }}
-                        </div>
-               </div>
-       </div>
-</div>
-<div class="container-fluid container-slice">
-<div class="row">
-               <div class="col-md-12">
-{% if section == "resources" %}
-<ul class="nav nav-tabs nav-section">
-       
-       <!-- <li><a href="/slice/{{ slice }}#testbeds">Testbeds</a></li> -->
-       <li class="active"><a class="link" href="/resources/{{ slice }}">Resources</a></li>
-       <li><a href="/slice/{{ slice }}#users">Users</a></li>
-       <li><a href="/slice/{{ slice }}#info">Information</a></li>
-       <!-- <li><a href="/slice/{{ slice }}#experiment">Statistics</a></li> -->
-       <li><a href="/slice/{{ slice }}#measurements">Measurements</a></li>
-       <li><a href="/slice/{{ slice }}#experiment">Tools</a></li>
-       <!-- <li><a href="/slice/{{ slice }}#studentslabs">Students Labs</a></li> -->
-</ul>
-{% else %}
-<ul class="nav nav-tabs nav-section">
-       <!-- <li class="testbeds"><a href="#testbeds">Testbeds</a></li> -->
-       <li><a class="link" href="/resources/{{ slice }}">Resources</a></li>
-       <li class="users"><a href="#users">Users</a></li>
-       <li class="active"><a href="#info">Information</a></li>
-       <!-- <li class="statistics"><a href="#experiment">Statistics</a></li> -->
-       <li class="measurements"><a href="#measurements">Measurements</a></li>
-       <li class="experiment"><a href="#experiment">Tools</a></li>
-       <!-- <li class="studentslabs"><a href="#studentslabs">Students Labs</a></li> -->
-</ul>
-
-<script>
-$(document).ready(function() {
-       $('.nav-tabs a').click(function (e) {
-               if ($(this).hasClass('link')) return;
-               e.preventDefault();
-               $(this).tab('show');
-       var id = $(this).attr('href').substr(1);        
-       $("#" + id).load('/' + id + '/{{ slice }}/');
-       });
-       
-       var hash = window.location.hash;
-       if (hash) {
-               $('.nav-tabs a[href='+hash+']').click();
-       } else {
-               $('div#info').load('/info/{{ slice }}/');
-       }
-});
-</script>
-{% endif %}
-</div>
-</div>
-</div>

diff --git a/portal/templates/slice-view.html b/portal/templates/slice-view.html
index 5902d16..9a7a6ec 100644 (file)
--- a/portal/templates/slice-view.html
+++ b/portal/templates/slice-view.html
@@ -1,19 +1,21 @@
 {% extends "layout_wide.html" %}
+{% load portal_filters %}
 
 {% block head %}
 <script type="text/javascript" src="{{STATIC_URL}}/js/experiment.js"></script>
 {% endblock %}
 
 {% block content %}
-{% include theme|add:"_widget-slice-sections.html" %}
-<div class="container-fluid tab-content">
-  <!-- <div class="tab-pane row" id="testbeds"></div> -->
+{% widget "_widget-slice-sections.html" %}
+<div class="container-fluid tab-content container-slice">
   <div class="tab-pane active row" id="resources"></div>
   <div class="tab-pane row" id="users"></div>
   <div class="tab-pane row" id="info"></div>
   <!-- <div class="tab-pane row" id="statistics">...</div> -->
   <!-- <div class="tab-pane row" id="measurements"></div> -->
   <div class="tab-pane row" id="experiment"></div>
+  <!-- <div class="tab-pane row" id="studentslabs"></div> -->
   <!-- <div class="tab-pane row" id="sla"></div> -->
+  <!-- <div class="tab-pane row" id="testbeds"></div> -->
 </div>         
 {% endblock %}