diff --git a/frontend/images/toggle-collapse-dark.png b/frontend/images/toggle-collapse-dark.png new file mode 100644 index 0000000..76577a5 Binary files /dev/null and b/frontend/images/toggle-collapse-dark.png differ diff --git a/frontend/images/toggle-collapse-light.png b/frontend/images/toggle-collapse-light.png new file mode 100644 index 0000000..ed1612f Binary files /dev/null and b/frontend/images/toggle-collapse-light.png differ diff --git a/frontend/images/toggle-expand-dark.png b/frontend/images/toggle-expand-dark.png new file mode 100644 index 0000000..cfb42a4 Binary files /dev/null and b/frontend/images/toggle-expand-dark.png differ diff --git a/frontend/images/toggle-expand-light.png b/frontend/images/toggle-expand-light.png new file mode 100644 index 0000000..27b5234 Binary files /dev/null and b/frontend/images/toggle-expand-light.png differ diff --git a/frontend/index.html b/frontend/index.html index 3e41719..37a1eb8 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -3,24 +3,26 @@ volkszaehler.org - web frontend - - - + + + + - - - - - - - - - + + + + + + + + + - - + + - + + @@ -40,7 +42,17 @@

Kanäle

-
+ + + + + + + + + + +
UUIDTitleTypOperationen

Optionen

diff --git a/frontend/javascript/jqplot/jquery.jqplot.css b/frontend/javascript/jqplot/jquery.jqplot.css deleted file mode 100644 index 3ce8ff0..0000000 --- a/frontend/javascript/jqplot/jquery.jqplot.css +++ /dev/null @@ -1,167 +0,0 @@ -/*rules for the plot target div. These will be cascaded down to all plot elements according to css rules*/ -.jqplot-target { - position: relative; - color: #666666; - font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 1em; -/* height: 300px; - width: 400px;*/ -} - -/*rules applied to all axes*/ -.jqplot-axis { - font-size: 0.75em; -} - -.jqplot-xaxis { - margin-top: 10px; -} - -.jqplot-x2axis { - margin-bottom: 10px; -} - -.jqplot-yaxis { - margin-right: 10px; -} - -.jqplot-y2axis, .jqplot-y3axis, .jqplot-y4axis, .jqplot-y5axis, .jqplot-y6axis, .jqplot-y7axis, .jqplot-y8axis, .jqplot-y9axis { - margin-left: 10px; - margin-right: 10px; -} - -/*rules applied to all axis tick divs*/ -.jqplot-axis-tick, .jqplot-xaxis-tick, .jqplot-yaxis-tick, .jqplot-x2axis-tick, .jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick { - position: absolute; -} - - -.jqplot-xaxis-tick { - top: 0px; - /* initial position untill tick is drawn in proper place */ - left: 15px; -/* padding-top: 10px;*/ - vertical-align: top; -} - -.jqplot-x2axis-tick { - bottom: 0px; - /* initial position untill tick is drawn in proper place */ - left: 15px; -/* padding-bottom: 10px;*/ - vertical-align: bottom; -} - -.jqplot-yaxis-tick { - right: 0px; - /* initial position untill tick is drawn in proper place */ - top: 15px; -/* padding-right: 10px;*/ - text-align: right; -} - -.jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick { - left: 0px; - /* initial position untill tick is drawn in proper place */ - top: 15px; -/* padding-left: 10px;*/ -/* padding-right: 15px;*/ - text-align: left; -} - -.jqplot-xaxis-label { - margin-top: 10px; - font-size: 11pt; - position: absolute; -} - -.jqplot-x2axis-label { - margin-bottom: 10px; - font-size: 11pt; - position: absolute; -} - -.jqplot-yaxis-label { - margin-right: 10px; -/* text-align: center;*/ - font-size: 11pt; - position: absolute; -} - -.jqplot-y2axis-label, .jqplot-y3axis-label, .jqplot-y4axis-label, .jqplot-y5axis-label, .jqplot-y6axis-label, .jqplot-y7axis-label, .jqplot-y8axis-label, .jqplot-y9axis-label { -/* text-align: center;*/ - font-size: 11pt; - position: absolute; -} - -table.jqplot-table-legend, table.jqplot-cursor-legend { - background-color: rgba(255,255,255,0.6); - border: 1px solid #cccccc; - position: absolute; - font-size: 0.75em; -} - -td.jqplot-table-legend { - vertical-align:middle; -} - -td.jqplot-table-legend > div { - border:1px solid #cccccc; - padding:0.2em; -} - -div.jqplot-table-legend-swatch { - width:0px; - height:0px; - border-top-width: 0.35em; - border-bottom-width: 0.35em; - border-left-width: 0.6em; - border-right-width: 0.6em; - border-top-style: solid; - border-bottom-style: solid; - border-left-style: solid; - border-right-style: solid; -} - -.jqplot-title { - top: 0px; - left: 0px; - padding-bottom: 0.5em; - font-size: 1.2em; -} - -table.jqplot-cursor-tooltip { - border: 1px solid #cccccc; - font-size: 0.75em; -} - - -.jqplot-cursor-tooltip { - border: 1px solid #cccccc; - font-size: 0.75em; - white-space: nowrap; - background: rgba(208,208,208,0.5); - padding: 1px; -} - -.jqplot-highlighter-tooltip { - border: 1px solid #cccccc; - font-size: 0.75em; - white-space: nowrap; - background: rgba(208,208,208,0.5); - padding: 1px; -} - -.jqplot-point-label { - font-size: 0.75em; -} - -td.jqplot-cursor-legend-swatch { -vertical-align:middle; -text-align:center; -} - -div.jqplot-cursor-legend-swatch { -width:1.2em; -height:0.7em; -} diff --git a/frontend/javascript/functions.js b/frontend/javascripts/functions.js similarity index 50% rename from frontend/javascript/functions.js rename to frontend/javascripts/functions.js index fcc9a53..a11d311 100644 --- a/frontend/javascript/functions.js +++ b/frontend/javascripts/functions.js @@ -24,22 +24,20 @@ * volkszaehler.org. If not, see . */ + +/* + * Frontend related functions + */ + +/** + * Refresh plot with new data + */ function refresh() { if ($('[name=refresh]').attr('checked')) { getData(); } } -function loadEntities() { - $('#entities').empty(); - $.each(uuids, function(index, value) { - $.getJSON(backendUrl + '/entity/' + value + '.json', function(json) { - var entity = (json.group) ? json.group : json.channel; - $('#entities').append(''); - }); - }); -} - function moveWindow(mode) { delta = myWindowEnd - myWindowStart; @@ -58,10 +56,9 @@ function moveWindow(mode) { getData(); } - function getData() { // load json data with given time window - $.getJSON(backendUrl + '/data/' + myUUID + '.json', {from: myWindowStart, to: myWindowEnd, tuples: 500}, function(data){ + $.getJSON(backendUrl + '/data/' + myUUID + '.json', { from: myWindowStart, to: myWindowEnd, tuples: 500 }, function(data){ json = data; showChart(); }); @@ -82,4 +79,91 @@ function showChart() { clear: true, resetAxes: true }); +} + +/* + * Entity list related functions + */ + +/** + * Get all entity infomration from backend + */ +function loadEntities() { + $.each(uuids, function(index, value) { + $.getJSON(backendUrl + '/entity/' + value + '.json', ajaxWait(showEntities, 'enities')); + }); +} + +/** + * Create nested entity list + * @param data + */ +function showEntities(data) { + $('#entities tbody').empty(); + + $.each(data, function(index, value) { + var entity = (value.group) ? value.group : value.channel; + + showEntity(entity); + }); + + $('#entities').treeTable(); +} + +/** + * Create nested entity list (recursive) + * @param entity + * @param parent + */ +function showEntity(entity, parent) { + $('#entities tbody').append( + $('') + .attr('class', (parent) ? 'child-of-entity-' + parent.uuid : '') + .attr('id', 'entity-' + entity.uuid) + .append($('
' + entity.uuid + '' + entity.title + '' + entity.type + '
').text(entity.uuid)) + .append($('').text(entity.title)) + .append($('').text(entity.type)) + ); + + var entities = new Array(); + if (entity.channels) { + $.merge(entities, entity.channels); + } + if (entity.groups) { + $.merge(entities, entity.groups); + } + + $.each(entities, function(index, value) { + showEntity(value, entity); + }); +} + +/* + * General helper functions + */ + +function ajaxWait(callback, identifier) { + if (!identifier) { + var identifier = 0; + } + + if (!ajaxWait.counter || !ajaxWait.data) { + ajaxWait.counter = new Array(); + ajaxWait.data = new Array(); + } + + if (!ajaxWait.counter[identifier] || !ajaxWait.data[identifier]) { + ajaxWait.counter[identifier] = 0; + ajaxWait.data[identifier] = new Array; + } + + ajaxWait.counter[identifier]++; + + return function (data, textStatus) { + ajaxWait.data[identifier].push(data); + + if (!--ajaxWait.counter[identifier]) { + callback(ajaxWait.data[identifier]); + } + }; } \ No newline at end of file diff --git a/frontend/javascript/jqplot/MIT-LICENSE.txt b/frontend/javascripts/jqplot/MIT-LICENSE.txt similarity index 100% rename from frontend/javascript/jqplot/MIT-LICENSE.txt rename to frontend/javascripts/jqplot/MIT-LICENSE.txt diff --git a/frontend/javascript/jqplot/README.txt b/frontend/javascripts/jqplot/README.txt similarity index 100% rename from frontend/javascript/jqplot/README.txt rename to frontend/javascripts/jqplot/README.txt diff --git a/frontend/javascript/jqplot/changes.txt b/frontend/javascripts/jqplot/changes.txt similarity index 100% rename from frontend/javascript/jqplot/changes.txt rename to frontend/javascripts/jqplot/changes.txt diff --git a/frontend/javascript/jqplot/copyright.txt b/frontend/javascripts/jqplot/copyright.txt similarity index 100% rename from frontend/javascript/jqplot/copyright.txt rename to frontend/javascripts/jqplot/copyright.txt diff --git a/frontend/javascript/jqplot/excanvas.js b/frontend/javascripts/jqplot/excanvas.js similarity index 100% rename from frontend/javascript/jqplot/excanvas.js rename to frontend/javascripts/jqplot/excanvas.js diff --git a/frontend/javascript/jqplot/excanvas.min.js b/frontend/javascripts/jqplot/excanvas.min.js similarity index 100% rename from frontend/javascript/jqplot/excanvas.min.js rename to frontend/javascripts/jqplot/excanvas.min.js diff --git a/frontend/javascript/jqplot/gpl-2.0.txt b/frontend/javascripts/jqplot/gpl-2.0.txt similarity index 100% rename from frontend/javascript/jqplot/gpl-2.0.txt rename to frontend/javascripts/jqplot/gpl-2.0.txt diff --git a/frontend/javascript/jqplot/jqPlotCssStyling.txt b/frontend/javascripts/jqplot/jqPlotCssStyling.txt similarity index 100% rename from frontend/javascript/jqplot/jqPlotCssStyling.txt rename to frontend/javascripts/jqplot/jqPlotCssStyling.txt diff --git a/frontend/javascript/jqplot/jqPlotOptions.txt b/frontend/javascripts/jqplot/jqPlotOptions.txt similarity index 100% rename from frontend/javascript/jqplot/jqPlotOptions.txt rename to frontend/javascripts/jqplot/jqPlotOptions.txt diff --git a/frontend/javascript/jqplot/jquery-1.3.2.min.js b/frontend/javascripts/jqplot/jquery-1.3.2.min.js similarity index 100% rename from frontend/javascript/jqplot/jquery-1.3.2.min.js rename to frontend/javascripts/jqplot/jquery-1.3.2.min.js diff --git a/frontend/javascript/jqplot/jquery.jqplot.js b/frontend/javascripts/jqplot/jquery.jqplot.js similarity index 100% rename from frontend/javascript/jqplot/jquery.jqplot.js rename to frontend/javascripts/jqplot/jquery.jqplot.js diff --git a/frontend/javascript/jqplot/jquery.jqplot.min.js b/frontend/javascripts/jqplot/jquery.jqplot.min.js similarity index 100% rename from frontend/javascript/jqplot/jquery.jqplot.min.js rename to frontend/javascripts/jqplot/jquery.jqplot.min.js diff --git a/frontend/javascript/jqplot/optionsTutorial.txt b/frontend/javascripts/jqplot/optionsTutorial.txt similarity index 100% rename from frontend/javascript/jqplot/optionsTutorial.txt rename to frontend/javascripts/jqplot/optionsTutorial.txt diff --git a/frontend/javascript/jqplot/plugins/jqplot.barRenderer.js b/frontend/javascripts/jqplot/plugins/jqplot.barRenderer.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.barRenderer.js rename to frontend/javascripts/jqplot/plugins/jqplot.barRenderer.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.barRenderer.min.js b/frontend/javascripts/jqplot/plugins/jqplot.barRenderer.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.barRenderer.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.barRenderer.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js b/frontend/javascripts/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js rename to frontend/javascripts/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js b/frontend/javascripts/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.canvasAxisTickRenderer.js b/frontend/javascripts/jqplot/plugins/jqplot.canvasAxisTickRenderer.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.canvasAxisTickRenderer.js rename to frontend/javascripts/jqplot/plugins/jqplot.canvasAxisTickRenderer.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js b/frontend/javascripts/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.canvasTextRenderer.js b/frontend/javascripts/jqplot/plugins/jqplot.canvasTextRenderer.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.canvasTextRenderer.js rename to frontend/javascripts/jqplot/plugins/jqplot.canvasTextRenderer.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.canvasTextRenderer.min.js b/frontend/javascripts/jqplot/plugins/jqplot.canvasTextRenderer.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.canvasTextRenderer.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.canvasTextRenderer.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.categoryAxisRenderer.js b/frontend/javascripts/jqplot/plugins/jqplot.categoryAxisRenderer.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.categoryAxisRenderer.js rename to frontend/javascripts/jqplot/plugins/jqplot.categoryAxisRenderer.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.categoryAxisRenderer.min.js b/frontend/javascripts/jqplot/plugins/jqplot.categoryAxisRenderer.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.categoryAxisRenderer.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.categoryAxisRenderer.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.cursor.js b/frontend/javascripts/jqplot/plugins/jqplot.cursor.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.cursor.js rename to frontend/javascripts/jqplot/plugins/jqplot.cursor.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.cursor.min.js b/frontend/javascripts/jqplot/plugins/jqplot.cursor.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.cursor.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.cursor.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.dateAxisRenderer.js b/frontend/javascripts/jqplot/plugins/jqplot.dateAxisRenderer.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.dateAxisRenderer.js rename to frontend/javascripts/jqplot/plugins/jqplot.dateAxisRenderer.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.dateAxisRenderer.min.js b/frontend/javascripts/jqplot/plugins/jqplot.dateAxisRenderer.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.dateAxisRenderer.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.dateAxisRenderer.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.dragable.js b/frontend/javascripts/jqplot/plugins/jqplot.dragable.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.dragable.js rename to frontend/javascripts/jqplot/plugins/jqplot.dragable.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.dragable.min.js b/frontend/javascripts/jqplot/plugins/jqplot.dragable.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.dragable.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.dragable.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.highlighter.js b/frontend/javascripts/jqplot/plugins/jqplot.highlighter.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.highlighter.js rename to frontend/javascripts/jqplot/plugins/jqplot.highlighter.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.highlighter.min.js b/frontend/javascripts/jqplot/plugins/jqplot.highlighter.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.highlighter.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.highlighter.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.logAxisRenderer.js b/frontend/javascripts/jqplot/plugins/jqplot.logAxisRenderer.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.logAxisRenderer.js rename to frontend/javascripts/jqplot/plugins/jqplot.logAxisRenderer.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.logAxisRenderer.min.js b/frontend/javascripts/jqplot/plugins/jqplot.logAxisRenderer.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.logAxisRenderer.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.logAxisRenderer.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.mekkoAxisRenderer.js b/frontend/javascripts/jqplot/plugins/jqplot.mekkoAxisRenderer.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.mekkoAxisRenderer.js rename to frontend/javascripts/jqplot/plugins/jqplot.mekkoAxisRenderer.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js b/frontend/javascripts/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.mekkoRenderer.js b/frontend/javascripts/jqplot/plugins/jqplot.mekkoRenderer.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.mekkoRenderer.js rename to frontend/javascripts/jqplot/plugins/jqplot.mekkoRenderer.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.mekkoRenderer.min.js b/frontend/javascripts/jqplot/plugins/jqplot.mekkoRenderer.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.mekkoRenderer.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.mekkoRenderer.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.ohlcRenderer.js b/frontend/javascripts/jqplot/plugins/jqplot.ohlcRenderer.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.ohlcRenderer.js rename to frontend/javascripts/jqplot/plugins/jqplot.ohlcRenderer.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.ohlcRenderer.min.js b/frontend/javascripts/jqplot/plugins/jqplot.ohlcRenderer.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.ohlcRenderer.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.ohlcRenderer.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.pieRenderer.js b/frontend/javascripts/jqplot/plugins/jqplot.pieRenderer.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.pieRenderer.js rename to frontend/javascripts/jqplot/plugins/jqplot.pieRenderer.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.pieRenderer.min.js b/frontend/javascripts/jqplot/plugins/jqplot.pieRenderer.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.pieRenderer.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.pieRenderer.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.pointLabels.js b/frontend/javascripts/jqplot/plugins/jqplot.pointLabels.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.pointLabels.js rename to frontend/javascripts/jqplot/plugins/jqplot.pointLabels.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.pointLabels.js.orig b/frontend/javascripts/jqplot/plugins/jqplot.pointLabels.js.orig similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.pointLabels.js.orig rename to frontend/javascripts/jqplot/plugins/jqplot.pointLabels.js.orig diff --git a/frontend/javascript/jqplot/plugins/jqplot.pointLabels.min.js b/frontend/javascripts/jqplot/plugins/jqplot.pointLabels.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.pointLabels.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.pointLabels.min.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.trendline.js b/frontend/javascripts/jqplot/plugins/jqplot.trendline.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.trendline.js rename to frontend/javascripts/jqplot/plugins/jqplot.trendline.js diff --git a/frontend/javascript/jqplot/plugins/jqplot.trendline.min.js b/frontend/javascripts/jqplot/plugins/jqplot.trendline.min.js similarity index 100% rename from frontend/javascript/jqplot/plugins/jqplot.trendline.min.js rename to frontend/javascripts/jqplot/plugins/jqplot.trendline.min.js diff --git a/frontend/javascript/jqplot/usage.txt b/frontend/javascripts/jqplot/usage.txt similarity index 100% rename from frontend/javascript/jqplot/usage.txt rename to frontend/javascripts/jqplot/usage.txt diff --git a/frontend/javascript/jquery-1.4.2.min.js b/frontend/javascripts/jquery-1.4.2.min.js similarity index 100% rename from frontend/javascript/jquery-1.4.2.min.js rename to frontend/javascripts/jquery-1.4.2.min.js diff --git a/frontend/javascript/jquery-extensions.js b/frontend/javascripts/jquery-extensions.js similarity index 50% rename from frontend/javascript/jquery-extensions.js rename to frontend/javascripts/jquery-extensions.js index 56d0e88..9aec604 100644 --- a/frontend/javascript/jquery-extensions.js +++ b/frontend/javascripts/jquery-extensions.js @@ -26,14 +26,14 @@ */ /** - * + * Get URL parameters */ $.extend( { getUrlVars : function() { var vars = [], hash; var hashes = window.location.href.slice( window.location.href.indexOf('?') + 1).split('&'); - for ( var i = 0; i < hashes.length; i++) { + for (var i = 0; i < hashes.length; i++) { hash = hashes[i].split('='); vars.push(hash[0]); vars[hash[0]] = hash[1]; @@ -57,49 +57,53 @@ $.extend( { * http://www.gnu.org/licenses/gpl.html */ $.extend({ - cookie: function(name, value, options) { - if (typeof value != 'undefined') { // name and value given, set cookie - options = options || {}; - if (value === null) { - value = ''; - options.expires = -1; - } - var expires = ''; - if (options.expires - && (typeof options.expires == 'number' || options.expires.toUTCString)) { - var date; - if (typeof options.expires == 'number') { - date = new Date(); - date.setTime(date.getTime() - + (options.expires * 24 * 60 * 60 * 1000)); - } else { - date = options.expires; - } - expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE - } - // CAUTION: Needed to parenthesize options.path and options.domain - // in the following expressions, otherwise they evaluate to undefined - // in the packed version for some reason... - var path = options.path ? '; path=' + (options.path) : ''; - var domain = options.domain ? '; domain=' + (options.domain) : ''; - var secure = options.secure ? '; secure' : ''; - document.cookie = [ name, '=', encodeURIComponent(value), expires, - path, domain, secure ].join(''); - } else { // only name given, get cookie - var cookieValue = null; - if (document.cookie && document.cookie != '') { - var cookies = document.cookie.split(';'); - for ( var i = 0; i < cookies.length; i++) { - var cookie = jQuery.trim(cookies[i]); - // Does this cookie string begin with the name we want? - if (cookie.substring(0, name.length + 1) == (name + '=')) { - cookieValue = decodeURIComponent(cookie - .substring(name.length + 1)); - break; - } - } - } - return cookieValue; + setCookie: function(name, value, options) { + options = options || {}; + + if (value === null) { + value = ''; + options.expires = -1; } + + var expires = ''; + + if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) { + var date; + if (typeof options.expires == 'number') { + date = new Date(); + date.setTime(date.getTime() + + (options.expires * 24 * 60 * 60 * 1000)); + } else { + date = options.expires; + } + expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE + } + + // CAUTION: Needed to parenthesize options.path and options.domain + // in the following expressions, otherwise they evaluate to undefined + // in the packed version for some reason... + var path = options.path ? '; path=' + (options.path) : ''; + var domain = options.domain ? '; domain=' + (options.domain) : ''; + var secure = options.secure ? '; secure' : ''; + document.cookie = [ name, '=', encodeURIComponent(value), expires, path, domain, secure ].join(''); + }, + getCookie: function(name) { + var value = null; + + if (document.cookie && document.cookie != '') { + var cookies = document.cookie.split(';'); + + for (var i = 0; i < cookies.length; i++) { + var cookie = $.trim(cookies[i]); + + // Does this cookie string begin with the name we want? + if (cookie.substring(0, name.length + 1) == (name + '=')) { + value = decodeURIComponent(cookie.substring(name.length + 1)); + break; + } + } + } + + return value; } }); \ No newline at end of file diff --git a/frontend/javascripts/jquery-treeTable.min.js b/frontend/javascripts/jquery-treeTable.min.js new file mode 100644 index 0000000..c4bee9b --- /dev/null +++ b/frontend/javascripts/jquery-treeTable.min.js @@ -0,0 +1,19 @@ +/* + * jQuery treeTable Plugin 2.3.0 + * http://ludo.cubicphuse.nl/jquery-plugins/treeTable/ + * + * Copyright 2010, Ludo van den Boom + * Dual licensed under the MIT or GPL Version 2 licenses. + */ +(function($){var options;var defaultPaddingLeft;$.fn.treeTable=function(opts){options=$.extend({},$.fn.treeTable.defaults,opts);return this.each(function(){$(this).addClass("treeTable").find("tbody tr").each(function(){if(!options.expandable||$(this)[0].className.search(options.childPrefix)==-1){if(isNaN(defaultPaddingLeft)){defaultPaddingLeft=parseInt($($(this).children("td")[options.treeColumn]).css('padding-left'),10);} +initialize($(this));}else if(options.initialState=="collapsed"){this.style.display="none";}});});};$.fn.treeTable.defaults={childPrefix:"child-of-",clickableNodeNames:false,expandable:true,indent:19,initialState:"collapsed",treeColumn:0};$.fn.collapse=function(){$(this).addClass("collapsed");childrenOf($(this)).each(function(){if(!$(this).hasClass("collapsed")){$(this).collapse();} +this.style.display="none";});return this;};$.fn.expand=function(){$(this).removeClass("collapsed").addClass("expanded");childrenOf($(this)).each(function(){initialize($(this));if($(this).is(".expanded.parent")){$(this).expand();} +$(this).show();});return this;};$.fn.reveal=function(){$(ancestorsOf($(this)).reverse()).each(function(){initialize($(this));$(this).expand().show();});return this;};$.fn.appendBranchTo=function(destination){var node=$(this);var parent=parentOf(node);var ancestorNames=$.map(ancestorsOf($(destination)),function(a){return a.id;});if($.inArray(node[0].id,ancestorNames)==-1&&(!parent||(destination.id!=parent[0].id))&&destination.id!=node[0].id){indent(node,ancestorsOf(node).length*options.indent*-1);if(parent){node.removeClass(options.childPrefix+parent[0].id);} +node.addClass(options.childPrefix+destination.id);move(node,destination);indent(node,ancestorsOf(node).length*options.indent);} +return this;};$.fn.reverse=function(){return this.pushStack(this.get().reverse(),arguments);};$.fn.toggleBranch=function(){if($(this).hasClass("collapsed")){$(this).expand();}else{$(this).removeClass("expanded").collapse();} +return this;};function ancestorsOf(node){var ancestors=[];while(node=parentOf(node)){ancestors[ancestors.length]=node[0];} +return ancestors;};function childrenOf(node){return $("table.treeTable tbody tr."+options.childPrefix+node[0].id);};function getPaddingLeft(node){var paddingLeft=parseInt(node[0].style.paddingLeft,10);return(isNaN(paddingLeft))?defaultPaddingLeft:paddingLeft;} +function indent(node,value){var cell=$(node.children("td")[options.treeColumn]);cell[0].style.paddingLeft=getPaddingLeft(cell)+value+"px";childrenOf(node).each(function(){indent($(this),value);});};function initialize(node){if(!node.hasClass("initialized")){node.addClass("initialized");var childNodes=childrenOf(node);if(!node.hasClass("parent")&&childNodes.length>0){node.addClass("parent");} +if(node.hasClass("parent")){var cell=$(node.children("td")[options.treeColumn]);var padding=getPaddingLeft(cell)+options.indent;childNodes.each(function(){$(this).children("td")[options.treeColumn].style.paddingLeft=padding+"px";});if(options.expandable){cell.prepend('');$(cell[0].firstChild).click(function(){node.toggleBranch();});if(options.clickableNodeNames){cell[0].style.cursor="pointer";$(cell).click(function(e){if(e.target.className!='expander'){node.toggleBranch();}});} +if(!(node.hasClass("expanded")||node.hasClass("collapsed"))){node.addClass(options.initialState);} +if(node.hasClass("expanded")){node.expand();}}}}};function move(node,destination){node.insertAfter(destination);childrenOf(node).reverse().each(function(){move($(this),node[0]);});};function parentOf(node){var classNames=node[0].className.split(' ');for(key in classNames){if(classNames[key].match(options.childPrefix)){return $("#"+classNames[key].substring(9));}}};})(jQuery); \ No newline at end of file diff --git a/frontend/javascript/jquery-ui-1.8.5.min.js b/frontend/javascripts/jquery-ui-1.8.5.min.js similarity index 100% rename from frontend/javascript/jquery-ui-1.8.5.min.js rename to frontend/javascripts/jquery-ui-1.8.5.min.js diff --git a/frontend/javascript/jstree/jquery.jstree.js b/frontend/javascripts/jstree/jquery.jstree.js similarity index 100% rename from frontend/javascript/jstree/jquery.jstree.js rename to frontend/javascripts/jstree/jquery.jstree.js diff --git a/frontend/javascript/jstree/themes/apple/bg.jpg b/frontend/javascripts/jstree/themes/apple/bg.jpg similarity index 100% rename from frontend/javascript/jstree/themes/apple/bg.jpg rename to frontend/javascripts/jstree/themes/apple/bg.jpg diff --git a/frontend/javascript/jstree/themes/apple/d.png b/frontend/javascripts/jstree/themes/apple/d.png similarity index 100% rename from frontend/javascript/jstree/themes/apple/d.png rename to frontend/javascripts/jstree/themes/apple/d.png diff --git a/frontend/javascript/jstree/themes/apple/dot_for_ie.gif b/frontend/javascripts/jstree/themes/apple/dot_for_ie.gif similarity index 100% rename from frontend/javascript/jstree/themes/apple/dot_for_ie.gif rename to frontend/javascripts/jstree/themes/apple/dot_for_ie.gif diff --git a/frontend/javascript/jstree/themes/apple/style.css b/frontend/javascripts/jstree/themes/apple/style.css similarity index 100% rename from frontend/javascript/jstree/themes/apple/style.css rename to frontend/javascripts/jstree/themes/apple/style.css diff --git a/frontend/javascript/jstree/themes/apple/throbber.gif b/frontend/javascripts/jstree/themes/apple/throbber.gif similarity index 100% rename from frontend/javascript/jstree/themes/apple/throbber.gif rename to frontend/javascripts/jstree/themes/apple/throbber.gif diff --git a/frontend/javascript/jstree/themes/classic/d.png b/frontend/javascripts/jstree/themes/classic/d.png similarity index 100% rename from frontend/javascript/jstree/themes/classic/d.png rename to frontend/javascripts/jstree/themes/classic/d.png diff --git a/frontend/javascript/jstree/themes/classic/dot_for_ie.gif b/frontend/javascripts/jstree/themes/classic/dot_for_ie.gif similarity index 100% rename from frontend/javascript/jstree/themes/classic/dot_for_ie.gif rename to frontend/javascripts/jstree/themes/classic/dot_for_ie.gif diff --git a/frontend/javascript/jstree/themes/classic/style.css b/frontend/javascripts/jstree/themes/classic/style.css similarity index 100% rename from frontend/javascript/jstree/themes/classic/style.css rename to frontend/javascripts/jstree/themes/classic/style.css diff --git a/frontend/javascript/jstree/themes/classic/throbber.gif b/frontend/javascripts/jstree/themes/classic/throbber.gif similarity index 100% rename from frontend/javascript/jstree/themes/classic/throbber.gif rename to frontend/javascripts/jstree/themes/classic/throbber.gif diff --git a/frontend/javascript/jstree/themes/default-rtl/d.gif b/frontend/javascripts/jstree/themes/default-rtl/d.gif similarity index 100% rename from frontend/javascript/jstree/themes/default-rtl/d.gif rename to frontend/javascripts/jstree/themes/default-rtl/d.gif diff --git a/frontend/javascript/jstree/themes/default-rtl/d.png b/frontend/javascripts/jstree/themes/default-rtl/d.png similarity index 100% rename from frontend/javascript/jstree/themes/default-rtl/d.png rename to frontend/javascripts/jstree/themes/default-rtl/d.png diff --git a/frontend/javascript/jstree/themes/default-rtl/dots.gif b/frontend/javascripts/jstree/themes/default-rtl/dots.gif similarity index 100% rename from frontend/javascript/jstree/themes/default-rtl/dots.gif rename to frontend/javascripts/jstree/themes/default-rtl/dots.gif diff --git a/frontend/javascript/jstree/themes/default-rtl/style.css b/frontend/javascripts/jstree/themes/default-rtl/style.css similarity index 100% rename from frontend/javascript/jstree/themes/default-rtl/style.css rename to frontend/javascripts/jstree/themes/default-rtl/style.css diff --git a/frontend/javascript/jstree/themes/default-rtl/throbber.gif b/frontend/javascripts/jstree/themes/default-rtl/throbber.gif similarity index 100% rename from frontend/javascript/jstree/themes/default-rtl/throbber.gif rename to frontend/javascripts/jstree/themes/default-rtl/throbber.gif diff --git a/frontend/javascript/jstree/themes/default/d.gif b/frontend/javascripts/jstree/themes/default/d.gif similarity index 100% rename from frontend/javascript/jstree/themes/default/d.gif rename to frontend/javascripts/jstree/themes/default/d.gif diff --git a/frontend/javascript/jstree/themes/default/d.png b/frontend/javascripts/jstree/themes/default/d.png similarity index 100% rename from frontend/javascript/jstree/themes/default/d.png rename to frontend/javascripts/jstree/themes/default/d.png diff --git a/frontend/javascript/jstree/themes/default/style.css b/frontend/javascripts/jstree/themes/default/style.css similarity index 100% rename from frontend/javascript/jstree/themes/default/style.css rename to frontend/javascripts/jstree/themes/default/style.css diff --git a/frontend/javascript/jstree/themes/default/throbber.gif b/frontend/javascripts/jstree/themes/default/throbber.gif similarity index 100% rename from frontend/javascript/jstree/themes/default/throbber.gif rename to frontend/javascripts/jstree/themes/default/throbber.gif diff --git a/frontend/javascript/script.js b/frontend/javascripts/script.js similarity index 89% rename from frontend/javascript/script.js rename to frontend/javascripts/script.js index 1421eb7..04a989f 100644 --- a/frontend/javascript/script.js +++ b/frontend/javascripts/script.js @@ -39,7 +39,12 @@ const jqOptions = { }, seriesDefaults: { lineWidth: 1, - showMarker: false + showMarker: true, + showLine: false, + markerOptions: { + style: 'dash', + size: 2 + } }, axes: { yaxis: { @@ -68,21 +73,27 @@ const jqOptions = { } }; -/* - * Variables - */ +// uuids var myUUID = ''; -var uuids = $.parseJSON($.cookie('uuids')); +var uuids = new Array; + +if ($.getCookie('uuids')) { + var uuids = $.parseJSON($.getCookie('uuids')); +} if($.getUrlVar('uuid')) { myUUID = $.getUrlVar('uuid'); uuids.push($.getUrlVar('uuid')); } +if (uuids.length == 0) { + alert('Error: No UUIDs given!') +} + // storing json data var json; -//windowEnd parameter for json server +// windowEnd parameter for json server var myWindowEnd = new Date().getTime(); // windowStart parameter for json server @@ -91,15 +102,6 @@ var myWindowStart = myWindowEnd - 24*60*60*1000; // executed on document loaded complete // this is where it all starts... $(document).ready(function() { - // initialization of user interface - $('#accordion h3').click(function() { - $(this).next().toggle('fast'); - return false; - }).next().hide(); - - $('#refreshInterval').slider(); - - // resize chart area for low resolution displays // works fine with HTC hero // perhaps you have to reload after display rotation @@ -113,8 +115,17 @@ $(document).ready(function() { // load all entity information loadEntities(); + // start auto refresh timer window.setInterval(refresh, 5000); + // initialization of user interface + $('#accordion h3').click(function() { + $(this).next().toggle('fast'); + return false; + }).next().hide(); + + $('#refreshInterval').slider(); + // load data and show plot getData(); }); diff --git a/frontend/javascript/jqplot/jquery.jqplot.min.css b/frontend/stylesheets/jquery.jqplot.min.css similarity index 100% rename from frontend/javascript/jqplot/jquery.jqplot.min.css rename to frontend/stylesheets/jquery.jqplot.min.css diff --git a/frontend/stylesheets/jquery.treeTable.css b/frontend/stylesheets/jquery.treeTable.css new file mode 100644 index 0000000..1f37f1c --- /dev/null +++ b/frontend/stylesheets/jquery.treeTable.css @@ -0,0 +1,43 @@ +/* jQuery TreeTable Core 2.0 stylesheet + * + * This file contains styles that are used to display the tree table. Each tree + * table is assigned the +treeTable+ class. + * ========================================================================= */ + +/* jquery.treeTable.collapsible + * ------------------------------------------------------------------------- */ +.treeTable tr td .expander { + background-position: left center; + background-repeat: no-repeat; + cursor: pointer; + padding: 0; + zoom: 1; /* IE7 Hack */ +} + +.treeTable tr.collapsed td .expander { + background-image: url(../images/toggle-expand-dark.png); +} + +.treeTable tr.expanded td .expander { + background-image: url(../images/toggle-collapse-dark.png); +} + +/* jquery.treeTable.sortable + * ------------------------------------------------------------------------- */ +.treeTable tr.selected, .treeTable tr.accept { + background-color: #3875d7; + color: #fff; +} + +.treeTable tr.collapsed.selected td .expander, .treeTable tr.collapsed.accept td .expander { + background-image: url(../images/toggle-expand-light.png); +} + +.treeTable tr.expanded.selected td .expander, .treeTable tr.expanded.accept td .expander { + background-image: url(../images/toggle-collapse-light.png); +} + +.treeTable .ui-draggable-dragging { + color: #000; + z-index: 1; +} \ No newline at end of file diff --git a/frontend/stylesheets/style.css b/frontend/stylesheets/style.css index c598d2c..9635fa1 100644 --- a/frontend/stylesheets/style.css +++ b/frontend/stylesheets/style.css @@ -26,4 +26,19 @@ body { margin: 2px; -moz-border-radius: 4px; font-size: 0.9em; +} + +/* treeTable for entities */ +#entities { + border-collapse: collapse; +} + +#entities thead tr th { + padding: 0.3em 1.67em; + text-align: left; +} + +#entities tbody tr td { + padding: 0.3em 1.5em; + white-space: nowrap; } \ No newline at end of file