Merge branch 'fnordmetric2' of github.com:paulasmuth/fnordmetric-dev into adminui_metricListView (fba6b574) · Commits · github_fork / Clip

fnordmetric-webui/fnordmetric-webui-queryresultview.js

+9 −34

Original line number	Diff line number	Diff line
		@@ -34,23 +34,9 @@ FnordMetric.util.queryResultView = function() {
		if (charts == undefined) {
		return;
		}
		var navbar = document.createElement("div");
		navbar.className = "result_navbar";
		for (var i = 0; i < charts.length; i++) {
		var item = FnordMetric.createButton(
		"#",
		"result_link",
		"<h3>Chart "+(i+1)+"</h3>");
		item.setAttribute("id", i);
		navbar.appendChild(item);

		item.onclick = function(e) {
		e.preventDfault();
		renderChart(charts[this.id], chart_container);
		}
		}
		elem.appendChild(navbar);

		var chart_container = document.createElement("div");
		chart_container.className = "result_card";
		elem.appendChild(chart_container);
		renderChart(charts[0], chart_container);
		}
		@@ -62,6 +48,7 @@ FnordMetric.util.queryResultView = function() {
		table.rows.map(function(row) {
		table_view.addRow(row);
		});

		table_view.render(false);
		}

		@@ -70,27 +57,15 @@ FnordMetric.util.queryResultView = function() {
		if (tables == undefined) {
		return;
		}
		var navbar = document.createElement("div");
		navbar.className = "result_navbar";

		for (var i = 0; i < tables.length; i++) {
		var item = FnordMetric.createButton(
		"#",
		"result_link",
		"<h3>Table "+(i+1)+"</h3>");
		item.setAttribute("id", i);
		navbar.appendChild(item);

		item.onclick = function(e) {
		e.preventDefault();
		renderTable(tables[this.id], table_container);
		};
		}
		elem.appendChild(navbar);
		var table_container = document.createElement("div");
		table_container.className = "result_card";
		elem.appendChild(table_container);
		renderTable(tables[0], table_container);
		renderTable(tables[i], table_container);
		result_pane.style.height = "auto";
		}
		}

		function renderError(msg, elem) {
		var msg_field = document.createElement("div");

fnordmetric-webui/fnordmetric-webui.css

+11 −2

Original line number	Diff line number	Diff line
		@@ -459,8 +459,8 @@ table.metric_list td {
		text-align: left;
		font-weight: 500;
		border: none;
		height: 40px;
		line-height: 40px;
		height: 38px;
		line-height: 38px;
		font-size: 109%;
		padding: 0 20px;
		}
		@@ -525,6 +525,15 @@ table.metric_list tr:hover td {
		margin-left: 20px;
		}

		.result_card {
		background: #fff;
		margin: 10px;
		padding: 0;
		border: 1px solid #ccc;
		box-shadow: 0 0 3px rgba(0,0,0,.1);
		border-radius: 1px
		}

		/* BASICS */

		.CodeMirror {

Admin message