Commit 1387be74 authored by Sergio Adrian Gongora Euan's avatar Sergio Adrian Gongora Euan

merged fixed

parents 6132408b 18c9bddf
......@@ -174,10 +174,14 @@
<li class="cloudTreeview treeview" id="searchCloud">
<a href="#">
<i class="fa fa-cloud"></i>
<img id="image_clouds" class="pull-right" src=""
width=40px" style="margin-top: 0px;margin-right: 10px">
<span>Cloud percentage</span>
<span class="pull-right-container">
<span class="label label-primary pull-right"></span>
</span>
</a>
<ul class="treeview-menu sidebar-form">
<li>
......@@ -341,6 +345,7 @@
//console.log(clouds)
//document.getElementById("clouds").value = clouds;
document.getElementById("clouds").innerHTML = clouds;
change_cloud(clouds);
}
function setCloudPercentageSlider(clouds) {
......@@ -373,7 +378,7 @@
</script>
<script>
$('#id_platform option:first').attr({selected:'selected', disabled:'disabled', hidden:'hidden'});
$('#id_platform option:first').attr({selected: 'selected', disabled: 'disabled', hidden: 'hidden'});
$('#id_platform').change(function () {
let dateTreeview = $('li.dateTreeview a');
dateTreeview.click();
......@@ -396,7 +401,7 @@
{% endblock %}
{% block guide %}
<script>
<script>
$('#initGuide').guides({
guides: [
{
......@@ -451,5 +456,34 @@
$('.main-header').removeClass('activateMainHeader');
}
});
</script>
function change_cloud(data) {
if (data == 0){
console.log('de 20 a 29 ' + data + '.');
document.getElementById('image_clouds').src="";
}
if (data >1 && data <=19){
console.log('de 20 a 29 ' + data + '.');
document.getElementById('image_clouds').src="{% static 'catalog/images/cloud1.png' %}";
}
if (data >20 && data <=39){
console.log('de 20 a 29 ' + data + '.');
document.getElementById('image_clouds').src="{% static 'catalog/images/cloud2.png' %}";
}
if (data >40 && data <=59){
console.log('de 20 a 29 ' + data + '.');
document.getElementById('image_clouds').src="{% static 'catalog/images/cloud3.png' %}";
}
if (data >60 && data <=79){
console.log('de 20 a 29 ' + data + '.');
document.getElementById('image_clouds').src="{% static 'catalog/images/cloud4.png' %}";
}
if (data >80 && data <=100){
console.log('de 20 a 29 ' + data + '.');
document.getElementById('image_clouds').src="{% static 'catalog/images/cloud5.png' %}";
}
}
</script>
{% endblock %}
\ No newline at end of file
......@@ -99,23 +99,23 @@
<i class="fa fa-pie-chart margin-r-5"></i> <b>Disk usage</b> <a
class="pull-right">{{ data.size }}</a>
</li>
<li class="list-group-item">
<div class="row ccontent ">
<div class="col-md-10 col-xs-10 col-lg-10 col-sm-10 col-xl-10">
<li class="list-group-item">
<i class="fa fa-search-plus margin-r-5"></i>
<b>Advanced Search</b>
</div>
<div class="col-md-2 col-xs-2 col-lg-2 col-sm-2 col-xl-2 pull-right">
<a class="pull-right">
<label class="switch">
<input class="pull-right" id="{{ data.user_id }}" type="checkbox"
onclick="change_permission({{ data.user_id }})"
{% if data.advanced_search == True %} checked {% endif %}>
<span class="slider round pull-right" style="margin-right: 0px"></span>
</label>
</div>
</div>
</a>
</li>
</ul>
<!--a href="#" class="btn btn-primary btn-block"><b>Follow</b></a-->
......
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