Merge remote-tracking branch 'github/adminui_changeView' into fnordmetric2 (b26e07a6) · Commits · github_fork / Clip

fnordmetric-webui/fnordmetric-webui-metriclist.js

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ FnordMetric.views.MetricList = function() {

		function renderEmptySearch(elem, search_item) {
		elem.innerHTML = "";
		FnordMetric.util.renderMetricHeader(
		FnordMetric.util.renderPageHeader(
		"No Results were found for " + search_item, elem);
		FnordMetric.util.TableView().renderEmptyTable(elem);
		}

fnordmetric-webui/fnordmetric-webui-queryeditor.js

+22 −11

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ FnordMetric.views.QueryPlayground = function() {
		var direction;
		var editor_pane;
		var result_pane;
		var current_view;
		var button_bar;

		function renderExecutionInfo(duration, tables, elem) {
		@@ -75,7 +76,6 @@ FnordMetric.views.QueryPlayground = function() {
		FnordMetric.httpPost("/query", query_str, function(r, duration) {
		if (r.status == 200 && r.statusText == "Ok") {
		var res = JSON.parse(r.response);

		FnordMetric.util.queryResultView().render(
		result_pane, res, duration);
		updateLayout(editor_pane, result_pane, direction);
		@@ -89,7 +89,6 @@ FnordMetric.views.QueryPlayground = function() {
		}

		function renderEditorView(view, editor_pane, result_pane, query) {
		"render editor view";
		editorViews[view].render(editor_pane, query);
		editor_pane.insertBefore(button_bar, editor_pane.firstChild);
		if (query != undefined) {
		@@ -98,7 +97,7 @@ FnordMetric.views.QueryPlayground = function() {
		}


		function updateLayout(editor_pane, result_pane, direction) {
		function updateLayout() {
		if (direction == "horizontal") {
		var height = FnordMetric.util.getHorizontalEditorHeight(
		editor_pane.offsetHeight, result_pane.offsetHeight);
		@@ -116,19 +115,19 @@ FnordMetric.views.QueryPlayground = function() {
		} else {
		editor_pane.style.float = "";
		editor_pane.style.width = "100%";
		/*editor_pane.style.height = editor_height + "px";
		query_editor.style.height = editor_height + "px";*/
		result_pane.style.width = (window.innerWidth - 55) + "px";
		result_pane.style.left = "20px";
		//result_pane.style.top = (editor_pane.offsetTop + editor_height) + "px";
		result_pane.style.height = "auto";
		var editor_height = editorViews[current_view].getHeight();
		editor_pane.style.height = editor_height + "px";
		result_pane.style.width = "100%";
		result_pane.style.left = 0;
		result_pane.style.top = (editor_pane.offsetTop + editor_height) + "px";
		result_pane.style.height = "100%";
		}
		}

		function render(viewport, url, query_params) {
		direction = "horizontal";
		viewport = viewport;
		var current_view = "sql";
		current_view = "sql";
		var query = null;
		/* init viewport */
		viewport.innerHTML = "";
		@@ -137,9 +136,22 @@ FnordMetric.views.QueryPlayground = function() {
		button_bar = document.createElement("div");
		button_bar.innerHTML = "<div class='editor_type_picker'><i class='fa fa-database'></i> SQL Editor</div>";
		button_bar.className = "navbar";

		var split_btn = FnordMetric.createButton(
		"#", "fancy_button", "Change View");
		split_btn.style.float = "right";
		button_bar.appendChild(split_btn);

		split_btn.onclick = function(e) {
		e.preventDefault();
		if (direction == "horizontal") {
		direction = "vertical"
		} else {
		direction = "horizontal"
		}
		updateLayout();
		console.log("change view");
		}

		var query_btn = FnordMetric.createButton(
		"#", "run_query", "Run Query");
		@@ -160,7 +172,6 @@ FnordMetric.views.QueryPlayground = function() {
		viewport, "Todo: Ruby/JS/html snippet");
		}

		button_bar.appendChild(split_btn);
		//button_bar.appendChild(query_btn);
		//button_bar.appendChild(embed_btn);

fnordmetric-webui/fnordmetric-webui-sqleditorview.js

+5 −4

Original line number	Diff line number	Diff line
		@@ -19,8 +19,9 @@ if (FnordMetric.util === undefined) {

		FnordMetric.util.SQLEditorView = function() {
		var cm;
		function initCodeMirror(cm) {
		/* set CodeMirror Configs here */
		function getHeight() {
		var line_num = cm.lineCount();
		return (line_num * 18 + 200);
		}

		function getQuery() {
		@@ -40,13 +41,13 @@ FnordMetric.util.SQLEditorView = function() {
		autofocus: true
		});

		initCodeMirror(cm);
		if (query != undefined) {
		cm.setValue(query);
		}
		}
		return {
		"render" : render,
		"getQuery" : getQuery
		"getQuery" : getQuery,
		"getHeight" : getHeight
		}
		}

fnordmetric-webui/fnordmetric-webui-tableview.js

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ FnordMetric.util.TableView = function(columns, elem, per_page) {
		"#", "pagination_tooltip", "←");
		ttp_back.onclick = function(e) {
		e.preventDefault();
		updatePage((current_page + per_page) % pages, isSortable);
		updatePage((current_page + pages - 1) % pages, isSortable);
		}
		navbar.appendChild(ttp_back);

fnordmetric-webui/fnordmetric-webui.css

+1 −0

Original line number	Diff line number	Diff line
		@@ -250,6 +250,7 @@ input {

		.editor_pane {
		border-bottom: 1px solid #dbdedf;
		overflow: hidden;
		}

		.result_pane {

Admin message