Merge pull request #140 from MathieuNls/139_mobile

Mobile improvements #139 #133 #131
Toolwatchapp · Apr 13, 2016 · 786a2ce · 786a2ce
2 parents baf8541 + b22828f
commit 786a2ce
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 28 deletions.
diff --git a/application/views/header.php b/application/views/header.php
@@ -81,8 +81,7 @@
         "https://plus.google.com/104724190750629608501/"]
     }
     </script>
-    <script type="text/javascript">CRISP_WEBSITE_ID = "-K4rBEcM_Qbt6JrISVzu";(function(){d=document;s=d.createElement("script");s.src="https://client.crisp.im/l.js";s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})();</script>
-    <meta name="p:domain_verify" content="9f4eefba8c49cf4a79b31c72a7e388a9"/>
+
 <?php
 foreach ($styleSheets as $css) {echo '<link rel="stylesheet" href="'.css_url($css).'?'.time().'">';}
 foreach ($javaScripts as $js) {echo '<script src="'.js_url($js).'"></script>';}
@@ -91,26 +90,28 @@
         <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
         <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
-    <!-- <script type="text/javascript" src="<?php echo js_url('jquery.cookiesdirective');?>"/> -->
-
-    <!-- Begin Cookie Consent plugin by Silktide - http://silktide.com/cookieconsent -->
-<script type="text/javascript">
-    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":"<?php echo base_url();?>assets/css/cookie.css"};
-</script>
-
-<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/1.0.9/cookieconsent.min.js"></script>
-<!-- End Cookie Consent plugin -->
-
-
-<script type="text/javascript">
-  window.onerror = function(message, file, line) {
-    $.post( "https://"+window.location.hostname+ "/ajax/reportClientError", { error:  file + "(" + line + "): "
-      + message + " ["+navigator.userAgent+","+navigator.platform+"]" })
-    .done(function( data ) {
-      console.log("logged");
-    });
-  }
-</script>
+
+    <script type="text/javascript">
+      window.onerror = function(message, file, line) {
+        $.post( "https://"+window.location.hostname+ "/ajax/reportClientError", { error:  file + "(" + line + "): "
+          + message + " ["+navigator.userAgent+","+navigator.platform+"]" })
+        .done(function( data ) {
+          console.log("logged");
+        });
+      }
+    </script>
+
+<?php if(!$this->agent->is_mobile()){?>
+
+  <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/1.0.9/cookieconsent.min.js"></script>
+  <script type="text/javascript">CRISP_WEBSITE_ID = "-K4rBEcM_Qbt6JrISVzu";(function(){d=document;s=d.createElement("script");s.src="https://client.crisp.im/l.js";s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})();</script>
+  <meta name="p:domain_verify" content="9f4eefba8c49cf4a79b31c72a7e388a9"/>
+
+  <script type="text/javascript">
+        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":"<?php echo base_url();?>assets/css/cookie.css"};
+  </script>
+<?php } ?>
+
 
 </head>
 <body>

diff --git a/application/views/measure/dashboard.php b/application/views/measure/dashboard.php
@@ -85,6 +85,8 @@
         </div>
     </div>
 
-    <?php $this->load->view("time");?>
+    <?php if(!$this->agent->is_mobile()){
+       $this->load->view("time");
+    }?>
 
 </div>
diff --git a/application/views/measure/dashboard/start-action-button.php b/application/views/measure/dashboard/start-action-button.php
@@ -3,4 +3,4 @@
        <button type="button" class="btn btn-default btn-sm dropdown-toggle dropdown-menu-right" data-toggle="dropdown" aria-expanded="false">
          Action <span class="caret"></span>
        </button>
-       <ul class="dropdown-menu" role="menu">
+       <ul class="dropdown-menu pull-right" role="menu">
diff --git a/application/views/measure/dashboard/start-new-measure.php b/application/views/measure/dashboard/start-new-measure.php
@@ -1,5 +1,5 @@
-<li><a class="submitNewMeasure" data-watch="<?php echo $watchId; ?>">Start a new measure</a>
-  <form method="post" action="/measures/new-measure-for-watch/" name="start-new-measure-<?php echo $watchId;?>">
-    <input type="hidden" name="watchId" value="<?php echo $watchId;?>">
-  </form>
+<li>
+  <a href="#" class="submitNewMeasure" data-watch="<?php echo $watchId; ?>">Start a new measure</a>
+  <form  method="post" action="/measures/new-measure-for-watch/" name="start-new-measure-<?php echo $watchId;?>" class="no-display">
+    <input type="hidden" name="watchId" value="<?php echo $watchId;?>"></form>
 </li>