From f8a40a78b050065abcaa3ca2e8a567756796fecc Mon Sep 17 00:00:00 2001
From: anonymous <anonymous>
Date: Fri, 11 Jan 2019 12:09:33 +0100
Subject: [PATCH] ODPSH-189: layout fixes
---
.../i18n/de/LC_MESSAGES/ckanext-odsh.1.po | 5 ++++-
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo | Bin 5108 -> 5186 bytes
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po | 8 +++++++-
ckanext/odsh/public/odsh.css | 14 ++++++++------
ckanext/odsh/public/odsh_header.css | 2 +-
ckanext/odsh/templates/header.html | 2 +-
ckanext/odsh/templates/home/index.html | 2 +-
ckanext/odsh/templates/package/search.html | 11 ++++++-----
ckanext/odsh/templates/snippets/map.html | 15 +++++++++++++++
.../odsh/templates/snippets/package_item.html | 2 +-
.../odsh/templates/snippets/search_form.html | 13 +++++++++++++
11 files changed, 57 insertions(+), 17 deletions(-)
create mode 100644 ckanext/odsh/templates/snippets/map.html
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 e8c65b5e..aa5b97f3 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
GIT binary patch
delta 1472
zcmeyOen_MKo)F7a1_lO(PzDAD83qQ1BTOJ30_U(YFbFX)Fyyi_FmN+4Ff_0-FsL#x
zF!ZoO)Nf*CU|?lnU^vgpz`)MHz;G3+?k+0>13v=;!%J2M24w~YhM%kq3|tHh46<wt
z41x>{3>s_<3<?Yk^$b>Q3=EPC3=GjwiBdL*!ge-@g_GDI7R+OVIAjSM0|Ofa1H*PU
z1_n+B28MlX3=9$s3=Air;t$y%4tW7J=L1y#Z>T&YI|BnB0|NsGJIEvT3=HDz3=Ap^
z3=FpH3=AR+3=B!^3=Fai3=HM$3=F&s3=C7*Ar4#&)wma`?hHG`fe+ak7^E2(7~Zlo
zFlaL{FmQ4}d~V9Yz#zrIz~IWkz`(-5z>vVfz`(=6z>vxTaX=9V1A}fo0|P@N2LppB
z0|Uc)4v0^WaxgG(FfcHj=79M03RJ^wsQ4=m1_p5k28Pd2i?}%<7D#hK3|8QTI6$8h
z5<>Qz5c51aAt4(CRTs<2z)%lzSq>*8$O@qfE1`4~RJ@xL;*iOl5FgLtWME)sU|?9r
z35m;9PzUVcWMB|xU|=}N3GvWXPKZNabAp1Jfq|I|9On$0Tnr3y3=9ljTnzP~M8J^A
z1qtFVE@&J>>Frz)ADrT1U;w4dD_jf=dJGH<*SQ!Nycif5*ti)OEEpIV0=XF&CNMHE
zba6wXOqv&xCNy~&7z`O07@T+^4k+P;$j{=1M8yi;dI)1HFT}-%cp+)w1}_7H7y|>t
zU#PeU9|MCL0|SE=9|MCt$U;7dL4|w}ef4~hpr6VI3CSgV3=9Gc3=C`dAR)Jx4-)i8
z_#hrU59L1sX#}O_w@`&&_#kQEH<ZuF4@s09{E);Y%MS@UPku=D%ixDNsFfcQHB0#+
ziFYGE#9`<8AyM#@9}<#(`573r7#JAX1sE6<85kJqjRYV;A0oiOpvl0%kS74~*$e?l
zTrLxU7_>`(fx(D@f#HGx#6o64h(nbHAqHy-LVRir<y#3t5~YhEB;-5=As#6ZgoIG5
zAUN&RGxQ2Vf@(fg;|3_bOAz9aBM^lQmjoe+?uj5IHNSwW`v|3fLupnaNb2Vof|x5W
z1aYW=5ZFQnGa-mWJ;3ty3=IB43=A5e{3*o1pv%C(&?y8-EZc=3L3vjQ;`84^khGyE
z3<;57VTc8p!jL$v5{5XeR~X{ZX~GN)mJAFGvxFHKoEaDxt_VXySOQeYI3_2j78ffd
zZw_TOWD&_tEMUk@EKn#;O)N^zP)JNJ$t>I4!db>4?wwdvlF9%k^NLH8Gg1{2vq6$S
I1%ERF08|5!F8}}l
delta 1384
zcmX@4@kPD<o)F7a1_lO(U<L*T83qQ1EleOD0{gHsFbFX)F!-`EFmN+4FeI=tFsL#x
zFyyd8)K6k%U|?lnU|7$}z`)MHz_1mnZZ9hX13v=;!%0>K24w~YhMTMm3|tHh41ZY}
z7z7y@7&zD%7!(*7>KUZi7#JiO7#OVCAQGW$5QXV%5DSagAQsfIK^)S;#=yYFz`!t_
zje&uafq`Kj8v}y`0|UbfsQ5uPh(k_5&A9;8e;X?Qkd1+XkAZ>V1sljC^$ZN(*%%m9
z7#J92*%=r_7#J9w*cljP85kJC*%=sk85kH!*&z;WW`}5;3stv<9pb=)><kRj3=9ls
z*%=tL85kH|vO|0>%E7=O#lXOz%E7?E!oa}bz`?-4!@$7c$^kJah=YMax1NE4A(4ZD
zL6m`kp`Qcd)1@2?3>*v$468XHKHUP<up26Vii3ecoPmMiG6%$>*H8<7L)C$T1r+rB
zoRAQb=Y*K2$q5NrBTk3|Y&jVi>On5^;e-TPAXH%_lum+*XLCXvQp^eQaTO=TM{S%8
z48jZy4Bea%56tI;IBY8?C}<fN&T@j|nBg-g1A`m`1A_<`gm26R3DFQPhI(+~%Hx8>
zZ6g=N#Z$N#7(nT89v1_H9s>izLM{ddF9rsN3tS8g77Ppw(%cLT6Brp7LbxGO^pppZ
z20rsJFc>m0F!1m~9AL)_kx$`;1bq>duIGg~xQDkM68DRE85qPE7#NO2CGPPuFsLyw
zFnr-<V2}q{$OkdVnh&DUlMfPv@qCbw%j08U5MW?nDC2{KR68FesQdUJ9-9f}uYt;M
zhtm7%`5<wA6e@6<50VHk@j(*Pb3RDW3G+j;n-M?6LH_)ZsL1DsB-Uzvh{I;`L!w|k
zKO`iN^D{7LF)%P(<Y!<|WME+U!w(61IROR+O$G*rdJ6%F&yoZnaakY$F{nj=fx(D@
zfnk;a#KN-z5Qn}MfEfH)0OHfXP(F(wBu(%MLPAbh5aJOlK}ZPs3qrDYxF95?G6lir
z)H75;7z{0f5Qp?Z70wZ4U|?ooU|1&zNxhq(>UKlvqfq+1AS4&ugc|%(5aO_3P(Gs&
z1A_(w1A~wd1A{K8oDqVgjZ7g>$b~R4^b0|Jx>g9179I#eLV#5m;!<g0NF3@2LmXl+
t3~`u;Fav`n0|SGPFav`#0|P^wFeFG%32)9~wPD%3hqHuZvxm?xMgXQ)d8PmW
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
index 94d41ba1..10c6577f 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 9ca7a5b1..d22ec20a 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 f07bde12..830cfdb3 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 2f25499b..bfb68568 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 1f64a0ca..a2466176 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 66b2e550..299ae586 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 00000000..07bf7396
--- /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 fcc2c3ee..4266b3f9 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 c1d4b041..40a7ff28 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>
--
GitLab