From b265a173bfe927271858420fbd421ff978de9aae Mon Sep 17 00:00:00 2001
From: Kevin Beckers <kevin@bcsa.nl>
Date: Wed, 29 Apr 2020 16:29:02 +0200
Subject: [PATCH] 1.3.0

---
 CHANGELOG.md                                     |  9 ++++++++-
 composer.json                                    |  2 +-
 src/assetbundles/cookieboss/CookieBossAsset.php  |  2 +-
 .../cookieboss/dist/css/CookieBoss.css           | 14 ++++++++++++++
 src/controllers/SettingsController.php           |  2 ++
 src/models/Settings.php                          |  7 +++++++
 src/templates/askConsent/_index.twig             |  2 +-
 src/templates/settings.twig                      | 16 ++++++++++++++++
 ...onsentVariable.php => CookieBossVariable.php} |  2 +-
 9 files changed, 51 insertions(+), 5 deletions(-)
 rename src/variables/{CookieConsentVariable.php => CookieBossVariable.php} (99%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce7e909..62416f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,4 +66,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## 1.2.1 - 2020-02-26
 ### Fixed
-- Fixed documentation link in plugin overview.
\ No newline at end of file
+- Fixed documentation link in plugin overview.
+
+## 1.3.0 - 2020-04-29
+### Added
+- Modal position setting.
+
+### Fixed
+- Fixed namespace.
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 348235c..ac9979e 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "dutchheight/craft-cookie-boss",
     "description": "Allow your visitors to set their cookie preference.",
     "type": "craft-plugin",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "keywords": [
         "craft",
         "cms",
diff --git a/src/assetbundles/cookieboss/CookieBossAsset.php b/src/assetbundles/cookieboss/CookieBossAsset.php
index bfd8114..07c2490 100644
--- a/src/assetbundles/cookieboss/CookieBossAsset.php
+++ b/src/assetbundles/cookieboss/CookieBossAsset.php
@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2019 Dutch Height
  */
 
-namespace dutchheight\cookieboss\assetbundles\CookieBoss;
+namespace dutchheight\cookieboss\assetbundles\cookieBoss;
 
 use Craft;
 use craft\web\AssetBundle;
diff --git a/src/assetbundles/cookieboss/dist/css/CookieBoss.css b/src/assetbundles/cookieboss/dist/css/CookieBoss.css
index bca2800..b70ce1f 100644
--- a/src/assetbundles/cookieboss/dist/css/CookieBoss.css
+++ b/src/assetbundles/cookieboss/dist/css/CookieBoss.css
@@ -174,6 +174,9 @@
 }
 
 @media (min-width: 768px) {
+    #cookie-boss {
+
+    }
     #cookie-boss-modal {
         z-index: 999;
 
@@ -210,6 +213,17 @@
         bottom: 2rem;
     }
 
+    #cookie-boss-modal.bottom-center {
+        left: 50%;
+        transform: translateX(-50%);
+    }
+
+    #cookie-boss-modal.center {
+        top: 50%;
+        left: 50%;
+        transform: translateX(-50%);
+    }
+
     #cookie-boss-modal>#container {
         display: flex;
         flex-wrap: wrap;
diff --git a/src/controllers/SettingsController.php b/src/controllers/SettingsController.php
index aaa1685..ee76c67 100644
--- a/src/controllers/SettingsController.php
+++ b/src/controllers/SettingsController.php
@@ -43,6 +43,7 @@ public function actionPluginSettings($settings = null): Response
         $variables['cookies'] = CookieBoss::getInstance()->cookieDescriptions->getAll();
 
         $variables['settings'] = $settings;
+        // Craft::dump($settings);
         $variables['tabs'] = [
             'general' => [
                 'label' => Craft::t('app', 'General'),
@@ -117,6 +118,7 @@ private function saveSettings($forceReconsent = false) {
         $settings['settingsButtonText']     = Craft::$app->getRequest()->getRequiredBodyParam('settingsButtonText');
         $settings['cookiesPageId']          = Craft::$app->getRequest()->getRequiredBodyParam('contactPage');
         $settings['acceptAfterSeconds']     = Craft::$app->getRequest()->getRequiredBodyParam('acceptAfterSeconds');
+        $settings['position']               = Craft::$app->getRequest()->getRequiredBodyParam('position');
 
         if ($forceReconsent) {
             $settings['lastSettingsUpdate'] = time();
diff --git a/src/models/Settings.php b/src/models/Settings.php
index fa110f1..6dc5551 100644
--- a/src/models/Settings.php
+++ b/src/models/Settings.php
@@ -115,6 +115,13 @@ class Settings extends Model
     */
     public $lastSettingsUpdate = null;
 
+    /**
+    * The position (css class) of the modal
+    *
+    * @var string
+    */
+    public $position = "bottom-right";
+
     // Public Methods
     // =========================================================================
 
diff --git a/src/templates/askConsent/_index.twig b/src/templates/askConsent/_index.twig
index c68e7f4..a5de652 100644
--- a/src/templates/askConsent/_index.twig
+++ b/src/templates/askConsent/_index.twig
@@ -20,7 +20,7 @@
         {% endif %}
 
         {% if settings.presentGroups %}
-            <div id="cookie-boss-modal" class="{{ templateSettings.position }}">
+            <div id="cookie-boss-modal" class="{{ templateSettings.position }}" :style=" !settingsOpen ? 'height: 150px;' : '' ">
                 <div id="container" v-if="!settingsOpen">
                     <h3 class="item-wrapper item-wrapper-padding noselect" style="width: 100%;">{{ settings.title }}</h3>
                     <p class="item-wrapper item-wrapper-padding noselect" style="width: 100%;">{{ settings.message }}</p>
diff --git a/src/templates/settings.twig b/src/templates/settings.twig
index 4ac4c89..1bfc640 100644
--- a/src/templates/settings.twig
+++ b/src/templates/settings.twig
@@ -142,6 +142,22 @@
             min: 0,
             value: settings['acceptAfterSeconds']
         }) }}
+
+        {{ forms.selectField({
+            label: 'Position' |t('cookie-boss'),
+            instructions: 'Set the popup position.' |t('cookie-boss'),
+            id: 'position',
+            name: 'position',
+            options: {
+                "top-left": "Top left" |t('cookie-boss'),
+                "top-right": "Top right" |t('cookie-boss'),
+                "bottom-left": "Bottom left" |t('cookie-boss'),
+                "bottom-right": "Bottom right" |t('cookie-boss'),
+                "bottom-center": "Bottom center" |t('cookie-boss'),
+                "center": "Center" |t('cookie-boss'),
+            },
+            value: settings['position']
+        }) }}
     </div>
 
     <div id="list-consent-groups" class="hidden">
diff --git a/src/variables/CookieConsentVariable.php b/src/variables/CookieBossVariable.php
similarity index 99%
rename from src/variables/CookieConsentVariable.php
rename to src/variables/CookieBossVariable.php
index 71fa154..14eb21a 100644
--- a/src/variables/CookieConsentVariable.php
+++ b/src/variables/CookieBossVariable.php
@@ -193,7 +193,7 @@ public function getCookiesRaw($consentGroupHandle = null)
 
     private function getDefaultTemplateSettings() {
         return [
-            'position' => 'bottom-right'
+            'position' => CookieBoss::$settings["position"]
         ];
     }
 }