Skip to content

Commit

Permalink
- Using YARN instead of BOWER (deprecated) and update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
afabiani committed Sep 1, 2019
1 parent e658257 commit 1bcf487
Show file tree
Hide file tree
Showing 156 changed files with 51,755 additions and 30,122 deletions.
14 changes: 0 additions & 14 deletions geonode/base/templatetags/base_tags.py
View file
Expand Up @@ -80,18 +80,13 @@ def facets(context):
pass

if facet_type == 'documents':

documents = Document.objects.filter(title__icontains=title_filter)

if category_filter:
documents = documents.filter(category__identifier__in=category_filter)

if regions_filter:
documents = documents.filter(regions__name__in=regions_filter)

if owner_filter:
documents = documents.filter(owner__username__in=owner_filter)

if date_gte_filter:
documents = documents.filter(date__gte=date_gte_filter)
if date_lte_filter:
Expand Down Expand Up @@ -126,20 +121,14 @@ def facets(context):
facets = dict([(count['doc_type'], count['count']) for count in counts])

return facets

else:

layers = Layer.objects.filter(title__icontains=title_filter)

if category_filter:
layers = layers.filter(category__identifier__in=category_filter)

if regions_filter:
layers = layers.filter(regions__name__in=regions_filter)

if owner_filter:
layers = layers.filter(owner__username__in=owner_filter)

if date_gte_filter:
layers = layers.filter(date__gte=date_gte_filter)
if date_lte_filter:
Expand Down Expand Up @@ -214,15 +203,12 @@ def facets(context):
if category_filter:
maps = maps.filter(category__identifier__in=category_filter)
documents = documents.filter(category__identifier__in=category_filter)

if regions_filter:
maps = maps.filter(regions__name__in=regions_filter)
documents = documents.filter(regions__name__in=regions_filter)

if owner_filter:
maps = maps.filter(owner__username__in=owner_filter)
documents = documents.filter(owner__username__in=owner_filter)

if date_gte_filter:
maps = maps.filter(date__gte=date_gte_filter)
documents = documents.filter(date__gte=date_gte_filter)
Expand Down
2 changes: 1 addition & 1 deletion geonode/catalogue/templates/geonode_metadata_full.html
View file
Expand Up @@ -13,7 +13,7 @@
<link href="{% static "lib/css/select2.css" %}" rel="stylesheet"/>
<link href="{% static "lib/css/bootstrap.min.css" %}" rel="stylesheet"/>
<link href="{% static "lib/css/jquery-ui.css" %}" rel="stylesheet"/>
<link href="{% static "lib/css/bootstrap-datetimepicker.css" %}" rel="stylesheet"/>
<link href="{% static "lib/css/bootstrap-datetimepicker.min.css" %}" rel="stylesheet" />
{% else %}
<link href="{% static "lib/css/assets.min.css" %}" rel="stylesheet"/>
{% endif %}
Expand Down
149 changes: 76 additions & 73 deletions geonode/layers/templates/layers/layer_detail.html
View file
Expand Up @@ -302,94 +302,100 @@ <h4 class="modal-title" id="myModalLabel">{% trans "Download Layer" %}</h4>
<div class="tab-pane" id="download_tab2">
{% endif %}
</br>

<!-- DOWNLOAD FILTER - START -->

{% if layer_type == "vector" %}
<button type="button" id = "button-toggle" class="btn btn-primary btn-circle" data-toggle="button" data-toggle="tooltip" title="{% trans "Click to filter the layer" %}">
{% trans "Do you want to filter it?" %}
</button>
<img src="{% static 'lib/css/geonode_icon.png' %}" class="gear pull-right loading_msg" witdth="30" height="30" style="margin-right:10px; display:none"/>
<img src="{% static 'lib/img/geonode_icon.png' %}" class="gear pull-right loading_msg" witdth="30" height="30" style="margin-right:10px; display:none"/>
<div class="pull-right loading_msg" style="margin-right:10px;margin-top:5px;display:none">{% trans "Loading..." %}</div>
</br></br>
{% endif %}
<ul class="nav nav-tabs" id="tabContent" style="display: none;">
<ul class="nav nav-tabs" id="tabContent" style="display: none;">
<li class="active"><a href="#query_builder" data-toggle="tab">{% trans "Filter by attributes" %}</a></li>
</ul>
</ul>
</br>

<div class="tab-content query_builder_tab" style="display:none;"> <!-- added now-->
<div class="tab-content query_builder_tab" style="display:none;">
<div id="query_builder" class="tab-pane fade in active">
<div class="form-inline">
<div class="form-inline">
{% trans "Match" %}
<div class="input-group" style=" display: inline-table; vertical-align: middle; width: auto; ">
<div class="input-group-btn" id="drop_operator_list">
<div class="btn-group btn-group-xs">
<div class="dropdown">
<button class="btn btn-primary btn-xs dropdown-toggle" id="modal-button-and-or" type="button" data-toggle="dropdown" data-target="#" value="AND">
<span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-and-or" id="and-or_list" data-modal-button-id="and-or">
<li><a href="#" id="AND">{% trans "all" %}</a></li>
<li><a href="#" id="OR">{% trans "any" %}</a></li>
</ul>
<div class="input-group" style=" display: inline-table; vertical-align: middle; width: auto; ">
<div class="input-group-btn" id="drop_operator_list">
<div class="btn-group btn-group-xs">
<div class="dropdown">
<button class="btn btn-primary btn-xs dropdown-toggle" id="modal-button-and-or" type="button" data-toggle="dropdown" value="AND">
<span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-and-or" id="and-or_list" data-modal-button-id="and-or">
<li><a href="#" id="AND">{% trans "all" %}</a></li>
<li><a href="#" id="OR">{% trans "any" %}</a></li>
</ul>
</div>
</div>
</div>
</div>
</div>
{% trans "of the following:" %}
</div>
</br></br>
<div class="input-group" id = "query-filter-tools">
<div class="input-group-btn">
<div class="btn-group btn-group-sm">
<div class="dropdown">
<button class="btn btn-primary dropdown-toggle" id="modal-button-attributes" type="button" data-toggle="dropdown" data-target="#">{% trans "Attribute" %}
</div>
</br></br>
<div class="input-group" id = "query-filter-tools">
<div class="input-group-btn">
<div class="btn-group btn-group-sm">
<div class="dropdown">
<button class="btn btn-primary dropdown-toggle" id="modal-button-attributes" type="button" data-toggle="dropdown">{% trans "Attribute" %}
<span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-attribute" id="attribute_list" data-modal-button-id="attribute">
{% if schema %}
{% for key, values in schema.properties.items %}
<li><a href="#" id= {{ key }} data-type= {{ values }} data-schema= 'yes'>{{ key }}</a></li>
{% endfor %}
{% else %}
{% for attribute in resource.attributes %}
<li><a href="#" id= {{ attribute }} data-type= 'string' data-schema= 'no'> {{ attribute }} </a></li>
{% endfor %}
{% endif %}
<ul class="dropdown-menu dropdown-menu-attribute" id="attribute_list" data-modal-button-id="attribute">
{% if schema %}
{% for key, values in schema.properties.items %}
<li><a href="#" id= {{ key }} data-type= {{ values }} data-schema= 'yes'>{{ key }}</a></li>
{% endfor %}
{% else %}
{% for attribute in resource.attributes %}
<li><a href="#" id= {{ attribute }} data-type= 'string' data-schema= 'no'> {{ attribute }} </a></li>
{% endfor %}
{% endif %}
</ul>
</div>
</div>
<div class="btn-group btn-group-sm">
<div class="dropdown">
<button class="btn btn-primary dropdown-toggle" id="modal-button-operator" type="button" data-toggle="dropdown">{% trans "Operator" %}
<span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-operator" id="operator_list" data-modal-button-id="operator">
<li><a href="#" id="=">=</a></li>
<li><a href="#" id="&lt;&gt;">&lt;&gt;</a></li>
<li><a href="#" id="&gt;">&gt;</a></li>
<li><a href="#" id="&lt;">&lt;</a></li>
<li><a href="#" id="&gt;=">&gt;=</a></li>
<li><a href="#" id="&lt;=">&lt;=</a></li>
<li role="separator" class="divider"></li>
<li><a href="#" id=" LIKE ">LIKE</a></li>
</ul>
</div>
</div>
</div>
<div class="btn-group btn-group-sm">
<div class="dropdown">
<button class="btn btn-primary dropdown-toggle" id="modal-button-operator" type="button" data-toggle="dropdown" data-target="#">{% trans "Operator" %}
<span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-operator" id="operator_list" data-modal-button-id="operator">
<li><a href="#" id="=">=</a></li>
<li><a href="#" id="&lt;&gt;">&lt;&gt;</a></li>
<li><a href="#" id="&gt;">&gt;</a></li>
<li><a href="#" id="&lt;">&lt;</a></li>
<li><a href="#" id="&gt;=">&gt;=</a></li>
<li><a href="#" id="&lt;=">&lt;=</a></li>
<li role="separator" class="divider"></li>
<li><a href="#" id=" LIKE ">LIKE</a></li>
</ul>
</div>
<input type="text" class="form-control js-data-array" style="position:static;" id="single_value" placeholder="" data-toggle="tooltip" title="">
<div class="input-group-btn" id="button_query">
<a href="#" id="query_part" class="btn btn-primary btn-mg" data-toggle="modal" data-target="#myModal" title=""><span class="glyphicon glyphicon-plus"></span></a>
</div>
</div>
<input type="text" class="form-control js-data-array" style="position:static;" id="single_value" placeholder="" data-toggle="tooltip" title="">
<div class="input-group-btn" id="button_query">
<a href="#" id="query_part" class="btn btn-primary btn-mg" data-toggle="modal" data-target="#myModal" title=""><span class="glyphicon glyphicon-plus"></span></a>
</div>
</div>
</br>
<div class="text_area">
<div class="form-group" id="added_rules"></div>
<div>
<p id="whole_query"> </p>
</br>
<div class="text_area">
<div class="form-group" id="added_rules"></div>
<div>
<p id="whole_query"> </p>
</div>
</div>
<label style="font-weight: normal;">{% trans "Feature limit" %}: </label>
<input type="text" id="max_features" name="filter" style="width: 50px"/>
<a href='#' id="clear_filter" style="float:right;">{% trans "Clear" %}</a> </br>
</div>
<label style="font-weight: normal;">{% trans "Feature limit" %}: </label>
<input type="text" id="max_features" name="filter" style="width: 50px"/>
<a href='#' id="clear_filter" style="float:right;">{% trans "Clear" %}</a> </br>
</div>
<hr id="hr_filter_layer" />
</div>

<!-- DOWNLOAD FILTER - END -->

<li>
<h4>{% trans "Pick your download format:" %}</h4>
<ul>
Expand Down Expand Up @@ -451,7 +457,7 @@ <h4>{% trans "Metadata" %}</h4>
<div class="col-sm-3">
<i class="fa fa-tint fa-3x"></i>
<h4>{% trans "Styles" %}</h4>
{% if preview == 'geoext' or preview == 'react' or preview == 'leaflet' %}
{% if preview == 'geoext' or preview == 'react' or preview == 'leaflet' %}
<a class="btn btn-default btn-block btn-xs style-edit" data-dismiss="modal" href="#">{% trans "Edit" %}</a>
{% else %}
<a class="btn btn-default btn-block btn-xs style-edit" href="{% url "layer_sld_edit" resource.service_typename %}">{% trans "Edit" %}</a>
Expand Down Expand Up @@ -739,17 +745,14 @@ <h1>{% trans "Processing..." %}</h1>
{% include 'rating.html' %}
{% include 'request_download.html' %}
{% if DISPLAY_SOCIAL %}
<script type="text/javascript">
{% autoescape off %}
(function() {
var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
po.src = 'https://apis.google.com/js/plusone.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
})();
{% endautoescape %}
</script>
{% endif %}
<script type="text/javascript">
$("#comment_submit_btn").click(function(event) {
$.ajax({
type: "POST",
Expand Down Expand Up @@ -780,10 +783,10 @@ <h1>{% trans "Processing..." %}</h1>
}).appendTo('#legend_placeholder');
});
{% endif %}
</script>
</script>

{% block thumbnail_script %}
<script type="text/javascript">
<script type="text/javascript">
{% if preview == 'react' %}
$('#set_thumbnail').click(function(){
window.setThumbnail({{resource.id}})
Expand All @@ -795,10 +798,11 @@ <h1>{% trans "Processing..." %}</h1>
$('#edit-layer').modal('toggle');
});
{% endif %}
</script>
</script>
{% endblock thumbnail_script %}

<script type="text/javascript">
<script type="text/javascript">

// set default values for the logical operator list
$("#modal-button-and-or:first-child").text($("#AND").text());
$("#and-or_list li:not(.divider)").addClass('selected');
Expand Down Expand Up @@ -1005,18 +1009,17 @@ <h1>{% trans "Processing..." %}</h1>
{% if show_popup %}
$('#download-layer').modal('toggle');
{% endif %}
</script>

</script>

{% if GEONODE_SECURITY_ENABLED %}
{% include "_permissions_form_js.html" %}
<script type="text/javascript">
$(function() {
if (sessionStorage.getItem("security_refresh_trigger")) {
sessionStorage.clear();
$("#security_refresh").trigger('click');
}
});
</script>
{% endif %}

{% if FAVORITE_ENABLED %}
Expand Down
2 changes: 1 addition & 1 deletion geonode/maps/templates/maps/map_detail.html
View file
Expand Up @@ -349,7 +349,7 @@ <h4 class="modal-title" id="myModalLabel">{% trans "Embed Widget" %}</h4>
$('#embed-widget-body').text(formatted_data);
});
});
var clipboard = new Clipboard('.btn');
var clipboard = new ClipboardJS('.btn');
clipboard.on('success', function(e) {
alert("Code copied");
});
Expand Down

0 comments on commit 1bcf487

Please sign in to comment.