New version 0.4.1. Fixed regression bug in templates that would break…

… links.
rouben · May 7, 2017 · 7cc3816 · 7cc3816
1 parent 70bf442
commit 7cc3816
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 29 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+zfswatcher (0.4.1-1) unstable; urgency=medium
+
+  * New version 0.04.1.
+  * Fixed regression bug in templates that would break links.
+
+ -- Rouben <rouben@rouben.net>  Sat, 06 May 2017 20:32:59 -0400
+
 zfswatcher (0.04-1) unstable; urgency=low
 
   * New version 0.04.

diff --git a/version.go b/version.go
@@ -1,3 +1,3 @@
 package main
 
-const VERSION = "0.04"
+const VERSION = "0.4.1"
diff --git a/www/templates/dashboard.html b/www/templates/dashboard.html
@@ -24,15 +24,15 @@
 		<tbody>
 			{{ range .Pools }}
 			<tr>
-				<td><a href="/status/{{ .Name }}">{{ .Name }}</a></td>
+				<td><a href="{{ .Root }}/status/{{ .Name }}">{{ .Name }}</a></td>
 				<td class="{{ .StateClass }}">{{ .State }}</td>
 				<td style="text-align: right">{{ nicenumber .Total }}</td>
 				<td style="text-align: right">{{ nicenumber .Used }}</td>
 				<td style="text-align: right">{{ .UsedPercent }}%</td>
 				<td style="text-align: right">{{ nicenumber .Avail }}</td>
 				<td style="text-align: right">{{ .AvailPercent }}%</td>
 				<td style="padding-left: 2em">
-					<a href="/usage/{{ .Name }}">
+					<a href="{{ .Root }}/usage/{{ .Name }}">
 					<div class="progress progress-zfswatcher-dashboard">
 					{{ if or .UsedPercent .AvailPercent }}
 						<div class="bar {{ .UsedClass }}" style="width: {{ .UsedPercent }}%"></div>

diff --git a/www/templates/footer.html b/www/templates/footer.html
@@ -1,19 +1,19 @@
 			</div> <!-- /row-fluid -->
 		</div> <!-- /container -->
 
-		<script src="/resources/bootstrap/js/jquery.js"></script>
-		<script src="/resources/bootstrap/js/bootstrap-transition.js"></script>
-		<script src="/resources/bootstrap/js/bootstrap-alert.js"></script>
-		<script src="/resources/bootstrap/js/bootstrap-modal.js"></script>
-		<script src="/resources/bootstrap/js/bootstrap-dropdown.js"></script>
-		<script src="/resources/bootstrap/js/bootstrap-scrollspy.js"></script>
-		<script src="/resources/bootstrap/js/bootstrap-tab.js"></script>
-		<script src="/resources/bootstrap/js/bootstrap-tooltip.js"></script>
-		<script src="/resources/bootstrap/js/bootstrap-popover.js"></script>
-		<script src="/resources/bootstrap/js/bootstrap-button.js"></script>
-		<script src="/resources/bootstrap/js/bootstrap-collapse.js"></script>
-		<script src="/resources/bootstrap/js/bootstrap-carousel.js"></script>
-		<script src="/resources/bootstrap/js/bootstrap-typeahead.js"></script>
+		<script src="{{ .Root }}/resources/bootstrap/js/jquery.js"></script>
+		<script src="{{ .Root }}/resources/bootstrap/js/bootstrap-transition.js"></script>
+		<script src="{{ .Root }}/resources/bootstrap/js/bootstrap-alert.js"></script>
+		<script src="{{ .Root }}/resources/bootstrap/js/bootstrap-modal.js"></script>
+		<script src="{{ .Root }}/resources/bootstrap/js/bootstrap-dropdown.js"></script>
+		<script src="{{ .Root }}/resources/bootstrap/js/bootstrap-scrollspy.js"></script>
+		<script src="{{ .Root }}/resources/bootstrap/js/bootstrap-tab.js"></script>
+		<script src="{{ .Root }}/resources/bootstrap/js/bootstrap-tooltip.js"></script>
+		<script src="{{ .Root }}/resources/bootstrap/js/bootstrap-popover.js"></script>
+		<script src="{{ .Root }}/resources/bootstrap/js/bootstrap-button.js"></script>
+		<script src="{{ .Root }}/resources/bootstrap/js/bootstrap-collapse.js"></script>
+		<script src="{{ .Root }}/resources/bootstrap/js/bootstrap-carousel.js"></script>
+		<script src="{{ .Root }}/resources/bootstrap/js/bootstrap-typeahead.js"></script>
 
 	</body>
 </html>
diff --git a/www/templates/header.html b/www/templates/header.html
@@ -4,16 +4,16 @@
 		<meta charset="utf-8">
 		<title>zfswatcher</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<link href="/resources/bootstrap/css/bootstrap.css" rel="stylesheet">
+		<link href="{{ .Root }}/resources/bootstrap/css/bootstrap.css" rel="stylesheet">
 		<style type="text/css">
 			body {
 				padding-top: 60px;
 				padding-bottom: 60px;
 			}
 		</style>
-		<link href="/resources/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
-		<link href="/resources/zfswatcher.css" rel="stylesheet">
-		<link href="/resources/favicon.ico" rel="shortcut icon">
+		<link href="{{ .Root }}/resources/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+		<link href="{{ .Root }}/resources/zfswatcher.css" rel="stylesheet">
+		<link href="{{ .Root }}/resources/favicon.ico" rel="shortcut icon">
 		<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
 		<!--[if lt IE 9]>
 			<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -30,21 +30,21 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="brand" href="/">zfswatcher</a>
+				<a class="brand" href="{{ .Root }}/">zfswatcher</a>
 				<div class="nav-collapse collapse">
 					<ul class="nav">
 						<li{{ if .Dashboard }} class="active"{{ end }}>
-							<a href="/">Dashboard</a></li>
+							<a href="{{ .Root }}/">Dashboard</a></li>
 						<li{{ if .PoolStatus }} class="active"{{ end }}>
-							<a href="/status/">Pool Status</a></li>
+							<a href="{{ .Root }}/status/">Pool Status</a></li>
 						<li{{ if .Statistics }} class="active"{{ end }}>
-							<a href="/statistics/">Statistics</a></li>
+							<a href="{{ .Root }}/statistics/">Statistics</a></li>
 						<li{{ if .Logs }} class="active"{{ end }}>
-							<a href="/logs/">Logs</a></li>
+							<a href="{{ .Root }}/logs/">Logs</a></li>
 					</ul>
 					<ul class="nav pull-right">
 						<li{{ if .About }} class="active"{{ end }}>
-							<a href="/about/" class="pull-right">About</a></li>
+							<a href="{{ .Root }}/about/" class="pull-right">About</a></li>
 					</ul>
 				</div>
 			</div>

diff --git a/www/templates/status-many.html b/www/templates/status-many.html
@@ -3,7 +3,7 @@
 <ul class="nav nav-tabs">
 {{ range .SubNav }}
 	<li{{ if .Active }} class="active"{{ end }}>
-	<a href="/status/{{ .Name }}">{{ .Name }}</a>
+		<a href="{{ .Name }}">{{ .Name }}</a>
 	</li>
 {{ end }}
 </ul>

diff --git a/www/templates/status-pool.html b/www/templates/status-pool.html
@@ -32,7 +32,7 @@
 				<td style="padding-left: {{ .Indent }}em">{{ .Name }}</td>
 				<td>
 				{{ if .EnableLed }}
-					<form action="/locate/" method="post" style="margin-bottom: -1px; margin-top: -1px">
+				<form action="{{ .Root }}/locate/" method="post" style="margin-bottom: -1px; margin-top: -1px">
 					{{ if .Locate }}
 					<input type="hidden" name="dev" value="{{ .Name }}">
 					<input type="hidden" name="state" value="off">

diff --git a/zfswatcher.spec b/zfswatcher.spec
@@ -6,7 +6,7 @@ Summary:	ZFS pool monitoring and notification daemon
 Group:		Applications/System
 License:	GPLv3+
 Vendor:		Damicon Kraa Oy <http://www.damicon.fi/>
-Packager:	Janne Snabb <snabb@epipe.com>
+Packager:	Rouben <rouben@rouben.net>
 URL:		http://zfswatcher.damicon.fi/
 Source0:	%{name}-%{version}.tar.gz
 ExclusiveArch:	x86_64