Skip to content

Commit

Permalink
Merge pull request #11 from datopian/mapdata-fix-ckan-2.10.1
Browse files Browse the repository at this point in the history 
Mapdata fix ckan 2.10.1
  • Loading branch information
@Mikanebu
Mikanebu committed Apr 2, 2024
2 parents cbc3607 + b2d6642 commit d094136
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 51 deletions.
66 changes: 54 additions & 12 deletions ckanext/rvr/assets/css/rvr.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,19 +130,22 @@ div#content.container div.row.wrapper{
box-shadow:none;
}
.account-masthead{
background-color: #00847d;
background-color: #00615B;
}
/*####################################### Header Bereich Start ###################################################*/
.navbar.navbar-static-top.masthead a {
color: #00847d!important;
color: #00615B;
font-size: 17px;
}


.navbar.navbar-static-top.masthead a:hover {
color: white;
font-size: 17px;
}

.masthead .navigation .nav-pills li a:hover,
.masthead .navigation .nav-pills li.active a{
background-color: #00847d;
background-color: #00615B;
color: white !important;
}

Expand Down Expand Up @@ -170,7 +173,7 @@ box-shadow:none;
}

.navbar-toggle , .navbar-toggle.collapsed{
color: #00847d;
color: #00615B;
}

@media (max-width:1201px) and (min-width:1200px){
Expand Down Expand Up @@ -264,11 +267,16 @@ div.field input#field-sitewide-search.form-control{

font-size: 1rem;
line-height: 1.6;
color: #00847d!important;
color: #00615B!important;
}

.social-icons{
padding-top: 2px;
padding-left: 2px;
}

.social-icons a {
font-size: 24px;
}

div.social-media.navbar-left.visible-md-inline-block.visible-lg-inline-block a i{
Expand Down Expand Up @@ -483,7 +491,7 @@ ul, ol {
text-decoration: none;
}
.link {
color: #00847d;
color: #00615B;
position: relative;
font-family: "Montserrat-Regular,Verdana,Arial,sans-serif";
}
Expand All @@ -496,6 +504,7 @@ ul, ol {
}
.a {
background-color: transparent;

}

h4 {
Expand All @@ -512,7 +521,7 @@ h4 {

/* #################################################### Main Content ############################################## */
body{
background: #00847d url("../../../base/images/bg.png");
background: #00615B url("../../../base/images/bg.png");
max-width: 100%;
}
div.hero{
Expand Down Expand Up @@ -631,6 +640,11 @@ div.module-content.box.box1::before{
width: 0; height: 0; border-top: 60px solid black; border-left: 60px solid transparent;
}

.module-content.box.box1 a {
color: #1C5E73;
text-decoration: none;
}

.module-content.box.box2{
/* margin-right:0;
margin-left: 5%;*/
Expand All @@ -640,6 +654,11 @@ div.module-content.box.box1::before{
position: relative;
}

.module-content.box.box2 a {
color: #00615B;
text-decoration: none;
}


div.module-content.box.box2::before{
content: "";
Expand All @@ -656,12 +675,17 @@ div.module-content.box.box2::before{
border:none;
}

form.module-content.search-form h3.heading{
form.module-content.search-form h2.heading{
color:white;
}

form.module-content.search-form a {
color: #FAFAFA;
text-decoration: none;
}

form.module-content{
background-color: #00847d;
background-color: #00615B;
position: relative;
}

Expand Down Expand Up @@ -705,6 +729,12 @@ div.module-content.box.dataset::before{
position: relative;
}

.module-content.box.statistic a {
color: #1C5F73;
text-decoration: none;
}



div.module-content.box.statistic::before{
content: "";
Expand Down Expand Up @@ -799,7 +829,7 @@ div#dataset-map-attribution div a{


[data-module="facet-search"] ul li.search {
border-left: 1px solid #00847d;
border-left: 1px solid #00615B;
background-color: #c8e9e842;
}

Expand Down Expand Up @@ -924,6 +954,17 @@ div#dataset-map-container.map-draw-field {
border-color: #4a4747;
}


.badge[data-format*=csv] {
background-color: #6B5600;
}

.badge[data-format=geojson] {
background-color: #7526CA !important;
}



.dataset-map-expanded #dataset-map {
position: absolute;
width: 940px;
Expand Down Expand Up @@ -966,4 +1007,5 @@ div#dataset-map-container.map-draw-field {
}
.dataset-map-expanded .wrapper {
margin-top: 383px;
}
}

32 changes: 16 additions & 16 deletions ckanext/rvr/templates/footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<div id="c85290" class="frame frame-default frame-type-textpic frame-layout-0">
<div class="media-element media-element--right ce-intext ce-nowrap"></div>
<div class="ce-bodytext">
<header>
<h4 class="">
<div>
<h2 class="">
INFOS
</h4>
</header>
</h2>
</div>
<p>
<a href="/pages/nutzungsbedingungen" title="Nutzungsbedingungen"
class="link">Nutzungsbedingungen</a>&nbsp;<br>
Expand All @@ -29,11 +29,11 @@ <h4 class="">
<div id="c85291" class="frame frame-default frame-type-textpic frame-layout-0">
<div class="media-element media-element--right ce-intext ce-nowrap"></div>
<div class="ce-bodytext">
<header>
<h4 class="">
<div>
<h2 class="">
weiterführende Links
</h4>
</header>
</h2>
</div>
<p>
<a href="https://okfn.org/" title="Open Knowledge Foundation" target="_blank" class="link">Open
Knowledge Foundation</a><br>
Expand All @@ -50,18 +50,18 @@ <h4 class="">

<div class="col-md-4">
<div id="c85293" class="frame frame-default frame-type-header frame-layout-0">
<header>
<h4 class="">
<div>
<h2 class="">
SOZIALE MEDIEN
</h4>
</header>
</h2>
</div>
</div>

<div class="social-media">
<a href="https://www.facebook.com/RVR.Ruhr" target="_blank"><i class="fa-brands fa-facebook"></i></a>
<a href="https://twitter.com/rvr_ruhr" target="_blank"><i class="fa-brands fa-twitter"></i></a>
<a href="https://www.instagram.com/rvr.ruhr/" target="_blank"><i class="fa-brands fa-instagram"></i></a>
<a href="https://www.youtube.com/channel/UCCJDPVQdYd_TRVqT_sutt7g" target="_blank"><i class="fa-brands fa-youtube"></i></a>
<a href="https://www.facebook.com/RVR.Ruhr" aria-label="Facebook" target="_blank"><i class="fa-brands fa-facebook"></i></a>
<a href="https://twitter.com/rvr_ruhr" aria-label="Twitter" target="_blank"><i class="fa-brands fa-twitter"></i></a>
<a href="https://www.instagram.com/rvr.ruhr/" aria-label="Instagram" target="_blank"><i class="fa-brands fa-instagram"></i></a>
<a href="https://www.youtube.com/channel/UCCJDPVQdYd_TRVqT_sutt7g" aria-label="Youtube" target="_blank"><i class="fa-brands fa-youtube"></i></a>
</div>
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions ckanext/rvr/templates/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,13 @@ <h2>{{ g.site_description }}</h2>
<form class="d-flex site-search" action="{% url_for dataset_type ~ '.search' %}" method="get">
<label class="d-none" for="field-sitewide-search">{% block header_site_search_label %}{{ h.humanize_entity_type('package', dataset_type, 'search_placeholder') or _('Search Datasets...') }}{% endblock %}</label>
<input id="field-sitewide-search" class="form-control me-2" type="text" name="q" placeholder="{{ _('Search') }}" aria-label="{{ h.humanize_entity_type('package', dataset_type, 'search_placeholder') or _('Search datasets...') }}"/>
<button class="btn" type="submit" aria-label="{{ _('Submit') }}"><i class="fa fa-search"></i></button>
<button class="btn" type="submit" aria-label="{{ _('Submit') }}"><i class="fa fa-search" aria-hidden="true"></i></button>
</form>
<div class="social-icons">
<a href="https://www.facebook.com/RVR.Ruhr" target="blank"><i class="fa-brands fa-facebook"></i></a>
<a href="https://twitter.com/metropole_ruhr" target="blank"><i class="fa-brands fa-twitter"></i></a>
<a href="https://www.instagram.com/rvr.ruhr/" target="blank"><i class="fa-brands fa-instagram"></i></a>
<a href="https://www.youtube.com/channel/UCCJDPVQdYd_TRVqT_sutt7g" target="blank"><i class="fa-brands fa-youtube"></i></a>
<a href="https://www.facebook.com/RVR.Ruhr" aria-label="Facebook" target="blank"><i class="fa-brands fa-facebook"></i></a>
<a href="https://twitter.com/metropole_ruhr" aria-label="Twitter"target="blank"><i class="fa-brands fa-twitter"></i></a>
<a href="https://www.instagram.com/rvr.ruhr/" aria-label="Instagram" target="blank"><i class="fa-brands fa-instagram"></i></a>
<a href="https://www.youtube.com/channel/UCCJDPVQdYd_TRVqT_sutt7g" aria-label="Youtube" target="blank"><i class="fa-brands fa-youtube"></i></a>
</div>
{% endblock %}
</div>
Expand Down
28 changes: 14 additions & 14 deletions ckanext/rvr/templates/home/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ <h3 class="heading">Suche</h3>
autocomplete="off" placeholder="Bürgermeisterwahl">
<button type="submit">
<i class="fa fa-search"></i>
<span class="sr-only">Search</span>
<span class="button-text">Search</span>
</button>
</div>
</form>
Expand All @@ -51,15 +51,15 @@ <h3 class="heading">Suche</h3>
<div id="minimized" class="searchbox-desktop" style="padding-bottom:30px;display:block;">
<div class="module module-search module-narrow module-shallow box">
<form class="module-content search-form">
<h3 class="heading">Kartensuche</h3>
<h2 class="heading">Kartensuche</h2>
<button type="button" onclick="maximizeMap()">
<img src="/small.png" alt="Ruhr Metropole" width="100%">Klicken Sie hier, um die Kartensuche zu maximieren</img>
</button>
</div>
</form>
</div>
<div class="module-content box box1">
<header>
<div>
<h1 class="page-heading">NEWS</h1>
{% block newest_news %}
{% set posts = h.get_recent_blog_posts(number=1)%}
Expand All @@ -76,13 +76,13 @@ <h3 class="dataset-heading">
{{post.content|safe}}
{% endfor %}
{% endblock %}
</header>
</div>
<a href="/blog">MEHR NEWS ANZEIGEN</a>
</div>
<div class="module-content box box2">
<div class="textbox">
<div class="textbox content">
<header>
<div>
{% if intro %}
{{ h.render_markdown(intro) }}
{% else %}
Expand All @@ -93,15 +93,15 @@ <h1 class="page-heading">{{ _("Welcome to CKAN") }}</h1>
{% endtrans %}
</p>
{% endif %}
</header>
</div>
</div>
</div>
<a href="/pages/uber-uns">ÜBER UNS</a>
</div>
<div class="module-content box box2">
<div class="textbox">
<div class="textbox content">
<header>
<div>
{% block verkehrsdaten_page %}
{% set posts = h.get_specific_page(name="verkehrsdaten")%}
{% for post in posts %}
Expand All @@ -110,21 +110,21 @@ <h1 class="page-heading">{{ post.title or post.name }}</h1>
{{post.content|safe}}
{% endfor %}
{% endblock %}
</header>
</div>
</div>
</div>
</div>
<div class="module-content box box2">
<div class="textbox">

<div class="textbox content">
<header>
<div>
<h1 class="page-heading">Vereinbarung der Metropole Ruhr</h1>
<p>
In interkommunalen Arbeitsgruppen wurde eine Vereinbarung erarbeitet, die u.a. Fragen zu rechtlichen
und technischen Rahmenbedingungen klärt.
</p>
</header>
</div>
</div>
</div>
<a target="_blank" href="/files/OpenData MR_Leitfaden.pdf">Leitfaden Open Data Metropole Ruhr</a>
Expand All @@ -134,13 +134,13 @@ <h1 class="page-heading">Vereinbarung der Metropole Ruhr</h1>
<div class="searchbox-desktop">
<div class="module module-search module-narrow module-shallow box">
<form class="module-content search-form" method="get" action="/dataset">
<h3 class="heading">Suche</h3>
<h2 class="heading">Suche</h2>
<div class="search-input form-group search-giant">
<input aria-label="Search datasets" id="field-main-search" type="text" class="form-control" name="q"
autocomplete="off" placeholder="Bürgermeisterwahl">
<button type="submit">
<i class="fa fa-search"></i>
<span class="sr-only">Search</span>
<span class="button-text">Search</span>
</button>
</div>
<a href="/verkehrsdaten">
Expand All @@ -151,7 +151,7 @@ <h3 class="heading">Zu den Verkehrsdaten Metropole Ruhr</h3>
</div>

<div class="module-content box dataset">
<header>
<div>

<h1 class="page-heading">NEUESTE DATENSÄTZE</h1>
<ul>
Expand All @@ -162,7 +162,7 @@ <h1 class="page-heading">NEUESTE DATENSÄTZE</h1>

</ul>

</header>
</div>

</div>

Expand Down
4 changes: 0 additions & 4 deletions ckanext/rvr/templates/page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

{%- block page -%}

{% block skip %}
<div class="sr-only sr-only-focusable"><a href="#content">{{ _('Skip to content') }}</a></div>
{% endblock %}

{#
Override the header on a page by page basis by extending this block. If
making sitewide header changes it is preferable to override the header.html
Expand Down

0 comments on commit d094136

Please sign in to comment.