Skip to content
Snippets Groups Projects
Commit d06c5a1c authored by chbaeh's avatar chbaeh
Browse files

ODPSH-95: layout changes for search results

parent d31c6767
Branches
Tags
No related merge requests found
No preview for this file type
......@@ -19,6 +19,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
msgid "Search dataset"
msgstr "Nach Datensatz suchen"
msgid "Edit Categories"
msgstr "Kategorien bearbeiten"
......@@ -205,3 +208,12 @@ msgid "{number} dataset found for \"{query}\""
msgid_plural "{number} datasets found for \"{query}\""
msgstr[0] "{number} Ergebnis für \"{query}\""
msgstr[1] "{number} Ergebnisse für \"{query}\""
msgid "Logged Out"
msgstr "Logout"
msgid "Filter by location"
msgstr "mit Karte suchen"
msgid "Clear"
msgstr "zurücksetzen"
......@@ -101,7 +101,10 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
def dataset_facets(self, facets_dict, package_type):
# TODO: Frage von Pascal 12.10.2018: warum ist die Ordnung hier genau umgekehrt (von hinten nach vorne?)
return OrderedDict({'res_format': _('Dateiformat'),
# Christian: ist sie wohl nicht, ckan sortiert das einfach irgendwie neu
return OrderedDict({'organization': _('Herausgeber'),
'res_format': _('Dateiformat'),
'license_title': _('Lizenz'),
'groups': _('Kategorie')})
def organization_facets(self, facets_dict, organization_type, package_type):
......
......@@ -16,6 +16,11 @@ body {
font-style: normal;
line-height: 1.2;
font-size: 16px;
background:none;
background-color: #d4004b;
}
html,body {
height: 100%;
}
/* FROM: https://stackoverflow.com/questions/2610497/change-an-html5-inputs-placeholder-color-with-css */
......@@ -78,7 +83,7 @@ h1{
margin: 0;
border: 1px;
background-color: #f2f2f2;
color: black;
color: #003064;
}
.search-form h2, .odsh-dataset-heading h2 {
......@@ -129,8 +134,8 @@ input[type=radio], input[type=checkbox] {
}
.secondary.span3 {
width: 210px;
max-width: 210px;
width: 193px;
max-width: 1970px;
padding: 20px 16px 0px;
}
......@@ -143,7 +148,7 @@ input[type=radio], input[type=checkbox] {
}
.primary.span9 {
width: 780px;
width: 725px;
}
.wrapper {
......@@ -327,11 +332,13 @@ a:hover.organization-item ,a:focus.organization-item
.dataset-content {
float:left;
width: 70%;
width: 470px;
}
.dataset-heading {
margin-right: 30px;
font-weight: normal;
font-size: 18px;
}
.dataset-empty {
......@@ -341,7 +348,8 @@ a:hover.organization-item ,a:focus.organization-item
.dataset-meta {
float:right;
width: 30%;
width: 225px;
/* width: 30%; */
}
ul.dataset-resources {
......@@ -632,19 +640,20 @@ label:after {
.footer{
background: white;
height: 570px;
color:white;
border-top:60px solid #f2f2f2;
background: #d4004b;
}
.footer .container{
background: #d4004b;
width: 1000px;
padding-bottom: 15px;
}
.footer-content{
width: 780px;
padding-top: 445px;
margin-left: auto;
margin-right: auto;
width: 965px;
padding-top: 160px;
font-size: 16px;
font-weight: 500;
display: block;
}
.footer-right{
float: right;
......@@ -664,9 +673,9 @@ label:after {
}
.footer-line{
border-top: 1px dotted #d4004b;
border-top: 1px dashed white;
margin-bottom: 10px;
margin-top: 20px;
margin-top: 10px;
}
.toolbar .breadcrumb li:after {
......@@ -787,3 +796,167 @@ label:after {
padding-right: 0px;
padding-left: 0px;
}
.search-box-container{
width:100%;
margin-bottom: 60px;
}
#field-sitewide-search {
font-size: 87%;
font-weight: 300;
padding: 0px;
padding-left: 5px;
width: 465px;
line-height: 1.1;
border: 1px solid #003064!important;
color:#003064;
background: rgb(246,247,249);
box-shadow: none !important;
height: 40px;
border-radius: 0px;
margin-left: 245px;
}
/* FROM: https://stackoverflow.com/questions/2610497/change-an-html5-inputs-placeholder-color-with-css */
/* do not group these rules */
#field-sitewide-search::-webkit-input-placeholder {
color: #003064!important;
}
#field-sitewide-search::-moz-placeholder {
/* FF 4-18 */
color: #003064!important;
opacity: 1 !important;
}
#field-sitewide-search::-moz-placeholder {
/* FF 19+ */
color: #003064!important;
opacity: 1 !important;
}
#field-sitewide-search::-ms-input-placeholder {
/* IE 10+ */
color: #003064!important;
}
#field-sitewide-search::-ms-input-placeholder {
/* Microsoft Edge */
color: #003064!important;
}
#field-sitewide-search::placeholder {
/* modern browser */
color: #003064!important;
}
#field-sitewide-search:focus {
outline: 1px solid rgba(82,168,236,0.8);
border-color: rgba(82,168,236,0.8);
}
.simple-input .field .btn-search {
height: 32px;
width: 32px;
background: url(/base/images/search_submit.png);
right: 287px;
top: 36%;
}
.column1{
width: 225px;
}
[role=main],
.main {
padding-bottom: 0px;
}
.wrapper {
margin-bottom: 0px;
}
.pagination{
margin-top:65px;
margin-bottom:50px;
}
.pagination ul {
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
border: none;
}
.pagination ul > li > a,
.pagination ul > li > span {
background-color: rgb(226,227,236);
border: 15px solid white;
border-left-width: 0;
font-weight: 900;
color:black;
}
.pagination ul > li > a:hover,
.pagination ul > li > a:focus,
.pagination ul > .active > a,
.pagination ul > .active > span {
background-color: #003064;
color: white;
}
.pagination ul > .active > a,
.pagination ul > .active > span {
color: white;
cursor: default;
}
.pagination ul > .disabled > span,
.pagination ul > .disabled > a,
.pagination ul > .disabled > a:hover,
.pagination ul > .disabled > a:focus {
color: #999999;
background-color: transparent;
cursor: default;
}
.pagination ul > li:first-child > a,
.pagination ul > li:first-child > span
.pagination ul > li:first-child > a:hover,
.pagination ul > li:first-child > span:hover {
border-left-width: 0px;
-webkit-border-top-left-radius: 0px;
-moz-border-radius-topleft: 0px;
border-top-left-radius: 0px;
-webkit-border-bottom-left-radius: 0px;
-moz-border-radius-bottomleft: 0px;
border-bottom-left-radius: 0px;
background-color: transparent;
color:black;
}
.pagination ul > li:last-child > a,
.pagination ul > li:last-child > span,
.pagination ul > li:last-child > a:hover,
.pagination ul > li:last-child > span:hover {
-webkit-border-top-right-radius: 0px;
-moz-border-radius-topright: 0px;
border-top-right-radius: 0px;
-webkit-border-bottom-right-radius: 0px;
-moz-border-radius-bottomright: 0px;
border-bottom-right-radius: 0px;
background-color: transparent;
color:black;
}
.module .pagination li a {
border-top: none;
border-bottom: none;
}
#dataset-map-attribution{
display:none;
}
#dataset-map .module-heading{
padding:0px;
margin-right:0px;
font-weight: normal;
}
#dataset-map .module-heading [class^="icon-"],
#dataset-map .module-heading [class*=" icon-"] {
font-size: 14px;
line-height: 1;
width: 14px;
text-align: left;
display: inherit;
}
\ No newline at end of file
......@@ -95,31 +95,6 @@
background: white;
}
#field-sitewide-search {
font-size: 87%;
font-weight: 300;
padding-left: .5em;
width: 167px;
line-height: 1.1;
border-bottom: 2px solid #c2cbd6 !important;
background: #f2f2f2;
border: 1px solid #f2f2f2;
box-shadow: none !important;
height: 20px;
}
#field-sitewide-search:focus {
outline: 1px solid rgba(82,168,236,0.8);
border-color: rgba(82,168,236,0.8);
}
.simple-input .field .btn-search {
height: 32px;
width: 32px;
background: url(/base/images/search_submit.png);
right: -47px;
top: 36%;
}
.navigation-container {
background: #f2f2f2;
......
<section class="module">
<div class="pagination pagination-centered">
<ul>
{% if current != 1 %}<li><a href="#page={{ current - 1 }}">«</a></li>{% endif %}
{% for index in range(1, total+1) %}
<li {% if index==current %} class="active" {% endif %}><a href="#page={{ index }}">{{ index }}</a></li>
{% endfor %}
{% if current != total %}<li><a href="#page={{ current + 1 }}">></a></li>{% endif %}
</ul>
</div>
</section>
\ No newline at end of file
......@@ -4,20 +4,12 @@
<div class='footer-first-row'>
<div class="footer-left">
<div class="footer-icon">Drucken</div>
<div class="footer-icon">Seite empfehlen</div>
</div>
<div class="footer-right">
<div class='footer-icon'>face</div>
<div class='footer-icon'>yout</div>
<div class='footer-icon'>twit</div>
<div class='footer-icon last'>rsss</div>
</div>
</div>
<div class='footer-line'></div>
<div class="footer-left">
<div class="footer-icon">&copy; 2018 Open Data Schleswig Holstein</div>
<div class="footer-right">
<div class='footer-icon'>Landesportal SH</div>
<div class='footer-icon'>Kontakt</div>
<div class='footer-icon'>Impressum</div>
<div class='footer-icon last'>Datenschutz</div>
......
......@@ -30,22 +30,6 @@
</hgroup>
</div>
<div class='span9 span-navigation pull-right'>
{% snippet "snippets/language_selector.html" %}
{% block header_site_search %}
<div class='top-search-form'>
<form class="section site-search simple-input" action="{% url_for controller='package', action='search' %}"
method="get">
<div class="field">
<input id="field-sitewide-search" type="text" name="q" placeholder="{{ _('Suchbegriff') }}" />
<button class="btn-search" type="submit">
</div>
</form>
</div>
{% endblock %}
</div>
</div>
</div>
......
......@@ -11,12 +11,9 @@
##
## tools on left side, ie filter
{% block secondary_content %}
<div class="karte_outer">
<p>Karte:</p>
<div class="karte_inner">
</div>
</div>
{% 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>
......@@ -33,3 +30,6 @@
{% endblock %}
{% block package_search_results_api %}
{% endblock %}
{% block page_pagination %}
{{ c.page.pager(q=c.q,symbol_next='>') }}
{% endblock %}
\ No newline at end of file
......@@ -11,6 +11,7 @@
{% block toolbar %}
{{ super() }}
{% snippet "snippets/search_box.html"%}
{% endblock %}
<div class="row wrapper{% block wrapper_class %}{% endblock %}{% if self.secondary()|trim == '' %} no-nav{% endif %} is-table-row">
......@@ -42,4 +43,3 @@
</div>
</div>
{% endblock -%}
\ No newline at end of file
......@@ -75,7 +75,8 @@ Example:
{% block resources_inner %}
{% for resource in h.dict_list_reduce(package.resources, 'format') %}
<li>
<a href="{{ h.url_for(controller='package', action='read', id=package.name) }}" class="label dataformat-label" data-format="{{ resource.lower() }}">{{
<a href="{{ h.url_for(controller='package', action='read', id=package.name) }}" class="label dataformat-label"
data-format="{{ resource.lower() }}">{{
resource }}</a>
</li>
{% endfor %}
......@@ -89,7 +90,6 @@ Example:
<p> {{_('Lizenz')}}: {{license}}</p>
<p> {{_('Herausgeber')}}: {{org}} </p>
<p> {{timerange_label}}: {{timerange}}</p>
<p> {{access_count_label}}: {{access_count}}</p>
</div>
{% endblock %}
{% endif %}
......
<div class='search-box-container'>
<div class='search-box'>
<form class="section site-search simple-input" action="{% url_for controller='package', action='search' %}"
method="get">
<div class="field">
<input id="field-sitewide-search" type="text" name="q" placeholder="{{ _('Search dataset') }}" />
<button class="btn-search" type="submit">
</div>
</form>
</div>
</div>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment