testbed list view updated style

diff --git a/myslice/urls.py b/myslice/urls.py
index 74cb7eb..68d3a94 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -71,7 +71,7 @@ urls = [
     #
     #
     # Portal
-    (r'^testbed/?$', portal.testbedlist.TestbedList.as_view()),
+    (r'^testbeds/?$', portal.testbedlist.TestbedList.as_view()),
     (r'^slice/(?P<slicename>[^/]+)/?$', portal.sliceview.SliceView.as_view()),
     url(r'^portal/', include('portal.urls')),
 ]

diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index e78eb56..260f749 100644 (file)
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -282,7 +282,7 @@ div#ticket-request p {
 /* SLICE VIEW */
 div#slice-view {
     width:100%;
-    margin-top:15px;
+    margin:25px auto;
 }
 div#slice-view div.list-group-item {
     border:0;
@@ -304,3 +304,8 @@ div#slice-view a.list-group-item p.list-group-item-text {
     font-style:italic;
 }
 
+/* TESTBED LIST */
+div#testbed-list {
+    margin:25px auto;
+}
+

diff --git a/portal/static/js/myslice-ui.js b/portal/static/js/myslice-ui.js
index 3b9ef5d..b60c7c1 100644 (file)
--- a/portal/static/js/myslice-ui.js
+++ b/portal/static/js/myslice-ui.js
@@ -29,19 +29,8 @@ $(document).ready(function() {
        
        /* Testbeds list */
        $('div#testbed-list').ready(function() {
-               $('table#testbedList').load("/table/testbed", function(data) {
-                       $(this).dataTable( {
-                               "bScrollInfinite": true,
-                       "bScrollCollapse": true,
-                       "sScrollY": "500px",
-                       "bStateSave": true,
-                       "bPaginate": false,
-                       "bLengthChange": false,
-                       "bFilter": true,
-                       "bSort": true,
-                       "bInfo": false,
-                       "bAutoWidth": false
-                       } );
+               $('table#testbedList').load("/table/testbed", function() {
+                       
                });
        });
        

diff --git a/portal/templates/onelab/onelab_testbed-list.html b/portal/templates/onelab/onelab_testbed-list.html
index 5b268b4..5c424e0 100644 (file)
--- a/portal/templates/onelab/onelab_testbed-list.html
+++ b/portal/templates/onelab/onelab_testbed-list.html
@@ -1,14 +1,12 @@
 {% extends "layout-unfold1.html" %}
 
 {% block unfold_main %}
-<div id="testbed-list">        
-       <div class="col-md-12">
-               <ul class="nav nav-tabs">
-                 <li class="active"><a href="#">Testbeds</a></li>
-                 <li><a href="#"></a></li>
-                 <li><a href="#"></a></li>
-               </ul>
-               <table cellpadding="0" cellspacing="0" border="0" class="table table-bordered" id="testbedList"></table>
-       </div>
+<div class="wrapper" id="testbed-list">
+<h1><img src="{{ STATIC_URL }}img/icon_testbed_small.png" alt="Open a Ticket" /> Testbeds</h1>
+
+<p>
+       
+</p>
+       <table cellpadding="0" cellspacing="0" border="0" class="table" id="testbedList"></table>
 </div>
 {% endblock unfold_main %}
\ No newline at end of file