diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.1.po b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.1.po
index e8c65b5ef99149723ae3f8ccb0d15714033684bd..aa5b97f3ba5f2e3045614f6a71261353a1271a00 100644
--- a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.1.po
+++ b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.1.po
@@ -19,9 +19,12 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
+msgid "map search active"
+msgstr "Kartensuche aktiv"
+
#: ckanext/odsh/templates/header.html:10
msgid "Start"
-msgstr "Startseite"
+msgstr "Start"
msgid "Datasets"
msgstr "Daten"
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo
index 8b66a573466c81adb2247471132a04ec56b836ca..c95ab37b7b246ec07bc35948f19a82d5b63f66ac 100644
Binary files a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo and b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo differ
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
index 94d41ba1893490eb3a7cfe07eacc63ed2392a421..10c6577fa1cf294bea25256b7b4903c44173ea5f 100644
--- a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
+++ b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
@@ -275,4 +275,10 @@ msgid "daterange"
msgstr "Zeitbezug"
msgid "share this dataset"
-msgstr "Datensatz teilen"
\ No newline at end of file
+msgstr "Datensatz teilen"
+
+msgid "map search active"
+msgstr "Kartensuche aktiv"
+
+msgid "map"
+msgstr "Karte"
\ No newline at end of file
diff --git a/ckanext/odsh/public/odsh.css b/ckanext/odsh/public/odsh.css
index 9ca7a5b105439a42d479a82e1e4e4cd46456768f..d22ec20aff2ea7e064567e5000d2d4e79f8e4576 100644
--- a/ckanext/odsh/public/odsh.css
+++ b/ckanext/odsh/public/odsh.css
@@ -216,7 +216,6 @@ input[type=radio], input[type=checkbox] {
}
.filter-reset-box a {
- color: black;
font-size: 12px;
}
@@ -411,10 +410,10 @@ a:hover.organization-item ,a:focus.organization-item
.dataset-heading {
margin-right: 30px;
font-weight: normal;
- font-size: 18px;
+ font-size: 20px;
}
.dataset-heading a{
- text-decoration: underline;
+ text-decoration: none;
}
.dataset-empty {
@@ -768,6 +767,8 @@ label:after {
color:white;
border-top:60px solid #f2f2f2;
background: #d4004b;
+ max-width: 1280px;
+ margin: auto;
}
@media (max-width: 767px){
.footer{
@@ -892,7 +893,7 @@ body {
font-size: 12px;
color: black;
max-width: 193px;
- word-break: break-all;
+ word-break: break-word;
}
.info-detail p{
margin: 0;
@@ -1201,9 +1202,10 @@ body {
}
#dataset-map .module-heading{
- padding:0px;
+ padding: 15px 0px 5px 0px;
margin-right:0px;
font-weight: normal;
+ border-top: 2px solid #dddddd;
}
.module.module-narrow.dataset-map{
margin: 5px 0;
@@ -1263,7 +1265,7 @@ display: none;
}
.filter-list .filtered.pill,
.filter-list .filtered.pill .fa{
- background-color: #444444;
+ background-color: #003064;
color:white;
}
.site-title{
diff --git a/ckanext/odsh/public/odsh_header.css b/ckanext/odsh/public/odsh_header.css
index f07bde121cc02320e09ca493e0303145310d4dbe..830cfdb369683ce73a950301fe112cf887ceac0c 100644
--- a/ckanext/odsh/public/odsh_header.css
+++ b/ckanext/odsh/public/odsh_header.css
@@ -7,7 +7,7 @@
}
.navbar-static-top .container.navigation-container{
width: 100%;
- max-width: unset;
+ max-width: 1280px;
}
[class*="span"] {
diff --git a/ckanext/odsh/templates/header.html b/ckanext/odsh/templates/header.html
index 2f25499bc35eace086717fe0968252b9b4f3d748..bfb685680ddb416d8e4ca31725cc77e1a2c2a226 100644
--- a/ckanext/odsh/templates/header.html
+++ b/ckanext/odsh/templates/header.html
@@ -34,7 +34,7 @@
<ul class="nav nav-pills">
{% block header_site_navigation_tabs %}
{{ h.build_nav_main(
- ('home', _('Startseite')),
+ ('home', _('Start')),
('search', _('Daten')),
('organizations_index', _('Herausgeber')),
('info_page', _('Infos'))
diff --git a/ckanext/odsh/templates/home/index.html b/ckanext/odsh/templates/home/index.html
index 1f64a0ca7d99a8ceeef145dd86ebefb185276ad3..a2466176e575e97c4feb9361b9a5f020cabef787 100644
--- a/ckanext/odsh/templates/home/index.html
+++ b/ckanext/odsh/templates/home/index.html
@@ -4,7 +4,7 @@
{% block subtitle %}{{ _("Welcome") }}{% endblock %}
{% block breadcrumb_content %}
- <li class="active">{{ h.nav_link(_('Startseite'), controller='home', action='index') }}</li>
+ <li class="active">{{ h.nav_link(_('Start'), controller='home', action='index') }}</li>
{% endblock %}
diff --git a/ckanext/odsh/templates/package/search.html b/ckanext/odsh/templates/package/search.html
index 66b2e550d5cd7af984304de0eeccd6388468f11c..299ae586b6819ceb27d069cbfb7df9ae5b336a25 100644
--- a/ckanext/odsh/templates/package/search.html
+++ b/ckanext/odsh/templates/package/search.html
@@ -14,15 +14,16 @@
{% block secondary_content %}
-{% snippet "spatial/snippets/spatial_query.html",
-default_extent="{ \"type\": \"Polygon\", \"coordinates\": [[[7.6574,53.1632],[11.8322,53.1632],[11.8322,55.1066],
-[7.6574,55.1066],[7.6574,53.1632]]] }"%}
<div class="filters">
<div class="container-fluid filter-reset">
<div class="filter-reset-label"><span>Filter:</span></div>
- <div class="filter-reset-box"><a href="{{c.remove_field(c.fields_grouped)}}">zurücksetzen</a></button></div>
+ <div class="filter-reset-box"><a href="{{h.url_for(controller='package', action='search')}}">zurücksetzen</a></button></div>
</div>
-
+</div>
+{% snippet "snippets/map.html",
+default_extent="{ \"type\": \"Polygon\", \"coordinates\": [[[7.6574,53.1632],[11.8322,53.1632],[11.8322,55.1066],
+[7.6574,55.1066],[7.6574,53.1632]]] }"%}
+<div class="filters">
<div>
{% for facet in c.facet_titles %}
{{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet) }}
diff --git a/ckanext/odsh/templates/snippets/map.html b/ckanext/odsh/templates/snippets/map.html
new file mode 100644
index 0000000000000000000000000000000000000000..07bf739610e6d1e554b69544a13a2eb846fd1a31
--- /dev/null
+++ b/ckanext/odsh/templates/snippets/map.html
@@ -0,0 +1,15 @@
+
+<section id="dataset-map" class="module-narrow module-shallow">
+ <h2 class="module-heading">
+ {{_('map')}}:
+ </h2>
+ {% set map_config = h.get_common_map_config() %}
+ <div class="dataset-map" data-module="spatial-query" data-default_extent="{{ default_extent }}" data-module-map_config="{{ h.dump_json(map_config) }}">
+ <div id="dataset-map-container"></div>
+ </div>
+ <div id="dataset-map-attribution">
+ {% snippet "spatial/snippets/map_attribution.html", map_config=map_config %}
+ </div>
+</section>
+
+{% resource 'ckanext-spatial/spatial_query' %}
\ No newline at end of file
diff --git a/ckanext/odsh/templates/snippets/package_item.html b/ckanext/odsh/templates/snippets/package_item.html
index fcc2c3ee73179fd8a42f279bd12468b01536ebb8..4266b3f94fddd9481b4d17602fe16b796fd9e2e4 100644
--- a/ckanext/odsh/templates/snippets/package_item.html
+++ b/ckanext/odsh/templates/snippets/package_item.html
@@ -46,7 +46,7 @@ Example:
{% endif %}
{% endblock %}
{% block heading_title %}
- {{ h.link_to(h.truncate(title, truncate_title), h.url_for(controller='package', action='read', id=package.name))
+ {{ h.link_to(h.truncate(title, truncate_title), h.url_for(controller='package', action='read', id=package.name),title=_('View {organization_name}').format(organization_name=package.name))
}}
{% endblock %}
{% block heading_meta %}
diff --git a/ckanext/odsh/templates/snippets/search_form.html b/ckanext/odsh/templates/snippets/search_form.html
index c1d4b041c22d64a90cd9fecf628c2d23f760d042..40a7ff28ab76cdd55765e7e32b3769e9733fe51a 100644
--- a/ckanext/odsh/templates/snippets/search_form.html
+++ b/ckanext/odsh/templates/snippets/search_form.html
@@ -93,6 +93,19 @@
</p>
{% endif %}
</div>
+ <div >
+ {%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 %}
+ <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>
+ </span>
+ </p>
+ {% endif %}
+ </div>
{% endblock %}
</form>