From d82083585ef74eb2143dbf7b78ba9b36b4fcafb2 Mon Sep 17 00:00:00 2001
From: "chad.hanna" <crh184@psu.edu>
Date: Sat, 15 Sep 2018 07:51:07 -0700
Subject: [PATCH] update summary page code
---
gstlal-ugly/share/dataserver/Makefile.am | 3 +-
gstlal-ugly/share/vis/gstlal.css | 135 +++++++++++++++++++++--
gstlal-ugly/share/vis/gstlal.js | 22 ++--
3 files changed, 143 insertions(+), 17 deletions(-)
diff --git a/gstlal-ugly/share/dataserver/Makefile.am b/gstlal-ugly/share/dataserver/Makefile.am
index fb659dce7b..e62722df43 100644
--- a/gstlal-ugly/share/dataserver/Makefile.am
+++ b/gstlal-ugly/share/dataserver/Makefile.am
@@ -7,4 +7,5 @@
dataserverdir = $(DATASRVDEST)
dataserver_SCRIPTS = \
- gstlal_data_server_latest_by_job
+ gstlal_data_server \
+ gstlal
diff --git a/gstlal-ugly/share/vis/gstlal.css b/gstlal-ugly/share/vis/gstlal.css
index 2d089a6ffd..aab68a4516 100644
--- a/gstlal-ugly/share/vis/gstlal.css
+++ b/gstlal-ugly/share/vis/gstlal.css
@@ -1,7 +1,7 @@
body {
- font: 11pt verdana;
+ font-family: 'M PLUS Rounded 1c', sans-serif;
color: #ecf0f1;
- background-color: #95a5a6;
+ background-color: #D4E6F1;
overflow-y: hidden;
margin: 0px;
padding-top: 0px;
@@ -11,7 +11,7 @@ body {
}
summary {
- font: 14pt verdana;
+ font-family: 'M PLUS Rounded 1c', sans-serif;
padding-top: 10px;
padding-right: 10px;
padding-bottom: 10px;
@@ -33,10 +33,12 @@ img {
div.gchart {
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+ font-size: 8pt;
}
div.google-visualization-tooltip {
color: black;
+ width: 200px;
}
/* Style the list */
@@ -85,19 +87,20 @@ input {
}
/* Change background color of links on hover */
-ul.tab li a:hover {background-color: #f1c40f;}
+ul.tab li a:hover {background-color: #FDEBD0;}
/* Create an active/current tablink class */
-ul.tab li a:focus, .active {background-color: #ccc;}
+ul.tab li a:focus, .active {background-color: #FDEBD0;}
/* Style the tab content */
.tabcontent {
display: none;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
- background-color: #ecf0f1;
+ background-color: #FDEBD0;
color: #2c3e50;
width: 98.5%;
- height: 88%;
+ overflow-y: scroll;
+ height: 90%;
}
div.tabcontent {
@@ -129,3 +132,121 @@ div.tabcontent {
to {opacity: 1;}
}
+
+/* -------------------- Select Box Styles: bavotasan.com Method (with special adaptations by ericrasch.com) */
+/* -------------------- Source: http://bavotasan.com/2011/style-select-box-using-only-css/ */
+.styled-select {
+ height: 29px;
+ overflow: hidden;
+ width: 400px;
+ font-family: 'M PLUS Rounded 1c', sans-serif;
+}
+
+.styled-select select {
+ background: transparent;
+ border: none;
+ font-size: 14px;
+ height: 29px;
+ padding: 5px; /* If you add too much padding here, the options won't show in IE */
+ width: 268px;
+}
+
+.styled-select.slate {
+ background: url(http://i62.tinypic.com/2e3ybe1.jpg) no-repeat right center;
+ height: 34px;
+ width: 240px;
+}
+
+.styled-select.slate select {
+ border: 1px solid #ccc;
+ font-size: 16px;
+ height: 34px;
+ width: 268px;
+}
+
+/* -------------------- Rounded Corners */
+.rounded {
+ -webkit-border-radius: 20px;
+ -moz-border-radius: 20px;
+ border-radius: 20px;
+}
+
+.semi-square {
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+}
+
+/* -------------------- Colors: Background */
+.slate { background-color: #ddd; }
+.green { background-color: #779126; }
+.blue { background-color: #D4E6F1; }
+.yellow { background-color: #eec111; }
+.black { background-color: #000; }
+
+/* -------------------- Colors: Text */
+.slate select { color: #000; }
+.green select { color: #fff; }
+.blue select { color: #fff; }
+.yellow select { color: #000; }
+.black select { color: #fff; }
+
+
+/* -------------------- Select Box Styles: danielneumann.com Method */
+/* -------------------- Source: http://danielneumann.com/blog/how-to-style-dropdown-with-css-only/ */
+#mainselection select {
+ border: 0;
+ color: #EEE;
+ background: transparent;
+ font-size: 20px;
+ font-weight: bold;
+ padding: 2px 10px;
+ width: 378px;
+ *width: 350px;
+ *background: #58B14C;
+ -webkit-appearance: none;
+}
+
+#mainselection {
+ overflow:hidden;
+ width:350px;
+ -moz-border-radius: 9px 9px 9px 9px;
+ -webkit-border-radius: 9px 9px 9px 9px;
+ border-radius: 9px 9px 9px 9px;
+ box-shadow: 1px 1px 11px #330033;
+ background: #58B14C url("http://i62.tinypic.com/15xvbd5.png") no-repeat scroll 319px center;
+}
+
+
+/* -------------------- Select Box Styles: stackoverflow.com Method */
+/* -------------------- Source: http://stackoverflow.com/a/5809186 */
+select#soflow, select#soflow-color {
+ -webkit-appearance: button;
+ -webkit-border-radius: 2px;
+ -webkit-box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1);
+ -webkit-padding-end: 20px;
+ -webkit-padding-start: 2px;
+ -webkit-user-select: none;
+ background-image: url(http://i62.tinypic.com/15xvbd5.png), -webkit-linear-gradient(#FAFAFA, #F4F4F4 40%, #E5E5E5);
+ background-position: 97% center;
+ background-repeat: no-repeat;
+ border: 1px solid #AAA;
+ color: #555;
+ font-size: inherit;
+ margin: 20px;
+ overflow: hidden;
+ padding: 5px 10px;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ width: 300px;
+}
+
+select#soflow-color {
+ color: #fff;
+ background-image: url(http://i62.tinypic.com/15xvbd5.png), -webkit-linear-gradient(#779126, #779126 40%, #779126);
+ background-color: #779126;
+ -webkit-border-radius: 20px;
+ -moz-border-radius: 20px;
+ border-radius: 20px;
+ padding-left: 15px;
+}
diff --git a/gstlal-ugly/share/vis/gstlal.js b/gstlal-ugly/share/vis/gstlal.js
index 0d1585b19b..c57eac5afc 100644
--- a/gstlal-ugly/share/vis/gstlal.js
+++ b/gstlal-ugly/share/vis/gstlal.js
@@ -56,12 +56,12 @@ var far_inj_history_wrapper;
var charts = [];
-var H1="#e74c3c";
-var L1="#2ecc71";
-var white="#ecf0f1";
+var H1="#F5B7B1";
+var L1="#A9CCE3";
+var V1="#D2B4DE";
+var ALL="#A2D9CE";
+var white="#FBFCFC";
var darkblue="#2c3e50";
-/* FIXME hack for infs in segments */
-var inf = 2000000000;
default_options = {
title: 'Figure',
@@ -70,20 +70,23 @@ default_options = {
chartArea: {left:50, top:15, width:'95%', height:'70%', backgroundColor:white},
titlePosition: 'in',
titleTextStyle: {color: darkblue},
- series: {0: {color: H1}, 1: {color:L1}},
+ series: {0: {color: H1}, 1: {color: L1}, 2:{color: V1}, 3:{color: ALL}},
legend: {position: "in", textStyle: {color: darkblue}},
explorer: {actions: ['dragToZoom', 'rightClickToReset']},
dataOpacity: "0.9",
curveType: "none",
- fontName: "Times",
- fontSize: 14,
+ fontName: "M PLUS Rounded 1c",
+ fontSize: 12,
lineWidth: 2,
backgroundColor: {stroke: darkblue, fill: white, strokeWidth: '1'},
width: "90%",
bar: {
groupWidth: '70%',
},
- allowHtml: true
+ allowHtml: true,
+ tooltip: {
+ isHtml: true
+ }
};
@@ -306,6 +309,7 @@ function ChartWrapper(obj) {
function drawLatencyStatusByNodes(gps, duration, refresh, analysis_path, job_ids, ifos) {
var these_options = clone(default_options);
+ //these_options.series = {0: {color: darkblue}}
these_options.vAxis = {textStyle: {color: darkblue}, scaleType: 'log', minValue:5, maxValue:75, textPosition: 'out', ticks: [8,16,32,64] };
these_options.title = 'Latency';
--
GitLab