Redesign of time filter UI
This commit is contained in:
Magnus Åhall
parent
2c5b434fd2
commit
3adf85a0f6
@ -258,42 +258,34 @@ label {
|
||||
border-radius: 8px;
|
||||
}
|
||||
#time-selector {
|
||||
position: absolute;
|
||||
top: 16px;
|
||||
right: 16px;
|
||||
display: grid;
|
||||
grid-template-columns: min-content min-content;
|
||||
grid-gap: 6px 16px;
|
||||
grid-template-columns: 8px repeat(2, min-content) 8px 1px 8px repeat(3, min-content) 8px repeat(3, min-content) 8px 1px 8px repeat(2, min-content) 8px;
|
||||
grid-gap: 6px 8px;
|
||||
align-items: center;
|
||||
width: min-content;
|
||||
background-color: #fff;
|
||||
border: 1px solid #2979b8;
|
||||
padding: 16px;
|
||||
border-radius: 6px;
|
||||
}
|
||||
#time-selector.hidden {
|
||||
display: none;
|
||||
}
|
||||
#time-selector .vertical-line {
|
||||
background-color: #2979b8;
|
||||
}
|
||||
#time-selector .header {
|
||||
padding-top: 12px;
|
||||
font-weight: bold;
|
||||
font-size: 0.85em;
|
||||
}
|
||||
#time-selector button {
|
||||
width: 100px;
|
||||
margin-top: 12px;
|
||||
justify-self: end;
|
||||
}
|
||||
#time-selector #time-filter {
|
||||
display: grid;
|
||||
grid-template-columns: min-content repeat(3, min-content);
|
||||
grid-gap: 16px;
|
||||
margin-top: 16px;
|
||||
align-items: center;
|
||||
justify-items: center;
|
||||
}
|
||||
#time-selector #time-filter .header-1 {
|
||||
font-weight: bold;
|
||||
justify-self: start;
|
||||
}
|
||||
#time-selector #time-filter .header-2 {
|
||||
font-weight: bold;
|
||||
justify-self: start;
|
||||
grid-column: 2 / -1;
|
||||
}
|
||||
#time-selector #time-filter .preset {
|
||||
#time-selector div {
|
||||
white-space: nowrap;
|
||||
justify-self: start;
|
||||
padding-right: 32px;
|
||||
}
|
||||
|
||||
@ -258,42 +258,34 @@ label {
|
||||
border-radius: 8px;
|
||||
}
|
||||
#time-selector {
|
||||
position: absolute;
|
||||
top: 16px;
|
||||
right: 16px;
|
||||
display: grid;
|
||||
grid-template-columns: min-content min-content;
|
||||
grid-gap: 6px 16px;
|
||||
grid-template-columns: 8px repeat(2, min-content) 8px 1px 8px repeat(3, min-content) 8px repeat(3, min-content) 8px 1px 8px repeat(2, min-content) 8px;
|
||||
grid-gap: 6px 8px;
|
||||
align-items: center;
|
||||
width: min-content;
|
||||
background-color: #282828;
|
||||
border: 1px solid #333;
|
||||
padding: 16px;
|
||||
border-radius: 6px;
|
||||
}
|
||||
#time-selector.hidden {
|
||||
display: none;
|
||||
}
|
||||
#time-selector .vertical-line {
|
||||
background-color: #333;
|
||||
}
|
||||
#time-selector .header {
|
||||
padding-top: 12px;
|
||||
font-weight: bold;
|
||||
font-size: 0.85em;
|
||||
}
|
||||
#time-selector button {
|
||||
width: 100px;
|
||||
margin-top: 12px;
|
||||
justify-self: end;
|
||||
}
|
||||
#time-selector #time-filter {
|
||||
display: grid;
|
||||
grid-template-columns: min-content repeat(3, min-content);
|
||||
grid-gap: 16px;
|
||||
margin-top: 16px;
|
||||
align-items: center;
|
||||
justify-items: center;
|
||||
}
|
||||
#time-selector #time-filter .header-1 {
|
||||
font-weight: bold;
|
||||
justify-self: start;
|
||||
}
|
||||
#time-selector #time-filter .header-2 {
|
||||
font-weight: bold;
|
||||
justify-self: start;
|
||||
grid-column: 2 / -1;
|
||||
}
|
||||
#time-selector #time-filter .preset {
|
||||
#time-selector div {
|
||||
white-space: nowrap;
|
||||
justify-self: start;
|
||||
padding-right: 32px;
|
||||
}
|
||||
|
||||
67
static/images/gruvbox/ok.svg
Normal file
67
static/images/gruvbox/ok.svg
Normal file
@ -0,0 +1,67 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="20.000002"
|
||||
height="20.000013"
|
||||
viewBox="0 0 5.291667 5.2916703"
|
||||
version="1.1"
|
||||
id="svg8"
|
||||
inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
|
||||
sodipodi:docname="ok.svg"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||
<defs
|
||||
id="defs2" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="2.9208594"
|
||||
inkscape:cx="9.7574023"
|
||||
inkscape:cy="10.27095"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
units="px"
|
||||
inkscape:window-width="2190"
|
||||
inkscape:window-height="1404"
|
||||
inkscape:window-x="1463"
|
||||
inkscape:window-y="16"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:showpageshadow="true"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d6d6d6"
|
||||
showborder="true" />
|
||||
<metadata
|
||||
id="metadata5">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(-90.222917,-148.43125)">
|
||||
<title
|
||||
id="title1">check-circle</title>
|
||||
<path
|
||||
d="m 92.86875,148.43125 c -1.455208,0 -2.645833,1.19063 -2.645833,2.64583 0,1.45521 1.190625,2.64584 2.645833,2.64584 1.455209,0 2.645834,-1.19063 2.645834,-2.64584 0,-1.4552 -1.190625,-2.64583 -2.645834,-2.64583 m -0.529166,3.96875 -1.322917,-1.32292 0.373062,-0.37306 0.949855,0.94721 2.008187,-2.00819 0.373063,0.37571 z"
|
||||
id="path1"
|
||||
style="fill:#aad400;stroke-width:0.264583" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.2 KiB |
68
static/images/gruvbox/warning.svg
Normal file
68
static/images/gruvbox/warning.svg
Normal file
@ -0,0 +1,68 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="23.157846"
|
||||
height="20.000013"
|
||||
viewBox="0 0 6.1271801 5.2916704"
|
||||
version="1.1"
|
||||
id="svg8"
|
||||
inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
|
||||
sodipodi:docname="warning.svg"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||
<defs
|
||||
id="defs2" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="22.627417"
|
||||
inkscape:cx="9.3028736"
|
||||
inkscape:cy="12.772116"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
units="px"
|
||||
inkscape:window-width="2190"
|
||||
inkscape:window-height="1404"
|
||||
inkscape:window-x="1463"
|
||||
inkscape:window-y="16"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:showpageshadow="true"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d6d6d6"
|
||||
showborder="true" />
|
||||
<metadata
|
||||
id="metadata5">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(-123.825,-155.04583)">
|
||||
<title
|
||||
id="title1">alert</title>
|
||||
<path
|
||||
d="m 127.21387,158.38793 h -0.65056 v -1.39253 h 0.65056 m 0,2.50657 h -0.65056 v -0.55701 h 0.65056 m -3.38887,1.39254 h 6.12718 l -3.06358,-5.29167 z"
|
||||
id="path1"
|
||||
style="fill:#ff9800;fill-opacity:1;stroke-width:0.278508"
|
||||
sodipodi:nodetypes="cccccccccccc" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.1 KiB |
@ -291,51 +291,42 @@ label {
|
||||
}
|
||||
|
||||
#time-selector {
|
||||
position: absolute;
|
||||
|
||||
top: 16px;
|
||||
right: 16px;
|
||||
|
||||
display: grid;
|
||||
grid-template-columns: min-content min-content;
|
||||
grid-gap: 6px 16px;
|
||||
grid-template-columns: 8px repeat(2,min-content) 8px 1px 8px repeat(3,min-content) 8px repeat(3,min-content) 8px 1px 8px repeat(2,min-content) 8px;
|
||||
grid-gap: 6px 8px;
|
||||
align-items: center;
|
||||
|
||||
width: min-content;
|
||||
background-color: @bg1;
|
||||
border: 1px solid @bg3;
|
||||
padding: 16px;
|
||||
border-radius: 6px;
|
||||
|
||||
&.hidden {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.vertical-line {
|
||||
background-color: @bg3;
|
||||
}
|
||||
|
||||
.header {
|
||||
padding-top: 12px;
|
||||
font-weight: bold;
|
||||
font-size: 0.85em;
|
||||
}
|
||||
|
||||
button {
|
||||
width: 100px;
|
||||
margin-top: 12px;
|
||||
justify-self: end;
|
||||
}
|
||||
|
||||
#time-filter {
|
||||
display: grid;
|
||||
grid-template-columns: min-content repeat(3, min-content);
|
||||
grid-gap: 16px;
|
||||
margin-top: 16px;
|
||||
|
||||
align-items: center;
|
||||
justify-items: center;
|
||||
|
||||
.header-1 {
|
||||
font-weight: bold;
|
||||
justify-self: start;
|
||||
}
|
||||
|
||||
.header-2 {
|
||||
font-weight: bold;
|
||||
justify-self: start;
|
||||
grid-column: ~"2 / -1";
|
||||
}
|
||||
|
||||
.preset {
|
||||
div {
|
||||
white-space: nowrap;
|
||||
justify-self: start;
|
||||
padding-right: 32px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -19,9 +19,96 @@
|
||||
<input type="hidden" name="time-offset" value=0>
|
||||
|
||||
<div id="time-selector">
|
||||
|
||||
{{/* Row 1 */}}
|
||||
<div></div>
|
||||
<div class="header" style="grid-column: 2 / 4">Date and time</div>
|
||||
|
||||
<div></div>
|
||||
<div class="vertical-line" style="grid-column: 5; grid-row: 1 / 5; height: 100%"> </div>
|
||||
<div></div>
|
||||
|
||||
<div class="header" style="grid-column: 7 / 14">Offsets</div>
|
||||
|
||||
<div></div>
|
||||
<div class="vertical-line" style="grid-column: 15; grid-row: 1 / 5; height: 100%"></div>
|
||||
<div></div>
|
||||
|
||||
<div class="header" style="grid-column: 17 / 19">Presets</div>
|
||||
<div></div>
|
||||
|
||||
|
||||
{{/* Row 2 */}}
|
||||
<div></div>
|
||||
<div>From</div>
|
||||
<input name="time-f" value="{{ .Data.TimeFrom }}" type="datetime-local">
|
||||
|
||||
<div></div>
|
||||
{{/* Vertical line */}}
|
||||
<div></div>
|
||||
|
||||
<div><a href="#" onclick="offsetTime(-3600)">◀</a></div>
|
||||
<div>Hour</div>
|
||||
<div><a href="#" onclick="offsetTime(3600)">▶</a></div>
|
||||
|
||||
<div></div>
|
||||
|
||||
<div><a href="#" onclick="offsetTime(-7 * 86400)">◀</a></div>
|
||||
<div>Week</div>
|
||||
<div><a href="#" onclick="offsetTime(7 * 86400)">▶</a></div>
|
||||
|
||||
<div></div>
|
||||
{{/* Vertical line */}}
|
||||
<div></div>
|
||||
|
||||
<div class="preset">⚫︎ <a href="#" onclick="preset(1)">Last hour</a></div>
|
||||
<div class="preset">⚫︎ <a href="#" onclick="preset(24 * 7)">Last 7 days</a></div>
|
||||
<div></div>
|
||||
|
||||
|
||||
{{/* Row 3 */}}
|
||||
<div></div>
|
||||
<div>To</div>
|
||||
<input name="time-t" value="{{ .Data.TimeTo }}" type="datetime-local">
|
||||
|
||||
<div></div>
|
||||
{{/* Vertical line */}}
|
||||
<div></div>
|
||||
|
||||
<div><a href="#" onclick="offsetTime(-86400)">◀</a></div>
|
||||
<div>Day</div>
|
||||
<div><a href="#" onclick="offsetTime(86400)">▶</a></div>
|
||||
|
||||
<div></div>
|
||||
|
||||
<div><a href="#" onclick="offsetTime(-31 * 86400)">◀</a></div>
|
||||
<div>Month</div>
|
||||
<div><a href="#" onclick="offsetTime(31 * 86400)">▶</a></div>
|
||||
|
||||
<div></div>
|
||||
{{/* Vertical line */}}
|
||||
<div></div>
|
||||
|
||||
<div class="preset">⚫︎ <a href="#" onclick="preset(24)">Last 24 hours</a></div>
|
||||
<div class="preset">⚫︎ <a href="#" onclick="preset(24 * 31)">Last 31 days</a></div>
|
||||
|
||||
<div></div>
|
||||
|
||||
|
||||
{{/* Row 4 */}}
|
||||
<div style="grid-column: 1 / 5; height: 8px"></div>
|
||||
<div style="grid-column: 6 / 15; height: 8px"></div>
|
||||
<div style="grid-column: 16 / 20; height: 8px"></div>
|
||||
|
||||
|
||||
{{/*
|
||||
<div>From</div>
|
||||
<div>To</div>
|
||||
|
||||
<div></div>
|
||||
<div style="background-color: #f0f;"></div>
|
||||
<div></div>
|
||||
|
||||
<input name="time-f" value="{{ .Data.TimeFrom }}" type="datetime-local">
|
||||
<input name="time-t" value="{{ .Data.TimeTo }}" type="datetime-local">
|
||||
|
||||
@ -49,6 +136,8 @@
|
||||
<div><a href="#" onclick="offsetTime(7 * 86400)">▶</a></div>
|
||||
|
||||
<div class="preset"><a href="#" onclick="preset(24 * 31)">Last 31 days</a></div>
|
||||
<div class="preset"><a href="#" onclick="preset(24)">Last 24 hours</a></div>
|
||||
<div class="preset"><a href="#" onclick="preset(24)">Last 24 hours</a></div>
|
||||
|
||||
<div><a href="#" onclick="offsetTime(-31 * 86400)">◀</a></div>
|
||||
<div>Month</div>
|
||||
@ -56,6 +145,7 @@
|
||||
</div>
|
||||
|
||||
<button>OK</button>
|
||||
*/}}
|
||||
</div>
|
||||
</form>
|
||||
{{ end }}
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
{{ if eq .Data.Datapoint.Datatype "INT" }}
|
||||
<div style="margin-top: 16px">
|
||||
<input onchange="selectDisplay('graph')" name="display" type="radio" id="display-graph" {{ if $graph }} checked {{ end}}> <label for="display-graph">Graph</label>
|
||||
<br>
|
||||
<input onchange="selectDisplay('list')" name="display" type="radio" id="display-list" {{ if not $graph }} checked {{ end }}> <label for="display-list">List</label>
|
||||
</div>
|
||||
{{ end }}
|
||||
|
||||
@ -10,22 +10,25 @@
|
||||
|
||||
{{ block "page_label" . }}{{ end }}
|
||||
|
||||
<div style="margin-bottom: 16px">
|
||||
<input {{ if eq .Data.Selection "CURRENT" }}checked{{ end }} type="radio" name="selection" id="selection-current" onclick="_ui.selectCurrent()"> <label for="selection-current">Current problems</label>
|
||||
<input {{ if eq .Data.Selection "ALL" }}checked{{ end }} type="radio" name="selection" id="selection-all" onclick="_ui.selectAll()"> <label for="selection-all">Time-filtered problems</label>
|
||||
<div style="margin-bottom: 16px; display: grid; grid-template-columns: min-content min-content; grid-gap: 32px;">
|
||||
<div style="white-space: nowrap">
|
||||
<b>Problem selection</b><br>
|
||||
<input {{ if eq .Data.Selection "CURRENT" }}checked{{ end }} type="radio" name="selection" id="selection-current" onclick="_ui.selectCurrent()"> <label for="selection-current">Current</label>
|
||||
<br>
|
||||
<input {{ if eq .Data.Selection "ALL" }}checked{{ end }} type="radio" name="selection" id="selection-all" onclick="_ui.selectAll()"> <label for="selection-all">All</label>
|
||||
</div>
|
||||
|
||||
<hr style="margin-bottom: 16px">
|
||||
|
||||
{{ block "timefilter" . }}{{ end }}
|
||||
|
||||
<div style="margin-top: 16px">
|
||||
<div style="white-space: nowrap">
|
||||
<b>Show</b><br>
|
||||
<input type="radio" name="display" id="display-table" onclick="_ui.displayAreas()"> <label for="display-table">Areas</label>
|
||||
<br>
|
||||
<input type="radio" name="display" id="display-list" onclick="_ui.displayList()"> <label for="display-list">List</label>
|
||||
<div style="margin-top: 8px">
|
||||
<input type="checkbox" id="show-acked" onclick="_ui.toggleAcknowledged(event)"> <label for="show-acked">Show acknowledged</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{ block "timefilter" . }}{{ end }}
|
||||
|
||||
<div class="display-list hidden">
|
||||
<div id="problems-list" class="table">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user