From 556dad723966bb4aecd7db2b78ea9aec39ee16b9 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Mon, 21 Jan 2019 16:42:58 -0500
Subject: [PATCH] Updated cookie info pop-up box to be visible in various
 themes.

---
 index.php                         |  6 +--
 models/frontCookiePopUp.php       | 61 +++++++++++++++++--------------
 readme.txt                        |  3 ++
 views/adminServerStatsConfig.html |  2 +-
 4 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/index.php b/index.php
index ed78d23..12c537e 100755
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Bandwidth
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Website Bandwidth Display and Reporting
- * Version: 2.2.1
+ * Version: 2.2.2
  * Author: Gaslight Media
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -19,7 +19,7 @@
  * @package glmServerStats
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 2.2.1
+ * @version 2.2.2
  */
 
 // Check that we're being called by WordPress.
@@ -28,7 +28,7 @@ if (!defined('ABSPATH')) {
     die();
 }
 
-define('GLM_SERVERSTATS_PLUGIN_VERSION', '2.2.1');
+define('GLM_SERVERSTATS_PLUGIN_VERSION', '2.2.2');
 
 // Required to be able to get user capabilities when being called as a filter from the main plugin
 require_once ABSPATH . 'wp-includes/pluggable.php';
diff --git a/models/frontCookiePopUp.php b/models/frontCookiePopUp.php
index 2a5b292..9a7da01 100755
--- a/models/frontCookiePopUp.php
+++ b/models/frontCookiePopUp.php
@@ -3,22 +3,39 @@
 $serverstatsConfig = get_option(GLM_SERVERSTATS_PLUGIN_CONFIG_OPTION);
 ?>
 <style>
-    #siteCookieDialog {
-        style="display: none;
-        font-size: 16px;
+    #cookieNoticeBox {
+        position: absolute;
+        top: 20px;
+        right: 30px;
+        width: 60%;
+        margin: 0 auto;
+        background: white;
+        padding: 15px;
+        border: 2px solid black;
+        border-radius: 20px/20px;
+        background-clip: padding-box;
+        text-align: left;
+        z-index: 99999 !important;
     }
-    #siteCookieDialog .cookieButton {
-        background-color: WhiteSmoke;
-        border: 1px solid gray;
-        padding: 4px;
-        margin: 4px;
+    #cookieNoticeBox .title {
+        font-size: 1.5em;
+        padding-bottom: .5em;
+        border-bottom: 2px solid black;
+        margin-bottom: .5em;
     }
-    #siteCookieDialog p {
-    }
-    #siteCookieDialog $cookieMoreInfo {
+    #cookieNoticeBox .button {
+        color: black;
+        background-color: lightgrey;
+        padding: 8px 20px;
+        z-index: 20;
+        left: 0;
+        top: 0;
+        margin: 0;
+        border-radius: 4px;
     }
 </style>
-<div id="siteCookieDialog" class="opensearchserver.ignore">
+<div id="cookieNoticeBox" class="opensearchserver.ignore hidden">
+    <div class="title">Please read!<br></div>
     <p>
         This site uses temporary "Session Cookies" to store limited information that's required to provide
         you with a consistent user experience. We don't store personally identifying or other sensitive
@@ -29,8 +46,8 @@ $serverstatsConfig = get_option(GLM_SERVERSTATS_PLUGIN_CONFIG_OPTION);
     </p>
 <?php if ($serverstatsConfig['cookie_message'] != '') { echo '<p>'.$serverstatsConfig['cookie_message'].'</p>'; }  ?>
     <p>
-        <a id="showMorePrivacyInfo" class="cookieButton">Show more</a>
-        <a id="privacyGotIt" class="cookieButton">Got it!</a>
+        <a id="showMorePrivacyInfo" class="button">Show more</a>
+        <a id="cookieNoticeBoxClose" class="button">Got it!</a>
     </p>
     <div id="cookieMoreInfo" style="display: none;">
 <?php if ($serverstatsConfig['cookie_opt_gdpr']) { ?>
@@ -117,18 +134,6 @@ $serverstatsConfig = get_option(GLM_SERVERSTATS_PLUGIN_CONFIG_OPTION);
 <script type="text/javascript">
     jQuery(function($){
 
-            // Setup dialog box
-            $( "#siteCookieDialog" ).dialog({
-                title: 'Please Note: This site uses Cookies',
-                position: { at: "center top+20%"},
-                autoOpen: false,
-                modal: true,
-                width: '80%'
-            });
-
-            // Show submit dialog box
-            $( "#siteCookieDialog" ).dialog( "open" );
-
             var showMorePrivacyInfo = false;
             $("#showMorePrivacyInfo").on('click', function() {
                 if (showMorePrivacyInfo) {
@@ -142,8 +147,8 @@ $serverstatsConfig = get_option(GLM_SERVERSTATS_PLUGIN_CONFIG_OPTION);
                 }
             });
 
-            $("#privacyGotIt").on('click', function() {
-                $( "#siteCookieDialog" ).dialog( "close" );
+            $("#cookieNoticeBoxClose").on('click', function() {
+                $("#cookieNoticeBox").hide();
             });
 
     });
diff --git a/readme.txt b/readme.txt
index f6ed4f8..05aeb65 100755
--- a/readme.txt
+++ b/readme.txt
@@ -29,6 +29,9 @@ e.g.
 1. Activate the plugin through the 'Plugins' menu in WordPress
 
 == Changelog ==
+= 2.2.2 =
+* Updated pop-up cookie information box to be more visible.
+
 = 2.2.1 =
 * Added class to container for Cookie Pop-Up to tell OpenSearchServer to ingore it.
 
diff --git a/views/adminServerStatsConfig.html b/views/adminServerStatsConfig.html
index 6c47f28..1111845 100755
--- a/views/adminServerStatsConfig.html
+++ b/views/adminServerStatsConfig.html
@@ -110,7 +110,7 @@
 {if $connectError}
             <h2 class="glm-error">Unable to connect to database! Please check connection settings.</h2>
 {/if}
-            <input type="submit" value="Update Database Connection" class="button-primary">
+            <input type="submit" value="Save Changes" class="button-primary">
         </form>
 
     </div>
-- 
2.17.1