Re-add version numbering

tempfiles-download · Aug 1, 2018 · 6592c02 · 6592c02
1 parent 787993d
commit 6592c02
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,5 +17,15 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-#NetBeans folder
-/nbproject/
+
+# Jekyll
+_site/
+Gemfile.lock
+.sass-cache
+.jekyll-metadata
+
+#Misc
+tmp/
+*.DS_Store
+*.swp
+.idea/
diff --git a/frontend/_layouts/default.html b/frontend/_layouts/default.html
@@ -24,8 +24,7 @@
   </nav> <!-- /navbar -->
   {{ content }}
   <footer>
-    <p>Made by <a href="https://carlgo11.com/">Carlgo11</a>.
-      <!-- <?php if (!empty($hashshort)) { ?> Version: <a href="https://github.com/Carlgo11/tempfiles" title="<?php print($hashlong); ?>"><?php print($hashshort); ?></a><?php } ?>--></p>
+    <p>Made by <a href="https://carlgo11.com/">Carlgo11</a>. Version: <a id="version" title="{{ site.github.build_revision }}" href="{{ site.github.repository_url }}"></a></p>
   </footer> <!-- /footer -->
   <script src="res/js/night-mode.js"></script>
   <script src="res/js/include-html.js"></script>

diff --git a/frontend/_site/index.html b/frontend/_site/index.html
@@ -76,8 +76,7 @@ <h3>Upload Failed</h3>
 </div> <!-- /container -->
 
   <footer>
-    <p>Made by <a href="https://carlgo11.com/">Carlgo11</a>.
-      <!-- <?php if (!empty($hashshort)) { ?> Version: <a href="https://github.com/Carlgo11/tempfiles" title="<?php print($hashlong); ?>"><?php print($hashshort); ?></a><?php } ?>--></p>
+    <p>Made by <a href="https://carlgo11.com/">Carlgo11</a>. Version: <a id="version" title="787993d810bee13ba29d72a98aaf3b84d20c25d3" href="http://github.com/carlgo11/tempfiles"></a></p>
   </footer> <!-- /footer -->
   <script src="res/js/night-mode.js"></script>
   <script src="res/js/include-html.js"></script>

diff --git a/frontend/_site/res/js/include-html.js b/frontend/_site/res/js/include-html.js
@@ -14,6 +14,9 @@ $(document).ready(function(e) {
     this.select();
   });
 
+  var longhash = '787993d810bee13ba29d72a98aaf3b84d20c25d3'
+  var shorthash = longhash.slice(0,7);
+  $('#version').text(shorthash);
   function upload_file() {
     var form_data = new FormData();
     if ($('#file').val() != "") {

diff --git a/frontend/res/js/include-html.js b/frontend/res/js/include-html.js
@@ -1,3 +1,5 @@
+---
+---
 //$("#navbar-container").load("/res/content/navbar.html");
 $(document).ready(function(e) {
   $('#upload-submit').click(function() {
@@ -14,6 +16,9 @@ $(document).ready(function(e) {
     this.select();
   });
 
+  var longhash = '{{ site.github.build_revision }}'
+  var shorthash = longhash.slice(0,7);
+  $('#version').text(shorthash);
   function upload_file() {
     var form_data = new FormData();
     if ($('#file').val() != "") {