From cfd17688b3902f2a7e0a9b1aace1473dd5428e3c Mon Sep 17 00:00:00 2001 From: Mathieu Nayrolles Date: Tue, 22 Mar 2016 08:56:48 -0400 Subject: [PATCH 1/7] deactivate crisp and cookie for mobile #139 --- application/views/header.php | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/application/views/header.php b/application/views/header.php index f6bddefc..35f88d64 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -81,8 +81,7 @@ "https://plus.google.com/104724190750629608501/"] } - - + ';} foreach ($javaScripts as $js) {echo '';} @@ -98,19 +97,24 @@ window.cookieconsent_options = {"message":"This website uses cookies to ensure you get the best experience on our website","dismiss":"Got it!","learnMore":"More info","link":"https://toolwatch.io/about","theme":"assets/css/cookie.css"}; - - +agent->is_mobile()){?> + + + + - + + + From cf9878a5e8dae5d38a9a475fe60bf9ae9bad8161 Mon Sep 17 00:00:00 2001 From: Mathieu Nayrolles Date: Tue, 22 Mar 2016 09:25:38 -0400 Subject: [PATCH 2/7] deactivate crisp and cookie for mobile #139 --- application/views/header.php | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/application/views/header.php b/application/views/header.php index 35f88d64..c165c22b 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -90,28 +90,26 @@ - - - + agent->is_mobile()){?> + - From d505849e1ceda8fc69f2b169adaa5bf0e0443de2 Mon Sep 17 00:00:00 2001 From: Mathieu Nayrolles Date: Tue, 22 Mar 2016 09:25:52 -0400 Subject: [PATCH 3/7] deactivate crisp and cookie for mobile #139 --- application/views/header.php | 1 - 1 file changed, 1 deletion(-) diff --git a/application/views/header.php b/application/views/header.php index c165c22b..3c5adb91 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -104,7 +104,6 @@ agent->is_mobile()){?> - From ba4905904ea9e48d6632893af675446c7e001bb0 Mon Sep 17 00:00:00 2001 From: Mathieu Nayrolles Date: Tue, 22 Mar 2016 09:29:01 -0400 Subject: [PATCH 4/7] remove time from mobile dashboard #139 --- application/views/measure/dashboard.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/views/measure/dashboard.php b/application/views/measure/dashboard.php index 17d0971b..81bfc8e0 100644 --- a/application/views/measure/dashboard.php +++ b/application/views/measure/dashboard.php @@ -85,6 +85,8 @@ - load->view("time");?> + agent->is_mobile()){ + $this->load->view("time"); + }?> From f9118d511f353f304e3657b5839da92094565bff Mon Sep 17 00:00:00 2001 From: Mathieu Nayrolles Date: Tue, 22 Mar 2016 09:35:55 -0400 Subject: [PATCH 5/7] add pull-right to dropdown menu. Fix #133 http://stackoverflow.com/questions/13806802/twitter-bootstrap-dropdown-goes-outside-the-screen --- application/views/measure/dashboard/start-action-button.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/measure/dashboard/start-action-button.php b/application/views/measure/dashboard/start-action-button.php index cb5d50d4..a812dd6a 100644 --- a/application/views/measure/dashboard/start-action-button.php +++ b/application/views/measure/dashboard/start-action-button.php @@ -3,4 +3,4 @@ -