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

fnordmetric-core/build/cmake/assets.sh

+6 −0

Original line number	Diff line number	Diff line
		@@ -46,3 +46,9 @@ asset_name() {
		asset_file "fnordmetric-webui/fnordmetric-favicon.ico"
		asset_name "fnordmetric_webui_fnordmetric_favicon_ico" "fnordmetric-webui/fnordmetric-favicon.ico"
		) >> stage/src/asset_bundle.cc

		(
		asset_uniq "fnordmetric_webui_fontawesome_woff"
		asset_file "fnordmetric-webui/fontawesome.woff"
		asset_name "fnordmetric_webui_fontawesome_woff" "fnordmetric-webui/fontawesome.woff"
		) >> stage/src/asset_bundle.cc

+8 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,14 @@ bool AdminUI::handleRequest(xzero::HttpRequest* request,
		return true;
		}

		if (url == "/s/fontawesome.woff") {
		sendAsset(
		response,
		"fnordmetric-webui/fontawesome.woff",
		"application/x-font-woff");
		return true;
		}

		return false;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ You should now be able to navigate to the admin interface on
		on the metric to bring up the interactive query editor. This should look something
		like this:

		<img style="margin: 30px;" src="/img/simple_example_screen.png" width="630" class="shadow" />
		<img src="/img/fnordmetric_server_screen.png" width="800" class="shadow" />
		<br />

		Click around a bit to make yourself familiar with the Web UI. The chart you see
		@@ -152,7 +152,7 @@ plotted on the Y axis and one series per hostname:

		The result should look something like this:

		<img style="margin: 30px;" src="/img/simple_example_screen.png" width="630" class="shadow" />
		<img src="/img/fnordmetric_server_screen.png" width="800" class="shadow" />
		<br />

		You now have a running FnordMetric Server, but there is a lot more you can do.

+25 −0

Original line number	Diff line number	Diff line
		@@ -559,6 +559,10 @@ section {
		text-align: center;
		}

		section.noborder:after {
		display: none;
		}

		section:after {
		content: ' ';
		display: block;
		@@ -693,3 +697,24 @@ p + .fancybutton {
		#documentation ul {
		margin-bottom: 1.5em;
		}

		#documentation .example_gallery h2 {
		font-size: 100%;
		margin-top: 0;
		}

		.example_gallery .example {
		list-style-type: none;
		width: 430px;
		margin: 20px 40px 0 0;
		padding: 0;
		float: left;
		}

		.example_gallery .thumb {
		height: 213px;
		display: block;
		background-size: contain;
		background-repeat: no-repeat;
		background-position: center center;
		}

0 → 100644

+33.4 KiB

Loading image diff...