diff --git a/src/ckanext-agra-theme/ckanext/agra_theme/public/base/css/agra.css b/src/ckanext-agra-theme/ckanext/agra_theme/public/base/css/agra.css index 60390c9..4b39529 100644 --- a/src/ckanext-agra-theme/ckanext/agra_theme/public/base/css/agra.css +++ b/src/ckanext-agra-theme/ckanext/agra_theme/public/base/css/agra.css @@ -16,8 +16,38 @@ a.tag:hover { color: #fff; background-color: #919191; } +span.label.label-count { + margin-left: 5px; + background-color: #ffffd6; + color: #00565a; +} +.row.dataset-list { + min-height: 120px; + border-bottom: 1px solid #e5e5e5; + margin: 0px; +} +.row.dataset-list .dataset-info, +.row.dataset-list .dataset-description { + min-height: 120px; + padding: 0px; +} +.row.dataset-list .dataset-info .dataset-resources { + position: absolute; + bottom: 10px; +} +.row.dataset-list h2 { + font-weight: 600; +} +span.recent-views, +span.private-views { + font-weight: 400; + color: #00565a; +} +span.private-views { + color: #e0051e; +} .masthead { - background: none; + background: rgba(0, 0, 0, 0.2); } .masthead a, .masthead .nav > li > a:focus, @@ -26,7 +56,7 @@ a.tag:hover { .masthead .nav > .active > a:hover, .masthead .nav > .active > a:focus { font-family: Poppins, sans-serif; - font-weight: 300; + font-weight: 400; color: #fff; } /* Home Page */ @@ -34,6 +64,7 @@ a.tag:hover { display: flex; justify-content: center; align-items: center; + min-height: calc(100vh - 72px); } #home > div[role="main"] > .main.hero h1, #home > div[role="main"] > .main.hero h1 small { @@ -43,6 +74,9 @@ a.tag:hover { margin-bottom: 0; } +#home > div[role="main"] .main.content { + background: #fff; +} #home > div[role="main"] > .main.hero h1 small { color: #e5e71e; } @@ -55,4 +89,10 @@ a.tag:hover { } .homepage .module-search { background: none; + padding: 40px; +} + +#home > div[role="main"] .main.content h1 { + text-align: center; + color: #08743f; } diff --git a/src/ckanext-agra-theme/ckanext/agra_theme/public/base/css/base.css b/src/ckanext-agra-theme/ckanext/agra_theme/public/base/css/base.css index 2d386df..ee44830 100644 --- a/src/ckanext-agra-theme/ckanext/agra_theme/public/base/css/base.css +++ b/src/ckanext-agra-theme/ckanext/agra_theme/public/base/css/base.css @@ -9094,7 +9094,7 @@ td.diff_header { border: none; background: none; font-size: 18px; - background-color: #fff; + background-color: transparent; font-size: 14px; padding: 10px 20px; } @@ -9736,10 +9736,13 @@ h4 small { margin-right: 3px; } .wrapper { + border: 1px solid #f6f6f6; position: relative; - border-radius: 4px; + border-radius: 0px; min-height: 300px; background-color: #fff; + box-shadow: none; + -webkit-box-shadow: none; } .wrapper:before, .wrapper:after { @@ -9758,6 +9761,9 @@ h4 small { clear: both; } @media (min-width: 768px) { + .main { + background: #f8f8f8; + } .wrapper:before { content: ""; display: block; @@ -10055,6 +10061,7 @@ h4 small { border-radius: 3px 3px 0 0; background-color: #08743f; border-bottom: none; + padding: 40px 20px 5px; } .homepage .module-search .module-content .heading { margin-top: 0; @@ -10063,7 +10070,7 @@ h4 small { line-height: 40px; } .homepage .module-search .tags { - padding: 5px 10px 10px 10px; + padding: 5px 20px 20px 20px; background-color: #08743f; border-radius: 0 0 3px 3px; } @@ -10094,7 +10101,7 @@ h4 small { color: #fff; font-size: 14px; line-height: 1.42857143; - padding: 2px 8px; + padding: 2px 8px 0px 0px; } .homepage .group-list { margin: 0; @@ -11268,7 +11275,7 @@ iframe { } .facet-category .facet-title, .facet-category .facet-items { - padding: 5px 10px; + padding: 20px; } .facet-category .group-hierarchy label, .facet-category .facet-items label { @@ -11280,7 +11287,8 @@ iframe { content: ""; } .facet-category .facet-title { - background: #f6f6f6; + background: #ddd; + font-weight: 600; } .facet-category .group-hierarchy { list-style: none; diff --git a/src/ckanext-agra-theme/ckanext/agra_theme/templates/home/index.html b/src/ckanext-agra-theme/ckanext/agra_theme/templates/home/index.html index 61a5fb0..2e6a91c 100644 --- a/src/ckanext-agra-theme/ckanext/agra_theme/templates/home/index.html +++ b/src/ckanext-agra-theme/ckanext/agra_theme/templates/home/index.html @@ -21,7 +21,23 @@ +
+
+
+
+

Find Dataset

+
+
+
+
+
+
+

Highlights

+
+
+
+
+ {% endblock %} {% endblock %} -{% endblock %} diff --git a/src/ckanext-agra-theme/ckanext/agra_theme/templates/package/search.html b/src/ckanext-agra-theme/ckanext/agra_theme/templates/package/search.html index 054b51d..1f43488 100644 --- a/src/ckanext-agra-theme/ckanext/agra_theme/templates/package/search.html +++ b/src/ckanext-agra-theme/ckanext/agra_theme/templates/package/search.html @@ -79,41 +79,13 @@ {% for item in search_facets[facet]['items'] %} {% endfor %} {% endfor %} - - {% if search_facets.get('groups') %} -
-
{{ facet_titles.get('groups', 'Groups') }}
- -
- {% endif %} close {% endblock %} diff --git a/src/ckanext-agra-theme/ckanext/agra_theme/templates/snippets/package_item.html b/src/ckanext-agra-theme/ckanext/agra_theme/templates/snippets/package_item.html index 77ab56f..113ce59 100644 --- a/src/ckanext-agra-theme/ckanext/agra_theme/templates/snippets/package_item.html +++ b/src/ckanext-agra-theme/ckanext/agra_theme/templates/snippets/package_item.html @@ -17,23 +17,16 @@ {% set truncate_title = truncate_title or 80 %} {% set title = package.title or package.name %} {% set notes = h.markdown_extract(package.notes, extract_length=truncate) %} +{% set package_with_tracking = h.get_action('package_show', ({'id': package.id, 'include_tracking': True})) %} {% block package_item %} -
  • {% block content %}
    {% block heading %} - +
    +

    - {% block heading_private %} - {% if package.private %} - - - {{ _('Private') }} - - {% endif %} - {% endblock %} {% block heading_title %} {{ h.link_to(h.truncate(title, truncate_title), h.url_for('%s.read' % package.type, id=package.name)) }} {% endblock %} @@ -43,19 +36,42 @@

    {% elif package.get('state', '').startswith('deleted') %} {{ _('Deleted') }} {% endif %} - {{ h.popular('views', package.tracking_summary.recent, min=1) if package.tracking_summary }} + {{ h.popular('views', package_with_tracking.tracking_summary.recent, min=5) if package_with_tracking.tracking_summary }} {% endblock %}

    -
    - {% set package_with_tracking = h.get_action('package_show', ({'id': package.id, 'include_tracking': True})) %} - Total Views: {{package_with_tracking.tracking_summary.total if package_with_tracking.tracking_summary else 'no tracking'}} -
    - {% endblock %} - {% block banner %} - {% if banner %} - - {% endif %} {% endblock %} +
    + {{package_with_tracking.tracking_summary.total if package_with_tracking.tracking_summary else 'no tracking'}} Recent Views +
    + {% block heading_private %} + {% if package.private %} +
    + {{ _('Private') }} +
    + {% endif %} + {% endblock %} + {% block banner %} + {% if banner %} + + {% endif %} + {% endblock %} + {% block resources %} + {% if package.resources and not hide_resources %} + {% block resources_outer %} +
      + {% block resources_inner %} + {% for resource in h.dict_list_reduce(package.resources, 'format') %} +
    • + {{ resource }} +
    • + {% endfor %} + {% endblock %} +
    + {% endblock %} + {% endif %} + {% endblock %} +
    +
    {% block notes %} {% if notes %}
    {{ notes|urlize }}
    @@ -63,22 +79,9 @@

    {{ _("This dataset has no description") }}

    {% endif %} {% endblock %} +

    +
    - {% block resources %} - {% if package.resources and not hide_resources %} - {% block resources_outer %} - - {% endblock %} - {% endif %} - {% endblock %} {% endblock %}
  • {% endblock %}