From c164a280b54dfdd16d7b497000e5edb1b01f4adf Mon Sep 17 00:00:00 2001
From: anonymous <anonymous>
Date: Fri, 18 Jan 2019 11:04:16 +0100
Subject: [PATCH] fix reset of map search
---
ckanext/odsh/public/odsh.css | 5 +++++
ckanext/odsh/templates/home/index.html | 2 ++
ckanext/odsh/templates/snippets/search_form.html | 3 ++-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ckanext/odsh/public/odsh.css b/ckanext/odsh/public/odsh.css
index 18ed18f8..b8255bff 100644
--- a/ckanext/odsh/public/odsh.css
+++ b/ckanext/odsh/public/odsh.css
@@ -1295,6 +1295,11 @@ display: none;
width: 20px;
}
+.home-page-content{
+ width: 960px;
+ margin-left: auto;
+ margin-right: auto;
+}
.home-groups{
width: 100%;
margin-top: 20px;
diff --git a/ckanext/odsh/templates/home/index.html b/ckanext/odsh/templates/home/index.html
index a2466176..081a7676 100644
--- a/ckanext/odsh/templates/home/index.html
+++ b/ckanext/odsh/templates/home/index.html
@@ -15,6 +15,7 @@
{% snippet "snippets/search_box.html"%}
{% endblock %}
+<div class='home-page-content'>
<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet</p>
{% for group_row in h.odsh_main_groups() | batch(3, '') %}
<div class='home-groups'>
@@ -37,6 +38,7 @@
</div>
</div>
{% endfor %}
+</div>
{% endblock %}
{% block secondary%}
{% endblock %}
\ No newline at end of file
diff --git a/ckanext/odsh/templates/snippets/search_form.html b/ckanext/odsh/templates/snippets/search_form.html
index 40a7ff28..c586eead 100644
--- a/ckanext/odsh/templates/snippets/search_form.html
+++ b/ckanext/odsh/templates/snippets/search_form.html
@@ -97,11 +97,12 @@
{%set ext_bbox=request.params.get('ext_bbox')%}
{%set ext_prev_extent=request.params.get('ext_prev_extent')%}
{%set ext_location=request.params.get('ext_location')%}
- {% if ext_bbox or ext_prev_extent %}
+ {% if ext_bbox %}
<p class="filter-list">
<span class="filtered pill">
{{_('map search active')}}
<a href="{{ h.remove_url_param(['ext_bbox','ext_prev_extent', 'ext_location'])}}" class="remove" title="{{ _('Remove') }}"><i class="fa fa-times"></i></a>
+ <a href="{{ h.remove_url_param(['ext_bbox','ext_prev_extent', 'ext_location']) }}" class="action">{{ _('Clear') }}</a>
</span>
</p>
{% endif %}
--
GitLab