From 4a3c9fc98d675ef99677a94a97b3d18125e9347a Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 23 Mar 2015 01:15:26 -0400
Subject: [PATCH] Add 2.1.1 JavaScript and button to installation page

---
 install/install_functions.inc.php            |  4 +--
 install/mods-for-hesk/installModsForHesk.php |  3 ++
 install/mods-for-hesk/js/version-scripts.js  |  3 ++
 install/mods-for-hesk/modsForHesk.php        | 31 +++++++++++++-------
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index 9b685d63..c709d8f6 100644
--- a/install/install_functions.inc.php
+++ b/install/install_functions.inc.php
@@ -36,8 +36,8 @@
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 // We will be installing this HESK version:
-define('HESK_NEW_VERSION','2.6.1');
-define('MODS_FOR_HESK_NEW_VERSION','2.1.0');
+define('HESK_NEW_VERSION','2.6.2');
+define('MODS_FOR_HESK_NEW_VERSION','2.1.1');
 define('REQUIRE_PHP_VERSION','5.0.0');
 define('REQUIRE_MYSQL_VERSION','5.0.7');
 
diff --git a/install/mods-for-hesk/installModsForHesk.php b/install/mods-for-hesk/installModsForHesk.php
index 33322d6e..e6ffec4f 100644
--- a/install/mods-for-hesk/installModsForHesk.php
+++ b/install/mods-for-hesk/installModsForHesk.php
@@ -40,6 +40,9 @@ function echoInitialVersionRows($version) {
     if ($version < 210) {
         printRow('v2.1.0');
     }
+    if ($version < 211) {
+        printRow('v2.1.1');
+    }
 }
 
 function printRow($version) {
diff --git a/install/mods-for-hesk/js/version-scripts.js b/install/mods-for-hesk/js/version-scripts.js
index 8cdd3412..de51148a 100644
--- a/install/mods-for-hesk/js/version-scripts.js
+++ b/install/mods-for-hesk/js/version-scripts.js
@@ -29,6 +29,9 @@ function processUpdates(startingVersion) {
     } else if (startingVersion < 210) {
         startVersionUpgrade('210');
         executeUpdate(210, '210', '2.1.0');
+    } else if (startingVersion < 211) {
+        startVersionUpgrade('211');
+        executeUpdate(211, '211', '2.1.1');
     } else {
         installationFinished();
     }
diff --git a/install/mods-for-hesk/modsForHesk.php b/install/mods-for-hesk/modsForHesk.php
index 4f412e71..342b640b 100644
--- a/install/mods-for-hesk/modsForHesk.php
+++ b/install/mods-for-hesk/modsForHesk.php
@@ -137,6 +137,17 @@ hesk_dbConnect();
                                 }
                                 ?>
                                 <div class="row">
+                                    <div class="col-md-3 col-sm-12">
+                                        <?php
+                                        if ($version == '2.1.0') {
+                                            $v210btn = 'btn-success';
+                                            $disableAllExcept = '210';
+                                        } else {
+                                            $v210btn = 'btn-default';
+                                        }
+                                        ?>
+                                        <a id="210" class="btn <?php echo $v210btn; ?> btn-block disablable" href="installModsForHesk.php?v=210">v2.1.0</a>
+                                    </div>
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '2.0.1') {
@@ -170,6 +181,9 @@ hesk_dbConnect();
                                         ?>
                                         <a id="170" class="btn <?php echo $v170btn; ?> btn-block disablable" href="installModsForHesk.php?v=170">v1.7.0</a>
                                     </div>
+                                </div>
+                                <br>
+                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
                                         <?php
                                         if ($version == '1.6.1') {
@@ -181,9 +195,6 @@ hesk_dbConnect();
                                         ?>
                                         <a id="161" class="btn <?php echo $v161btn; ?> btn-block disablable" href="installModsForHesk.php?v=161">v1.6.1</a>
                                     </div>
-                                </div>
-                                <br>
-                                <div class="row">
                                     <div class="col-md-3 col-sm-12">
 
                                         <?php
@@ -202,26 +213,26 @@ hesk_dbConnect();
                                     <div class="col-md-3 col-sm-12">
                                         <a id="141" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=141">v1.4.1</a>
                                     </div>
-                                    <div class="col-md-3 col-sm-12">
-                                        <a id="140" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=140">v1.4.0</a>
-                                    </div>
                                 </div>
                                 <br>
                                 <div class="row">
+                                    <div class="col-md-3 col-sm-12">
+                                        <a id="140" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=140">v1.4.0</a>
+                                    </div>
                                     <div class="col-md-3 col-sm-12">
                                         <a id="130" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=130">v1.3.0</a>
                                     </div>
                                     <div class="col-md-3 col-sm-12">
                                         <a id="124" class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=124">v1.2.4</a>
                                     </div>
-                                    <div class="col-md-6 col-sm-12">
-                                        <a class="btn btn-default btn-block disablable" href="installModsForHesk.php?v=0">No previous installation</a>
-                                    </div>
                                 </div>
                                 <br>
                                 <div class="row">
                                     <div class="col-sm-12">
-                                        <button type="button" class="btn btn-danger btn-block" data-toggle="modal" data-target="#uninstallModal"><i class="fa fa-trash"></i> Uninstall Mods for HESK</button>
+                                        <div class="btn-group-vertical" role="group" style="width: 100%">
+                                            <a class="btn btn-primary btn-block disablable" href="installModsForHesk.php?v=0">No previous installation</a>
+                                            <button type="button" class="btn btn-danger btn-block" data-toggle="modal" data-target="#uninstallModal"><i class="fa fa-trash"></i> Uninstall Mods for HESK</button>
+                                        </div>
                                     </div>
                                 </div>
                                 <br>