chg: [template] change to a grid layout

nifi
Jean-Louis Huynen 2020-02-11 15:22:43 +01:00
parent c9c7db2b5d
commit f962687fe5
No known key found for this signature in database
GPG Key ID: 64799157F4BD6B93
2 changed files with 58 additions and 59 deletions

View File

@ -535,7 +535,7 @@ func plotStats(s *SshdParser, v string) error {
return err return err
} }
bc.LineStyle.Width = vg.Length(0) bc.LineStyle.Width = vg.Length(0)
bc.Color = plotutil.Color(0) bc.Color = plotutil.Color(2)
p.Add(bc) p.Add(bc)
p.NominalY(keys...) p.NominalY(keys...)

View File

@ -21,18 +21,28 @@
</script> </script>
<script src="load.js"></script> <script src="load.js"></script>
<style> <style>
body { body {
background: white display: grid;
grid-template-columns: 75px 120px 1fr;
grid-template-rows: 25px 25px auto;
grid-gap: 5px;
} }
#imageholder { label {
background: black; grid-column: 1;
margin: auto;
width: 50%;
padding: 10px;
} }
span { select {
float: left; grid-column: 2;
clear: left; }
input {
grid-column: 2;
}
div {
grid-column: 3;
grid-column-start: 3;
grid-column-end: 4;
grid-row-start: 1;
grid-row-end: 3;
} }
</style> </style>
</head> </head>
@ -47,64 +57,53 @@
{{ define "dailytpl"}} {{ define "dailytpl"}}
<body onload="loadImage(currentYear+currentMonth+currentDay, currentType)"> <body onload="loadImage(currentYear+currentMonth+currentDay, currentType)">
<span> <label for="statsday">Day: </label>
<label for="statsday">Statistics for: </label>
<input id="statsday" type="date" value="{{.CurrentTime}}" min="{{.MinDate}}" max="{{.MaxDate}}" onchange="updateSplits(this.value); loadImage(currentYear+currentMonth+currentDay, currentType)"/> <input id="statsday" type="date" value="{{.CurrentTime}}" min="{{.MinDate}}" max="{{.MaxDate}}" onchange="updateSplits(this.value); loadImage(currentYear+currentMonth+currentDay, currentType)"/>
</span> <label for="statstype">Type: </label>
<span> <select selected="statsusername" onchange="currentType = this.value; loadImage(currentYear+currentMonth+currentDay, currentType)">
<label for="statstype">Type: </label> <option value="statsusername">Usernames</option>
<select selected="statsusername" onchange="currentType = this.value; loadImage(currentYear+currentMonth+currentDay, currentType)"> <option value="statssrc">Sources</option>
<option value="statsusername">Usernames</option> <option value="statshost">Hosts</option>
<option value="statssrc">Sources</option> </select>
<option value="statshost">Hosts</option>
</select>
</span>
{{end}} {{end}}
{{ define "yearlytpl"}} {{ define "yearlytpl"}}
<body onload="loadImage(currentYear, currentType)"> <body onload="loadImage(currentYear, currentType)">
<span> <label>Year: </label>
<select onchange="currentYear = this.value; loadImage(currentYear, currentType)"> <select onchange="currentYear = this.value; loadImage(currentYear, currentType)">
{{range $val := .YearList}} {{range $val := .YearList}}
<option value="{{$val}}">{{$val}}</option> <option value="{{$val}}">{{$val}}</option>
{{end}} {{end}}
</select> </select>
</span> <label>Type: </label>
<span> <select selected="statsusername" onchange="currentType = this.value; loadImage(currentYear, currentType)">
<label for="statstype">Type: </label> <option value="statsusername">Usernames</option>
<select selected="statsusername" onchange="currentType = this.value; loadImage(currentYear, currentType)"> <option value="statssrc">Sources</option>
<option value="statsusername">Usernames</option> <option value="statshost">Hosts</option>
<option value="statssrc">Sources</option> </select>
<option value="statshost">Hosts</option>
</select>
</span>
{{end}} {{end}}
{{ define "monthlytpl"}} {{ define "monthlytpl"}}
<body onload="loadImage(currentYear+currentMonth, currentType)"> <body onload="loadImage(currentYear+currentMonth, currentType)">
<span> <label>Month: </label>
<select onchange="currentMonth = this.value; loadImage(currentYear+currentMonth, currentType)"> <select onchange="currentMonth = this.value; loadImage(currentYear+currentMonth, currentType)">
{{range $key, $val := .MonthList}} {{range $key, $val := .MonthList}}
{{range $month := index $val}} {{range $month := index $val}}
<option value="{{$month}}">{{$month}}</option> <option value="{{$month}}">{{$month}}</option>
{{end}}
{{end}} {{end}}
</select> {{end}}
</span> </select>
<span> <label>Year: </label>
<select onchange="currentYear = this.value; loadImage(currentYear+currentMonth, currentType)"> <select onchange="currentYear = this.value; loadImage(currentYear+currentMonth, currentType)">
{{range $key, $val := .MonthList}} {{range $key, $val := .MonthList}}
<option value="{{$key}}">{{$key}}</option> <option value="{{$key}}">{{$key}}</option>
{{end}} {{end}}
</select> </select>
</span> <label for="statstype">Type: </label>
<span> <select selected="statsusername" onchange="currentType = this.value; loadImage(currentYear+currentMonth, currentType)">
<label for="statstype">Type: </label> <option value="statsusername">Usernames</option>
<select selected="statsusername" onchange="currentType = this.value; loadImage(currentYear+currentMonth, currentType)"> <option value="statssrc">Sources</option>
<option value="statsusername">Usernames</option> <option value="statshost">Hosts</option>
<option value="statssrc">Sources</option> </select>
<option value="statshost">Hosts</option>
</select>
</span>
{{end}} {{end}}
'' ''