From: Ciro Scognamiglio Date: Wed, 15 Apr 2015 17:28:03 +0000 (+0200) Subject: merge X-Git-Tag: myslice-1.3~37^2~14 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=a61c68825e91ea92162c737ffa6a7c2f2fcde78d merge --- a61c68825e91ea92162c737ffa6a7c2f2fcde78d diff --cc .settings/org.eclipse.core.resources.prefs index dad90097,dad90097..00f180df --- a/.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 50daa303,50daa303..8d28dd86 --- a/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 49afc697,49afc697..a62067ff --- a/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 45f5efcf,45f5efcf..4023e6c2 --- a/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 c8b6b440,c8b6b440..21a7daeb --- a/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" %} --
--
...
--
...
--
...
--
...
-- -- --
...
-- ++
++
++
++
++ ++
++
++
{% endblock %} diff --cc portal/templates/onelab/onelab_widget-slice-sections.html index e03a53c1,e03a53c1..44b5d632 --- a/portal/templates/onelab/onelab_widget-slice-sections.html +++ b/portal/templates/onelab/onelab_widget-slice-sections.html @@@ -18,7 -18,7 +18,7 @@@
  • Users
  • Information
    • -- ++
  • Measurements
  • Tools
    • @@@ -29,7 -29,7 +29,7 @@@
  • Users
  • Information
    • -- ++
  • Measurements
  • Tools
    • diff --cc portal/templates/slice-view.html index 91d3f730,91d3f730..4aebe060 --- a/portal/templates/slice-view.html +++ b/portal/templates/slice-view.html @@@ -6,7 -6,7 +6,6 @@@ {% endblock %} {% block content %} --
    @@@ -15,13 -15,13 +14,13 @@@
    --
    ...
    --
    ...
    --
    ...
    --
    ...
    ++
    ++
    ++
    ++
    --
    ...
    --
    ...
    --
    ...
    ++
    ++
    ++
    {% endblock %}