Commit be0f52e1 authored by Ulises Morales Ramírez's avatar Ulises Morales Ramírez

Merge remote-tracking branch 'origin/dev' into dev

parents e8cc02cf f1909472
...@@ -317,7 +317,7 @@ function showControlMap() { ...@@ -317,7 +317,7 @@ function showControlMap() {
if ($('#showControlMap').is(':visible')) { if ($('#showControlMap').is(':visible')) {
$("#showControlMap").hide(); $("#showControlMap").hide();
$("#hideControlMap").show(); $("#hideControlMap").show();
$(".mapControl").show(); // $(".mapControl").show();
} else { } else {
$("#showControlMap").show(); $("#showControlMap").show();
$("#hideControlMap").hide(); $("#hideControlMap").hide();
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</ul> </ul>
</li> </li>
<!-- <!--
<a class="treeview " href="#" onclick="compare(labels)"> <a class="treeview " href="#" onclick="compare(labels)">
<i class="fas fa-columns"></i></i> <i class="fas fa-columns"></i></i>
<i class="fa fa-eye-slash hideChart" style="display:none"></i> <i class="fa fa-eye-slash hideChart" style="display:none"></i>
...@@ -292,8 +292,8 @@ ...@@ -292,8 +292,8 @@
</ul> </ul>
</li> </li>
<li> <li class="treeview ">
<a class="treeview " href="#" onclick="showControlMap()"> <a href="#" onclick="showControlMap()">
<i class="fa fa-globe"></i> <i class="fa fa-globe"></i>
<i class="fa fa-globe" style="display:none"></i> <i class="fa fa-globe" style="display:none"></i>
<span id="showControlMap">Show Maps</span> <span id="showControlMap">Show Maps</span>
...@@ -302,9 +302,27 @@ ...@@ -302,9 +302,27 @@
<span class="label label-primary pull-right"></span> <span class="label label-primary pull-right"></span>
</span> </span>
</a> </a>
<ul class="treeview-menu sidebar-form text-center">
<span>
<div class="form-check submenu" onclick="changeMap('light')">
<input id="light" type="radio" name="layerOption" checked>
<span>Noon</span>
</div>
<div class="form-check submenu" onclick="changeMap('streets')">
<input id="streets" type="radio" name="layerOption">
<span>Streets</span>
</div>
<div class="form-check submenu" onclick="changeMap('night')">
<input id="night" type="radio" name="layerOption">
<span>Night</span>
</div>
<div class="form-check submenu" onclick="changeMap('cycle')">
<input id="cycle" type="radio" name="layerOption">
<span>Cycle</span>
</div>
</span>
</ul>
</li> </li>
<!-- <li> <!-- <li>
<a class="treeview " href="#" onclick="showComparisons()"> <a class="treeview " href="#" onclick="showComparisons()">
<i class="fa fa-eye showImage"></i> <i class="fa fa-eye showImage"></i>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment