merge

diff --cc .settings/org.eclipse.core.resources.prefs
index dad9009,dad9009..00f180d
--- 1/.settings/org.eclipse.core.resources.prefs
--- 2/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@@ -1,4 -1,4 +1,6 @@@
  eclipse.preferences.version=1
++encoding//forge/forms.py=utf-8
++encoding//forge/views.py=utf-8
  encoding//portal/django_passresetview.py=utf-8
  encoding//portal/forms.py=utf-8
  encoding//portal/migrations/0002_extend_slice.py=utf-8
@@@ -6,6 -6,6 +8,8 @@@ encoding//portal/migrations/0005_extend
  encoding//portal/migrations/0008_extend_user.py=utf-8
  encoding//portal/migrations/0009_initial.py=utf-8
  encoding//portal/migrations/0010_project.py=utf-8
++encoding//portal/migrations/0011_join.py=utf-8
  encoding//portal/models.py=utf-8
  encoding//portal/urls.py=utf-8
  encoding//portal/validationview.py=utf-8
++encoding//portal/views/__init__.py=utf-8

diff --cc influxdb/client.py
index 50daa30,50daa30..8d28dd8
--- 1/influxdb/client.py
--- 2/influxdb/client.py
+++ b/influxdb/client.py
@@@ -1,15 -1,15 +1,19 @@@
  from django.http import HttpResponse
  from rest import error
--import os,json
--import ConfigParser
--import string, random
++import os,json,string,random
++import logging,ConfigParser
  
  from portal.models import MeasurementsDB
  
  from manifold.core.query             import Query, AnalyzedQuery
  from manifoldapi.manifoldapi         import execute_query
  
--from influxdb import InfluxDBClient
++logger = logging.getLogger(__name__)
++
++try :
++    from influxdb import InfluxDBClient
++except :
++    logger.error('can\'t import InfluxDBClient module')
  
  def createDatabase(request, slicename):
      result = {}

diff --cc portal/slicetabmeasurements.py
index 49afc69,49afc69..a62067f
--- 1/portal/slicetabmeasurements.py
--- 2/portal/slicetabmeasurements.py
+++ b/portal/slicetabmeasurements.py
@@@ -6,7 -6,7 +6,7 @@@ from unfold.loginrequired           imp
  from myslice.theme import ThemeView
  
  class SliceTabMeasurements (LoginRequiredView, ThemeView):
--    template_name = "slice-tab-measurement.html"
++    template_name = "slice-tab-measurements.html"
      
      def get(self, request, slicename):
--        return render_to_response(self.template, {"theme": self.theme, "username": request.user, "slice" : slicename, "section":"measurements"}, context_instance=RequestContext(request))
++        return render_to_response(self.template, {"theme": self.theme, "username": request.user, "slicename" : slicename, "section":"measurements"}, context_instance=RequestContext(request))

diff --cc portal/static/css/onelab.css
index 45f5efc,45f5efc..4023e6c
--- 1/portal/static/css/onelab.css
--- 2/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@@ -56,6 -56,6 +56,12 @@@ h4 
      font-size:12pt;
      color:#333333;
  }
++ul {
++    margin:0 0 0 15px;
++    padding:0;
++}
++li {
++}
  span.subtitle {
      color:#454545;
      font-size:9pt;
@@@ -121,7 -121,7 +127,6 @@@ div.breadcrumbs a:hover 
      text-decoration:underline;
  }
  .tab-pane {
--    padding-top:15px;
  }
  /* buttons */
  button.btn, input.btn {
@@@ -389,6 -389,6 +394,31 @@@ div.sl-filter-facilities 
  div.sl-filter-facilities h4 {
      margin-bottom:15px;
      
++}
++.sl-menu {
++    padding:0;
++}
++.sl-menu h4 {
++    margin:0 0 15px 0;
++    padding:0;
++}
++.sl-menu ul {
++    list-style:none;
++    margin:0;
++    padding:0;
++}
++.sl-menu li {
++    color:gray;
++    cursor:pointer;
++    padding:4px 8px;
++}
++.sl-menu li img {
++    vertical-align:top;
++}
++.sl-menu li.active {
++    color:black;
++}
++.sl-menu-item {
  }
  img.sl-image {
      margin:0 5px 5px 0;

diff --cc portal/templates/onelab/onelab_slice-view.html
index c8b6b44,c8b6b44..21a7dae
--- 1/portal/templates/onelab/onelab_slice-view.html
--- 2/portal/templates/onelab/onelab_slice-view.html
+++ b/portal/templates/onelab/onelab_slice-view.html
@@@ -5,15 -5,15 +5,14 @@@
  
  {% 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 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 --cc portal/templates/onelab/onelab_widget-slice-sections.html
index e03a53c,e03a53c..44b5d63
--- 1/portal/templates/onelab/onelab_widget-slice-sections.html
--- 2/portal/templates/onelab/onelab_widget-slice-sections.html
+++ b/portal/templates/onelab/onelab_widget-slice-sections.html
@@@ -18,7 -18,7 +18,7 @@@
        <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 }}#experiment">Measurements</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>
@@@ -29,7 -29,7 +29,7 @@@
        <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="#experiment">Measurements</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>

diff --cc portal/templates/slice-view.html
index 91d3f73,91d3f73..4aebe06
--- 1/portal/templates/slice-view.html
--- 2/portal/templates/slice-view.html
+++ b/portal/templates/slice-view.html
@@@ -6,7 -6,7 +6,6 @@@
  {% endblock %}
  
  {% block content %}
--
  <div class="container">
        <div class="row">
                <div class="col-md-12">
@@@ -15,13 -15,13 +14,13 @@@
        </div>
  </div>
  <div class="container-fluid tab-content">
--  <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 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="sla">...</div>
++  <div class="tab-pane row" id="measurements"></div>
++  <div class="tab-pane row" id="experiment"></div>
++  <div class="tab-pane row" id="sla"></div>
  </div>        
  {% endblock %}