From 5d23bf258e2336b6649a4a9ce8a07b71d762ae2c Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 1 Sep 2016 13:23:10 +0000
Subject: [PATCH] done #648 @2

---
 .../controllers/AdminajaxpopupController.php  | 11 +++++--
 .../controllers/AjaxpopupController.php       | 22 ++++++-------
 js/104-nav.js                                 |  1 +
 less/001-variables.less                       |  1 +
 less/002-common.less                          | 32 +++++++++++++++++--
 less/101-header.less                          |  2 +-
 6 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/framework/application/controllers/AdminajaxpopupController.php b/framework/application/controllers/AdminajaxpopupController.php
index 2a1039b..c8dca26 100644
--- a/framework/application/controllers/AdminajaxpopupController.php
+++ b/framework/application/controllers/AdminajaxpopupController.php
@@ -1,7 +1,12 @@
 <?php
 
 class AdminajaxpopupController extends CubeIT_Controller_Admin_AdminajaxpopupController {
-	
-}
+	public function init() {
+		parent::init();
 
-?>
+		$this->setPopupMaxWidth(1440);
+		$this->setPopupPadding(20);
+		$this->setVerticalMargin(20);
+		$this->setOverlayOpacity(0);
+	}
+}
diff --git a/framework/application/controllers/AjaxpopupController.php b/framework/application/controllers/AjaxpopupController.php
index 4dbd875..a53bf7b 100644
--- a/framework/application/controllers/AjaxpopupController.php
+++ b/framework/application/controllers/AjaxpopupController.php
@@ -2,18 +2,18 @@
 
 class AjaxpopupController extends CubeIT_Controller_AjaxpopupController {
 
-    public function quoteForm() {
-        $this->setPopupMaxWidth(1440);
-        $this->setPopupPadding(20);
-        $this->setVerticalMargin(20);
-        $this->setOverlayOpacity(0.5);
-        return $this->view->quoteForm('requestQuotePopup'); // Different ID for popup form so it doesn't conflict with contact page form
-    }
+	public function init() {
+		parent::init();
 
-    public function contents($id = null, $locale = null) {
-        $this->setPopupMaxWidth('1000'); // Increase default popup width to allow more room for admin lists
-        return parent::contents($id, $locale);
-    }
+		$this->setPopupMaxWidth(1440);
+		$this->setPopupPadding(20);
+		$this->setVerticalMargin(20);
+		$this->setOverlayOpacity(0);
+	}
+
+	public function quoteForm() {
+		return $this->view->quoteForm('requestQuotePopup'); // Different ID for popup form so it doesn't conflict with contact page form
+	}
 
 
 }
\ No newline at end of file
diff --git a/js/104-nav.js b/js/104-nav.js
index 57f5c9d..e7a9692 100644
--- a/js/104-nav.js
+++ b/js/104-nav.js
@@ -74,5 +74,6 @@ function load_nav() {
         }
     });
 
+    $("body").append($('#ajaxLoader'));
     $("body").prepend($("#nav-icon"));
 }
\ No newline at end of file
diff --git a/less/001-variables.less b/less/001-variables.less
index d94d54c..6745bdd 100644
--- a/less/001-variables.less
+++ b/less/001-variables.less
@@ -29,6 +29,7 @@
 
 // -- transition times
 @transition-time-buttons: 200ms;
+@transition-time-popin: 600ms;
 
 //-- Break points
 @s1280: ~"(min-width: 1280px)";
diff --git a/less/002-common.less b/less/002-common.less
index 35046d8..bf80b48 100644
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -20,9 +20,13 @@ body {
 	opacity: 0;
 	transition: opacity @transition-time-buttons;
 
+	#mm-0, #h, .pagination {
+		transition: filter, -webkit-filter @transition-time-popin;
+	}
+
 	&.popupOpen {
-		#mm-0, #h {
-			filter: blur(5px);
+		#mm-0, #h, .pagination {
+			filter: blur(50px);
 		}
 	}
 
@@ -35,6 +39,10 @@ body {
 	}
 }
 
+.popupWindow .back {
+	box-shadow: none;
+}
+
 main {
 	background-color: #fff;
 	max-width: @content-max-width;
@@ -230,4 +238,24 @@ a {
 	@media @m768 {
 		padding-top: 80px;
 	}
+}
+
+#ajaxLoader {
+	cursor: wait;
+	.c {
+		visibility: hidden;
+	}
+}
+
+.popupLayer {
+	.popupWindow {
+		opacity: 0;
+		transition: opacity @transition-time-popin;
+	}
+
+	&.display {
+		.popupWindow {
+			opacity: 1;
+		}
+	}
 }
\ No newline at end of file
diff --git a/less/101-header.less b/less/101-header.less
index b2dc3d7..6e90eaf 100644
--- a/less/101-header.less
+++ b/less/101-header.less
@@ -1,7 +1,7 @@
 @import "000-imports";
 
 header#h {
-	transition: left 0.4s ease, background-color 0.4s ease, box-shadow 0.4s ease;
+	transition: left 0.4s ease, background-color 0.4s ease, box-shadow 0.4s ease, filter, -webkit-filter @transition-time-popin;
 
 	position: fixed;
 	top: 0px;
-- 
2.39.5