Skip to content

Commit f962687

Browse files
gallypettegallypette
committed
chg: [template] change to a grid layout
1 parent c9c7db2 commit f962687

File tree

2 files changed

+58
-59
lines changed

2 files changed

+58
-59
lines changed

‎logparser/sshd.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ func plotStats(s *SshdParser, v string) error {
535535
return err
536536
}
537537
bc.LineStyle.Width = vg.Length(0)
538-
bc.Color = plotutil.Color(0)
538+
bc.Color = plotutil.Color(2)
539539

540540
p.Add(bc)
541541
p.NominalY(keys...)

‎logparser/sshd/statistics.gohtml‎

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,28 @@
2121
</script>
2222
<script src="load.js"></script>
2323
<style>
24+
2425
body {
25-
background: white
26+
display: grid;
27+
grid-template-columns: 75px 120px 1fr;
28+
grid-template-rows: 25px 25px auto;
29+
grid-gap: 5px;
30+
}
31+
label {
32+
grid-column: 1;
33+
}
34+
select {
35+
grid-column: 2;
2636
}
27-
#imageholder {
28-
background: black;
29-
margin: auto;
30-
width: 50%;
31-
padding: 10px;
37+
input {
38+
grid-column: 2;
3239
}
33-
span {
34-
float: left;
35-
clear: left;
40+
div {
41+
grid-column: 3;
42+
grid-column-start: 3;
43+
grid-column-end: 4;
44+
grid-row-start: 1;
45+
grid-row-end: 3;
3646
}
3747
</style>
3848
</head>
@@ -47,64 +57,53 @@
4757

4858
{{ define "dailytpl"}}
4959
<body onload="loadImage(currentYear+currentMonth+currentDay, currentType)">
50-
<span>
51-
<label for="statsday">Statistics for: </label>
60+
<label for="statsday">Day: </label>
5261
<input id="statsday" type="date" value="{{.CurrentTime}}" min="{{.MinDate}}" max="{{.MaxDate}}" onchange="updateSplits(this.value); loadImage(currentYear+currentMonth+currentDay, currentType)"/>
53-
</span>
54-
<span>
55-
<label for="statstype">Type: </label>
56-
<select selected="statsusername" onchange="currentType = this.value; loadImage(currentYear+currentMonth+currentDay, currentType)">
57-
<option value="statsusername">Usernames</option>
58-
<option value="statssrc">Sources</option>
59-
<option value="statshost">Hosts</option>
60-
</select>
61-
</span>
62+
<label for="statstype">Type: </label>
63+
<select selected="statsusername" onchange="currentType = this.value; loadImage(currentYear+currentMonth+currentDay, currentType)">
64+
<option value="statsusername">Usernames</option>
65+
<option value="statssrc">Sources</option>
66+
<option value="statshost">Hosts</option>
67+
</select>
6268
{{end}}
6369

6470
{{ define "yearlytpl"}}
6571
<body onload="loadImage(currentYear, currentType)">
66-
<span>
67-
<select onchange="currentYear = this.value; loadImage(currentYear, currentType)">
68-
{{range $val := .YearList}}
69-
<option value="{{$val}}">{{$val}}</option>
70-
{{end}}
71-
</select>
72-
</span>
73-
<span>
74-
<label for="statstype">Type: </label>
75-
<select selected="statsusername" onchange="currentType = this.value; loadImage(currentYear, currentType)">
76-
<option value="statsusername">Usernames</option>
77-
<option value="statssrc">Sources</option>
78-
<option value="statshost">Hosts</option>
79-
</select>
80-
</span>
72+
<label>Year: </label>
73+
<select onchange="currentYear = this.value; loadImage(currentYear, currentType)">
74+
{{range $val := .YearList}}
75+
<option value="{{$val}}">{{$val}}</option>
76+
{{end}}
77+
</select>
78+
<label>Type: </label>
79+
<select selected="statsusername" onchange="currentType = this.value; loadImage(currentYear, currentType)">
80+
<option value="statsusername">Usernames</option>
81+
<option value="statssrc">Sources</option>
82+
<option value="statshost">Hosts</option>
83+
</select>
8184
{{end}}
8285

8386
{{ define "monthlytpl"}}
8487
<body onload="loadImage(currentYear+currentMonth, currentType)">
85-
<span>
86-
<select onchange="currentMonth = this.value; loadImage(currentYear+currentMonth, currentType)">
87-
{{range $key, $val := .MonthList}}
88-
{{range $month := index $val}}
89-
<option value="{{$month}}">{{$month}}</option>
90-
{{end}}
88+
<label>Month: </label>
89+
<select onchange="currentMonth = this.value; loadImage(currentYear+currentMonth, currentType)">
90+
{{range $key, $val := .MonthList}}
91+
{{range $month := index $val}}
92+
<option value="{{$month}}">{{$month}}</option>
9193
{{end}}
92-
</select>
93-
</span>
94-
<span>
95-
<select onchange="currentYear = this.value; loadImage(currentYear+currentMonth, currentType)">
96-
{{range $key, $val := .MonthList}}
97-
<option value="{{$key}}">{{$key}}</option>
98-
{{end}}
99-
</select>
100-
</span>
101-
<span>
102-
<label for="statstype">Type: </label>
103-
<select selected="statsusername" onchange="currentType = this.value; loadImage(currentYear+currentMonth, currentType)">
104-
<option value="statsusername">Usernames</option>
105-
<option value="statssrc">Sources</option>
106-
<option value="statshost">Hosts</option>
107-
</select>
108-
</span>
94+
{{end}}
95+
</select>
96+
<label>Year: </label>
97+
<select onchange="currentYear = this.value; loadImage(currentYear+currentMonth, currentType)">
98+
{{range $key, $val := .MonthList}}
99+
<option value="{{$key}}">{{$key}}</option>
100+
{{end}}
101+
</select>
102+
<label for="statstype">Type: </label>
103+
<select selected="statsusername" onchange="currentType = this.value; loadImage(currentYear+currentMonth, currentType)">
104+
<option value="statsusername">Usernames</option>
105+
<option value="statssrc">Sources</option>
106+
<option value="statshost">Hosts</option>
107+
</select>
109108
{{end}}
110109
''

0 commit comments

Comments
 (0)