Version bump to 0.0.7, dynamic version printing on homepage.

mkalus · Oct 6, 2015 · 50dd8f2 · 50dd8f2
1 parent 017f7a4
commit 50dd8f2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/org/segrada/SegradaLauncher.java b/src/main/java/org/segrada/SegradaLauncher.java
@@ -119,7 +119,7 @@ public void windowDeactivated(WindowEvent windowEvent) {
 
 		Font fatFont = new Font("sans-serif", Font.BOLD, 16);
 
-		setTitle(messages.getString("segrada").concat(" v0.0.6"));
+		setTitle(messages.getString("segrada").concat(" v0.0.7"));
 
 		// create elements
 		statusText = new JLabel(messages.getString("stopped"));

diff --git a/src/main/java/org/segrada/controller/MainController.java b/src/main/java/org/segrada/controller/MainController.java
@@ -4,6 +4,7 @@
 import com.google.inject.servlet.RequestScoped;
 import com.sun.jersey.api.view.Viewable;
 import org.segrada.service.ConfigService;
+import org.segrada.servlet.SegradaUpdateChecker;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -44,6 +45,7 @@ public Viewable index() {
 
 		// create model map
 		Map<String, Object> model = new HashMap<>();
+		model.put("version", SegradaUpdateChecker.currentVersion);
 		model.put("versionUpdate", versionUpdate);
 
 		return new Viewable("home", model);

diff --git a/src/main/java/org/segrada/servlet/SegradaUpdateChecker.java b/src/main/java/org/segrada/servlet/SegradaUpdateChecker.java
@@ -39,7 +39,7 @@ public class SegradaUpdateChecker {
 	/**
 	 * current version
 	 */
-	private static final String currentVersion = "v0.0.6";
+	public static final String currentVersion = "v0.0.7";
 
 	private final OrientGraphFactory graph;
 

diff --git a/src/main/webapp/WEB-INF/templates/home.html b/src/main/webapp/WEB-INF/templates/home.html
@@ -20,7 +20,7 @@
 				<!--/*###segrada-control###*/-->
 				<p style="margin: 3em 0 0 3em;">
 					<img src="../../img/logo_small.png" th:src="@{/img/logo_small.png}" width="194" height="53" alt="Segrada" />
-					<span class="text-muted" style="margin-left: 1ex;"><samp>v0.0.6</samp></span>
+					<span class="text-muted" style="margin-left: 1ex;"><samp th:text="${version}">v0.0.0</samp></span>
 				</p>
 				<!--/*###Upate check###*/-->
 				<div class="alert alert-danger sg-margin-top" role="alert" th:unless="${#strings.isEmpty(versionUpdate)}"><span th:text="#{UpdateAlert}">Update:</span> <a href="http://segrada.org/" class="sg-link-external">segrada.org</a> (Version: <span th:text="${versionUpdate}">v0.0.0</span>)</div>