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/?a=commitdiff_plain;h=a61c68825e91ea92162c737ffa6a7c2f2fcde78d;hp=4b88d97b444f7c3b0ab05c7e1e25ce1a9eaf1b9e;p=myslice.git merge --- diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index dad90097..00f180df 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -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 +8,8 @@ encoding//portal/migrations/0005_extend_user.py=utf-8 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 --git a/influxdb/client.py b/influxdb/client.py index 50daa303..8d28dd86 100644 --- a/influxdb/client.py +++ b/influxdb/client.py @@ -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 --git a/portal/slicetabmeasurements.py b/portal/slicetabmeasurements.py index 49afc697..a62067ff 100644 --- a/portal/slicetabmeasurements.py +++ b/portal/slicetabmeasurements.py @@ -6,7 +6,7 @@ from unfold.loginrequired import LoginRequiredView 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 --git a/portal/static/css/fed4fire.css b/portal/static/css/fed4fire.css index 70de2a8f..6340326e 100644 --- a/portal/static/css/fed4fire.css +++ b/portal/static/css/fed4fire.css @@ -27,7 +27,8 @@ h2 { color:#333333; } h3 { - font-size:13pt; + font-size:12pt; + letter-spacing:0.6pt; color:#201E62; } input[type=checkbox] { @@ -651,17 +652,28 @@ div.secondary .account span { div.secondary .account a { color:black; } -div.dashboard div { - margin:25px 0; -} + div.dashboard { - text-align:center; +} +div.dashboard a { + color:black; +} +div.dashboard a:hover { } div.dashboard ul { text-align:left; margin-left:24px; list-style:none; } +div.dashboard h3 { + border-bottom:0.5px solid #E0E0E0; + margin-right:15px; +} +div.dashboard h3 img { + margin:15px 15px 15px 0; +} + + div.dataTables_filter label{ float:left; width:400px; diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css index 45f5efcf..4023e6c2 100644 --- a/portal/static/css/onelab.css +++ b/portal/static/css/onelab.css @@ -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 +127,6 @@ div.breadcrumbs a:hover { text-decoration:underline; } .tab-pane { - padding-top:15px; } /* buttons */ button.btn, input.btn { @@ -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 --git a/portal/static/js/common.functions.js b/portal/static/js/common.functions.js index 481e9478..a74132e2 100644 --- a/portal/static/js/common.functions.js +++ b/portal/static/js/common.functions.js @@ -19,13 +19,13 @@ function getKeySplitId(id,separator){ if ( typeof String.prototype.startsWith != 'function' ) { String.prototype.startsWith = function( str ) { return this.substring( 0, str.length ) === str; - } + }; }; if ( typeof String.prototype.endsWith != 'function' ) { String.prototype.endsWith = function( str ) { return this.substring( this.length - str.length, this.length ) === str; - } + }; }; // http://stackoverflow.com/questions/646628/javascript-startswith @@ -58,15 +58,19 @@ jQuery.fn.spin = function(opts) { // FROM Triptych : http://stackoverflow.com/users/43089/triptych // http://stackoverflow.com/questions/979256/how-to-sort-an-array-of-javascript-objects // data.sort(sort_by('city', false, function(a){return a.toUpperCase()})); -var sort_by = function(field, reverse, primer){ +var sort_by = function(field, reverse, primer) { - var key = function (x) {return primer ? primer(x[field]) : x[field]}; + var key = function(x) { return primer ? primer(x[field]) : x[field]; }; //var key = primer ? function (x) { return primer(x[field]); } : function (x) { return x[field]; } - return function (a,b) { + return function(a,b) { var A = key(a), B = key(b); return (A < B ? -1 : (A > B ? 1 : 0)) * [1,-1][+!!reverse]; //return ((A < B) ? -1 : // (A > B) ? +1 : 0)) * [-1,1][+!!reverse]; - } + }; +}; + +function escapeRegExp(str) { + return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"); } diff --git a/portal/templates/base.html b/portal/templates/base.html index aed282c1..fd1869ee 100644 --- a/portal/templates/base.html +++ b/portal/templates/base.html @@ -21,7 +21,7 @@ - + @@ -82,6 +82,7 @@ $(document).ready(function() { p = myslice.projects(); if(p != null){ drawProjects(p); + drawProjectsTree(p,slices); } {% endif %} }); @@ -106,6 +107,26 @@ $(document).ready(function() { $("div#home-project-list").html($( " diff --git a/portal/templates/slice-view.html b/portal/templates/slice-view.html index 91d3f730..4aebe060 100644 --- a/portal/templates/slice-view.html +++ b/portal/templates/slice-view.html @@ -6,7 +6,6 @@ {% endblock %} {% block content %} -
@@ -15,13 +14,13 @@
-
...
-
...
-
...
-
...
+
+
+
+
-
...
-
...
-
...
+
+
+
{% endblock %}