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

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

parents 04c82aef e33d3386
...@@ -331,6 +331,11 @@ select::-ms-expand { ...@@ -331,6 +331,11 @@ select::-ms-expand {
/*progress bar effect*/ /*progress bar effect*/
a[disabled="disabled"] {
pointer-events: none;
opacity: 0.2;
}
/*left and right arrows for slider with font-awesome*/ /*left and right arrows for slider with font-awesome*/
.fas.fa-chevron-left { .fas.fa-chevron-left {
......
...@@ -165,6 +165,13 @@ var ctrl = new ol.control.Swipe(); ...@@ -165,6 +165,13 @@ var ctrl = new ol.control.Swipe();
function compare(labels) { function compare(labels) {
var swipeControl = false; var swipeControl = false;
//oculta la grafica si esta abierta
$("#draggableChart").css('z-index', -1);
$(".showChart").show();
$(".hideChart").hide();
//desactiva el botón de mostrar la gráfica
$('#showGraph').attr('disabled',true);
map.getControls().forEach(function (control) { //checa si ya se añadio el control de comparacion (swipe), si no lo tiene, lo agrega map.getControls().forEach(function (control) { //checa si ya se añadio el control de comparacion (swipe), si no lo tiene, lo agrega
if (control instanceof ol.control.Swipe) { //si ya tiene el control agregado if (control instanceof ol.control.Swipe) { //si ya tiene el control agregado
swipeControl = true; swipeControl = true;
...@@ -220,6 +227,9 @@ function exitCompare() { ...@@ -220,6 +227,9 @@ function exitCompare() {
document.getElementById("selectLeft").style.display = "none"; document.getElementById("selectLeft").style.display = "none";
document.getElementById("selectRight").style.display = "none"; document.getElementById("selectRight").style.display = "none";
document.getElementById("timeLine").style.display = "block"; document.getElementById("timeLine").style.display = "block";
//activa el boton de la grafica
$('#showGraph').attr('disabled',false);
} }
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</li> </li>
{% else %} {% else %}
<li> <li>
<a class="treeview " href="#" onclick="showGraph()"> <a class="treeview " href="#" onclick="showGraph()" id="showGraph">
<i class="fa fa-eye showChart"></i> <i class="fa fa-eye showChart"></i>
<i class="fa fa-eye-slash hideChart" style="display:none"></i> <i class="fa fa-eye-slash hideChart" style="display:none"></i>
<span class="showChart">Show Chart</span> <span class="showChart">Show Chart</span>
......
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