done #648 @2

diff --git a/framework/application/controllers/AdminajaxpopupController.php b/framework/application/controllers/AdminajaxpopupController.php
index 2a1039b1d846a7ed0a0c6717cac9e64d425f4080..c8dca267b91d42b6aed7c9371a5791a6c6fdadd5 100644 (file)
--- 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 4dbd875644c01bf2b86a63e48f5d5e1fcef69dae..a53bf7bfd0ba4b70c7690026f7692848feeccae7 100644 (file)
--- 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 57f5c9d869e6f2d32fcb049f2221b82bbb4a4deb..e7a9692cd58fbc0c3eb17be8ba9accc95531603a 100644 (file)
--- a/js/104-nav.js
+++ b/js/104-nav.js
@@ -74,5 +74,6 @@ function load_nav() {
         }\r
     });\r
 \r
+    $("body").append($('#ajaxLoader'));\r
     $("body").prepend($("#nav-icon"));\r
 }
\ No newline at end of file

diff --git a/less/001-variables.less b/less/001-variables.less
index d94d54c32f9e12153e585f066b0e74f0c110fd4b..6745bddac1ad30f06b3b39429aaf4466f57a0ba2 100644 (file)
--- 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 35046d813ddea654c675c6e65bd1add891924cf8..bf80b4883ac87531a62ac7c6222be34457b71b2a 100644 (file)
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -20,9 +20,13 @@ body {
        opacity: 0;\r
        transition: opacity @transition-time-buttons;\r
 \r
+       #mm-0, #h, .pagination {\r
+               transition: filter, -webkit-filter @transition-time-popin;\r
+       }\r
+\r
        &.popupOpen {\r
-               #mm-0, #h {\r
-                       filter: blur(5px);\r
+               #mm-0, #h, .pagination {\r
+                       filter: blur(50px);\r
                }\r
        }\r
 \r
@@ -35,6 +39,10 @@ body {
        }\r
 }\r
 \r
+.popupWindow .back {\r
+       box-shadow: none;\r
+}\r
+\r
 main {\r
        background-color: #fff;\r
        max-width: @content-max-width;\r
@@ -230,4 +238,24 @@ a {
        @media @m768 {\r
                padding-top: 80px;\r
        }\r
+}\r
+\r
+#ajaxLoader {\r
+       cursor: wait;\r
+       .c {\r
+               visibility: hidden;\r
+       }\r
+}\r
+\r
+.popupLayer {\r
+       .popupWindow {\r
+               opacity: 0;\r
+               transition: opacity @transition-time-popin;\r
+       }\r
+\r
+       &.display {\r
+               .popupWindow {\r
+                       opacity: 1;\r
+               }\r
+       }\r
 }
\ No newline at end of file

diff --git a/less/101-header.less b/less/101-header.less
index b2dc3d7f3afbd45a6b561da84679f212f911e47b..6e90eafe194e703d334e1fde396c4847b754d614 100644 (file)
--- a/less/101-header.less
+++ b/less/101-header.less
@@ -1,7 +1,7 @@
 @import "000-imports";\r
 \r
 header#h {\r
-       transition: left 0.4s ease, background-color 0.4s ease, box-shadow 0.4s ease;\r
+       transition: left 0.4s ease, background-color 0.4s ease, box-shadow 0.4s ease, filter, -webkit-filter @transition-time-popin;\r
 \r
        position: fixed;\r
        top: 0px;\r