Show version on each page with link (fixes #83)

sushain97 · Feb 28, 2015 · 9109ab8 · 9109ab8
1 parent cf759a1
commit 9109ab8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/src/util/BaseHttpServlet.java b/src/util/BaseHttpServlet.java
@@ -33,6 +33,7 @@
 
 import com.google.appengine.api.datastore.Entity;
 import com.google.appengine.api.datastore.Text;
+import com.google.appengine.api.utils.SystemProperty;
 
 import contestTabulation.Level;
 
@@ -68,6 +69,8 @@ public Pair<Entity, UserCookie> init(VelocityContext context, HttpServletRequest
 			}
 		}
 
+		context.put("applicationVersion", SystemProperty.applicationVersion.get().split("\\.")[0].replace('-', '.'));
+
 		return new Pair<Entity, UserCookie>(contestInfo, userCookie);
 	}
 

diff --git a/war/WEB-INF/app.yaml b/war/WEB-INF/app.yaml
@@ -15,7 +15,7 @@
 # along with this program. If not, see [http://www.gnu.org/licenses/].
 
 application: villagetmsca
-version: 7-0-0
+version: 7-6-0
 runtime: java
 threadsafe: false
 sessions_enabled: true

diff --git a/war/WEB-INF/appengine-web.xml b/war/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <!-- Generated from app.yaml. Do not edit. -->
 <appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
   <application>villagetmsca</application>
-  <version>7-0-0</version>
+  <version>7-6-0</version>
   <static-files>
     <include path='/favicon.ico' expiration='14d'/>
     <include path='/css/**.css' expiration='7d'/>

diff --git a/war/html/snippets/head.html b/war/html/snippets/head.html
@@ -98,5 +98,7 @@
 
 		if (window.top !== window.self)
 			window.top.location.replace(window.self.location.href);
+
+		$('#applicationVersion[data-toggle="tooltip"]').tooltip()
 	});
 </script>
diff --git a/war/html/snippets/navbar.html b/war/html/snippets/navbar.html
@@ -47,6 +47,12 @@
 					#end
 				#end
 			</ul>
+			<div class="pull-right hidden-xs" style="display: inline-flex; height: 50px; cursor: pointer;">
+				<a style="color: white; margin: auto 0; font-style: italic;" data-toggle="tooltip" data-placement="left" id="applicationVersion" href="https://github.com/sushain97/contestManagement/releases/tag/v$applicationVersion" target="_blank"
+					title='Version $applicationVersion of the TMSCA Contest Management software licensed by Sushain Cherivirala under the GPLv3 (code) and CC BY-NC-SA (content).'>
+					v$applicationVersion
+				</a>
+			</div>
 		</div>
 	</div>
 </div>