Gitlab CSE Unil

Commit 30148f04 authored by M. Chardon's avatar M. Chardon
Browse files

env geo et date : correction changement de propriété

parent 51c103c2
......@@ -773,7 +773,6 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export
}
if (_sideCol.has("#side-col-panel-group.w-50").length) {
console.log(_sideCol.has("#side-col-panel-group.w-50"));
_sideCol.toggleClass("default", !isCollapsed);
_sideCol.toggleClass("w-25", isCollapsed);
_canvasCol.toggleClass("w-100", !isCollapsed);
......@@ -1528,6 +1527,9 @@ function($, _, Signal, paper, config, view, io, tools, attributes, Users, export
},
getValue: function(){
var catBut = this.el.find(".btn-cat.active");
if (catBut.length < 1){
catBut = this.el.find(".btn-cat.focus");
}
return catBut.length === 1 ? catBut.data('category') : "";
}
}
......
......@@ -785,13 +785,13 @@ body.home #dlg-about-adim .modal-dialog {
background-color: transparent;
border-color: #494949;
}
#side-col-panel-group label,
#alt-side-col-panel-group label,
.panel-dark label,
.panel-dark label,
#analyse-graph-ctrl label,
.panel.panel-dark label {
color: #CACACA;
}
.panel.panel-dark .badge {
.panel-dark .badge {
background-color: #919191;
}
.panel-group .panel-heading + .panel-collapse .panel-body {
......
......@@ -232,14 +232,14 @@
<div class="row btn-group" style="width: 100%;margin-left: 0;">
{% endifequal %}
<!--div class="col-6 btn-group" style="padding:0;"-->
<label class="btn btn-sm btn-cat"
<button type="button" class="btn btn-sm btn-cat"
data-env="{{ adim_env }}"
data-category="{{ cat.id }}" data-color="{{ cat.color }}" data-color-bg="{{ cat.colorbg }}"
title="{{ cat.title|default:cat.label }}"
style="width:50%;height:100%;">
<input type="radio" name="category" autocomplete="off"/>
{{ cat.label }}
</label>
</button>
<!--/div-->
{% ifequal compteur 1 %}
</div>
......
......@@ -178,13 +178,13 @@
<div class="row btn-group" style="width: 100%;margin-left: 0;">
{% endifequal %}
<!--div class="col-6 btn-group" style="padding:0;"-->
<label class="btn btn-sm btn-cat"
<button type="button" class="btn btn-sm btn-cat"
data-category="{{ cat.id }}" data-color="{{ cat.color }}" data-color-bg="{{ cat.colorbg }}"
title="{{ cat.title|default:cat.label }}"
style="width:50%;height:100%;">
<input type="radio" name="category" autocomplete="off"/>
{{ cat.label }}
</label>
</button>
<!--/div-->
{% ifequal compteur 1 %}
</div>
......
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