mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

frontend: rename main template to index.tmpl.html, fix showing HEAD

Browse source 
Fix some Captions, too.
This commit is contained in:
Florian Klink 2019-12-04 14:51:04 +01:00
parent 3125b79f2f
commit bdfdad2585
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/frontend.go
View file

@ -71,12 +71,12 @@ func MakeFrontend(rotatingLogHandler *misc.RotatingLogHandler, gerritClient *ger
} }
tmpl := template.Must(loadTemplate([]string{ tmpl := template.Must(loadTemplate([]string{
"submit-queue.tmpl.html", "index.tmpl.html",
"serie.tmpl.html", "serie.tmpl.html",
"changeset.tmpl.html", "changeset.tmpl.html",
}, funcMap)) }, funcMap))
tmpl.ExecuteTemplate(c.Writer, "submit-queue.tmpl.html", gin.H{ tmpl.ExecuteTemplate(c.Writer, "index.tmpl.html", gin.H{
// Config // Config
"projectName": projectName, "projectName": projectName,
"branchName": branchName, "branchName": branchName,

6
public/submit-queue.tmpl.html → public/index.tmpl.html
View file

@ -19,7 +19,7 @@
<a class="nav-link" href="#region-info">Info</a> <a class="nav-link" href="#region-info">Info</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#region-queue">Current Queue</a> <a class="nav-link" href="#region-wipserie">WIP Serie</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#region-log">Log</a> <a class="nav-link" href="#region-log">Log</a>
@ -49,13 +49,13 @@
<tr> <tr>
<th scope="row">HEAD:</th> <th scope="row">HEAD:</th>
<td> <td>
{{ if .currentlyRunning }}{{ .HEAD }}{{ else }}-{{ end }} {{ if .HEAD }}{{ .HEAD }}{{ else }}-{{ end }}
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<h2 id="region-wipserie">wip Serie</h2> <h2 id="region-wipserie">WIP Serie</h2>
{{ if .wipSerie }} {{ if .wipSerie }}
{{ block "serie" .wipSerie }}{{ end }} {{ block "serie" .wipSerie }}{{ end }}
{{ else }} {{ else }}