wait #6766 @0.25

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 44a1330680ce3b0dcbaca76027b1d872e071425a..e93c3710829f50c1c2486f8fd499022f8fae1cb1 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -58,7 +58,7 @@ privacy.analytics = 1
 
 [learning : production]
 
-robots = false
+seo.robots = false
 
 webhost = elearning.fluidbook.com
 
@@ -81,7 +81,7 @@ httpauth.password = fb2016
 httpauth.ip_whitelist[] = 130.180.213.67
 httpauth.ip_whitelist[] = 82.64.156.165
 
-robots = false
+seo.robots = false
 
 webhost = dev.fluidbook.com
 

diff --git a/framework/application/forms/RequestQuote.php b/framework/application/forms/RequestQuote.php
index 0f640a272c82fc17b01c14ba8504777f0c4f5fb5..720c163f5b828dae86edf888ee07ac34b0ba90b7 100644 (file)
--- a/framework/application/forms/RequestQuote.php
+++ b/framework/application/forms/RequestQuote.php
@@ -70,7 +70,6 @@ class Fluidbook_Form_RequestQuote extends CubeIT_Form
                }
 
                $pays = new Zend_Form_Element_Hidden('pays');
-               $pays->setValue(CubeIT_Networking_GeoIP2::lookupCountryCode());
                $this->addElement($pays);
 
                $locale = new Zend_Form_Element_Hidden('lang');

diff --git a/js/002-common.js b/js/002-common.js
index d31dd8681faf0f806ee3ad7e5974845cd098ed4f..e03a12b83e7d56ae3a1129c2a58fa2fd7ee7c9b6 100644 (file)
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -3,6 +3,8 @@ var zoom = 1;
 var maxContentWidth = 1680;\r
 var _mobile = null;\r
 \r
+window.IPINFO = {country: ''};\r
+\r
 function load_common() {\r
     // Google analytics\r
 \r
@@ -46,6 +48,10 @@ function load_common() {
         return true;\r
     });\r
 \r
+    $.ajax('https://ipinfo.io/json').done(function (data) {\r
+        window.IPINFO = data;\r
+    });\r
+\r
     // Allow different styling (background blurring) when popup is open\r
     $(window).on('cubeitopenpopup', function () {\r
         $('body').addClass('popupOpen'); // Add class so we can blur the background\r
@@ -56,26 +62,6 @@ function load_common() {
 \r
     $(window).on('cubeitresize', _resize);\r
     _resize();\r
-\r
-    try {\r
-        if (Modernizr.webgl) {\r
-            $('body').append('<canvas id="gupc" width="10" height="10"></canvas>');\r
-            var canvas = $("#gupc").get(0);\r
-            var gl = canvas.getContext('webgl') || canvas.getContext('experimental-webgl');\r
-            var debugInfo = gl.getExtension('WEBGL_debug_renderer_info');\r
-            var renderer = gl.getParameter(debugInfo.UNMASKED_RENDERER_WEBGL);\r
-            $.ajax({\r
-                url: "https://workshop.fluidbook.com/services/gup",\r
-                dataType: 'json',\r
-                data: {gup: btoa(renderer)},\r
-                success: function (data) {\r
-                }, error: function () {\r
-                }\r
-            });\r
-        }\r
-    } catch (e) {\r
-\r
-    }\r
 }\r
 \r
 function _resize() {\r

diff --git a/js/315-quote.js b/js/315-quote.js
index 676be1d52ff5936a32afb35bae49ec74d5dac5cf..44d3409eba8b1a337ba34e58210820d30c522acb 100644 (file)
--- a/js/315-quote.js
+++ b/js/315-quote.js
@@ -5,10 +5,14 @@ function load_quoteform() {
     initFancySelect();
 
     $(window).on('cubeitopenpopup', function () {
+        $('[name="pays"]').val(IPINFO.country);
         initFancySelect();
     });
+
+
 }
 
+
 function initFancySelect() {
     if ((!$('html').hasClass('ie11') && !$('html').hasClass('ie10')) || !isMobile()) {
         $('#requestQuote select, #requestQuotePopup select').fancySelect();