From e95e0e1fd5ff17d79b764b4a3da5ffa4288d413a Mon Sep 17 00:00:00 2001
From: Pascal <rost@informatik.uni-hamburg.de>
Date: Fri, 12 Oct 2018 21:22:23 +0200
Subject: [PATCH] Applies design of mockup to searchresults-page.
---
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo | Bin 779 -> 1063 bytes
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po | 10 ++
ckanext/odsh/public/odsh.css | 88 ++++++++++++++++++
.../odsh/templates/snippets/package_item.html | 56 ++++++-----
.../odsh/templates/snippets/package_list.html | 4 +-
5 files changed, 132 insertions(+), 26 deletions(-)
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo
index 99420a5d1bf773835f32e7241ce3097dcaf1eb4b..4d7b80af0180fb7b351aae69e49127f8953c2914 100644
GIT binary patch
delta 460
zcmeBXTh38`Pl#nI0|NsC7Xt%>3<Cp04v2$<_b@Op2r)1)>}6nJU}IolxWK@`AjrVL
zaGimHfro*C;UxnD10Mqe!#4&7238PeWMGhFU|`^8WMI%^U|>*XWMJ@OU|<MgWMG)U
z$iOh4k%57ifq}t*8EmIDgB>#igD3+7gC{csgD?XFLp+pU%nUKG6Uy&rW?-;oU|?9v
z%)sExz`*dBdE%_>`s%#W+@#c^T7{IvlEmWF5{0z<(!3M~bm3wg;t*klwEQ9krRu`c
z)S}8-C0v@(R0R~}XQgiDVq|1OIKm~dBsH%%v7|~NJvFT~FC{fkAp&6>ME3BKlB!g!
e@~%bcsY!X6#R_SM_h5AoOhIufiW25pB?bUZqIPuv
delta 168
zcmZ3^(alzWPl#nI0|NsC2Ll6x3<Cp042Xk-=P)oZ2r)1)%w=F;U}Iol*ucQRAjrVL
zu$_T{fro*C;UohC10Mqe!!-s5237_JhNlb+43Z2C46hj&7$z_>Ft9Q*Fz_-kFic}&
wVBlh4U|7P$z#z)Nz_6Z)fkBvoL7L$xRNy8P#DMou{#T}nyRtXWXJlgn0O;Bi;{X5v
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
index e3aa49ec..a24a2df6 100644
--- a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
+++ b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
@@ -39,3 +39,13 @@ msgstr "Namensnennung"
msgid "Spatial extension"
msgstr "räumliche Ausdehnung"
+
+msgid "{number} dataset found"
+msgid_plural "{number} datasets found"
+msgstr[0] "{number} Datensatz gefunden X"
+msgstr[1] "{number} Datensätze gefunden X"
+
+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}\""
diff --git a/ckanext/odsh/public/odsh.css b/ckanext/odsh/public/odsh.css
index fe5ff860..1c7d8a84 100644
--- a/ckanext/odsh/public/odsh.css
+++ b/ckanext/odsh/public/odsh.css
@@ -60,13 +60,24 @@ input, button, select, textarea {
width: 1000px;
}
+.search-form {
+ border-bottom: 4px solid #dbdbdb;
+ padding-bottom: 5px;
+}
+
.search-form .control-order-by select {
width: 225px;
margin: 0;
+ border: 1px;
+ background-color: #f2f2f2;
+ color: black;
}
.search-form h2 {
margin-top: 0px;
+ font-size: 25px;
+ color: #003064;
+ font-weight: 300;
}
.module-content:first-child {
@@ -227,3 +238,80 @@ label.mylabel::after {
display: table-cell;
vertical-align: top;
}
+
+.pill {
+ background-color: #F6F7F9;
+ border-radius: 0px;
+ color:black;
+ font-size: 12px;
+ margin-right: 2px;
+}
+
+.pill a.remove {
+ color: black;
+ font-size: 10px;
+ position: relative;
+ top: -8px;
+ right: -8px;
+}
+
+.container-fluid.odsh-dataset-item {
+ padding: 20px 0px 20px 0px;
+ border-bottom: 2px solid #DBDBDB;
+}
+
+.dataset-content {
+ float:left;
+ width: 70%;
+}
+
+.dataset-heading {
+ margin-right: 30px;
+}
+
+.dataset-empty {
+ margin-right: 30px;
+ color: darkgrey;
+}
+
+.dataset-meta {
+ float:right;
+ width: 30%;
+}
+
+ul.dataset-resources {
+ margin: 0px 0px 10px 0px;
+}
+
+.dataformat-label {
+ background-color: #1c355e !important;
+ padding: 3px 3px 1px 3px;
+ font-size: 14px;
+ margin-right: 4px;
+}
+
+.dataset-stars {
+ margin-bottom: 10px;
+}
+
+.odsh-star {
+ margin-right: 5px;
+ font-size: 20px;
+ color: #1c355e;
+}
+
+.dataformat-label:hover {
+ background-color: #d7004d !important;
+}
+
+.dataset-info p {
+ font-size: 12px;
+ margin-bottom: 1px;
+ color: black;
+}
+
+.breadcrumb>li a {
+ font-weight: normal !important;
+ font-size: 15px;
+ color: #003064 !important;
+}
diff --git a/ckanext/odsh/templates/snippets/package_item.html b/ckanext/odsh/templates/snippets/package_item.html
index ad5edae2..7eb2551d 100644
--- a/ckanext/odsh/templates/snippets/package_item.html
+++ b/ckanext/odsh/templates/snippets/package_item.html
@@ -22,10 +22,10 @@ Example:
{% set org = package.organization.title or package.organization.name or '-' %}
{% set access_count=(package.tracking_summary.total if package.tracking_summary) or '-' %}
{% set timerange_label ='Zeitraum' %}
-{% set access_count_label ='Zugriffe' %}
+{% set access_count_label ='Aufrufe' %}
{% block package_item %}
-<li class="{{ item_class or "dataset-item" }}">
+<div class="container-fluid odsh-dataset-item">
{% block content %}
<div class="dataset-content">
{% block heading %}
@@ -62,34 +62,42 @@ Example:
{% if notes %}
<div>{{ notes|urlize }}</div>
{% else %}
- <p class="empty">{{ _("This dataset has no description") }}</p>
+ <p class="dataset-empty">{{ _("This dataset has no description") }}</p>
{% endif %}
{% endblock %}
</div>
- {% block resources %}
- {% if package.resources and not hide_resources %}
- {% block resources_outer %}
- <ul class="dataset-resources unstyled">
- {% 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" data-format="{{ resource.lower() }}">{{
- resource }}</a>
- </li>
- {% endfor %}
+ <div class="dataset-meta">
+ {% block resources %}
+ {% if package.resources and not hide_resources %}
+ {% block resources_outer %}
+ <ul class="dataset-resources">
+ {% 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() }}">{{
+ resource }}</a>
+ </li>
+ {% endfor %}
+ {% endblock %}
+ </ul>
+ <div class="dataset-stars">
+ <i class="fa fa-star odsh-star"></i><i class="fa fa-star odsh-star"></i><i class="fa fa-star odsh-star"></i><i class="fa fa-star odsh-star"></i><i class="fa fa-star-o odsh-star"></i>
+ </div>
+
+ <div class="dataset-info">
+ <p> {{_('Lizenz')}}: {{license}}</p>
+ <p> {{_('Herausgeber')}}: {{org}} </p>
+ <p> {{timerange_label}}: {{timerange}}</p>
+ <p> {{access_count_label}}: {{access_count}}</p>
+ </div>
{% endblock %}
- </ul>
- <span> {{_('Organizations')}}: {{org}}</span>
- <span> {{_('License')}}: {{license}}</span>
- <span> {{timerange_label}}: {{timerange}}</span>
- <span> {{access_count_label}}: {{access_count}}</span>
- {% endblock %}
- {% endif %}
- {% endblock %}
+ {% endif %}
+ {% endblock %}
+ </div>
{% block package_openness %}
<div class="module module-narrow module-shallow context-info">
</div>
{% endblock %}
{% endblock %}
-</li>
-{% endblock %}
\ No newline at end of file
+</div>
+{% endblock %}
diff --git a/ckanext/odsh/templates/snippets/package_list.html b/ckanext/odsh/templates/snippets/package_list.html
index 3cb0d852..01b2ef8f 100644
--- a/ckanext/odsh/templates/snippets/package_list.html
+++ b/ckanext/odsh/templates/snippets/package_list.html
@@ -16,12 +16,12 @@ Example:
#}
{% block package_list %}
{% if packages %}
- <ul class="{{ list_class or 'dataset-list unstyled' }}">
+ <div class="{{ list_class or 'dataset-list unstyled' }}">
{% block package_list_inner %}
{% for package in packages %}
{% snippet 'snippets/package_item.html', package=package, item_class=item_class, hide_resources=hide_resources, banner=banner, truncate=truncate, truncate_title=truncate_title %}
{% endfor %}
{% endblock %}
- </ul>
+ </div>
{% endif %}
{% endblock %}
--
GitLab