bootsstrap'ified dashboard - 3 columns layout, much less css again

diff --git a/portal/static/css/dashboard.css b/portal/static/css/dashboard.css
index d5b6361..dae329b 100644 (file)
--- a/portal/static/css/dashboard.css
+++ b/portal/static/css/dashboard.css
@@ -34,6 +34,7 @@
 }   
 
 
+/*
 #ms-dashboard-profile {
     float: left;
     position: relative;
@@ -44,13 +45,6 @@
     height:200px; 
 }
 
-#ms-dashboard-slices {
-    float: left;
-    position: relative;
-    width: 45%;
-    padding-top: 1em;
-}
-
 #ms-dashboard-testbeds {
     float: right;
     border: 1px #CCC;
@@ -62,6 +56,14 @@
     height:200px; 
 }
 
+#ms-dashboard-slices {
+    float: left;
+    position: relative;
+    width: 45%;
+    padding-top: 1em;
+}
+*/
+
 li.icn {
     padding: 0 0 0 0;
     list-style: none;

diff --git a/portal/templates/dashboard.html b/portal/templates/dashboard.html
index df5c211..cb9264b 100644 (file)
--- a/portal/templates/dashboard.html
+++ b/portal/templates/dashboard.html
@@ -9,36 +9,39 @@
 <div id='tophat_status'></div>
 <div id='ms-dashboard'>
 
-  <div class='ms-dashboard-panel' id="ms-dashboard-profile">
-    <div class='ms-dashboard-caption'>
-      <h2>User profile</h2>
-    </div>
-    <div class='ms-dashboard-content'>
-      <ul>
-        <li><span id='username'>{{person.first_name}} {{person.last_name}}</span></li>
-        <li><b>Email: </b><a href='mailto:#'>{{person.email}}</a></li>
-      </ul>
-      <button id="account" onclick="location.href='{{URL}}/portal/account'" class="btn">Modify</button>
-    </div>
-  </div>
+  <div class="container">
+    <div class="row">
+      <div class='col-md-4' id="ms-dashboard-profile">
+       <div class='ms-dashboard-caption'>
+         <h2>User profile</h2>
+       </div>
+       <div class='ms-dashboard-content'>
+         <ul>
+           {% if person.last_name %} <li><span id='username'>{{person.first_name}} {{person.last_name}}</span></li> {% endif %}
+           <li><b>Email: </b><a href='mailto:#'>{{person.email}}</a></li>
+         </ul>
+         <button id="account" onclick="location.href='{{URL}}/portal/account'" class="btn btn-default">Modify</button>
+       </div>
+      </div>
 
-  <div class='ms-dashboard-panel' id='ms-dashboard-testbeds'>
-    <div class='ms-dashboard-caption'>
-      <h2>Testbeds access</h2>
-    </div>
-    <div class='ms-dashboard-content' id='tophat__list__network_hrn__network_name'>
-    {{networks}}
+      <div class='col-md-4' id='ms-dashboard-testbeds'>
+       <div class='ms-dashboard-caption'>
+         <h2>Testbeds</h2>
        </div>
-  </div>
+       <div class='ms-dashboard-content' id='tophat__list__network_hrn__network_name'>
+         {{networks}}
+       </div>
+      </div>
 
-  <div class='ms-dashboard-panel' id='ms-dashboard-slices'>
-    <div class='ms-dashboard-caption'>
-      <h2>Slices</h2>
-    </div>
-    <div class='ms-dashboard-content' id='tophat__list__slice_hrn__slice_hrn'>
-    {{slices}}
+      <div class='col-md-4' id='ms-dashboard-slices'>
+       <div class='ms-dashboard-caption'>
+         <h2>Slices</h2>
+       </div>
+       <div class='ms-dashboard-content' id='tophat__list__slice_hrn__slice_hrn'>
+         {{slices}}
+       </div>
+      </div>
     </div>
   </div>
 </div>
-
 {% endblock %}