From d8fec04d81e7a4532a39aaf24c48131fe13679d2 Mon Sep 17 00:00:00 2001
From: Wruczek <wruczekk@gmail.com>
Date: Sun, 30 Dec 2018 04:27:43 +0100
Subject: [PATCH] Added a shortened commit hash along the version The commit
 value is replaced when building the zip file

---
 src/installer/pages/1.php        | 7 ++++++-
 src/installer/pages/7.php        | 1 +
 src/private/php/constants.php    | 1 +
 src/private/templates/body.latte | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/installer/pages/1.php b/src/installer/pages/1.php
index 935c3ef..880dbad 100644
--- a/src/installer/pages/1.php
+++ b/src/installer/pages/1.php
@@ -117,7 +117,12 @@
 
 <div class="card">
     <div class="card-body">
-        <h4 class="card-title text-center">Welcome to TS-website <?= __TSWEBSITE_VERSION ?> Installer!</h4>
+        <h4 class="card-title text-center mb-0">Welcome to TS-website Installer!</h4>
+
+        <p class="card-text text-center text-muted font-italic mb-5">
+            Version <?= __TSWEBSITE_VERSION ?> (<?= __TSWEBSITE_COMMIT ?>)
+        </p>
+
         <p class="card-text">This wizard will guide you through the installation process of TS-website.</p>
         <p class="card-text text-danger" id="hidejs">Please enable Javascript before continuing!</p>
         <p class="card-text">
diff --git a/src/installer/pages/7.php b/src/installer/pages/7.php
index 1d900de..0d89c00 100644
--- a/src/installer/pages/7.php
+++ b/src/installer/pages/7.php
@@ -13,6 +13,7 @@ if(!empty($_COOKIE["tsw_allow_metrics"])) {
 
     $data = [
         "tswVersion" => __TSWEBSITE_VERSION,
+        "tswCommit" => __TSWEBSITE_COMMIT,
         "phpVersion" => PHP_VERSION,
         "os" => sprintf("%s %s %s %s", php_uname("s"), php_uname("r"), php_uname("v"), php_uname("m")), // no hostname
         "webServer" => $_SERVER["SERVER_SOFTWARE"],
diff --git a/src/private/php/constants.php b/src/private/php/constants.php
index acb816b..a2aeabd 100644
--- a/src/private/php/constants.php
+++ b/src/private/php/constants.php
@@ -1,5 +1,6 @@
 <?php
 define("__TSWEBSITE_VERSION",   "dev-2.0.0");
+define("__TSWEBSITE_COMMIT",    "no-commit");
 define("__BASE_DIR",            __DIR__ . "/../..");
 define("__PRIVATE_DIR",         __BASE_DIR . "/private");
 define("__CACHE_DIR",           __PRIVATE_DIR . "/cache");
diff --git a/src/private/templates/body.latte b/src/private/templates/body.latte
index 5c0c0c1..a94f94a 100644
--- a/src/private/templates/body.latte
+++ b/src/private/templates/body.latte
@@ -210,7 +210,7 @@ $navActiveIndex = isset($navActiveIndex) ? (int) $navActiveIndex : 0;
 {block footerbottom}{/block}
 
 <!--
-    TS-website {\__TSWEBSITE_VERSION} by Wruczek
+    TS-website {\__TSWEBSITE_VERSION} ({\__TSWEBSITE_COMMIT}) by Wruczek
     Generated in {@$tplutils::getRenderTime()} s
     MySQL queries: {$sqlCount}
 -->