Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
	portal/templates/onelab/onelab_slice-resource-view.html

diff --combined portal/templates/onelab/onelab_slice-resource-view.html
index 4051c62,8206fdf..80c3fcc
--- 1/portal/templates/onelab/onelab_slice-resource-view.html
--- 2/portal/templates/onelab/onelab_slice-resource-view.html
+++ b/portal/templates/onelab/onelab_slice-resource-view.html
@@@ -1,10 -1,10 +1,10 @@@
  {% extends "layout_wide.html" %}
  
  {% block head %}
 -<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyC1RUj824JAiHRVqgc2CSIg4CpKHhh84Lw&sensor=false"></script>
 +<!-- <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyC1RUj824JAiHRVqgc2CSIg4CpKHhh84Lw&sensor=false"></script> -->
  <script src="{{ STATIC_URL }}js/onelab_slice-resource-view.js"></script>
  <script>
 -      myslice.slice = "{{ slice }}";
 +      //myslice.slice = "{{ slice }}";
  </script>
  {% endblock %}
  
@@@ -13,20 -13,20 +13,20 @@@
                <div id="select-platform" class="list-group">
                </div>
                        
 -              <ul class="list-group">
 +              <!-- <ul class="list-group">
                  <li class="list-group-item">Filter: CPU</li>
                  <li class="list-group-item">Filter: Interface</li>
                  <li class="list-group-item">...</li>
                  <li class="list-group-item">...</li>
                  <li class="list-group-item">...</li>
 -              </ul>
 +              </ul> -->
        
        </div>
        <div class="col-md-10" style="height:100%;">
                <div class="row">
                        {% include theme|add:"_widget-slice-sections.html" %}
                </div>
 -              <div class="row slice-pending">
 +              <!-- <div class="row slice-pending">
                        <ul class="nav nav-pills">
                                <li><a href="">Unreserved</a></li>
                                <li><a href="">Reserved</a></li>
@@@ -39,16 -39,16 +39,16 @@@
                                        <div id="loading" style="display:none;"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading" /></div>
                                </li>
                        </ul>
 -              </div>
 +              </div> -->
                <div class="row">
                        {% if msg %}
                        <div class="col-md-12"><p class="alert-success">{{ msg }}</p></div>
                        {% endif %}
                </div>
                <div class="row">
 -                      <ul class="nav nav-tabs nav-resources">
 +                      <ul class="nav nav-pills nav-resources">
                          <li class="active"><a data-panel="resources" href="#">Resources</a></li>
-                         <li><a data-panel="map" href="#">Map</a></li>
+                         <li id="GoogleMap"><a data-panel="map" href="#">Map</a></li>
                          <li><a data-panel="pending" href="#">Pending</a></li>
                          <li><a href="#"></a></li>
                        </ul>
@@@ -56,7 -56,6 +56,7 @@@
                <div class="row" style="height:100%;">
                        <div id="resources" class="panel">
                  {{list_resources}}
 +                              <!-- <table cellpadding="0" cellspacing="0" border="0" class="table" id="objectList"></table> -->
                        </div>
                        <div id="map" class="panel" style="height:370px;display:none;">
                  {{map_resources}}